hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-14 05:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename DataCiteIdentifierProvider to EZIDIdentifierProvider to better reflect its role and disentangle from another DataCite provider in development.

Browse Source
This commit is contained in:
Mark H. Wood
2013-06-18 15:07:35 -04:00
parent 7ba9088bb3
commit b03a1d942a
3 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/src/main/java/org/dspace/identifier/DataCiteIdentifierProvider.java → dspace-api/src/main/java/org/dspace/identifier/EZIDIdentifierProvider.java
View File

@@ -67,10 +67,10 @@ import org.springframework.beans.factory.annotation.Required;
* *
* @author mwood * @author mwood
*/ */
public class DataCiteIdentifierProvider public class EZIDIdentifierProvider
extends IdentifierProvider extends IdentifierProvider
{ {
private static final Logger log = LoggerFactory.getLogger(DataCiteIdentifierProvider.class); private static final Logger log = LoggerFactory.getLogger(EZIDIdentifierProvider.class);
// Configuration property names // Configuration property names
static final String CFG_SHOULDER = "identifier.doi.ezid.shoulder"; static final String CFG_SHOULDER = "identifier.doi.ezid.shoulder";

5
dspace-api/src/main/resources/spring/spring-dspace-addon-identifier-services.xml
View File

@@ -13,9 +13,10 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
<bean id="org.dspace.identifier.DataCiteIdentifierProvider" <bean id="org.dspace.identifier.EZIDIdentifierProvider"
class="org.dspace.identifier.DataCiteIdentifierProvider" class="org.dspace.identifier.EZIDIdentifierProvider"
scope='singleton'> scope='singleton'>
<description>Uses the EZID service to provide DOI identifiers from DataCite</description>
<property name="configurationService" <property name="configurationService"
ref="org.dspace.services.ConfigurationService"/> ref="org.dspace.services.ConfigurationService"/>
<property name='requestFactory'> <property name='requestFactory'>

88
dspace-api/src/test/java/org/dspace/identifier/DataCiteIdentifierProviderTest.java → dspace-api/src/test/java/org/dspace/identifier/EZIDIdentifierProviderTest.java
View File

@@ -26,7 +26,7 @@ import static org.junit.Assert.*;
* *
* @author mwood * @author mwood
*/ */
public class DataCiteIdentifierProviderTest public class EZIDIdentifierProviderTest
extends AbstractUnitTest extends AbstractUnitTest
{ {
/** Name of the reserved EZID test authority */ /** Name of the reserved EZID test authority */
@@ -43,7 +43,7 @@ public class DataCiteIdentifierProviderTest
/** The most recently created test Item's ID */ /** The most recently created test Item's ID */
private static int itemID; private static int itemID;
public DataCiteIdentifierProviderTest() public EZIDIdentifierProviderTest()
{ {
} }
@@ -116,9 +116,9 @@ public class DataCiteIdentifierProviderTest
config = kernelImpl.getConfigurationService(); config = kernelImpl.getConfigurationService();
// Configure the service under test. // Configure the service under test.
config.setProperty(DataCiteIdentifierProvider.CFG_SHOULDER, TEST_SHOULDER); config.setProperty(EZIDIdentifierProvider.CFG_SHOULDER, TEST_SHOULDER);
config.setProperty(DataCiteIdentifierProvider.CFG_USER, "apitest"); config.setProperty(EZIDIdentifierProvider.CFG_USER, "apitest");
config.setProperty(DataCiteIdentifierProvider.CFG_PASSWORD, "apitest"); config.setProperty(EZIDIdentifierProvider.CFG_PASSWORD, "apitest");
// Don't try to send mail. // Don't try to send mail.
config.setProperty("mail.server.disabled", "true"); config.setProperty("mail.server.disabled", "true");
@@ -154,9 +154,9 @@ public class DataCiteIdentifierProviderTest
{ {
System.out.println("supports"); System.out.println("supports");
DataCiteIdentifierProvider instance EZIDIdentifierProvider instance
= (DataCiteIdentifierProvider) = (EZIDIdentifierProvider)
sm.getServicesByType(DataCiteIdentifierProvider.class).get(0); sm.getServicesByType(EZIDIdentifierProvider.class).get(0);
Class<? extends Identifier> identifier = DOI.class; Class<? extends Identifier> identifier = DOI.class;
boolean result = instance.supports(identifier); boolean result = instance.supports(identifier);
@@ -171,9 +171,9 @@ public class DataCiteIdentifierProviderTest
{ {
System.out.println("supports"); System.out.println("supports");
DataCiteIdentifierProvider instance EZIDIdentifierProvider instance
= (DataCiteIdentifierProvider) = (EZIDIdentifierProvider)
sm.getServicesByType(DataCiteIdentifierProvider.class).get(0); sm.getServicesByType(EZIDIdentifierProvider.class).get(0);
String identifier = "doi:" + TEST_SHOULDER; String identifier = "doi:" + TEST_SHOULDER;
boolean result = instance.supports(identifier); boolean result = instance.supports(identifier);
@@ -189,9 +189,9 @@ public class DataCiteIdentifierProviderTest
{ {
System.out.println("register 2"); System.out.println("register 2");
DataCiteIdentifierProvider instance EZIDIdentifierProvider instance
= (DataCiteIdentifierProvider) = (EZIDIdentifierProvider)
sm.getServicesByType(DataCiteIdentifierProvider.class).get(0); sm.getServicesByType(EZIDIdentifierProvider.class).get(0);
DSpaceObject dso = newItem(context); DSpaceObject dso = newItem(context);
@@ -209,9 +209,9 @@ public class DataCiteIdentifierProviderTest
{ {
System.out.println("register 3"); System.out.println("register 3");
DataCiteIdentifierProvider instance EZIDIdentifierProvider instance
= (DataCiteIdentifierProvider) = (EZIDIdentifierProvider)
sm.getServicesByType(DataCiteIdentifierProvider.class).get(0); sm.getServicesByType(EZIDIdentifierProvider.class).get(0);
DSpaceObject object = newItem(context); DSpaceObject object = newItem(context);
@@ -229,9 +229,9 @@ public class DataCiteIdentifierProviderTest
{ {
System.out.println("reserve"); System.out.println("reserve");
DataCiteIdentifierProvider instance EZIDIdentifierProvider instance
= (DataCiteIdentifierProvider) = (EZIDIdentifierProvider)
sm.getServicesByType(DataCiteIdentifierProvider.class).get(0); sm.getServicesByType(EZIDIdentifierProvider.class).get(0);
DSpaceObject dso = newItem(context); DSpaceObject dso = newItem(context);
String identifier = UUID.randomUUID().toString(); String identifier = UUID.randomUUID().toString();
@@ -247,9 +247,9 @@ public class DataCiteIdentifierProviderTest
{ {
System.out.println("mint"); System.out.println("mint");
DataCiteIdentifierProvider instance EZIDIdentifierProvider instance
= (DataCiteIdentifierProvider) = (EZIDIdentifierProvider)
sm.getServicesByType(DataCiteIdentifierProvider.class).get(0); sm.getServicesByType(EZIDIdentifierProvider.class).get(0);
DSpaceObject dso = newItem(context); DSpaceObject dso = newItem(context);
String result = instance.mint(context, dso); String result = instance.mint(context, dso);
@@ -265,9 +265,9 @@ public class DataCiteIdentifierProviderTest
{ {
System.out.println("resolve"); System.out.println("resolve");
DataCiteIdentifierProvider instance EZIDIdentifierProvider instance
= (DataCiteIdentifierProvider) = (EZIDIdentifierProvider)
sm.getServicesByType(DataCiteIdentifierProvider.class).get(0); sm.getServicesByType(EZIDIdentifierProvider.class).get(0);
String identifier = UUID.randomUUID().toString(); String identifier = UUID.randomUUID().toString();
DSpaceObject expResult = newItem(context); DSpaceObject expResult = newItem(context);
@@ -287,9 +287,9 @@ public class DataCiteIdentifierProviderTest
{ {
System.out.println("lookup"); System.out.println("lookup");
DataCiteIdentifierProvider instance EZIDIdentifierProvider instance
= (DataCiteIdentifierProvider) = (EZIDIdentifierProvider)
sm.getServicesByType(DataCiteIdentifierProvider.class).get(0); sm.getServicesByType(EZIDIdentifierProvider.class).get(0);
String identifier = UUID.randomUUID().toString(); String identifier = UUID.randomUUID().toString();
DSpaceObject object = newItem(context); DSpaceObject object = newItem(context);
@@ -308,9 +308,9 @@ public class DataCiteIdentifierProviderTest
{ {
System.out.println("delete 2"); System.out.println("delete 2");
DataCiteIdentifierProvider instance EZIDIdentifierProvider instance
= (DataCiteIdentifierProvider) = (EZIDIdentifierProvider)
sm.getServicesByType(DataCiteIdentifierProvider.class).get(0); sm.getServicesByType(EZIDIdentifierProvider.class).get(0);
DSpaceObject dso = newItem(context); DSpaceObject dso = newItem(context);
@@ -331,15 +331,15 @@ public class DataCiteIdentifierProviderTest
// See if those identifiers were really deleted. // See if those identifiers were really deleted.
ItemIterator found; ItemIterator found;
found = Item.findByMetadataField(context, found = Item.findByMetadataField(context,
DataCiteIdentifierProvider.MD_SCHEMA, EZIDIdentifierProvider.MD_SCHEMA,
DataCiteIdentifierProvider.DOI_ELEMENT, EZIDIdentifierProvider.DOI_ELEMENT,
DataCiteIdentifierProvider.DOI_QUALIFIER, id1); EZIDIdentifierProvider.DOI_QUALIFIER, id1);
assertFalse("A test identifier is still present", found.hasNext()); assertFalse("A test identifier is still present", found.hasNext());
found = Item.findByMetadataField(context, found = Item.findByMetadataField(context,
DataCiteIdentifierProvider.MD_SCHEMA, EZIDIdentifierProvider.MD_SCHEMA,
DataCiteIdentifierProvider.DOI_ELEMENT, EZIDIdentifierProvider.DOI_ELEMENT,
DataCiteIdentifierProvider.DOI_QUALIFIER, id2); EZIDIdentifierProvider.DOI_QUALIFIER, id2);
assertFalse("A test identifier is still present", found.hasNext()); assertFalse("A test identifier is still present", found.hasNext());
} }
@@ -352,9 +352,9 @@ public class DataCiteIdentifierProviderTest
{ {
System.out.println("delete 3"); System.out.println("delete 3");
DataCiteIdentifierProvider instance EZIDIdentifierProvider instance
= (DataCiteIdentifierProvider) = (EZIDIdentifierProvider)
sm.getServicesByType(DataCiteIdentifierProvider.class).get(0); sm.getServicesByType(EZIDIdentifierProvider.class).get(0);
DSpaceObject dso = newItem(context); DSpaceObject dso = newItem(context);
String identifier = UUID.randomUUID().toString(); String identifier = UUID.randomUUID().toString();
@@ -367,9 +367,9 @@ public class DataCiteIdentifierProviderTest
// See if it is gone // See if it is gone
ItemIterator found = Item.findByMetadataField(context, ItemIterator found = Item.findByMetadataField(context,
DataCiteIdentifierProvider.MD_SCHEMA, EZIDIdentifierProvider.MD_SCHEMA,
DataCiteIdentifierProvider.DOI_ELEMENT, EZIDIdentifierProvider.DOI_ELEMENT,
DataCiteIdentifierProvider.DOI_QUALIFIER, identifier); EZIDIdentifierProvider.DOI_QUALIFIER, identifier);
assertFalse("Test identifier is still present", found.hasNext()); assertFalse("Test identifier is still present", found.hasNext());
} }
} }