diff --git a/README.md b/README.md
index d7251a22d85c0b86f63fa144500144b50477ea6a..27e3c595cd712ed4c9d42fc78fad84d75179f7b2 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,12 @@ Or you can use a DEB file from the DARIAH-DE [APTLY Repository](https://ci.de.da
The service is deployed just by installing the appropriate DEB package.
+
+# Releasing a new version
+
+For releasing a new version of DARIAH-DE OAI-PMH, please have a look at the [DARIAH-DE Release Management Page](https://wiki.de.dariah.eu/display/DARIAH3/DARIAH-DE+Release+Management#DARIAHDEReleaseManagement-Gitlabflow/Gitflow(develop,main,featurebranchesundtags)) or see the [Gitlab CI file](.gitlab-ci.yml).
+
+
## Links and References
* [OAI-PMH Service Gitlab page](https://gitlab.gwdg.de/dariah-de/dariah-de-oai-pmh-services)
diff --git a/RELEASE.md b/RELEASE.md
deleted file mode 100644
index 81ccda006626990031f39bc7288ffd809be5811e..0000000000000000000000000000000000000000
--- a/RELEASE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Releasing a new version
-
-For releasing a new version of DARIAH-DE OAI-PMH, please have a look at the [DARIAH-DE Release Management Page](https://wiki.de.dariah.eu/display/DARIAH3/DARIAH-DE+Release+Management#DARIAHDEReleaseManagement-Gitlabflow/Gitflow(develop,main,featurebranchesundtags)) or see the [Gitlab CI file](.gitlab-ci.yml).
diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 990a4cfec1d8366331d0903c095dfafc993d2b97..cef534c4f6f4cdafdadff7cdac9948cae78e0aeb 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -134,11 +134,11 @@
<format property="BUILDDATE" pattern="yyyyMMddHHmm" />
</tstamp>
<echo
- file="./src/main/java/info/textgrid/middleware/OAIPMHServiceVersion.java">
+ file="./src/main/java/info/textgrid/middleware/OaipmhServiceVersion.java">
package info.textgrid.middleware;
public final class
- OAIPMHServiceVersion {
- private OAIPMHServiceVersion() {
+ OaipmhServiceVersion {
+ private OaipmhServiceVersion() {
//
}
public static final String VERSION = "${project.version}";
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java
index 351074451972ed2d901f7c23cb19ee71bdd9eb80..cb3e2ca4365bba7794192ada991c991a309b6cd4 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java
@@ -114,7 +114,7 @@ public final class DublinCoreBuilder {
for (String dcdate : dates) {
ElementType dateElement = new ElementType();
JAXBElement<ElementType> dcCoreDate = oaiDcObj.createDate(dateElement);
- dateElement.setValue(OAIPMHUtilities.convertDateFormat(dcdate).toString());
+ dateElement.setValue(OaipmhUtilities.convertDateFormat(dcdate).toString());
this.tgMappedDC.getTitleOrCreatorOrSubject().add(dcCoreDate);
}
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
index 0e03d3ad69282867b79093d808e3c2c325469bc6..9606e0c1ea725450bca5550b35cbd2632018a49e 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
@@ -61,7 +61,7 @@ public class DublinCoreFieldLoader {
try {
// FIXME DO SET VALUES VIA CONFIG FILE!
if (responseWorkValues.getField(field) != null) {
- dates.add(OAIPMHUtilities
+ dates.add(OaipmhUtilities
.convertDateFormat(responseWorkValues.getField(field).getValue().toString())
.toXMLFormat());
}
@@ -94,7 +94,7 @@ public class DublinCoreFieldLoader {
for (String field : fields) {
if (hit.getFields().get(field) != null) {
try {
- dates.add(OAIPMHUtilities
+ dates.add(OaipmhUtilities
.convertDateFormat(hit.getFields().get(field).getValues().get(0).toString())
.toXMLFormat());
} catch (ParseException e) {
@@ -125,7 +125,7 @@ public class DublinCoreFieldLoader {
if (fields != null) {
for (String field : fields) {
if (responseWorkValues.getSourceAsMap().get(field) == null) {
- String[] requestedField = field.split(OAIPMHUtilities.ES_DIVIDER_REGEXP);
+ String[] requestedField = field.split(OaipmhUtilities.ES_DIVIDER_REGEXP);
Map<String, Object> nestedMap = responseWorkValues.getSourceAsMap();
String valueOfRequestedField = null;
Map<String, Object> nestedMap2 = null;
@@ -173,7 +173,7 @@ public class DublinCoreFieldLoader {
if (fields != null) {
for (String field : fields) {
if (hit.getSourceAsMap().get(field) == null) {
- String[] requestedField = field.split(OAIPMHUtilities.ES_DIVIDER_REGEXP);
+ String[] requestedField = field.split(OaipmhUtilities.ES_DIVIDER_REGEXP);
Map<String, Object> nestedMap = hit.getSourceAsMap();
String valueOfRequestedField = null;
Map<String, Object> nestedMap2 = null;
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
index bbe1aad3bb625385905a5b7d3660060780b7495b..cad7b27b673dcba4d8de9888f35484f5d2520394 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
@@ -40,7 +40,7 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
// CLASS
// **
- protected OAIPMHElasticSearchClient oaiEsClient;
+ protected OaipmhElasticSearchClient oaiEsClient;
protected boolean textgrid;
protected boolean dariah;
@@ -83,17 +83,17 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
// Check for metadata prefix AND resumption token.
if (request.getMetadataPrefix() != null && request.getResumptionToken() != null) {
- result.setError(OAIPMHConstants.OAI_BAD_ARGUMENT,
+ result.setError(OaipmhConstants.OAI_BAD_ARGUMENT,
"The resumptionToken is an exclusive argument, please remove metadataPrefix!");
return result;
}
// Check if metadata prefix is existing and valid.
if (request.getMetadataPrefix() != null
- && !request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
- result.setError(OAIPMHConstants.OAI_METADATA_FORMAT_ERROR,
+ && !request.getMetadataPrefix().equals(OaipmhUtilities.OAIDC_PREFIX)
+ && !request.getMetadataPrefix().equals(OaipmhConstants.METADATA_IDIOM_PREFIX)
+ && !request.getMetadataPrefix().equals(OaipmhConstants.METADATA_OPENAIRE_PREFIX)) {
+ result.setError(OaipmhConstants.OAI_METADATA_FORMAT_ERROR,
"The value of the metadataPrefix " + request.getMetadataPrefix()
+ " is not supported by the item identified by the value of: "
+ request.getIdentifier());
@@ -110,7 +110,7 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
errorValues.add("identifier");
}
if (errorValues.size() > 0) {
- result.setError(OAIPMHConstants.OAI_BAD_ARGUMENT,
+ result.setError(OaipmhConstants.OAI_BAD_ARGUMENT,
"The request includes illegal arguments or is missing required arguments: "
+ errorValues);
}
@@ -139,7 +139,7 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
if (this.textgrid) {
String datestamp = hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
try {
- datestamp = OAIPMHUtilities.convertDateFormat(datestamp).toXMLFormat();
+ datestamp = OaipmhUtilities.convertDateFormat(datestamp).toXMLFormat();
} catch (ParseException e) {
log.severe(e.getMessage());
} catch (DatatypeConfigurationException e) {
@@ -154,9 +154,9 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
JSONObject json = new JSONObject(hit.getSourceAsMap());
// Get modifiedDate field and convert datestamp.
- this.datestamp = OAIPMHUtilities.fieldLoader(json, this.dateOfObjectCreation);
+ this.datestamp = OaipmhUtilities.fieldLoader(json, this.dateOfObjectCreation);
try {
- this.datestamp = OAIPMHUtilities.convertDateFormat(this.datestamp).toXMLFormat();
+ this.datestamp = OaipmhUtilities.convertDateFormat(this.datestamp).toXMLFormat();
} catch (ParseException e) {
log.severe(e.getMessage());
// FIXME Go to ERROR state!
@@ -166,13 +166,13 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
}
// Get identifier field.
- String identifier = OAIPMHUtilities.fieldLoader(json, this.identifierField);
+ String identifier = OaipmhUtilities.fieldLoader(json, this.identifierField);
lit = setListIdentifierHeader(this.datestamp, identifier, lit, set);
}
}
// Check the need for a resumption token!
- ResumptionTokenType responseToken = OAIPMHUtilities.getResumptionToken(
+ ResumptionTokenType responseToken = OaipmhUtilities.getResumptionToken(
listFurtherValues.getHits().getTotalHits(), resumptionToken, cursorCollector,
listFurtherValues.getScrollId(), this.searchResponseSize, i);
if (responseToken != null) {
@@ -498,14 +498,14 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
/**
* @return
*/
- public OAIPMHElasticSearchClient getOaiEsClient() {
+ public OaipmhElasticSearchClient getOaiEsClient() {
return this.oaiEsClient;
}
/**
* @param oaiEsClient
*/
- public void setOaiEsClient(OAIPMHElasticSearchClient oaiEsClient) {
+ public void setOaiEsClient(OaipmhElasticSearchClient oaiEsClient) {
this.oaiEsClient = oaiEsClient;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDATACITE.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDatacite.java
similarity index 96%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDATACITE.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDatacite.java
index aa17acd56249a8365f73eb0dd18ad4f43ded9fee..cbcc39db766e5c8d4ce8ae5c02b6c937687d4bb6 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDATACITE.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDatacite.java
@@ -24,7 +24,7 @@ import info.textgrid.middleware.oaipmh.ListIdentifiersType;
* @version 2022-09-07
* @since 2014-02-20
*/
-public class IdentifierListDelivererDATACITE extends IdentifierListDelivererAbstract {
+public class IdentifierListDelivererDatacite extends IdentifierListDelivererAbstract {
protected static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
@@ -33,7 +33,7 @@ public class IdentifierListDelivererDATACITE extends IdentifierListDelivererAbst
* @param identifier taken from the elasticSearch index (textgridUri)
* @return the ListIdentifierElement with the responded header element
*/
- public IdentifierListDelivererDATACITE(boolean textgrid, boolean dariah) {
+ public IdentifierListDelivererDatacite(boolean textgrid, boolean dariah) {
super(textgrid, dariah);
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIdiom.java
similarity index 86%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIdiom.java
index 4e1cadee3da54adcd75362e60b764ab2326378ef..cb65a84b09e7ffa2a04a08110d9bbd6c358eb568 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIdiom.java
@@ -24,17 +24,17 @@ import info.textgrid.middleware.oaipmh.ResumptionTokenType;
* @author Stefan E. Funk, SUB Göttingen
* @version 2022-09-23
*/
-public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstract {
+public class IdentifierListDelivererIdiom extends IdentifierListDelivererAbstract {
// **
// STATICS
// **
- private static Logger log = Logger.getLogger(IdentifierListDelivererIDIOM.class.getName());
+ private static Logger log = Logger.getLogger(IdentifierListDelivererIdiom.class.getName());
private static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
- private RecordDelivererIDIOM idiomRecord;
+ private RecordDelivererIdiom idiomRecord;
// **
// CLASS
@@ -47,7 +47,7 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
* @param textgrid
* @param dariah
*/
- public IdentifierListDelivererIDIOM(boolean textgrid, boolean dariah) {
+ public IdentifierListDelivererIdiom(boolean textgrid, boolean dariah) {
super(textgrid, dariah);
}
@@ -122,16 +122,16 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
for (SearchHit hit : scrollResp.getHits().getHits()) {
i++;
String textgridURI =
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), TGConstants.URI);
- String createdDate = OAIPMHUtilities.oaiDatestampAsString(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), TGConstants.CREATED));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), OaipmhTGConstants.URI);
+ String createdDate = OaipmhUtilities.oaiDatestampAsString(
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), OaipmhTGConstants.CREATED));
- identifierList.getHeader().add(OAIPMHUtilities.computeResponseHeader(createdDate,
- OAIPMHUtilities.getTextGridBaseURI(textgridURI), ""));
+ identifierList.getHeader().add(OaipmhUtilities.computeResponseHeader(createdDate,
+ OaipmhUtilities.getTextGridBaseURI(textgridURI), ""));
}
// Check the need for a resumption token!
- ResumptionTokenType responseToken = OAIPMHUtilities.getResumptionToken(completeListSize,
+ ResumptionTokenType responseToken = OaipmhUtilities.getResumptionToken(completeListSize,
resumptionToken, cursorCollector, scrollID, this.idiomResponseSize, i);
if (responseToken != null) {
identifierList.setResumptionToken(responseToken);
@@ -167,14 +167,14 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
/**
* @return
*/
- public RecordDelivererIDIOM getIdiomRecord() {
+ public RecordDelivererIdiom getIdiomRecord() {
return this.idiomRecord;
}
/**
* @param idiomRecord
*/
- public void setIdiomRecord(RecordDelivererIDIOM idiomRecord) {
+ public void setIdiomRecord(RecordDelivererIdiom idiomRecord) {
this.idiomRecord = idiomRecord;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdiomImages.java
similarity index 96%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/IdiomImages.java
index d1a95578e7918148e72d949d25ed9914b7d76d63..2d72b921ac417d798199c03efed8cb2d2fdc38aa 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdiomImages.java
@@ -41,10 +41,10 @@ import info.textgrid.middleware.oaipmh.ResumptionTokenType;
*
*/
// TODO Why do we have to implement three classes??
-public class IDIOMImages implements RecordDelivererInterface, RecordListDelivererInterface,
+public class IdiomImages implements RecordDelivererInterface, RecordListDelivererInterface,
IdentifierListDelivererInterface {
- private static Logger log = Logger.getLogger(IDIOMImages.class.getName());
+ private static Logger log = Logger.getLogger(IdiomImages.class.getName());
private String kindID;
private String perPage;
@@ -63,7 +63,7 @@ public class IDIOMImages implements RecordDelivererInterface, RecordListDelivere
/**
*
*/
- public IDIOMImages() {
+ public IdiomImages() {
//
}
@@ -71,7 +71,7 @@ public class IDIOMImages implements RecordDelivererInterface, RecordListDelivere
* @param tgcrudEndpoint
* @param rbacSessionID
*/
- public IDIOMImages(String tgcrudEndpoint, String rbacSessionID) {
+ public IdiomImages(String tgcrudEndpoint, String rbacSessionID) {
this.idiomTgcrudEndpoint = tgcrudEndpoint;
this.idiomRbacSessionID = rbacSessionID;
}
@@ -192,7 +192,7 @@ public class IDIOMImages implements RecordDelivererInterface, RecordListDelivere
log.fine("processing id: " + changedID);
log.fine("tgcrud endpoint: " + this.idiomTgcrudEndpoint);
- log.fine("tgcrud rbac sid: " + OAIPMHUtilities.hideSID(this.idiomRbacSessionID));
+ log.fine("tgcrud rbac sid: " + OaipmhUtilities.hideSID(this.idiomRbacSessionID));
try {
// Get TG-crud client (if not yet existing)
@@ -218,9 +218,9 @@ public class IDIOMImages implements RecordDelivererInterface, RecordListDelivere
conedaKorRecord.setMetadata(metadataMets);
// Use base URI for IDIOM image delivery!
- String tgBaseURI = OAIPMHUtilities.getTextGridBaseURI(changedID);
+ String tgBaseURI = OaipmhUtilities.getTextGridBaseURI(changedID);
conedaKorRecord.setHeader(buildOAIPMHRecordHeader(
- OAIPMHUtilities.oaiDatestampAsString(immByTGObject.getCreationDate()), tgBaseURI));
+ OaipmhUtilities.oaiDatestampAsString(immByTGObject.getCreationDate()), tgBaseURI));
singleImageMetsMods.setRecord(conedaKorRecord);
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbstract.java
index 81dfae0452d75e74d33b8557a31250e8d5a45737..b0f536c3f70b30a75792bb975f8a50a0ce596f83 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbstract.java
@@ -14,7 +14,7 @@ public abstract class MetadataFormatListDelivererAbstract
// CLASS
//
- protected OAIPMHElasticSearchClient oaiEsClient;
+ protected OaipmhElasticSearchClient oaiEsClient;
private boolean idExist = true;
@@ -36,16 +36,16 @@ public abstract class MetadataFormatListDelivererAbstract
// Add default metadata format (oai_dc).
MetadataFormatType mft = new MetadataFormatType();
- mft.setMetadataPrefix(OAIPMHUtilities.OAIDC_PREFIX);
- mft.setMetadataNamespace(OAIPMHUtilities.OAIDC_NAMESPACE);
- mft.setSchema(OAIPMHUtilities.OAIDC_SCHEMA_LOCATION);
+ mft.setMetadataPrefix(OaipmhUtilities.OAIDC_PREFIX);
+ mft.setMetadataNamespace(OaipmhUtilities.OAIDC_NAMESPACE);
+ mft.setSchema(OaipmhUtilities.OAIDC_SCHEMA_LOCATION);
result.getMetadataFormat().add(mft);
// Add metadata format for OPEN AIRE.
MetadataFormatType mftOpenAire = new MetadataFormatType();
- mftOpenAire.setMetadataNamespace(OAIPMHUtilities.OPEN_AIRE_NAMESPACE);
- mftOpenAire.setMetadataPrefix(OAIPMHConstants.METADATA_OPENAIRE_PREFIX);
- mftOpenAire.setSchema(OAIPMHUtilities.OPEN_AIRE_SCHEMA_LOCATION);
+ mftOpenAire.setMetadataNamespace(OaipmhUtilities.OPEN_AIRE_NAMESPACE);
+ mftOpenAire.setMetadataPrefix(OaipmhConstants.METADATA_OPENAIRE_PREFIX);
+ mftOpenAire.setSchema(OaipmhUtilities.OPEN_AIRE_SCHEMA_LOCATION);
result.getMetadataFormat().add(mftOpenAire);
return result;
@@ -92,14 +92,14 @@ public abstract class MetadataFormatListDelivererAbstract
/**
* @return
*/
- public OAIPMHElasticSearchClient getOaiEsClient() {
+ public OaipmhElasticSearchClient getOaiEsClient() {
return this.oaiEsClient;
}
/**
* @param oaiEsClient
*/
- public void setOaiEsClient(OAIPMHElasticSearchClient oaiEsClient) {
+ public void setOaiEsClient(OaipmhElasticSearchClient oaiEsClient) {
this.oaiEsClient = oaiEsClient;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererTG.java b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererTG.java
index 0e003c06fb8580fc7cb51dcf3ea96d5b67cd1b9b..412c8c1b0977c185ed039c35e7aa6fe5e862999c 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererTG.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererTG.java
@@ -27,7 +27,7 @@ public class MetadataFormatListDelivererTG extends MetadataFormatListDelivererAb
@Override
public ListMetadataFormatsType setMetadataFormatList(String id) {
- String[] includes = new String[] {TGConstants.URI};
+ String[] includes = new String[] {OaipmhTGConstants.URI};
String[] excludes = Strings.EMPTY_ARRAY;
FetchSourceContext fetchSourceContext = new FetchSourceContext(true, includes, excludes);
@@ -45,13 +45,13 @@ public class MetadataFormatListDelivererTG extends MetadataFormatListDelivererAb
if (tgObject.isExists()) {
setIdExist(true);
- mft.setMetadataPrefix(OAIPMHUtilities.OAIDC_PREFIX);
- mft.setMetadataNamespace(OAIPMHUtilities.OAIDC_NAMESPACE);
- mft.setSchema(OAIPMHUtilities.OAIDC_SCHEMA_LOCATION);
+ mft.setMetadataPrefix(OaipmhUtilities.OAIDC_PREFIX);
+ mft.setMetadataNamespace(OaipmhUtilities.OAIDC_NAMESPACE);
+ mft.setSchema(OaipmhUtilities.OAIDC_SCHEMA_LOCATION);
- openAireMetadataFormat.setMetadataPrefix(OAIPMHConstants.METADATA_OPENAIRE_PREFIX);
- openAireMetadataFormat.setMetadataNamespace(OAIPMHUtilities.OPEN_AIRE_NAMESPACE);
- openAireMetadataFormat.setSchema(OAIPMHUtilities.OPEN_AIRE_SCHEMA_LOCATION);
+ openAireMetadataFormat.setMetadataPrefix(OaipmhConstants.METADATA_OPENAIRE_PREFIX);
+ openAireMetadataFormat.setMetadataNamespace(OaipmhUtilities.OPEN_AIRE_NAMESPACE);
+ openAireMetadataFormat.setSchema(OaipmhUtilities.OPEN_AIRE_SCHEMA_LOCATION);
lmft.getMetadataFormat().add(mft);
lmft.getMetadataFormat().add(openAireMetadataFormat);
@@ -79,9 +79,9 @@ public class MetadataFormatListDelivererTG extends MetadataFormatListDelivererAb
// Add metadata format for IDIOM METS.
MetadataFormatType mftIdiomMets = new MetadataFormatType();
- mftIdiomMets.setMetadataPrefix(OAIPMHConstants.METADATA_IDIOM_PREFIX);
- mftIdiomMets.setMetadataNamespace(OAIPMHUtilities.METS_NAMESPACE);
- mftIdiomMets.setSchema(OAIPMHUtilities.METS_SCHEMA_LOCATION);
+ mftIdiomMets.setMetadataPrefix(OaipmhConstants.METADATA_IDIOM_PREFIX);
+ mftIdiomMets.setMetadataNamespace(OaipmhUtilities.METS_NAMESPACE);
+ mftIdiomMets.setSchema(OaipmhUtilities.METS_SCHEMA_LOCATION);
result.getMetadataFormat().add(mftIdiomMets);
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHClient.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhClient.java
similarity index 81%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHClient.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhClient.java
index 1f4e496e91f30bef6959987c74b88010a6f8bb12..7e1531e0f52a2bb108fa5fa01f01c19fea10ef93 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHClient.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhClient.java
@@ -11,7 +11,7 @@ import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
/**
*
*/
-public class OAIPMHClient {
+public class OaipmhClient {
private String identifier;
private String metadataPrefix;
@@ -19,13 +19,13 @@ public class OAIPMHClient {
private String from;
private String until;
private String resumptionToken;
- private OAIPMHProducer producer;
+ private OaipmhProducer producer;
/**
* @param endpoint
*/
- public OAIPMHClient(String endpoint) {
- this.producer = JAXRSClientFactory.create(endpoint + "/oai", OAIPMHProducer.class);
+ public OaipmhClient(String endpoint) {
+ this.producer = JAXRSClientFactory.create(endpoint + "/oai", OaipmhProducer.class);
}
/**
@@ -46,8 +46,8 @@ public class OAIPMHClient {
@Path("/version")
@Produces(MediaType.TEXT_PLAIN)
public String getVersion() {
- return OAIPMHServiceVersion.BUILDNAME + "-" + OAIPMHServiceVersion.VERSION + "+"
- + OAIPMHServiceVersion.BUILDDATE;
+ return OaipmhServiceVersion.BUILDNAME + "-" + OaipmhServiceVersion.VERSION + "+"
+ + OaipmhServiceVersion.BUILDDATE;
}
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHConstants.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhConstants.java
similarity index 99%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHConstants.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhConstants.java
index f4241cd52f204fb679a6b7fb5ed3f647b31a8101..c9b92d6304e7906e5d1c9fb45583a41ac1305b64 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHConstants.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhConstants.java
@@ -8,7 +8,7 @@ package info.textgrid.middleware;
* @author Maximilian Brodhun, SUB Göttingen
*/
-public final class OAIPMHConstants {
+public final class OaipmhConstants {
// **
// GENERAL CONSTANTS
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHElasticSearchClient.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhElasticSearchClient.java
similarity index 95%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHElasticSearchClient.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhElasticSearchClient.java
index f56d3cf50aeee1619b85ea2b98779bae083aee68..30b0c3d31eb47f1e1027633ae47adc2828aeaf48 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHElasticSearchClient.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhElasticSearchClient.java
@@ -16,7 +16,7 @@ import org.elasticsearch.client.RestHighLevelClient;
* @version 2022-09-08
* @since 2014-01-09
*/
-public class OAIPMHElasticSearchClient {
+public class OaipmhElasticSearchClient {
private String url;
private int[] ports;
@@ -34,7 +34,7 @@ public class OAIPMHElasticSearchClient {
* @param ports Ports for the ElasticSearch connection
* @param itemLimit Limit of items returned
*/
- public OAIPMHElasticSearchClient(String url, int[] ports, int itemLimit) {
+ public OaipmhElasticSearchClient(String url, int[] ports, int itemLimit) {
this.setUrl(url);
this.setPorts(ports);
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhImpl.java
similarity index 86%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhImpl.java
index 6b025832bbc0ffd5f8b39590e2cb8b8f5fcceee8..8c9bc7b1503baf26c7ac47b93d6df36c753f88ad 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhImpl.java
@@ -34,7 +34,7 @@ import info.textgrid.middleware.oaipmh.VerbType;
* @version 2022-09-21
* @since 2014-01-29
*/
-public class OAIPMHImpl implements OAIPMHProducer {
+public class OaipmhImpl implements OaipmhProducer {
// **
// PRIVATE STATIC FINAL
@@ -53,7 +53,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
// STATICS
// **
- private static Logger log = Logger.getLogger(OAIPMHImpl.class.getName());
+ private static Logger log = Logger.getLogger(OaipmhImpl.class.getName());
private static ObjectFactory obf = new ObjectFactory();
// **
@@ -64,21 +64,21 @@ public class OAIPMHImpl implements OAIPMHProducer {
private RepIdentification rep;
private RecordListDelivererDC recordListDC;
- private RecordListDelivererIDIOM recordListIDIOM;
- private RecordListDelivererDATACITE recordListDATACITE;
+ private RecordListDelivererIdiom recordListIDIOM;
+ private RecordListDelivererDatacite recordListDATACITE;
private RecordDelivererDC recordDC;
- private RecordDelivererIDIOM recordIDIOM;
- private RecordDelivererDATACITE recordDATACITE;
+ private RecordDelivererIdiom recordIDIOM;
+ private RecordDelivererDatacite recordDATACITE;
private MetadataFormatListDelivererInterface metadataFormatList;
private SetListDeliverer setList;
private IdentifierListDelivererDC identifierListDC;
- private IdentifierListDelivererIDIOM identifierListIDIOM;
- private IdentifierListDelivererDATACITE identifierListDATACITE;
+ private IdentifierListDelivererIdiom identifierListIDIOM;
+ private IdentifierListDelivererDatacite identifierListDATACITE;
- private IDIOMImages idiomImages;
+ private IdiomImages idiomImages;
// **
// PUBLIC
@@ -101,20 +101,20 @@ public class OAIPMHImpl implements OAIPMHProducer {
* @param identifierListIDIOM
* @param identifierListDATACITE
*/
- public OAIPMHImpl(
+ public OaipmhImpl(
RepIdentification rep, // 0
RecordDelivererDC recordDC, // 1
- RecordDelivererIDIOM recordIDIOM, // 2
- RecordDelivererDATACITE recordDATACITE, // 3
+ RecordDelivererIdiom recordIDIOM, // 2
+ RecordDelivererDatacite recordDATACITE, // 3
RecordListDelivererDC recordListDC, // 4
- RecordListDelivererIDIOM recordListIDIOM, // 5
- RecordListDelivererDATACITE recordListDATACITE, // 6
+ RecordListDelivererIdiom recordListIDIOM, // 5
+ RecordListDelivererDatacite recordListDATACITE, // 6
MetadataFormatListDelivererInterface metadataFormatList, // 7
SetListDeliverer setList, // 8
IdentifierListDelivererDC identifierList, // 9
- IdentifierListDelivererIDIOM identifierListIDIOM, // 10
- IdentifierListDelivererDATACITE identifierListDATACITE, // 11
- IDIOMImages imageList) {
+ IdentifierListDelivererIdiom identifierListIDIOM, // 10
+ IdentifierListDelivererDatacite identifierListDATACITE, // 11
+ IdiomImages imageList) {
this.rep = rep;
@@ -149,8 +149,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
String result = "";
// Check IDs.
- String checkedID = OAIPMHUtilities.omitPrefixFromIdentifier(identifier);
- String checkedSET = OAIPMHUtilities.omitPrefixFromIdentifier(set);
+ String checkedID = OaipmhUtilities.omitPrefixFromIdentifier(identifier);
+ String checkedSET = OaipmhUtilities.omitPrefixFromIdentifier(set);
try {
result = getStringFromJAXBOAIElement(verb,
@@ -184,8 +184,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
String result = "";
// Check IDs.
- String checkedID = OAIPMHUtilities.omitPrefixFromIdentifier(identifier);
- String checkedSET = OAIPMHUtilities.omitPrefixFromIdentifier(set);
+ String checkedID = OaipmhUtilities.omitPrefixFromIdentifier(identifier);
+ String checkedSET = OaipmhUtilities.omitPrefixFromIdentifier(set);
try {
result = getStringFromJAXBOAIElement(verb,
@@ -211,8 +211,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
*/
@Override
public String getVersion() {
- return OAIPMHServiceVersion.BUILDNAME + "-" + OAIPMHServiceVersion.VERSION + "+"
- + OAIPMHServiceVersion.BUILDDATE;
+ return OaipmhServiceVersion.BUILDNAME + "-" + OaipmhServiceVersion.VERSION + "+"
+ + OaipmhServiceVersion.BUILDDATE;
}
/**
@@ -261,7 +261,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
errorValues.add(ERR_VAL_SET);
}
- this.error.setError(OAIPMHConstants.OAI_BAD_ARGUMENT, ILLEGAL_ARG + errorValues);
+ this.error.setError(OaipmhConstants.OAI_BAD_ARGUMENT, ILLEGAL_ARG + errorValues);
oaipmhRoot.getError().add(this.error.getError());
}
@@ -296,13 +296,13 @@ public class OAIPMHImpl implements OAIPMHProducer {
RecordDelivererInterface recDeliv = this.recordDC;
// Take IDIOM if IDIOM prefix.
- if (request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_PREFIX)) {
+ if (request.getMetadataPrefix().equals(OaipmhConstants.METADATA_IDIOM_PREFIX)) {
recDeliv = this.recordIDIOM;
log.fine(" ## creating RecordDelivererIDIOM");
}
- if (request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
+ if (request.getMetadataPrefix().equals(OaipmhConstants.METADATA_OPENAIRE_PREFIX)) {
recDeliv = this.recordDATACITE;
}
@@ -326,7 +326,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
} catch (ParseException | DatatypeConfigurationException | IOException e) {
// FIXME Handle exceptions with errors in other methods, too!
ErrorHandler idError = new ErrorHandler();
- idError.setError(OAIPMHConstants.OAI_ID_DOES_NOT_EXIST, e.getMessage());
+ idError.setError(OaipmhConstants.OAI_ID_DOES_NOT_EXIST, e.getMessage());
oaipmhRoot.getError().add(idError.getError());
return oaipmhRoot;
}
@@ -335,7 +335,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
oaipmhRoot.setGetRecord(getRecord);
} else {
ErrorHandler idError = new ErrorHandler();
- idError.setError(OAIPMHConstants.OAI_ID_DOES_NOT_EXIST, "No matching identifier");
+ idError.setError(OaipmhConstants.OAI_ID_DOES_NOT_EXIST, "No matching identifier");
oaipmhRoot.getError().add(idError.getError());
}
}
@@ -368,11 +368,11 @@ public class OAIPMHImpl implements OAIPMHProducer {
// If metadataFormat IS SET, set recordListDeliverer accordingly.
if (request.getMetadataPrefix() != null) {
- if (request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)) {
+ if (request.getMetadataPrefix().equals(OaipmhUtilities.OAIDC_PREFIX)) {
idListDeliv = this.identifierListDC;
- } else if (request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_PREFIX)) {
+ } else if (request.getMetadataPrefix().equals(OaipmhConstants.METADATA_IDIOM_PREFIX)) {
idListDeliv = this.identifierListIDIOM;
- } else if (request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
+ } else if (request.getMetadataPrefix().equals(OaipmhConstants.METADATA_OPENAIRE_PREFIX)) {
idListDeliv = this.identifierListDATACITE;
}
}
@@ -386,31 +386,31 @@ public class OAIPMHImpl implements OAIPMHProducer {
idListDeliv = this.identifierListDC;
}
// Token is from IDIOM request.
- else if (IdentifierListDelivererIDIOM.getCursorCollector() != null
- && IdentifierListDelivererIDIOM.getCursorCollector()
+ else if (IdentifierListDelivererIdiom.getCursorCollector() != null
+ && IdentifierListDelivererIdiom.getCursorCollector()
.containsKey(request.getResumptionToken())) {
idListDeliv = this.identifierListIDIOM;
}
// Token is from DATACITE request.
- else if (IdentifierListDelivererDATACITE.cursorCollector != null
- && IdentifierListDelivererDATACITE.cursorCollector
+ else if (IdentifierListDelivererDatacite.cursorCollector != null
+ && IdentifierListDelivererDatacite.cursorCollector
.containsKey(request.getResumptionToken())) {
idListDeliv = this.identifierListDATACITE;
}
// Token is from IDIOMImages request.
- else if (IDIOMImages.getCursorCollector() != null
- && IDIOMImages.getCursorCollector().containsKey(request.getResumptionToken())) {
+ else if (IdiomImages.getCursorCollector() != null
+ && IdiomImages.getCursorCollector().containsKey(request.getResumptionToken())) {
// TODO Make configurable in config file??
this.idiomImages.setKindID("1");
this.idiomImages.setPerPage("100");
this.idiomImages.setPageNumber(
- Integer.toString(IDIOMImages.getCursorCollector().get(request.getResumptionToken())));
+ Integer.toString(IdiomImages.getCursorCollector().get(request.getResumptionToken())));
idListDeliv = this.idiomImages;
}
// We have got an invalid resumptionToken here!
else {
ErrorHandler e = new ErrorHandler();
- e.setError(OAIPMHConstants.OAI_BAD_RESUMPTION_TOKEN,
+ e.setError(OaipmhConstants.OAI_BAD_RESUMPTION_TOKEN,
"The value of the resumptionToken is invalid or expired.");
oaipmhRoot.getError().add(e.getError());
return oaipmhRoot;
@@ -430,7 +430,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
oaipmhRoot.setListIdentifiers(listIdentifiers);
} else {
ErrorHandler idError = new ErrorHandler();
- idError.setError(OAIPMHConstants.OAI_NO_RECORD_MATCH, "The value of the identifier: "
+ idError.setError(OaipmhConstants.OAI_NO_RECORD_MATCH, "The value of the identifier: "
+ request.getIdentifier() + " is unknown or illegal in this repository");
oaipmhRoot.getError().add(idError.getError());
}
@@ -477,7 +477,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
errorValues.add(ERR_VAL_SET);
}
- badArgument.setError(OAIPMHConstants.OAI_BAD_ARGUMENT, ILLEGAL_ARG + errorValues);
+ badArgument.setError(OaipmhConstants.OAI_BAD_ARGUMENT, ILLEGAL_ARG + errorValues);
oaipmhRoot.getError().add(badArgument.getError());
}
@@ -507,7 +507,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
if (listMF != null) {
oaipmhRoot.setListMetadataFormats(listMF);
} else {
- this.error.setError(OAIPMHConstants.OAI_NO_RECORD_MATCH, "The value of the identifier: "
+ this.error.setError(OaipmhConstants.OAI_NO_RECORD_MATCH, "The value of the identifier: "
+ request.getIdentifier() + " is unknown or illegal in this repository");
oaipmhRoot.getError().add(this.error.getError());
}
@@ -530,7 +530,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
errorValues.add(ERR_VAL_UNTIL);
}
- this.error.setError(OAIPMHConstants.OAI_BAD_ARGUMENT, "The request includes illegal "
+ this.error.setError(OaipmhConstants.OAI_BAD_ARGUMENT, "The request includes illegal "
+ "arguments or is missing required arguments: " + errorValues);
oaipmhRoot.getError().add(this.error.getError());
}
@@ -559,16 +559,16 @@ public class OAIPMHImpl implements OAIPMHProducer {
// If metadataFormat IS SET, set recordListDeliverer accordingly.
if (request.getMetadataPrefix() != null) {
- if (request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)) {
+ if (request.getMetadataPrefix().equals(OaipmhUtilities.OAIDC_PREFIX)) {
recListDeliv = this.recordListDC;
}
- if (request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_PREFIX)) {
+ if (request.getMetadataPrefix().equals(OaipmhConstants.METADATA_IDIOM_PREFIX)) {
log.fine(" ## creating RecordListDelivererIDIOM");
recListDeliv = this.recordListIDIOM;
}
- if (request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
+ if (request.getMetadataPrefix().equals(OaipmhConstants.METADATA_OPENAIRE_PREFIX)) {
recListDeliv = this.recordListDATACITE;
}
}
@@ -583,7 +583,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
recListDeliv = this.recordListDC;
}
// Token is from IDIOM request.
- else if (RecordListDelivererIDIOM.getCursorCollector() != null && RecordListDelivererIDIOM
+ else if (RecordListDelivererIdiom.getCursorCollector() != null && RecordListDelivererIdiom
.getCursorCollector().containsKey(request.getResumptionToken())) {
log.fine(" ## creating RecordListDelivererIDIOM restok");
@@ -591,25 +591,25 @@ public class OAIPMHImpl implements OAIPMHProducer {
recListDeliv = this.recordListIDIOM;
}
// Token is from DATACITE request.
- else if (RecordListDelivererDATACITE.cursorCollector != null
- && RecordListDelivererDATACITE.cursorCollector
+ else if (RecordListDelivererDatacite.cursorCollector != null
+ && RecordListDelivererDatacite.cursorCollector
.containsKey(request.getResumptionToken())) {
recListDeliv = this.recordListDATACITE;
}
// Token is from IDIOMImages request.
- else if (IDIOMImages.getCursorCollector() != null
- && IDIOMImages.getCursorCollector().containsKey(request.getResumptionToken())) {
+ else if (IdiomImages.getCursorCollector() != null
+ && IdiomImages.getCursorCollector().containsKey(request.getResumptionToken())) {
// TODO Make configurable in config file??
this.idiomImages.setKindID("1");
this.idiomImages.setPerPage("100");
this.idiomImages.setPageNumber(
- Integer.toString(IDIOMImages.getCursorCollector().get(request.getResumptionToken())));
+ Integer.toString(IdiomImages.getCursorCollector().get(request.getResumptionToken())));
recListDeliv = this.idiomImages;
}
// We have got an invalid resumptionToken here!
else {
ErrorHandler e = new ErrorHandler();
- e.setError(OAIPMHConstants.OAI_BAD_RESUMPTION_TOKEN,
+ e.setError(OaipmhConstants.OAI_BAD_RESUMPTION_TOKEN,
"The value of the resumptionToken is invalid or expired.");
oaipmhRoot.getError().add(e.getError());
return oaipmhRoot;
@@ -634,7 +634,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
} catch (IOException e) {
// FIXME Handle exceptions with errors in other methods, too!
ErrorHandler idError = new ErrorHandler();
- idError.setError(OAIPMHConstants.OAI_ID_DOES_NOT_EXIST, e.getMessage());
+ idError.setError(OaipmhConstants.OAI_ID_DOES_NOT_EXIST, e.getMessage());
oaipmhRoot.getError().add(idError.getError());
return oaipmhRoot;
}
@@ -668,7 +668,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
} else if (verb != null && verb.equals("GetRecord")) {
verbParam = VerbType.GET_RECORD;
} else if (verb != null && verb.length() > 0) {
- this.error.setError(OAIPMHConstants.OAI_VERB_ERROR, ILLEGAL_OAI_VERB);
+ this.error.setError(OaipmhConstants.OAI_VERB_ERROR, ILLEGAL_OAI_VERB);
}
// Verb not set --> please do use verb=Identify!
// FIXME Is the following appropriate?? Do we miss any error messages that way??
@@ -801,8 +801,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
// Set the responseDate of today.
try {
XMLGregorianCalendar convertedDateFormat;
- convertedDateFormat = OAIPMHUtilities
- .convertDateFormat(OAIPMHUtilities.getXMLGregorianCalendarNow().toString());
+ convertedDateFormat = OaipmhUtilities
+ .convertDateFormat(OaipmhUtilities.getXMLGregorianCalendarNow().toString());
response.setResponseDate(convertedDateFormat);
} catch (ParseException e) {
log.severe("can not parse date format");
@@ -820,10 +820,10 @@ public class OAIPMHImpl implements OAIPMHProducer {
request.setVerb(verbParam);
if (this.textgrid == true) {
- request.setValue(TGConstants.REPOSITORY_BASEURL);
+ request.setValue(OaipmhTGConstants.REPOSITORY_BASEURL);
}
if (this.dariah == true) {
- request.setValue(OAIPMHConstants.REPOSITORY_BASEURL);
+ request.setValue(OaipmhConstants.REPOSITORY_BASEURL);
}
if (verbParam != null) {
@@ -843,10 +843,10 @@ public class OAIPMHImpl implements OAIPMHProducer {
} else {
if (this.error.getError().getValue() != null
&& this.error.getError().getValue().equals(ILLEGAL_OAI_VERB)) {
- this.error.setError(OAIPMHConstants.OAI_VERB_ERROR, ILLEGAL_OAI_VERB);
+ this.error.setError(OaipmhConstants.OAI_VERB_ERROR, ILLEGAL_OAI_VERB);
response.getError().add(this.error.getError());
} else {
- this.error.setError(OAIPMHConstants.OAI_VERB_ERROR, ILLEGAL_OAI_VERB);
+ this.error.setError(OaipmhConstants.OAI_VERB_ERROR, ILLEGAL_OAI_VERB);
response.getError().add(this.error.getError());
}
}
@@ -874,19 +874,19 @@ public class OAIPMHImpl implements OAIPMHProducer {
// Always add OAIPMH schema location.
String schemaLocations =
- OAIPMHUtilities.OAIPMH_NAMESPACE + " " + OAIPMHUtilities.OAIPMH_SCHEMA_LOCATION;
+ OaipmhUtilities.OAIPMH_NAMESPACE + " " + OaipmhUtilities.OAIPMH_SCHEMA_LOCATION;
// Add OAI_DC and DC schema location if needed.
if (theVerb != null && (theVerb.equals("GetRecord") || theVerb.endsWith("ListRecords"))) {
schemaLocations +=
- " " + OAIPMHUtilities.OAIDC_NAMESPACE + " " + OAIPMHUtilities.OAIDC_SCHEMA_LOCATION + " "
- + OAIPMHUtilities.DC_NAMESPACE + " " + OAIPMHUtilities.DC_SCHEMA_LOCATION;
+ " " + OaipmhUtilities.OAIDC_NAMESPACE + " " + OaipmhUtilities.OAIDC_SCHEMA_LOCATION + " "
+ + OaipmhUtilities.DC_NAMESPACE + " " + OaipmhUtilities.DC_SCHEMA_LOCATION;
// Add the openaire datacite schemas as well, please.
schemaLocations +=
- " " + OAIPMHUtilities.OPEN_AIRE_NAMESPACE + " " + OAIPMHUtilities.OAIPMH_SCHEMA_LOCATION
+ " " + OaipmhUtilities.OPEN_AIRE_NAMESPACE + " " + OaipmhUtilities.OAIPMH_SCHEMA_LOCATION
+ " " +
- OAIPMHUtilities.DATACITE_NAMESPACE + " " + OAIPMHUtilities.DATACITE_SCHEMA_LOCATION;
+ OaipmhUtilities.DATACITE_NAMESPACE + " " + OaipmhUtilities.DATACITE_SCHEMA_LOCATION;
}
// PLEASE NOTE We always get oai_dc and dc prefixes defined in the root element due to the
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHProducer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhProducer.java
similarity index 99%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHProducer.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhProducer.java
index 38f03be698493309be1aedb729ac63b524874bd2..845eae91cbdcd981b341a575a354185cd4f69ef3 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHProducer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhProducer.java
@@ -20,7 +20,7 @@ import javax.ws.rs.core.MediaType;
* @version 2018-05-16
* @since 2014-01-15
*/
-public interface OAIPMHProducer {
+public interface OaipmhProducer {
/**
* <p>
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/TGConstants.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhTGConstants.java
similarity index 97%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/TGConstants.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhTGConstants.java
index 91cfa262d7d8b69aab0e07a54464362d5006d3d2..580c161a4b8290dc6c3e24229548f01b78c5512a 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/TGConstants.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhTGConstants.java
@@ -8,7 +8,7 @@ package info.textgrid.middleware;
* @author Maximilian Brodhun, SUB Göttingen
*/
-public final class TGConstants {
+public final class OaipmhTGConstants {
public static final String REPOSITORY_BASEURL = "textgridrep.org";
public static final String ITEM_IDENTIFIER_PREFIX = "textgrid:";
@@ -49,14 +49,14 @@ public final class TGConstants {
public static final String WORK_TEMPORAL = "work.temporal.value";
public static final String WORK_AGENT = "work.agent.value";
public static final String WORK_ID = "work.subject.id.value";
- public static final String MODIFIED_FIELD = "lastModified";
+ public static final String LAST_MODIFIED = "lastModified";
public static final String NOTES = "notes";
public static final String[] TGFields =
{CREATED, FORMAT, IDENTIFIER, DATA_CONTRIBUTOR, URI, PROJECT_ID, IS_DERIVED_FROM, TITLE, PID,
EDITION_ISEDITIONOF, EDITION_AGENT, EDITION_LICENSEURI, EDITION_LANGUAGE, BIBCIT_AUTHOR,
BIBCIT_EDITOR, BIBCIT_TITLE, BIBCIT_PLACEPUB, BIBCIT_PUBLISHER, BIBCIT_NO, BIBCIT_SERIES,
BIBCIT_VOLUME, BIBCIT_ISSUE, BIBCIT_EPAGE, BIBCIT_SPAGE, BIBCIT_BIBID, WORK_ABSTRACT,
- WORK_GENRE, WORK_TYPE, WORK_SPATIAL, WORK_TEMPORAL, WORK_AGENT, MODIFIED_FIELD};
+ WORK_GENRE, WORK_TYPE, WORK_SPATIAL, WORK_TEMPORAL, WORK_AGENT, LAST_MODIFIED};
public static final String[] TGWorkFields = {CREATED, WORK_ABSTRACT, IS_DERIVED_FROM, URI,
WORK_GENRE, TITLE, WORK_TYPE, WORK_SPATIAL, WORK_TEMPORAL, WORK_AGENT, WORK_ID};
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhUtilities.java
similarity index 99%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhUtilities.java
index f558f6c7065c4212476c679d5eb5638d9cf27aec..d8fcc6f13e74e7329faa56b979c81846f7d8206d 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OaipmhUtilities.java
@@ -50,9 +50,9 @@ import info.textgrid.namespaces.middleware.tgauth.ProjectInfo;
* @author Maximilian Brodhun, SUB Göttingen
* @author Stefan E. Funk, SUB Göttingen
*/
-public class OAIPMHUtilities {
+public class OaipmhUtilities {
- private static Logger log = Logger.getLogger(OAIPMHUtilities.class.getName());
+ private static Logger log = Logger.getLogger(OaipmhUtilities.class.getName());
// **
// FINALS
@@ -482,7 +482,7 @@ public class OAIPMHUtilities {
* @return
* @throws IOException
*/
- protected static GetResponse getRcordByIDFromElasticSearch(OAIPMHElasticSearchClient theESClient,
+ protected static GetResponse getRcordByIDFromElasticSearch(OaipmhElasticSearchClient theESClient,
String idInElasticSearchIndex, String[] includes, String[] excludes) throws IOException {
log.fine("id in es index: " + idInElasticSearchIndex);
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
index a27af1c74d8c17f2e7e787ba7d66720411b166b3..a8ef01b3d62c90d98cd24f3c13d5e5a8aa95be81 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
@@ -15,7 +15,7 @@ public abstract class RecordDelivererAbstract implements RecordDelivererInterfac
protected boolean textgrid;
protected boolean dariah;
- protected OAIPMHElasticSearchClient oaiEsClient;
+ protected OaipmhElasticSearchClient oaiEsClient;
protected String[] fields;
protected String[] workFields;
@@ -68,10 +68,10 @@ public abstract class RecordDelivererAbstract implements RecordDelivererInterfac
// Check if metadata prefix is existing and valid.
if (request.getMetadataPrefix() != null
- && !request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
- result.setError(OAIPMHConstants.OAI_METADATA_FORMAT_ERROR,
+ && !request.getMetadataPrefix().equals(OaipmhUtilities.OAIDC_PREFIX)
+ && !request.getMetadataPrefix().equals(OaipmhConstants.METADATA_IDIOM_PREFIX)
+ && !request.getMetadataPrefix().equals(OaipmhConstants.METADATA_OPENAIRE_PREFIX)) {
+ result.setError(OaipmhConstants.OAI_METADATA_FORMAT_ERROR,
"The value of the metadataPrefix: " + request.getMetadataPrefix()
+ " is not supported by the item identified by the value of: "
+ request.getIdentifier());
@@ -100,7 +100,7 @@ public abstract class RecordDelivererAbstract implements RecordDelivererInterfac
errorValues.add("identifier");
}
if (errorValues.size() > 0) {
- result.setError(OAIPMHConstants.OAI_BAD_ARGUMENT, "The request includes illegal arguments "
+ result.setError(OaipmhConstants.OAI_BAD_ARGUMENT, "The request includes illegal arguments "
+ "or is missing required arguments: " + errorValues);
}
}
@@ -297,14 +297,14 @@ public abstract class RecordDelivererAbstract implements RecordDelivererInterfac
/**
* @return
*/
- public OAIPMHElasticSearchClient getOaiEsClient() {
+ public OaipmhElasticSearchClient getOaiEsClient() {
return this.oaiEsClient;
}
/**
* @param oaiEsClient
*/
- public void setOaiEsClient(OAIPMHElasticSearchClient oaiEsClient) {
+ public void setOaiEsClient(OaipmhElasticSearchClient oaiEsClient) {
this.oaiEsClient = oaiEsClient;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
index 9dcc625d9b133d3f1c794387356b4a0950238ee5..738900aca7ac63bfdb5863e81ee8ae0fcfa93a4e 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
@@ -57,7 +57,7 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
String[] excludes = Strings.EMPTY_ARRAY;
try {
GetResponse esResultObject =
- OAIPMHUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient, id, includes, excludes);
+ OaipmhUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient, id, includes, excludes);
log.fine("es result id/size: " + (esResultObject != null
? esResultObject.getId() + "/" + esResultObject.getFields().size()
@@ -73,14 +73,14 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
if (this.dariah == true) {
dublinCoreBuilder = putContentIntoDCFieldListsDH(esResultObject);
JSONObject json = new JSONObject(esResultObject.getSourceAsMap());
- identifier = OAIPMHUtilities.fieldLoader(json, this.identifierField);
+ identifier = OaipmhUtilities.fieldLoader(json, this.identifierField);
String dateOfCreation = "NO_DATE_SET!";
- if (OAIPMHUtilities.fieldLoader(json, this.dateOfObjectCreation) != null) {
+ if (OaipmhUtilities.fieldLoader(json, this.dateOfObjectCreation) != null) {
try {
- dateOfCreation = OAIPMHUtilities
+ dateOfCreation = OaipmhUtilities
.convertDateFormat(
- OAIPMHUtilities.fieldLoader(json, this.dateOfObjectCreation).toString())
+ OaipmhUtilities.fieldLoader(json, this.dateOfObjectCreation).toString())
.toXMLFormat();
} catch (ParseException e) {
// TODO Auto-generated catch block
@@ -91,12 +91,12 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
}
}
- String setSpec = OAIPMHUtilities.fieldLoader(json, this.specField);
+ String setSpec = OaipmhUtilities.fieldLoader(json, this.specField);
String setSpecValue =
- OAIPMHUtilities.getSetSpec(setSpec, this.specFieldPrefix, identifier);
+ OaipmhUtilities.getSetSpec(setSpec, this.specFieldPrefix, identifier);
record.setHeader(
- OAIPMHUtilities.computeResponseHeader(dateOfCreation, identifier, setSpecValue));
+ OaipmhUtilities.computeResponseHeader(dateOfCreation, identifier, setSpecValue));
record.setMetadata(dublinCoreBuilder.getDC());
}
@@ -122,12 +122,12 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
esResultObject.getSourceAsMap().get(this.dateOfObjectCreation).toString();
String setSpec = DublinCoreFieldLoader
- .fillListFromTGWorkValues(esResultObject, TGConstants.RELATIONS_LIST).get(0);
+ .fillListFromTGWorkValues(esResultObject, OaipmhTGConstants.RELATIONS_LIST).get(0);
String setSpecValue =
- OAIPMHUtilities.getSetSpec(setSpec, this.specFieldPrefix, identifier);
+ OaipmhUtilities.getSetSpec(setSpec, this.specFieldPrefix, identifier);
- record.setHeader(OAIPMHUtilities.computeResponseHeader(
- OAIPMHUtilities.convertDateFormat(dateOfCreation).toString(), identifier,
+ record.setHeader(OaipmhUtilities.computeResponseHeader(
+ OaipmhUtilities.convertDateFormat(dateOfCreation).toString(), identifier,
setSpecValue));
record.setMetadata(dublinCoreBuilder.getDC());
}
@@ -166,7 +166,7 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
String[] excludes = Strings.EMPTY_ARRAY;
responseWorkValues =
- OAIPMHUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient, id, includes, excludes);
+ OaipmhUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient, id, includes, excludes);
} catch (IOException e) {
// TODO Auto-generated catch block
@@ -238,45 +238,45 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
DublinCoreBuilder result = new DublinCoreBuilder();
// Set DublinCore lists with content from elastic search results due to configuration.
- result.setContributor(OAIPMHUtilities
+ result.setContributor(OaipmhUtilities
.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()), this.contributorList));
result.setCoverage(
- OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.coverageList));
result
- .setCreator(OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ .setCreator(OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.creatorList));
- result.setDate(OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ result.setDate(OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.dateList));
result.setDescription(
- OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.descriptionList));
result
- .setFormat(OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ .setFormat(OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.formatList));
result.setIdentifier(
- OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.identifierList));
result.setLanguage(
- OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.languageList));
result.setPublisher(
- OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.publisherList));
result.setRelation(
- OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.relationList));
result
- .setRights(OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ .setRights(OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.rightsList));
result
- .setSource(OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ .setSource(OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.sourceList));
- result.setSubject(OAIPMHUtilities
+ result.setSubject(OaipmhUtilities
.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()), this.subjectList));
- result.setTitle(OAIPMHUtilities
+ result.setTitle(OaipmhUtilities
.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()), this.titleList));
- result.setType(OAIPMHUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
+ result.setType(OaipmhUtilities.fieldLoader(new JSONObject(responseWorkValues.getSourceAsMap()),
this.typeList));
return result;
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDATACITE.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDatacite.java
similarity index 91%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDATACITE.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDatacite.java
index 11e6f9b8a73140b86816f3f53e4b2545c1008c4e..b8e420b2b7eb498ebb61b7ba1022877fcaa43832 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDATACITE.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDatacite.java
@@ -52,9 +52,9 @@ import info.textgrid.middleware.oaipmh.Resource.Titles.Title;
* @since 2020-06-13
*/
@Component
-public class RecordDelivererDATACITE extends RecordDelivererAbstract {
+public class RecordDelivererDatacite extends RecordDelivererAbstract {
- private static Logger log = Logger.getLogger(RecordDelivererDATACITE.class.getName());
+ private static Logger log = Logger.getLogger(RecordDelivererDatacite.class.getName());
// Container object for the result of the elasticsearch request. This object contains the source
// of the response.
@@ -88,7 +88,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
* Repository.
* @throws IOException
*/
- public RecordDelivererDATACITE(boolean textgrid, boolean dariah) throws IOException {
+ public RecordDelivererDatacite(boolean textgrid, boolean dariah) throws IOException {
super(textgrid, dariah);
}
@@ -103,7 +103,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
GetRecordType getRecordType = new GetRecordType();
// Get ES object.
- this.jsonObj = new JSONObject(OAIPMHUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient,
+ this.jsonObj = new JSONObject(OaipmhUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient,
replacedID, this.fields, Strings.EMPTY_ARRAY).getSource());
if (this.jsonObj == null || this.jsonObj.isEmpty()) {
@@ -112,8 +112,8 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
}
// Set response header.
- String datestamp = OAIPMHUtilities
- .oaiDatestampAsString(OAIPMHUtilities.fieldLoader(this.jsonObj, this.dateOfObjectCreation));
+ String datestamp = OaipmhUtilities
+ .oaiDatestampAsString(OaipmhUtilities.fieldLoader(this.jsonObj, this.dateOfObjectCreation));
String identifier = "";
if (!idInElasticSearchIndex.startsWith(this.repositoryObjectURIPrefix)) {
@@ -122,12 +122,12 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
identifier = idInElasticSearchIndex;
}
- String setSpec = OAIPMHUtilities.fieldLoader(this.jsonObj, this.specField);
- String setSpecValue = OAIPMHUtilities.getSetSpec(setSpec, this.specFieldPrefix, identifier);
+ String setSpec = OaipmhUtilities.fieldLoader(this.jsonObj, this.specField);
+ String setSpecValue = OaipmhUtilities.getSetSpec(setSpec, this.specFieldPrefix, identifier);
HeaderType header =
- OAIPMHUtilities.computeResponseHeader(datestamp, identifier, setSpecValue);
- getRecordType = OAIPMHUtilities.getRecordType(this.setOpenAireRecord(), header);
+ OaipmhUtilities.computeResponseHeader(datestamp, identifier, setSpecValue);
+ getRecordType = OaipmhUtilities.getRecordType(this.setOpenAireRecord(), header);
return getRecordType;
}
@@ -177,7 +177,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
private Sizes addSize() {
Sizes sizes = new Sizes();
- String size = OAIPMHUtilities.fieldLoader(this.jsonObj, this.oarSizeField) + " Bytes";
+ String size = OaipmhUtilities.fieldLoader(this.jsonObj, this.oarSizeField) + " Bytes";
sizes.getSize().add(size);
@@ -198,10 +198,10 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
if (this.textgrid) {
for (String subjectField : this.oarSubjectFields) {
Subject subject = new Subject();
- subject.setValue(OAIPMHUtilities.fieldLoader(this.jsonObj, subjectField + ".value"));
- subject.setSchemeURI(OAIPMHUtilities.fieldLoader(this.jsonObj, subjectField + ".id.type"));
+ subject.setValue(OaipmhUtilities.fieldLoader(this.jsonObj, subjectField + ".value"));
+ subject.setSchemeURI(OaipmhUtilities.fieldLoader(this.jsonObj, subjectField + ".id.type"));
subject.setSubjectScheme(
- OAIPMHUtilities.fieldLoader(this.jsonObj, subjectField + ".id.value"));
+ OaipmhUtilities.fieldLoader(this.jsonObj, subjectField + ".id.value"));
subjects.getSubject().add(subject);
}
}
@@ -212,7 +212,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
else if (this.dariah) {
for (String subjectField : this.oarSubjectFields) {
- List<String> sList = OAIPMHUtilities.fieldLoader(this.jsonObj, new String[] {subjectField});
+ List<String> sList = OaipmhUtilities.fieldLoader(this.jsonObj, new String[] {subjectField});
for (String s : sList) {
Subject subject = new Subject();
@@ -236,7 +236,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
String version = "";
for (String versionField : this.oarVersionFields) {
- version = OAIPMHUtilities.fieldLoader(this.jsonObj, versionField);
+ version = OaipmhUtilities.fieldLoader(this.jsonObj, versionField);
}
return version;
@@ -255,7 +255,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
if (this.textgrid) {
for (String format : this.oarFormatFields) {
- String resourceValue = OAIPMHUtilities.fieldLoader(this.jsonObj, format);
+ String resourceValue = OaipmhUtilities.fieldLoader(this.jsonObj, format);
// TODO Set resource value here?
resourceType.setValue(resourceValue);
// Set collection for all aggregation types, take also into account: images and text.
@@ -290,7 +290,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
// Only the first value is taken here! We do not need to create a list!
// TODO Please see addLanguage(), maybe do it as done there to use the other fielsLoader()
// method!
- String resourceValue = OAIPMHUtilities.fieldLoader(this.jsonObj, format);
+ String resourceValue = OaipmhUtilities.fieldLoader(this.jsonObj, format);
resourceType.setValue(resourceValue);
// Set collection for DARIAH collection type here, data object for everything else.
@@ -322,7 +322,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
for (String geoLocationField : this.oarGeoLocationFields) {
GeoLocation geoLocation = new GeoLocation();
geoLocation.setGeoLocationPlace(
- OAIPMHUtilities.fieldLoader(this.jsonObj, geoLocationField + ".value"));
+ OaipmhUtilities.fieldLoader(this.jsonObj, geoLocationField + ".value"));
geoLocations.getGeoLocation().add(geoLocation);
}
@@ -356,15 +356,15 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
// relatedIdentifier.setSchemeType("XSD");
// relatedIdentifier.setSchemeURI(TGConstants.TEXTGRID_METADATASCHEME_URI);
- String uriForWork = OAIPMHUtilities.fieldLoader(this.jsonObj, relatedIdentifierField)
+ String uriForWork = OaipmhUtilities.fieldLoader(this.jsonObj, relatedIdentifierField)
.replace(this.repositoryObjectURIPrefix, "");
relatedIdentifier
.setValue(
- OAIPMHUtilities
+ OaipmhUtilities
.fieldLoader(
new JSONObject(
- OAIPMHUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient,
+ OaipmhUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient,
uriForWork, workFields, Strings.EMPTY_ARRAY).getSource()),
this.handle));
relatedIdentifiers.getRelatedIdentifier().add(relatedIdentifier);
@@ -376,7 +376,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
else if (this.dariah) {
List<String> relatedIdentiferList =
- OAIPMHUtilities.fieldLoader(this.jsonObj, new String[] {relatedIdentifierField});
+ OaipmhUtilities.fieldLoader(this.jsonObj, new String[] {relatedIdentifierField});
for (String i : relatedIdentiferList) {
RelatedIdentifier relatedID = new RelatedIdentifier();
@@ -423,15 +423,15 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
if (this.textgrid) {
String idForWorkObject =
- OAIPMHUtilities.fieldLoader(this.jsonObj, this.relationToWorkObject);
+ OaipmhUtilities.fieldLoader(this.jsonObj, this.relationToWorkObject);
if (idForWorkObject != null) {
idForWorkObject = idForWorkObject.replace(this.repositoryObjectURIPrefix, "");
JSONObject resultOfFurtherObject =
- new JSONObject(OAIPMHUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient,
+ new JSONObject(OaipmhUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient,
idForWorkObject, this.workFields, Strings.EMPTY_ARRAY).getSource());
// Create abstract for every dc:description.
List<String> abstractsFromWork =
- OAIPMHUtilities.fieldLoader(resultOfFurtherObject, new String[] {descriptionField});
+ OaipmhUtilities.fieldLoader(resultOfFurtherObject, new String[] {descriptionField});
for (String d : abstractsFromWork) {
Description description = new Description();
description.setDescriptionType(OpenaireDescriptionType.ABSTRACT);
@@ -449,7 +449,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
// Here the version of fieldLoader() is used, that delivers a LIST of strings!
// TODO Check if you can adapt the other method to only have ONE method left!
List<String> descriptionsFromMetadata =
- OAIPMHUtilities.fieldLoader(this.jsonObj, new String[] {descriptionField});
+ OaipmhUtilities.fieldLoader(this.jsonObj, new String[] {descriptionField});
// Create abstract for every dc:description.
for (String d : descriptionsFromMetadata) {
@@ -478,8 +478,8 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
if (this.textgrid) {
for (String rightsField : this.oarRightsFields) {
Rights rights = new Rights();
- rights.setRightsURI(OAIPMHUtilities.fieldLoader(this.jsonObj, rightsField + ".licenseUri"));
- rights.setValue(OAIPMHUtilities.fieldLoader(this.jsonObj, rightsField + ".value"));
+ rights.setRightsURI(OaipmhUtilities.fieldLoader(this.jsonObj, rightsField + ".licenseUri"));
+ rights.setValue(OaipmhUtilities.fieldLoader(this.jsonObj, rightsField + ".value"));
rightsList.getRights().add(rights);
}
if (rightsList.getRights().get(0).getValue() != null) {
@@ -497,7 +497,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
for (String rightsField : this.oarRightsFields) {
Rights rights = new Rights();
- List<String> rList = OAIPMHUtilities.fieldLoader(this.jsonObj, new String[] {rightsField});
+ List<String> rList = OaipmhUtilities.fieldLoader(this.jsonObj, new String[] {rightsField});
for (String r : rList) {
@@ -524,7 +524,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
Formats formats = new Formats();
for (String formatField : this.oarFormatFields) {
- formats.getFormat().add(OAIPMHUtilities.fieldLoader(this.jsonObj, formatField));
+ formats.getFormat().add(OaipmhUtilities.fieldLoader(this.jsonObj, formatField));
}
return formats;
@@ -546,8 +546,8 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
if (this.textgrid) {
AlternateIdentifier alternateIdentifier = new AlternateIdentifier();
alternateIdentifier
- .setValue(OAIPMHUtilities.fieldLoader(this.jsonObj, alternateIdentifierField));
- alternateIdentifier.setAlternateIdentifierType(OAIPMHConstants.URI_IDENTIIER_TYPE);
+ .setValue(OaipmhUtilities.fieldLoader(this.jsonObj, alternateIdentifierField));
+ alternateIdentifier.setAlternateIdentifierType(OaipmhConstants.URI_IDENTIIER_TYPE);
alternateIdentifiers.getAlternateIdentifier().add(alternateIdentifier);
}
@@ -557,7 +557,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
else if (this.dariah) {
List<String> alternateIdentifierList =
- OAIPMHUtilities.fieldLoader(this.jsonObj, new String[] {alternateIdentifierField});
+ OaipmhUtilities.fieldLoader(this.jsonObj, new String[] {alternateIdentifierField});
for (String i : alternateIdentifierList) {
AlternateIdentifier alternateID = new AlternateIdentifier();
if (i.startsWith(RDFConstants.HDL_PREFIX)) {
@@ -588,7 +588,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
// TODO Only ONE language is permitted in Datacite schema? What if we have more then one in
// DARIAH DC data? Take only first one for the moment!
for (String languageField : this.oarLanguageFields) {
- List<String> langs = OAIPMHUtilities.fieldLoader(this.jsonObj, new String[] {languageField});
+ List<String> langs = OaipmhUtilities.fieldLoader(this.jsonObj, new String[] {languageField});
if (!langs.isEmpty()) {
language = langs.get(0);
}
@@ -616,20 +616,20 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
if (contributorField.equals("project")) {
String fieldContent =
- OAIPMHUtilities.fieldLoader(this.jsonObj, contributorField + ".value");
+ OaipmhUtilities.fieldLoader(this.jsonObj, contributorField + ".value");
if (fieldContent != null && !fieldContent.isEmpty()) {
contributorInOpenAireRecord.setContributorName(fieldContent);
contributorInOpenAireRecord.setContributorType(ContributorType.OTHER);
info.textgrid.middleware.oaipmh.Resource.Contributors.Contributor.NameIdentifier name =
new info.textgrid.middleware.oaipmh.Resource.Contributors.Contributor.NameIdentifier();
name.setNameIdentifierScheme("textgrid");
- name.setValue(OAIPMHUtilities.fieldLoader(this.jsonObj, contributorField + ".id"));
+ name.setValue(OaipmhUtilities.fieldLoader(this.jsonObj, contributorField + ".id"));
name.setSchemeURI("https://textgridlab.org/schema/textgrid-metadata_2010.xsd");
contributorInOpenAireRecord.setNameIdentifier(name);
contributors.getContributor().add(contributorInOpenAireRecord);
}
} else {
- String fieldContent = OAIPMHUtilities.fieldLoader(this.jsonObj, contributorField);
+ String fieldContent = OaipmhUtilities.fieldLoader(this.jsonObj, contributorField);
if (fieldContent != null && !fieldContent.isEmpty()) {
contributorInOpenAireRecord.setContributorName(fieldContent);
contributorInOpenAireRecord.setContributorType(ContributorType.DATA_MANAGER);
@@ -653,7 +653,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
else if (this.dariah) {
List<String> contributorList =
- OAIPMHUtilities.fieldLoader(this.jsonObj, new String[] {contributorField});
+ OaipmhUtilities.fieldLoader(this.jsonObj, new String[] {contributorField});
for (String i : contributorList) {
Contributor contributorInOpenAireRecord = new Contributor();
if (i != null && !i.isEmpty()) {
@@ -691,8 +691,8 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
try {
// Only one value per field is needed here (I think).
- String dateValue = OAIPMHUtilities
- .convertDateFormat(OAIPMHUtilities.fieldLoader(this.jsonObj, dateField).toString())
+ String dateValue = OaipmhUtilities
+ .convertDateFormat(OaipmhUtilities.fieldLoader(this.jsonObj, dateField).toString())
.toXMLFormat();
dateInOpenAireRecord.setValue(dateValue);
@@ -732,7 +732,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
private Identifier addIdentifier() {
Identifier identifier = new Identifier();
- String idValue = OAIPMHUtilities.fieldLoader(this.jsonObj, this.oarIdentifierField);
+ String idValue = OaipmhUtilities.fieldLoader(this.jsonObj, this.oarIdentifierField);
// **
// TextGrid
@@ -775,10 +775,10 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
// TODO: Fields from configFile
Creator creator = new Creator();
- creator.setCreatorName(OAIPMHUtilities.fieldLoader(this.jsonObj, "edition.agent.value"));
+ creator.setCreatorName(OaipmhUtilities.fieldLoader(this.jsonObj, "edition.agent.value"));
NameIdentifier nameIdentifier = new NameIdentifier();
// TODO: creatorID Field from config file
- String creatorID = OAIPMHUtilities.fieldLoader(this.jsonObj,
+ String creatorID = OaipmhUtilities.fieldLoader(this.jsonObj,
"edition.source.bibliographicCitation.author.id");
if (creatorID != null && creatorID.contains(":")) {
@@ -803,7 +803,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
for (String cFields : this.oarCreatorFields) {
List<String> creatorsList =
- OAIPMHUtilities.fieldLoader(this.jsonObj, this.oarCreatorFields);
+ OaipmhUtilities.fieldLoader(this.jsonObj, this.oarCreatorFields);
for (String c : creatorsList) {
Creator creator = new Creator();
creator.setCreatorName(c);
@@ -825,7 +825,7 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
for (String titleField : this.oarTitleFields) {
- List<String> titleList = OAIPMHUtilities.fieldLoader(this.jsonObj, this.oarTitleFields);
+ List<String> titleList = OaipmhUtilities.fieldLoader(this.jsonObj, this.oarTitleFields);
for (String title : titleList) {
Title tileInOpenAireRecord = new Title();
tileInOpenAireRecord.setValue(title);
@@ -869,8 +869,8 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
* @throws DatatypeConfigurationException
*/
private String addPublicationYear() throws ParseException, DatatypeConfigurationException {
- return Integer.toString(OAIPMHUtilities
- .convertDateFormat(OAIPMHUtilities.fieldLoader(this.jsonObj, this.dateOfObjectCreation))
+ return Integer.toString(OaipmhUtilities
+ .convertDateFormat(OaipmhUtilities.fieldLoader(this.jsonObj, this.dateOfObjectCreation))
.getYear());
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIdiom.java
similarity index 88%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIdiom.java
index ffedd741862fd82084890dcf1f8254f7d2843ed1..3df0aa676d97d0ae00dbb0834ea5212f6b741e0c 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIdiom.java
@@ -28,7 +28,7 @@ import info.textgrid.middleware.oaipmh.RecordType;
* @since 2019-03-12
*/
@Component
-public class RecordDelivererIDIOM extends RecordDelivererAbstract {
+public class RecordDelivererIdiom extends RecordDelivererAbstract {
// **
// FINALS
@@ -40,19 +40,19 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
// STATICS
// **
- private static Logger log = Logger.getLogger(RecordDelivererIDIOM.class.getName());
+ private static Logger log = Logger.getLogger(RecordDelivererIdiom.class.getName());
// **
// CLASS
// **
- private IDIOMImages idiomImages;
+ private IdiomImages idiomImages;
/**
* @param textgrid
* @param dariah
*/
- public RecordDelivererIDIOM(boolean textgrid, boolean dariah) {
+ public RecordDelivererIdiom(boolean textgrid, boolean dariah) {
super(textgrid, dariah);
}
@@ -76,13 +76,14 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
// Get revision URI if no revision URI is put in.
// FIXME Implement getLatestRevision in OAIPMHUtilities.getTextGridRevisionURI()!!
// FIXME We just implement it as it has been before! DO MAKE IT RIGHT SOON!!
- String textgridRevisionURI = OAIPMHUtilities.getTextGridRevisionURI(id);
+ String textgridRevisionURI = OaipmhUtilities.getTextGridRevisionURI(id);
log.fine("textgrid revision uri: " + textgridRevisionURI);
- String objectType = getIdiomInfoFromES(textgridRevisionURI, TGConstants.NOTES);
- String creationDate = getIdiomInfoFromES(textgridRevisionURI, TGConstants.CREATED);
- String modificationDate = getIdiomInfoFromES(textgridRevisionURI, TGConstants.MODIFIED_FIELD);
+ String objectType = getIdiomInfoFromES(textgridRevisionURI, OaipmhTGConstants.NOTES);
+ String creationDate = getIdiomInfoFromES(textgridRevisionURI, OaipmhTGConstants.CREATED);
+ String modificationDate =
+ getIdiomInfoFromES(textgridRevisionURI, OaipmhTGConstants.LAST_MODIFIED);
// Get TG URI from ID.
if (!textgridRevisionURI.startsWith(TEXTGRID_URI_PREFIX)) {
@@ -90,7 +91,7 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
}
// Get base URI for ClassicMayanMetsMods and response header here.
- String textgridBaseURI = OAIPMHUtilities.getTextGridBaseURI(textgridRevisionURI);
+ String textgridBaseURI = OaipmhUtilities.getTextGridBaseURI(textgridRevisionURI);
log.fine("textgrid base uri: " + textgridBaseURI);
log.fine("object type is: " + objectType);
@@ -148,7 +149,7 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
// We need to have the base URI here in header (and record), it is used as Record ID of Mayan
// artifacts here!
HeaderType header =
- OAIPMHUtilities.computeResponseHeader(creationDate, textgridBaseURI, setSpec);
+ OaipmhUtilities.computeResponseHeader(modificationDate, textgridBaseURI, setSpec);
recordType.setHeader(header);
result.setRecord(recordType);
@@ -214,10 +215,10 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
String[] searchField = {theSearchField};
JSONObject json = new JSONObject();
- json = new JSONObject(OAIPMHUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient, changedId,
+ json = new JSONObject(OaipmhUtilities.getRcordByIDFromElasticSearch(this.oaiEsClient, changedId,
searchField, Strings.EMPTY_ARRAY).getSource());
- result = OAIPMHUtilities.fieldLoader(json, theSearchField);
+ result = OaipmhUtilities.fieldLoader(json, theSearchField);
return result;
}
@@ -229,14 +230,14 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
/**
* @return
*/
- public IDIOMImages getIdiomImages() {
+ public IdiomImages getIdiomImages() {
return this.idiomImages;
}
/**
* @param idiomImages
*/
- public void setIdiomImages(IDIOMImages idiomImages) {
+ public void setIdiomImages(IdiomImages idiomImages) {
this.idiomImages = idiomImages;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
index c4e4c40968e5b548d99e2a3f821c67aa5d0d8f16..132efd36aa2bea0bbe388eb9407d151291c8f96d 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
@@ -14,7 +14,7 @@ import info.textgrid.middleware.oaipmh.ResumptionTokenType;
*/
public abstract class RecordListDelivererAbstract implements RecordListDelivererInterface {
- protected OAIPMHElasticSearchClient oaiEsClient;
+ protected OaipmhElasticSearchClient oaiEsClient;
protected boolean textgrid;
protected boolean dariah;
@@ -59,17 +59,17 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer
// Check for metadata prefix AND resumption token.
if (request.getMetadataPrefix() != null && request.getResumptionToken() != null) {
- result.setError(OAIPMHConstants.OAI_BAD_ARGUMENT,
+ result.setError(OaipmhConstants.OAI_BAD_ARGUMENT,
"The resumptionToken is an exclusive argument, please remove metadataPrefix!");
return result;
}
// Check if metadata prefix is existing and valid.
if (request.getMetadataPrefix() != null
- && !request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
- result.setError(OAIPMHConstants.OAI_METADATA_FORMAT_ERROR,
+ && !request.getMetadataPrefix().equals(OaipmhUtilities.OAIDC_PREFIX)
+ && !request.getMetadataPrefix().equals(OaipmhConstants.METADATA_IDIOM_PREFIX)
+ && !request.getMetadataPrefix().equals(OaipmhConstants.METADATA_OPENAIRE_PREFIX)) {
+ result.setError(OaipmhConstants.OAI_METADATA_FORMAT_ERROR,
"The value of the metadataPrefix " + request.getMetadataPrefix()
+ " is not supported by the item identified by the value of: "
+ request.getIdentifier());
@@ -96,7 +96,7 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer
* request.getFrom()))) { errorValues.add("until, from"); }
*/
if (errorValues.size() > 0) {
- result.setError(OAIPMHConstants.OAI_BAD_ARGUMENT, "The request includes illegal arguments "
+ result.setError(OaipmhConstants.OAI_BAD_ARGUMENT, "The request includes illegal arguments "
+ "or is missing required arguments: " + errorValues);
}
@@ -180,14 +180,14 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer
/**
* @return
*/
- public OAIPMHElasticSearchClient getOaiEsClient() {
+ public OaipmhElasticSearchClient getOaiEsClient() {
return this.oaiEsClient;
}
/**
* @param oaiEsClient
*/
- public void setOaiEsClient(OAIPMHElasticSearchClient oaiEsClient) {
+ public void setOaiEsClient(OaipmhElasticSearchClient oaiEsClient) {
this.oaiEsClient = oaiEsClient;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
index 3dcab2361da91a580164d1f34d574c475b468811..a5807a05503b4a84293e76c5c8653582ff541e75 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
@@ -191,7 +191,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
if (hit != null && hit.getFields() != null) {
JSONObject json = new JSONObject(hit.getSourceAsMap());
- this.modifiedValue = OAIPMHUtilities.fieldLoader(json, this.modifiedField);
+ this.modifiedValue = OaipmhUtilities.fieldLoader(json, this.modifiedField);
// **
// TEXTGRID SEARCH
@@ -203,7 +203,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
if (hit.getSourceAsMap().get(this.formatField).toString().equals(this.formatToFilter)) {
String setSpec = this.specFieldPrefix
- + DublinCoreFieldLoader.fillList(hit, TGConstants.RELATIONS_LIST).get(0);
+ + DublinCoreFieldLoader.fillList(hit, OaipmhTGConstants.RELATIONS_LIST).get(0);
if (DublinCoreFieldLoader.fillList(hit, relationFields).get(0) != null) {
workUri = DublinCoreFieldLoader.fillList(hit, relationFields).get(0)
.substring(this.repositoryObjectURIPrefix.length());
@@ -218,8 +218,8 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
String identifier = hit.getSourceAsMap().get(this.identifierField).toString();
- HeaderType header = OAIPMHUtilities.computeResponseHeader(
- OAIPMHUtilities.convertDateFormat(this.modifiedValue).toString(), identifier,
+ HeaderType header = OaipmhUtilities.computeResponseHeader(
+ OaipmhUtilities.convertDateFormat(this.modifiedValue).toString(), identifier,
setSpec);
buildRecord(recordList, header, dublinCoreBuilder);
@@ -240,14 +240,14 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
else if (this.dariah) {
// Get identifier and setSpec field, add setSpec prefix if not already set.
- String identifier = OAIPMHUtilities.fieldLoader(json, this.identifierField);
- String setSpec = OAIPMHUtilities.getSetSpec(set, this.specFieldPrefix, identifier);
+ String identifier = OaipmhUtilities.fieldLoader(json, this.identifierField);
+ String setSpec = OaipmhUtilities.getSetSpec(set, this.specFieldPrefix, identifier);
try {
dublinCoreBuilder = putContentIntoDCFieldListsDH(hit);
- HeaderType header = OAIPMHUtilities.computeResponseHeader(
- OAIPMHUtilities.convertDateFormat(this.modifiedValue).toString(), identifier,
+ HeaderType header = OaipmhUtilities.computeResponseHeader(
+ OaipmhUtilities.convertDateFormat(this.modifiedValue).toString(), identifier,
setSpec);
buildRecord(recordList, header, dublinCoreBuilder);
@@ -269,7 +269,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
log.fine("scrollid: " + scrollID);
log.fine("searchResponseSize: " + this.searchResponseSize);
- ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(completeListSize,
+ ResumptionTokenType resTokenForResponse = OaipmhUtilities.getResumptionToken(completeListSize,
resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i);
if (resTokenForResponse != null) {
@@ -416,7 +416,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
DublinCoreFieldLoader.fillListFromTGWorkValues(responseWorkValues, this.descriptionList));
result.setFormat(DublinCoreFieldLoader.fillList(hit, this.formatList));
result.setIdentifier(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.identifierList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.identifierList));
result.setLanguage(DublinCoreFieldLoader.fillList(hit, this.languageList));
result.setPublisher(DublinCoreFieldLoader.fillList(hit, this.publisherList));
result.setRelation(DublinCoreFieldLoader.fillList(hit, this.relationList));
@@ -444,35 +444,35 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
DublinCoreBuilder result = new DublinCoreBuilder();
result.setContributor(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.contributorList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.contributorList));
result.setCoverage(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.coverageList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.coverageList));
result.setCreator(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.creatorList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.creatorList));
result
- .setDate(OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.dateList));
+ .setDate(OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.dateList));
result.setDescription(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.descriptionList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.descriptionList));
result.setFormat(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.formatList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.formatList));
result.setIdentifier(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.identifierList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.identifierList));
result.setLanguage(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.languageList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.languageList));
result.setPublisher(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.publisherList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.publisherList));
result.setRelation(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.relationList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.relationList));
result.setRights(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.rightsList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.rightsList));
result.setSource(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.sourceList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.sourceList));
result.setSubject(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.subjectList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.subjectList));
result.setTitle(
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.titleList));
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.titleList));
result
- .setType(OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.typeList));
+ .setType(OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.typeList));
return result;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDATACITE.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDatacite.java
similarity index 94%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDATACITE.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDatacite.java
index 2f52c1ca7efdec5697a83b0962a0daa036526712..a8d538a053cda38175e900bd1784288fa602bc6a 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDATACITE.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDatacite.java
@@ -27,23 +27,23 @@ import info.textgrid.middleware.oaipmh.RecordType;
* @version 2022-09-08
* @since 2020-06-13
*/
-public class RecordListDelivererDATACITE extends RecordListDelivererAbstract {
+public class RecordListDelivererDatacite extends RecordListDelivererAbstract {
// **
// STATICS
// **
- private static Logger log = Logger.getLogger(RecordListDelivererDATACITE.class.getName());
+ private static Logger log = Logger.getLogger(RecordListDelivererDatacite.class.getName());
protected static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
- private RecordDelivererDATACITE dataciteRecord;
+ private RecordDelivererDatacite dataciteRecord;
/**
* @param textgrid
* @param dariah
*/
- public RecordListDelivererDATACITE(boolean textgrid, boolean dariah) {
+ public RecordListDelivererDatacite(boolean textgrid, boolean dariah) {
super(textgrid, dariah);
}
@@ -217,7 +217,7 @@ public class RecordListDelivererDATACITE extends RecordListDelivererAbstract {
String id2add;
// FIXME Could we not use hit.getId() also for TG hits? Where is the difference?
if (this.textgrid) {
- id2add = hit.getSourceAsMap().get(TGConstants.URI).toString();
+ id2add = hit.getSourceAsMap().get(OaipmhTGConstants.URI).toString();
} else {
id2add = hit.getId();
}
@@ -233,7 +233,7 @@ public class RecordListDelivererDATACITE extends RecordListDelivererAbstract {
}
this.resTokenForResponse.setValue("");
} else {
- this.resTokenForResponse = OAIPMHUtilities.getResumptionToken(completeListSize,
+ this.resTokenForResponse = OaipmhUtilities.getResumptionToken(completeListSize,
resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i);
}
@@ -252,14 +252,14 @@ public class RecordListDelivererDATACITE extends RecordListDelivererAbstract {
/**
* @return
*/
- public RecordDelivererDATACITE getDataciteRecord() {
+ public RecordDelivererDatacite getDataciteRecord() {
return this.dataciteRecord;
}
/**
* @param dataciteRecord
*/
- public void setDataciteRecord(RecordDelivererDATACITE dataciteRecord) {
+ public void setDataciteRecord(RecordDelivererDatacite dataciteRecord) {
this.dataciteRecord = dataciteRecord;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIdiom.java
similarity index 93%
rename from oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
rename to oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIdiom.java
index 6e80c1f6093de08a11c417226a9051d677fe2265..12c22826f522e58b4d9f4b433fce022b9b02ac1d 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIdiom.java
@@ -24,20 +24,20 @@ import info.textgrid.middleware.oaipmh.ResumptionTokenType;
* @author Maximilian Brodhun, SUB Göttingen
* @author Stefan E. Funk, SUB Göttingen
*/
-public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
+public class RecordListDelivererIdiom extends RecordListDelivererAbstract {
// **
// STATICS
// **
- private static Logger log = Logger.getLogger(RecordListDelivererIDIOM.class.getName());
+ private static Logger log = Logger.getLogger(RecordListDelivererIdiom.class.getName());
private static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
// **
// CLASS
// **
- private RecordDelivererIDIOM idiomRecord;
+ private RecordDelivererIdiom idiomRecord;
// Set default to 30, can be changed in oaipmh.properties.
private int idiomResponseSize = 30;
@@ -45,7 +45,7 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
* @param textgrid
* @param dariah
*/
- public RecordListDelivererIDIOM(boolean textgrid, boolean dariah) {
+ public RecordListDelivererIdiom(boolean textgrid, boolean dariah) {
super(textgrid, dariah);
}
@@ -125,7 +125,7 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
log.fine("hit no." + i + ": id=" + hit.getId());
String textgridURI =
- OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), "textgridUri");
+ OaipmhUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), "textgridUri");
log.fine("textgrid uri: " + textgridURI);
@@ -148,7 +148,7 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
}
// Check the need for a resumption token!
- ResumptionTokenType responseToken = OAIPMHUtilities.getResumptionToken(completeListSize,
+ ResumptionTokenType responseToken = OaipmhUtilities.getResumptionToken(completeListSize,
resumptionToken, cursorCollector, scrollID, this.idiomResponseSize, i);
if (responseToken != null) {
recordList.setResumptionToken(responseToken);
@@ -183,14 +183,14 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
/**
* @return
*/
- public RecordDelivererIDIOM getIdiomRecord() {
+ public RecordDelivererIdiom getIdiomRecord() {
return this.idiomRecord;
}
/**
* @param idiomRecord
*/
- public void setIdiomRecord(RecordDelivererIDIOM idiomRecord) {
+ public void setIdiomRecord(RecordDelivererIdiom idiomRecord) {
this.idiomRecord = idiomRecord;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java
index 04be7ab961177073b11b6d72831e7f89001b0055..d9746b2649210cf545445c5f02d1825326f394ae 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java
@@ -43,7 +43,7 @@ public class SetListDeliverer {
private boolean textgrid;
private boolean dariah;
- private OAIPMHElasticSearchClient oaiEsClient;
+ private OaipmhElasticSearchClient oaiEsClient;
/**
* @param oaiEsClient
@@ -343,14 +343,14 @@ public class SetListDeliverer {
/**
* @return
*/
- public OAIPMHElasticSearchClient getOaiEsClient() {
+ public OaipmhElasticSearchClient getOaiEsClient() {
return this.oaiEsClient;
}
/**
* @param oaiEsClient
*/
- public void setOaiEsClient(OAIPMHElasticSearchClient oaiEsClient) {
+ public void setOaiEsClient(OaipmhElasticSearchClient oaiEsClient) {
this.oaiEsClient = oaiEsClient;
}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestDHOAIPMHLocally.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestDHOAIPMHLocally.java
deleted file mode 100644
index b613e8c5ec35ba6872408d9f284947a5829ebd31..0000000000000000000000000000000000000000
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestDHOAIPMHLocally.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package info.textgrid.middleware.test;
-
-import java.text.ParseException;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import info.textgrid.middleware.oaipmh.DeletedRecordType;
-import info.textgrid.middleware.oaipmh.GranularityType;
-import info.textgrid.middleware.IDIOMImages;
-import info.textgrid.middleware.IdentifierListDelivererDATACITE;
-import info.textgrid.middleware.IdentifierListDelivererDC;
-import info.textgrid.middleware.IdentifierListDelivererIDIOM;
-import info.textgrid.middleware.MetadataFormatListDelivererDH;
-import info.textgrid.middleware.MetadataFormatListDelivererInterface;
-import info.textgrid.middleware.OAIPMHConstants;
-import info.textgrid.middleware.OAIPMHElasticSearchClient;
-import info.textgrid.middleware.OAIPMHImpl;
-import info.textgrid.middleware.OAIPMHUtilities;
-import info.textgrid.middleware.RecordDelivererDATACITE;
-import info.textgrid.middleware.RecordDelivererDC;
-import info.textgrid.middleware.RecordDelivererIDIOM;
-import info.textgrid.middleware.RecordListDelivererDATACITE;
-import info.textgrid.middleware.RecordListDelivererDC;
-import info.textgrid.middleware.RecordListDelivererIDIOM;
-import info.textgrid.middleware.RepIdentification;
-import info.textgrid.middleware.SetListDeliverer;
-import info.textgrid.middleware.common.TextGridMimetypes;
-
-/**
- * FIXME: Add documentation how to use this class, use SSH tunnel?
- */
-@Ignore
-public class TestDHOAIPMHLocally {
-
- public static OAIPMHElasticSearchClient oaiEsClient;
-
- private static RecordDelivererDC record;
- private static RecordListDelivererDC recordList;
- private static IdentifierListDelivererDC identifierList;
- private static MetadataFormatListDelivererInterface metadataFormatList =
- new MetadataFormatListDelivererDH();
- private static SetListDeliverer setListDARIAH = new SetListDeliverer(false, true);
-
- // private static OpenAireRecord openAireRecord;
- private static RecordDelivererDATACITE recordDATACITE;
- // private static OpenAireRecordList openAireRecordList;
- private static RecordListDelivererDATACITE recordListDATACITE;
- // private static OpenAireIdentifierList openAireIdentifierList;
- private static IdentifierListDelivererDATACITE identifierListDATACITE;
- private static IDIOMImages idiomImages;
- private DeletedRecordType deletedRecordType = DeletedRecordType.NO;
- private GranularityType granularityType = GranularityType.YYYY_MM_DD_THH_MM_SS_Z;
- private RepIdentification rep = new RepIdentification("DARIAH-DE Repository",
- "https://trep.de.dariah.eu", this.deletedRecordType, "2011-06-11T02:32:40Z",
- this.granularityType, "2.0", "funk@sub.uni-goettingen.de");
-
- /**
- * FIXME: it should not be necessary to put idiom record variables for a DARIAH test case
- */
- private static RecordDelivererIDIOM recordIDIOM;
- private static RecordListDelivererIDIOM recordListIDIOM;
- private static IdentifierListDelivererIDIOM identifierListIDIOM =
- new IdentifierListDelivererIDIOM(true, false);
-
- private OAIPMHImpl request =
- new OAIPMHImpl(this.rep,
- TestDHOAIPMHLocally.record,
- TestDHOAIPMHLocally.recordIDIOM,
- TestDHOAIPMHLocally.recordDATACITE,
- TestDHOAIPMHLocally.recordList,
- TestDHOAIPMHLocally.recordListIDIOM,
- TestDHOAIPMHLocally.recordListDATACITE,
- TestDHOAIPMHLocally.metadataFormatList,
- TestDHOAIPMHLocally.setListDARIAH,
- TestDHOAIPMHLocally.identifierList,
- TestDHOAIPMHLocally.identifierListIDIOM,
- // OaiPmhTestDH.openAireIdentifierList);
- TestDHOAIPMHLocally.identifierListDATACITE,
- TestDHOAIPMHLocally.idiomImages);
-
- OAIPMHUtilities settings = new OAIPMHUtilities();
-
- /**
- * @throws Exception
- */
- @BeforeClass
- public static void setUp() throws Exception {
- int[] ports = new int[] {9202};
- oaiEsClient = new OAIPMHElasticSearchClient("localhost", ports, 100);
- oaiEsClient.setEsIndex("dariah-public");
- oaiEsClient.setEsType("metadata");
-
- record = new RecordDelivererDC(false, true);
- record.setOaiEsClient(oaiEsClient);
- record.setWorkFields(OAIPMHConstants.TEST_DARIAH_FIELDS);
- }
-
- /**
- * @throws ParseException
- */
- @Test
- public void testGetRequestIdentify() throws ParseException {
- System.out.println("Test for the verb \"Identify\" with succesfull response");
- String r = this.request.getRequest("Identify", "", "", "", "", "", "");
- System.out.println(r);
- System.out.println("-----------------------------------\n");
- }
-
- /**
- * @throws ParseException
- */
- @Test
- public void testGetRequestGetRecordDariah() throws ParseException {
-
- TestDHOAIPMHLocally.record.setContributor(OAIPMHConstants.TEST_DARIAH_CONTRIBUTOR_LIST);
- TestDHOAIPMHLocally.record.setCoverage(OAIPMHConstants.TEST_DARIAH_COVERAGE_LIST);
- TestDHOAIPMHLocally.record.setCreator(OAIPMHConstants.TEST_DARIAH_CREATOR_LIST);
- TestDHOAIPMHLocally.record.setDates(OAIPMHConstants.TEST_DARIAH_DATE_LIST);
- TestDHOAIPMHLocally.record.setDescriptions(OAIPMHConstants.TEST_DARIAH_DESCRIPTION_LIST);
- TestDHOAIPMHLocally.record.setFormats(OAIPMHConstants.TEST_DARIAH_FORMAT_LIST);
- TestDHOAIPMHLocally.record.setIdentifiers(OAIPMHConstants.TEST_DARIAH_IDENTIFIER_LIST);
- TestDHOAIPMHLocally.record.setLanguages(OAIPMHConstants.TEST_DARIAH_LANGUAGE_LIST);
- TestDHOAIPMHLocally.record.setPublishers(OAIPMHConstants.TEST_DARIAH_PUBLISHER_LIST);
- TestDHOAIPMHLocally.record.setRelations(OAIPMHConstants.TEST_DARIAH_RELATIONS_LIST);
- TestDHOAIPMHLocally.record.setRights(OAIPMHConstants.TEST_DARIAH_RIGHTS_LIST);
- TestDHOAIPMHLocally.record.setSources(OAIPMHConstants.TEST_DARIAH_SOURCE_LIST);
- TestDHOAIPMHLocally.record.setSubjects(OAIPMHConstants.TEST_DARIAH_SUBJECT_LIST);
- TestDHOAIPMHLocally.record.setTitles(OAIPMHConstants.TEST_DARIAH_TITLE_LIST);
- TestDHOAIPMHLocally.record.setTypes(OAIPMHConstants.TEST_DARIAH_TYPE_LIST);
- TestDHOAIPMHLocally.record.setFields(OAIPMHConstants.TEST_DARIAH_FIELDS);
- TestDHOAIPMHLocally.record.setFormatField(OAIPMHConstants.TEST_DARIAH_FORMAT);
- TestDHOAIPMHLocally.record.setFormatToFilter("metadata");
- TestDHOAIPMHLocally.record
- .setDateOfObjectCreation(OAIPMHConstants.TEST_DARIAH_MODIFIED_FIELD);
- TestDHOAIPMHLocally.record
- .setRepositoryObjectURIPrefix(OAIPMHConstants.TEST_DARIAH_ITEM_IDENTIFIER_PREFIX);
- TestDHOAIPMHLocally.record.setIdentifierField("administrativeMetadata.dcterms:identifier");
-
- System.out.println("Test for the verb \"GetRecord\" for DARIAH with succesfull response");
- String p = this.request.getRequest("GetRecord", "hdl:21.T11991/0000-0005-E1AA-D", "oai_dc", "",
- "", "", "");
- System.out.println(p);
- System.out.println("-----------------------------------\n");
- }
-
- /**
- * @throws ParseException
- */
- @Test
- public void testListRecordsDariah() throws ParseException {
-
- TestDHOAIPMHLocally.recordList.setContributors(OAIPMHConstants.TEST_DARIAH_CONTRIBUTOR_LIST);
- TestDHOAIPMHLocally.recordList.setCoverages(OAIPMHConstants.TEST_DARIAH_COVERAGE_LIST);
- TestDHOAIPMHLocally.recordList.setCreators(OAIPMHConstants.TEST_DARIAH_CREATOR_LIST);
- TestDHOAIPMHLocally.recordList.setDates(OAIPMHConstants.TEST_DARIAH_DATE_LIST);
- TestDHOAIPMHLocally.recordList.setDescriptions(OAIPMHConstants.TEST_DARIAH_DESCRIPTION_LIST);
- TestDHOAIPMHLocally.recordList.setFormats(OAIPMHConstants.TEST_DARIAH_FORMAT_LIST);
- TestDHOAIPMHLocally.recordList.setIdentifiers(OAIPMHConstants.TEST_DARIAH_IDENTIFIER_LIST);
- TestDHOAIPMHLocally.recordList.setLanguages(OAIPMHConstants.TEST_DARIAH_LANGUAGE_LIST);
- TestDHOAIPMHLocally.recordList.setPublishers(OAIPMHConstants.TEST_DARIAH_PUBLISHER_LIST);
- TestDHOAIPMHLocally.recordList.setRelations(OAIPMHConstants.TEST_DARIAH_RELATIONS_LIST);
- TestDHOAIPMHLocally.recordList.setRights(OAIPMHConstants.TEST_DARIAH_RIGHTS_LIST);
- TestDHOAIPMHLocally.recordList.setSources(OAIPMHConstants.TEST_DARIAH_SOURCE_LIST);
- TestDHOAIPMHLocally.recordList.setSubjects(OAIPMHConstants.TEST_DARIAH_SUBJECT_LIST);
- TestDHOAIPMHLocally.recordList.setTitles(OAIPMHConstants.TEST_DARIAH_TITLE_LIST);
- TestDHOAIPMHLocally.recordList.setTypes(OAIPMHConstants.TEST_DARIAH_TYPE_LIST);
- TestDHOAIPMHLocally.recordList.setFormatField(OAIPMHConstants.TEST_DARIAH_FORMAT);
- TestDHOAIPMHLocally.recordList.setDateOfObjectCreation(OAIPMHConstants.TEST_DARIAH_CREATED);
- TestDHOAIPMHLocally.recordList.setRangeField(OAIPMHConstants.TEST_DARIAH_MODIFIED_FIELD);
- TestDHOAIPMHLocally.recordList
- .setDateOfObjectCreation(OAIPMHConstants.TEST_DARIAH_RANGE_FIELD);
- TestDHOAIPMHLocally.recordList.setIdentifierField(OAIPMHConstants.TEST_DARIAH_IDENTIFIER);
- TestDHOAIPMHLocally.recordList.setFormatToFilter(TextGridMimetypes.DARIAH_COLLECTION);
- TestDHOAIPMHLocally.recordList.setModifiedField(OAIPMHConstants.TEST_DARIAH_MODIFIED_FIELD);
- TestDHOAIPMHLocally.recordList
- .setRelationToFurtherMetadataObject("descriptiveMetadata.dc:relation");
- TestDHOAIPMHLocally.recordList.setSearchResponseSize(100);
-
- String r = this.request.getRequest("ListRecords", "", "oai_dc", "21.T11991/0000-0003-718E-E",
- "", "", "");
- System.out.println(r);
- System.out.println("-----------------------------------\n");
- }
-
- /**
- * @throws ParseException
- */
- @Test
- public void testListSetsDARIAH() throws ParseException {
-
- TestDHOAIPMHLocally.setListDARIAH.setFormatField(OAIPMHConstants.TEST_DARIAH_FORMAT);
- TestDHOAIPMHLocally.setListDARIAH
- .setFormatToFilter(OAIPMHConstants.TEST_DARIAH_COLLECTION_MIMETYPE);
- TestDHOAIPMHLocally.setListDARIAH.setIdentifierField(OAIPMHConstants.TEST_DARIAH_IDENTIFIER);
- TestDHOAIPMHLocally.setListDARIAH
- .setRepositoryObjectURIPrefix(OAIPMHConstants.TEST_DARIAH_ITEM_IDENTIFIER_PREFIX);
- TestDHOAIPMHLocally.setListDARIAH
- .setIdentifierField("administrativeMetadata.dcterms:identifier");
- TestDHOAIPMHLocally.setListDARIAH
- .setSpecFieldPrefix(OAIPMHConstants.TEST_DARIAH_COLLECTIONREGISTRY_PREFIX);
- String r = this.request.getRequest("ListSets", "", "", "", "", "", "");
- System.out.println(r);
- System.out.println("-----------------------------------\n");
- }
-
- /**
- * @throws ParseException
- */
- @Test
- public void testListIdentifiersDARIAH() throws ParseException {
-
- TestDHOAIPMHLocally.identifierList.setFieldForRange(OAIPMHConstants.TEST_DARIAH_RANGE_FIELD);
- TestDHOAIPMHLocally.identifierList
- .setIdentifierListFields(OAIPMHConstants.TEST_DARIAH_IDENTIFIER_LIST_FIELDS);
- TestDHOAIPMHLocally.identifierList
- .setDateOfObjectCreation("administrativeMetadata.dcterms:modified");
- TestDHOAIPMHLocally.identifierList
- .setRepositoryObjectURIPrefix(OAIPMHConstants.TEST_DARIAH_ITEM_IDENTIFIER_PREFIX);
- TestDHOAIPMHLocally.identifierList
- .setIdentifierField("administrativeMetadata.dcterms:identifier");
- TestDHOAIPMHLocally.identifierList.setSearchResponseSize("100");
- String r = this.request.getRequest("ListIdentifiers", "", "oai_dc", "", "", "", "");
- System.out.println(r);
- System.out.println("-----------------------------------\n");
- }
-
-}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestDHOaipmhLocally.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestDHOaipmhLocally.java
new file mode 100644
index 0000000000000000000000000000000000000000..a77e5d10ba363410846b8e8a9c7776e3f0a0cedd
--- /dev/null
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestDHOaipmhLocally.java
@@ -0,0 +1,227 @@
+package info.textgrid.middleware.test;
+
+import java.text.ParseException;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import info.textgrid.middleware.oaipmh.DeletedRecordType;
+import info.textgrid.middleware.oaipmh.GranularityType;
+import info.textgrid.middleware.IdiomImages;
+import info.textgrid.middleware.IdentifierListDelivererDatacite;
+import info.textgrid.middleware.IdentifierListDelivererDC;
+import info.textgrid.middleware.IdentifierListDelivererIdiom;
+import info.textgrid.middleware.MetadataFormatListDelivererDH;
+import info.textgrid.middleware.MetadataFormatListDelivererInterface;
+import info.textgrid.middleware.OaipmhConstants;
+import info.textgrid.middleware.OaipmhElasticSearchClient;
+import info.textgrid.middleware.OaipmhImpl;
+import info.textgrid.middleware.OaipmhUtilities;
+import info.textgrid.middleware.RecordDelivererDatacite;
+import info.textgrid.middleware.RecordDelivererDC;
+import info.textgrid.middleware.RecordDelivererIdiom;
+import info.textgrid.middleware.RecordListDelivererDatacite;
+import info.textgrid.middleware.RecordListDelivererDC;
+import info.textgrid.middleware.RecordListDelivererIdiom;
+import info.textgrid.middleware.RepIdentification;
+import info.textgrid.middleware.SetListDeliverer;
+import info.textgrid.middleware.common.TextGridMimetypes;
+
+/**
+ * FIXME: Add documentation how to use this class, use SSH tunnel?
+ */
+@Ignore
+public class TestDHOaipmhLocally {
+
+ public static OaipmhElasticSearchClient oaiEsClient;
+
+ private static RecordDelivererDC record;
+ private static RecordListDelivererDC recordList;
+ private static IdentifierListDelivererDC identifierList;
+ private static MetadataFormatListDelivererInterface metadataFormatList =
+ new MetadataFormatListDelivererDH();
+ private static SetListDeliverer setListDARIAH = new SetListDeliverer(false, true);
+
+ // private static OpenAireRecord openAireRecord;
+ private static RecordDelivererDatacite recordDATACITE;
+ // private static OpenAireRecordList openAireRecordList;
+ private static RecordListDelivererDatacite recordListDATACITE;
+ // private static OpenAireIdentifierList openAireIdentifierList;
+ private static IdentifierListDelivererDatacite identifierListDATACITE;
+ private static IdiomImages idiomImages;
+ private DeletedRecordType deletedRecordType = DeletedRecordType.NO;
+ private GranularityType granularityType = GranularityType.YYYY_MM_DD_THH_MM_SS_Z;
+ private RepIdentification rep = new RepIdentification("DARIAH-DE Repository",
+ "https://trep.de.dariah.eu", this.deletedRecordType, "2011-06-11T02:32:40Z",
+ this.granularityType, "2.0", "funk@sub.uni-goettingen.de");
+
+ /**
+ * FIXME: it should not be necessary to put idiom record variables for a DARIAH test case
+ */
+ private static RecordDelivererIdiom recordIDIOM;
+ private static RecordListDelivererIdiom recordListIDIOM;
+ private static IdentifierListDelivererIdiom identifierListIDIOM =
+ new IdentifierListDelivererIdiom(true, false);
+
+ private OaipmhImpl request =
+ new OaipmhImpl(this.rep,
+ TestDHOaipmhLocally.record,
+ TestDHOaipmhLocally.recordIDIOM,
+ TestDHOaipmhLocally.recordDATACITE,
+ TestDHOaipmhLocally.recordList,
+ TestDHOaipmhLocally.recordListIDIOM,
+ TestDHOaipmhLocally.recordListDATACITE,
+ TestDHOaipmhLocally.metadataFormatList,
+ TestDHOaipmhLocally.setListDARIAH,
+ TestDHOaipmhLocally.identifierList,
+ TestDHOaipmhLocally.identifierListIDIOM,
+ // OaiPmhTestDH.openAireIdentifierList);
+ TestDHOaipmhLocally.identifierListDATACITE,
+ TestDHOaipmhLocally.idiomImages);
+
+ OaipmhUtilities settings = new OaipmhUtilities();
+
+ /**
+ * @throws Exception
+ */
+ @BeforeClass
+ public static void setUp() throws Exception {
+ int[] ports = new int[] {9202};
+ oaiEsClient = new OaipmhElasticSearchClient("localhost", ports, 100);
+ oaiEsClient.setEsIndex("dariah-public");
+ oaiEsClient.setEsType("metadata");
+
+ record = new RecordDelivererDC(false, true);
+ record.setOaiEsClient(oaiEsClient);
+ record.setWorkFields(OaipmhConstants.TEST_DARIAH_FIELDS);
+ }
+
+ /**
+ * @throws ParseException
+ */
+ @Test
+ public void testGetRequestIdentify() throws ParseException {
+ System.out.println("Test for the verb \"Identify\" with succesfull response");
+ String r = this.request.getRequest("Identify", "", "", "", "", "", "");
+ System.out.println(r);
+ System.out.println("-----------------------------------\n");
+ }
+
+ /**
+ * @throws ParseException
+ */
+ @Test
+ public void testGetRequestGetRecordDariah() throws ParseException {
+
+ TestDHOaipmhLocally.record.setContributor(OaipmhConstants.TEST_DARIAH_CONTRIBUTOR_LIST);
+ TestDHOaipmhLocally.record.setCoverage(OaipmhConstants.TEST_DARIAH_COVERAGE_LIST);
+ TestDHOaipmhLocally.record.setCreator(OaipmhConstants.TEST_DARIAH_CREATOR_LIST);
+ TestDHOaipmhLocally.record.setDates(OaipmhConstants.TEST_DARIAH_DATE_LIST);
+ TestDHOaipmhLocally.record.setDescriptions(OaipmhConstants.TEST_DARIAH_DESCRIPTION_LIST);
+ TestDHOaipmhLocally.record.setFormats(OaipmhConstants.TEST_DARIAH_FORMAT_LIST);
+ TestDHOaipmhLocally.record.setIdentifiers(OaipmhConstants.TEST_DARIAH_IDENTIFIER_LIST);
+ TestDHOaipmhLocally.record.setLanguages(OaipmhConstants.TEST_DARIAH_LANGUAGE_LIST);
+ TestDHOaipmhLocally.record.setPublishers(OaipmhConstants.TEST_DARIAH_PUBLISHER_LIST);
+ TestDHOaipmhLocally.record.setRelations(OaipmhConstants.TEST_DARIAH_RELATIONS_LIST);
+ TestDHOaipmhLocally.record.setRights(OaipmhConstants.TEST_DARIAH_RIGHTS_LIST);
+ TestDHOaipmhLocally.record.setSources(OaipmhConstants.TEST_DARIAH_SOURCE_LIST);
+ TestDHOaipmhLocally.record.setSubjects(OaipmhConstants.TEST_DARIAH_SUBJECT_LIST);
+ TestDHOaipmhLocally.record.setTitles(OaipmhConstants.TEST_DARIAH_TITLE_LIST);
+ TestDHOaipmhLocally.record.setTypes(OaipmhConstants.TEST_DARIAH_TYPE_LIST);
+ TestDHOaipmhLocally.record.setFields(OaipmhConstants.TEST_DARIAH_FIELDS);
+ TestDHOaipmhLocally.record.setFormatField(OaipmhConstants.TEST_DARIAH_FORMAT);
+ TestDHOaipmhLocally.record.setFormatToFilter("metadata");
+ TestDHOaipmhLocally.record
+ .setDateOfObjectCreation(OaipmhConstants.TEST_DARIAH_MODIFIED_FIELD);
+ TestDHOaipmhLocally.record
+ .setRepositoryObjectURIPrefix(OaipmhConstants.TEST_DARIAH_ITEM_IDENTIFIER_PREFIX);
+ TestDHOaipmhLocally.record.setIdentifierField("administrativeMetadata.dcterms:identifier");
+
+ System.out.println("Test for the verb \"GetRecord\" for DARIAH with succesfull response");
+ String p = this.request.getRequest("GetRecord", "hdl:21.T11991/0000-0005-E1AA-D", "oai_dc", "",
+ "", "", "");
+ System.out.println(p);
+ System.out.println("-----------------------------------\n");
+ }
+
+ /**
+ * @throws ParseException
+ */
+ @Test
+ public void testListRecordsDariah() throws ParseException {
+
+ TestDHOaipmhLocally.recordList.setContributors(OaipmhConstants.TEST_DARIAH_CONTRIBUTOR_LIST);
+ TestDHOaipmhLocally.recordList.setCoverages(OaipmhConstants.TEST_DARIAH_COVERAGE_LIST);
+ TestDHOaipmhLocally.recordList.setCreators(OaipmhConstants.TEST_DARIAH_CREATOR_LIST);
+ TestDHOaipmhLocally.recordList.setDates(OaipmhConstants.TEST_DARIAH_DATE_LIST);
+ TestDHOaipmhLocally.recordList.setDescriptions(OaipmhConstants.TEST_DARIAH_DESCRIPTION_LIST);
+ TestDHOaipmhLocally.recordList.setFormats(OaipmhConstants.TEST_DARIAH_FORMAT_LIST);
+ TestDHOaipmhLocally.recordList.setIdentifiers(OaipmhConstants.TEST_DARIAH_IDENTIFIER_LIST);
+ TestDHOaipmhLocally.recordList.setLanguages(OaipmhConstants.TEST_DARIAH_LANGUAGE_LIST);
+ TestDHOaipmhLocally.recordList.setPublishers(OaipmhConstants.TEST_DARIAH_PUBLISHER_LIST);
+ TestDHOaipmhLocally.recordList.setRelations(OaipmhConstants.TEST_DARIAH_RELATIONS_LIST);
+ TestDHOaipmhLocally.recordList.setRights(OaipmhConstants.TEST_DARIAH_RIGHTS_LIST);
+ TestDHOaipmhLocally.recordList.setSources(OaipmhConstants.TEST_DARIAH_SOURCE_LIST);
+ TestDHOaipmhLocally.recordList.setSubjects(OaipmhConstants.TEST_DARIAH_SUBJECT_LIST);
+ TestDHOaipmhLocally.recordList.setTitles(OaipmhConstants.TEST_DARIAH_TITLE_LIST);
+ TestDHOaipmhLocally.recordList.setTypes(OaipmhConstants.TEST_DARIAH_TYPE_LIST);
+ TestDHOaipmhLocally.recordList.setFormatField(OaipmhConstants.TEST_DARIAH_FORMAT);
+ TestDHOaipmhLocally.recordList.setDateOfObjectCreation(OaipmhConstants.TEST_DARIAH_CREATED);
+ TestDHOaipmhLocally.recordList.setRangeField(OaipmhConstants.TEST_DARIAH_MODIFIED_FIELD);
+ TestDHOaipmhLocally.recordList
+ .setDateOfObjectCreation(OaipmhConstants.TEST_DARIAH_RANGE_FIELD);
+ TestDHOaipmhLocally.recordList.setIdentifierField(OaipmhConstants.TEST_DARIAH_IDENTIFIER);
+ TestDHOaipmhLocally.recordList.setFormatToFilter(TextGridMimetypes.DARIAH_COLLECTION);
+ TestDHOaipmhLocally.recordList.setModifiedField(OaipmhConstants.TEST_DARIAH_MODIFIED_FIELD);
+ TestDHOaipmhLocally.recordList
+ .setRelationToFurtherMetadataObject("descriptiveMetadata.dc:relation");
+ TestDHOaipmhLocally.recordList.setSearchResponseSize(100);
+
+ String r = this.request.getRequest("ListRecords", "", "oai_dc", "21.T11991/0000-0003-718E-E",
+ "", "", "");
+ System.out.println(r);
+ System.out.println("-----------------------------------\n");
+ }
+
+ /**
+ * @throws ParseException
+ */
+ @Test
+ public void testListSetsDARIAH() throws ParseException {
+
+ TestDHOaipmhLocally.setListDARIAH.setFormatField(OaipmhConstants.TEST_DARIAH_FORMAT);
+ TestDHOaipmhLocally.setListDARIAH
+ .setFormatToFilter(OaipmhConstants.TEST_DARIAH_COLLECTION_MIMETYPE);
+ TestDHOaipmhLocally.setListDARIAH.setIdentifierField(OaipmhConstants.TEST_DARIAH_IDENTIFIER);
+ TestDHOaipmhLocally.setListDARIAH
+ .setRepositoryObjectURIPrefix(OaipmhConstants.TEST_DARIAH_ITEM_IDENTIFIER_PREFIX);
+ TestDHOaipmhLocally.setListDARIAH
+ .setIdentifierField("administrativeMetadata.dcterms:identifier");
+ TestDHOaipmhLocally.setListDARIAH
+ .setSpecFieldPrefix(OaipmhConstants.TEST_DARIAH_COLLECTIONREGISTRY_PREFIX);
+ String r = this.request.getRequest("ListSets", "", "", "", "", "", "");
+ System.out.println(r);
+ System.out.println("-----------------------------------\n");
+ }
+
+ /**
+ * @throws ParseException
+ */
+ @Test
+ public void testListIdentifiersDARIAH() throws ParseException {
+
+ TestDHOaipmhLocally.identifierList.setFieldForRange(OaipmhConstants.TEST_DARIAH_RANGE_FIELD);
+ TestDHOaipmhLocally.identifierList
+ .setIdentifierListFields(OaipmhConstants.TEST_DARIAH_IDENTIFIER_LIST_FIELDS);
+ TestDHOaipmhLocally.identifierList
+ .setDateOfObjectCreation("administrativeMetadata.dcterms:modified");
+ TestDHOaipmhLocally.identifierList
+ .setRepositoryObjectURIPrefix(OaipmhConstants.TEST_DARIAH_ITEM_IDENTIFIER_PREFIX);
+ TestDHOaipmhLocally.identifierList
+ .setIdentifierField("administrativeMetadata.dcterms:identifier");
+ TestDHOaipmhLocally.identifierList.setSearchResponseSize("100");
+ String r = this.request.getRequest("ListIdentifiers", "", "oai_dc", "", "", "", "");
+ System.out.println(r);
+ System.out.println("-----------------------------------\n");
+ }
+
+}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestOAIPMHUtilities.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestOaipmhUtilities.java
similarity index 78%
rename from oaipmh-core/src/test/java/info/textgrid/middleware/test/TestOAIPMHUtilities.java
rename to oaipmh-core/src/test/java/info/textgrid/middleware/test/TestOaipmhUtilities.java
index 14838ff6b83cc8bc9319ca89a39a6d4ec2c01270..f941fa50c5c1a97b3b39233920705e22f86656e6 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestOAIPMHUtilities.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestOaipmhUtilities.java
@@ -2,12 +2,12 @@ package info.textgrid.middleware.test;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import info.textgrid.middleware.OAIPMHUtilities;
+import info.textgrid.middleware.OaipmhUtilities;
/**
*
*/
-public class TestOAIPMHUtilities {
+public class TestOaipmhUtilities {
/**
*
@@ -18,7 +18,7 @@ public class TestOAIPMHUtilities {
// Check Handle IDs (dhrep).
String id1 = "hdl:21.11113/0000-000B-C8EF-7";
String exp1 = "21.11113/0000-000B-C8EF-7";
- String res1 = OAIPMHUtilities.omitPrefixFromIdentifier(id1);
+ String res1 = OaipmhUtilities.omitPrefixFromIdentifier(id1);
if (!res1.equals(exp1)) {
System.out.println(res1 + "!=" + exp1);
assertTrue(false);
@@ -27,7 +27,7 @@ public class TestOAIPMHUtilities {
// Check tgrep set IDs (do not filter project: prefix!).
String id2 = "project:TGPR-2c283391-6ed5-70b4-2e5e-5501c856bca9";
String exp2 = "project:TGPR-2c283391-6ed5-70b4-2e5e-5501c856bca9";
- String res2 = OAIPMHUtilities.omitPrefixFromIdentifier(id2);
+ String res2 = OaipmhUtilities.omitPrefixFromIdentifier(id2);
if (!res2.equals(exp2)) {
System.out.println(res2 + "!=" + exp2);
assertTrue(false);
@@ -36,7 +36,7 @@ public class TestOAIPMHUtilities {
// Check tgrep identifier.
String id3 = "textgrid:24gv8.0";
String exp3 = "24gv8.0";
- String res3 = OAIPMHUtilities.omitPrefixFromIdentifier(id3);
+ String res3 = OaipmhUtilities.omitPrefixFromIdentifier(id3);
if (!res3.equals(exp3)) {
System.out.println(res3 + "!=" + exp3);
assertTrue(false);
@@ -45,7 +45,7 @@ public class TestOAIPMHUtilities {
// Check unknown prefix.
String id4 = "urgli:furgli";
String exp4 = "urgli:furgli";
- String res4 = OAIPMHUtilities.omitPrefixFromIdentifier(id4);
+ String res4 = OaipmhUtilities.omitPrefixFromIdentifier(id4);
if (!res4.equals(exp4)) {
System.out.println(res4 + "!=" + exp4);
assertTrue(false);
@@ -54,7 +54,7 @@ public class TestOAIPMHUtilities {
// Check no prefix.
String id5 = "URGLARGLAUA";
String exp5 = "URGLARGLAUA";
- String res5 = OAIPMHUtilities.omitPrefixFromIdentifier(id5);
+ String res5 = OaipmhUtilities.omitPrefixFromIdentifier(id5);
if (!res5.equals(exp5)) {
System.out.println(res5 + "!=" + exp5);
assertTrue(false);
@@ -63,7 +63,7 @@ public class TestOAIPMHUtilities {
// Check **: prefix.
String id6 = "**:21.T11991/0000-001C-2AA6-8";
String exp6 = "**:21.T11991/0000-001C-2AA6-8";
- String res6 = OAIPMHUtilities.omitPrefixFromIdentifier(id6);
+ String res6 = OaipmhUtilities.omitPrefixFromIdentifier(id6);
if (!res6.equals(exp6)) {
System.out.println(res6 + "!=" + exp6);
assertTrue(false);
@@ -72,7 +72,7 @@ public class TestOAIPMHUtilities {
// Check ** prefix.
String id7 = "**21.T11991/0000-001C-2AA6-8";
String exp7 = "**21.T11991/0000-001C-2AA6-8";
- String res7 = OAIPMHUtilities.omitPrefixFromIdentifier(id7);
+ String res7 = OaipmhUtilities.omitPrefixFromIdentifier(id7);
if (!res7.equals(exp7)) {
System.out.println(res7 + "!=" + exp7);
assertTrue(false);
@@ -90,7 +90,7 @@ public class TestOAIPMHUtilities {
// Set is empty.
String set = "";
String exp = "hdl:21.T11991/0000-001B-4C00-E";
- String setSpec = OAIPMHUtilities.getSetSpec(set, "hdl:", id);
+ String setSpec = OaipmhUtilities.getSetSpec(set, "hdl:", id);
if (!setSpec.equals(exp)) {
System.out.println(setSpec + " != " + exp);
@@ -100,7 +100,7 @@ public class TestOAIPMHUtilities {
// Set is prefix only.
set = "hdl:";
exp = "hdl:21.T11991/0000-001B-4C00-E";
- setSpec = OAIPMHUtilities.getSetSpec(set, "hdl:", id);
+ setSpec = OaipmhUtilities.getSetSpec(set, "hdl:", id);
if (!setSpec.equals(exp)) {
System.out.println(setSpec + " != " + exp);
@@ -110,7 +110,7 @@ public class TestOAIPMHUtilities {
// Set is NOT empty.
set = "project:53281-3452-34-5";
exp = "project:53281-3452-34-5";
- setSpec = OAIPMHUtilities.getSetSpec(set, "project:", id);
+ setSpec = OaipmhUtilities.getSetSpec(set, "project:", id);
if (!setSpec.equals(exp)) {
System.out.println(setSpec + " != " + exp);
@@ -127,28 +127,28 @@ public class TestOAIPMHUtilities {
String uriExpected = "textgrid:12345";
String uri = "textgrid:12345.13";
- String baseURI = OAIPMHUtilities.getTextGridBaseURI(uri);
+ String baseURI = OaipmhUtilities.getTextGridBaseURI(uri);
if (!baseURI.equals(uriExpected)) {
System.out.println(baseURI + " != " + uriExpected);
assertTrue(false);
}
uri = "textgrid:12345.1";
- baseURI = OAIPMHUtilities.getTextGridBaseURI(uri);
+ baseURI = OaipmhUtilities.getTextGridBaseURI(uri);
if (!baseURI.equals(uriExpected)) {
System.out.println(baseURI + " != " + uriExpected);
assertTrue(false);
}
uri = "textgrid:12345";
- baseURI = OAIPMHUtilities.getTextGridBaseURI(uri);
+ baseURI = OaipmhUtilities.getTextGridBaseURI(uri);
if (!baseURI.equals(uriExpected)) {
System.out.println(baseURI + " != " + uriExpected);
assertTrue(false);
}
uri = "textgrid:12345.3847";
- baseURI = OAIPMHUtilities.getTextGridBaseURI(uri);
+ baseURI = OaipmhUtilities.getTextGridBaseURI(uri);
if (!baseURI.equals(uriExpected)) {
System.out.println(baseURI + " != " + uriExpected);
assertTrue(false);
@@ -163,7 +163,7 @@ public class TestOAIPMHUtilities {
String uriExpected = "textgrid:12345.0";
String uri = "textgrid:12345";
- String revisionURI = OAIPMHUtilities.getTextGridRevisionURI(uri);
+ String revisionURI = OaipmhUtilities.getTextGridRevisionURI(uri);
if (!revisionURI.equals(uriExpected)) {
System.out.println(revisionURI + " != " + uriExpected);
assertTrue(false);
@@ -171,7 +171,7 @@ public class TestOAIPMHUtilities {
uriExpected = "textgrid:12345.15";
uri = "textgrid:12345.15";
- revisionURI = OAIPMHUtilities.getTextGridRevisionURI(uri);
+ revisionURI = OaipmhUtilities.getTextGridRevisionURI(uri);
if (!revisionURI.equals(uriExpected)) {
System.out.println(revisionURI + " != " + uriExpected);
assertTrue(false);
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestTGOAIPMHLocally.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestTGOaipmhLocally.java
similarity index 63%
rename from oaipmh-core/src/test/java/info/textgrid/middleware/test/TestTGOAIPMHLocally.java
rename to oaipmh-core/src/test/java/info/textgrid/middleware/test/TestTGOaipmhLocally.java
index 730263c8dd94e775606b349207d64056f7178e02..23f25f5958dccbeaf5d5afad72f8d1864644fec0 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestTGOAIPMHLocally.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/TestTGOaipmhLocally.java
@@ -13,25 +13,25 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import info.textgrid.middleware.DublinCoreBuilder;
-import info.textgrid.middleware.IDIOMImages;
-import info.textgrid.middleware.IdentifierListDelivererDATACITE;
+import info.textgrid.middleware.IdiomImages;
+import info.textgrid.middleware.IdentifierListDelivererDatacite;
import info.textgrid.middleware.IdentifierListDelivererDC;
-import info.textgrid.middleware.IdentifierListDelivererIDIOM;
+import info.textgrid.middleware.IdentifierListDelivererIdiom;
import info.textgrid.middleware.MetadataFormatListDelivererInterface;
import info.textgrid.middleware.MetadataFormatListDelivererTG;
-import info.textgrid.middleware.OAIPMHConstants;
-import info.textgrid.middleware.OAIPMHElasticSearchClient;
-import info.textgrid.middleware.OAIPMHImpl;
-import info.textgrid.middleware.OAIPMHUtilities;
-import info.textgrid.middleware.RecordDelivererDATACITE;
+import info.textgrid.middleware.OaipmhConstants;
+import info.textgrid.middleware.OaipmhElasticSearchClient;
+import info.textgrid.middleware.OaipmhImpl;
+import info.textgrid.middleware.OaipmhUtilities;
+import info.textgrid.middleware.RecordDelivererDatacite;
import info.textgrid.middleware.RecordDelivererDC;
-import info.textgrid.middleware.RecordDelivererIDIOM;
-import info.textgrid.middleware.RecordListDelivererDATACITE;
+import info.textgrid.middleware.RecordDelivererIdiom;
+import info.textgrid.middleware.RecordListDelivererDatacite;
import info.textgrid.middleware.RecordListDelivererDC;
-import info.textgrid.middleware.RecordListDelivererIDIOM;
+import info.textgrid.middleware.RecordListDelivererIdiom;
import info.textgrid.middleware.RepIdentification;
import info.textgrid.middleware.SetListDeliverer;
-import info.textgrid.middleware.TGConstants;
+import info.textgrid.middleware.OaipmhTGConstants;
import info.textgrid.middleware.common.TextGridMimetypes;
import info.textgrid.middleware.oaipmh.DeletedRecordType;
import info.textgrid.middleware.oaipmh.GranularityType;
@@ -43,27 +43,27 @@ import info.textgrid.middleware.oaipmh.GranularityType;
* @author Stefan E. Funk, SUB Göttingen
*/
@Ignore
-public class TestTGOAIPMHLocally {
+public class TestTGOaipmhLocally {
// **
// STATICS
// **
- public static OAIPMHElasticSearchClient oaiEsClient;
+ public static OaipmhElasticSearchClient oaiEsClient;
private static RecordDelivererDC record;
- private static RecordDelivererIDIOM recordIDIOM;
- private static RecordDelivererDATACITE recordDATACITE;
- private static RecordListDelivererDATACITE recordListDATACITE;
- private static IdentifierListDelivererDATACITE identifierListDATACITE;
+ private static RecordDelivererIdiom recordIDIOM;
+ private static RecordDelivererDatacite recordDATACITE;
+ private static RecordListDelivererDatacite recordListDATACITE;
+ private static IdentifierListDelivererDatacite identifierListDATACITE;
private static RecordListDelivererDC recordList;
- private static RecordListDelivererIDIOM recordListIDIOM;
+ private static RecordListDelivererIdiom recordListIDIOM;
private static IdentifierListDelivererDC identifierList =
new IdentifierListDelivererDC(true, false);
- private static IdentifierListDelivererIDIOM identifierListIDIOM =
- new IdentifierListDelivererIDIOM(true, false);
+ private static IdentifierListDelivererIdiom identifierListIDIOM =
+ new IdentifierListDelivererIdiom(true, false);
private static SetListDeliverer setListTextGrid;
- private static IDIOMImages idiomImages;
+ private static IdiomImages idiomImages;
// **
// CLASS
@@ -76,21 +76,21 @@ public class TestTGOAIPMHLocally {
"2011-06-11T02:32:40Z", this.granularityType, "2.0", "textgrid-support@gwdg.de");
private MetadataFormatListDelivererInterface metadataFormatList =
new MetadataFormatListDelivererTG();
- private OAIPMHImpl request = new OAIPMHImpl(this.rep,
- TestTGOAIPMHLocally.record,
- TestTGOAIPMHLocally.recordIDIOM,
- TestTGOAIPMHLocally.recordDATACITE,
- TestTGOAIPMHLocally.recordList,
- TestTGOAIPMHLocally.recordListIDIOM,
- TestTGOAIPMHLocally.recordListDATACITE,
+ private OaipmhImpl request = new OaipmhImpl(this.rep,
+ TestTGOaipmhLocally.record,
+ TestTGOaipmhLocally.recordIDIOM,
+ TestTGOaipmhLocally.recordDATACITE,
+ TestTGOaipmhLocally.recordList,
+ TestTGOaipmhLocally.recordListIDIOM,
+ TestTGOaipmhLocally.recordListDATACITE,
this.metadataFormatList,
- TestTGOAIPMHLocally.setListTextGrid,
- TestTGOAIPMHLocally.identifierList,
- TestTGOAIPMHLocally.identifierListIDIOM,
- TestTGOAIPMHLocally.identifierListDATACITE,
- TestTGOAIPMHLocally.idiomImages);
+ TestTGOaipmhLocally.setListTextGrid,
+ TestTGOaipmhLocally.identifierList,
+ TestTGOaipmhLocally.identifierListIDIOM,
+ TestTGOaipmhLocally.identifierListDATACITE,
+ TestTGOaipmhLocally.idiomImages);
- OAIPMHUtilities settings = new OAIPMHUtilities();
+ OaipmhUtilities settings = new OaipmhUtilities();
/**
* @throws Exception
@@ -99,36 +99,36 @@ public class TestTGOAIPMHLocally {
public static void setUp() throws Exception {
int[] ports = new int[] {9202};
- oaiEsClient = new OAIPMHElasticSearchClient("localhost", ports, 100);
+ oaiEsClient = new OaipmhElasticSearchClient("localhost", ports, 100);
oaiEsClient.setEsIndex("textgrid-public");
oaiEsClient.setEsType("metadata");
record = new RecordDelivererDC(true, false);
record.setOaiEsClient(oaiEsClient);
- record.setWorkFields(TGConstants.TGWorkFields);
+ record.setWorkFields(OaipmhTGConstants.TGWorkFields);
- recordIDIOM = new RecordDelivererIDIOM(true, false);
+ recordIDIOM = new RecordDelivererIdiom(true, false);
recordIDIOM.setOaiEsClient(oaiEsClient);
- recordDATACITE = new RecordDelivererDATACITE(true, false);
+ recordDATACITE = new RecordDelivererDatacite(true, false);
recordDATACITE.setOaiEsClient(oaiEsClient);
- recordListDATACITE = new RecordListDelivererDATACITE(true, false);
+ recordListDATACITE = new RecordListDelivererDatacite(true, false);
recordListDATACITE.setOaiEsClient(oaiEsClient);
- identifierListIDIOM = new IdentifierListDelivererIDIOM(true, false);
+ identifierListIDIOM = new IdentifierListDelivererIdiom(true, false);
recordList = new RecordListDelivererDC(true, false);
- recordList.setFields(TGConstants.TGFields);
- recordList.setWorkFields(TGConstants.TGWorkFields);
+ recordList.setFields(OaipmhTGConstants.TGFields);
+ recordList.setWorkFields(OaipmhTGConstants.TGWorkFields);
recordList.setOaiEsClient(oaiEsClient);
recordList.setSearchResponseSize(100);
- recordListIDIOM = new RecordListDelivererIDIOM(true, false);
+ recordListIDIOM = new RecordListDelivererIdiom(true, false);
recordListIDIOM.setOaiEsClient(oaiEsClient);
identifierList = new IdentifierListDelivererDC(true, false);
identifierList.setOaiEsClient(oaiEsClient);
- identifierList.setIdentifierListFields(TGConstants.IDENTIFIER_LIST_FIELDS);
+ identifierList.setIdentifierListFields(OaipmhTGConstants.IDENTIFIER_LIST_FIELDS);
setListTextGrid = new SetListDeliverer(true, false);
}
@@ -148,8 +148,8 @@ public class TestTGOAIPMHLocally {
DublinCoreBuilder result = new DublinCoreBuilder();
List<String> identifier = new ArrayList<String>();
String[] fieldsForIdentifier = {"descriptiveMetadata.dc:identifier"};
- System.out.println(OAIPMHUtilities.fieldLoader(json, OAIPMHConstants.TEST_DARIAH_IDENTIFIER));
- identifier = OAIPMHUtilities.fieldLoader(json, fieldsForIdentifier);
+ System.out.println(OaipmhUtilities.fieldLoader(json, OaipmhConstants.TEST_DARIAH_IDENTIFIER));
+ identifier = OaipmhUtilities.fieldLoader(json, fieldsForIdentifier);
for (String id : identifier) {
System.out.println(id);
}
@@ -198,8 +198,8 @@ public class TestTGOAIPMHLocally {
DublinCoreBuilder result = new DublinCoreBuilder();
List<String> identifier = new ArrayList<String>();
String[] fieldsForIdentifier = {"descriptiveMetadata.dc:identifier"};
- System.out.println(OAIPMHUtilities.fieldLoader(json, OAIPMHConstants.TEST_DARIAH_IDENTIFIER));
- identifier = OAIPMHUtilities.fieldLoader(json, fieldsForIdentifier);
+ System.out.println(OaipmhUtilities.fieldLoader(json, OaipmhConstants.TEST_DARIAH_IDENTIFIER));
+ identifier = OaipmhUtilities.fieldLoader(json, fieldsForIdentifier);
for (String id : identifier) {
System.out.println(id);
}
@@ -216,8 +216,8 @@ public class TestTGOAIPMHLocally {
@Ignore
public void testOpenAireIdentifierList() {
- this.settings.setRangeField(TGConstants.RANGE_FIELD);
- this.settings.setFormatField(TGConstants.FORMAT);
+ this.settings.setRangeField(OaipmhTGConstants.RANGE_FIELD);
+ this.settings.setFormatField(OaipmhTGConstants.FORMAT);
this.settings.setFormatToFilter(TextGridMimetypes.EDITION);
this.settings.setSearchResponseSize(100);
@@ -234,7 +234,7 @@ public class TestTGOAIPMHLocally {
public void testDateNow() throws DatatypeConfigurationException {
System.out.println("---------------Test Datestamp Parsing with now date -----------------");
- XMLGregorianCalendar nowTest = OAIPMHUtilities.getXMLGregorianCalendarNow();
+ XMLGregorianCalendar nowTest = OaipmhUtilities.getXMLGregorianCalendarNow();
System.out.println(nowTest);
System.out.println("-------------------------------------------");
}
@@ -249,7 +249,7 @@ public class TestTGOAIPMHLocally {
String dateformatbefore = "2012-02-06T20:48:39.614+01:00";
System.out.println("--------- Test Datestamp Parsing with a given date ---------------");
System.out.println("Original date: " + dateformatbefore);
- XMLGregorianCalendar testDate = OAIPMHUtilities.convertDateFormat(dateformatbefore);
+ XMLGregorianCalendar testDate = OaipmhUtilities.convertDateFormat(dateformatbefore);
System.out.println("Date after conversion: " + testDate);
System.out.println("---------------------------------------------");
}
@@ -264,7 +264,7 @@ public class TestTGOAIPMHLocally {
String dateformatbefore = "2012-02-06T20:48:39.614+01:00";
System.out.println("------------String Version-------------------");
System.out.println("Original date: " + dateformatbefore);
- String testDate = OAIPMHUtilities.oaiDatestampAsString(dateformatbefore);
+ String testDate = OaipmhUtilities.oaiDatestampAsString(dateformatbefore);
System.out.println("Date after conversion: " + testDate);
System.out.println("---------------------------------------------");
}
@@ -312,7 +312,7 @@ public class TestTGOAIPMHLocally {
public void testGetDateFormat() throws ParseException {
System.out.println("Test get time format");
- System.out.println(OAIPMHUtilities.getFormatOfDate("2019-12-02T15:36:13Z"));
+ System.out.println(OaipmhUtilities.getFormatOfDate("2019-12-02T15:36:13Z"));
System.out.println("-----------------------------------\n");
}
@@ -323,28 +323,28 @@ public class TestTGOAIPMHLocally {
@Ignore
public void testGetRequestGetRecordTextGrid() throws ParseException {
- record.setContributor(TGConstants.CONTRIBUTOR_LIST);
- record.setCoverage(TGConstants.COVERAGE_LIST);
- record.setCreator(TGConstants.CREATOR_LIST);
- record.setDates(TGConstants.DATE_LIST);
- record.setDescriptions(TGConstants.DESCRIPTION_LIST);
- record.setFormats(TGConstants.FORMAT_LIST);
- record.setIdentifiers(TGConstants.IDENTIFIER_LIST);
- record.setLanguages(TGConstants.LANGUAGE_LIST);
- record.setPublishers(TGConstants.PUBLISHER_LIST);
- record.setRelations(TGConstants.RELATIONS_LIST);
+ record.setContributor(OaipmhTGConstants.CONTRIBUTOR_LIST);
+ record.setCoverage(OaipmhTGConstants.COVERAGE_LIST);
+ record.setCreator(OaipmhTGConstants.CREATOR_LIST);
+ record.setDates(OaipmhTGConstants.DATE_LIST);
+ record.setDescriptions(OaipmhTGConstants.DESCRIPTION_LIST);
+ record.setFormats(OaipmhTGConstants.FORMAT_LIST);
+ record.setIdentifiers(OaipmhTGConstants.IDENTIFIER_LIST);
+ record.setLanguages(OaipmhTGConstants.LANGUAGE_LIST);
+ record.setPublishers(OaipmhTGConstants.PUBLISHER_LIST);
+ record.setRelations(OaipmhTGConstants.RELATIONS_LIST);
// record.setRelationsForWork(TGConstants.RELATIONS_FOR_WORK_LIST);
- record.setRights(TGConstants.RIGHTS_LIST);
- record.setSources(TGConstants.SOURCE_LIST);
- record.setSubjects(TGConstants.SUBJECT_LIST);
- record.setTitles(TGConstants.TITLE_LIST);
- record.setTypes(TGConstants.TYPE_LIST);
- record.setFields(TGConstants.TGFields);
- record.setFormatField(TGConstants.FORMAT);
+ record.setRights(OaipmhTGConstants.RIGHTS_LIST);
+ record.setSources(OaipmhTGConstants.SOURCE_LIST);
+ record.setSubjects(OaipmhTGConstants.SUBJECT_LIST);
+ record.setTitles(OaipmhTGConstants.TITLE_LIST);
+ record.setTypes(OaipmhTGConstants.TYPE_LIST);
+ record.setFields(OaipmhTGConstants.TGFields);
+ record.setFormatField(OaipmhTGConstants.FORMAT);
record.setFormatToFilter(TextGridMimetypes.EDITION);
- record.setDateOfObjectCreation(TGConstants.CREATED);
- record.setRelationToFurtherMetadataObject(TGConstants.EDITION_ISEDITIONOF);
- record.setRepositoryObjectURIPrefix(TGConstants.ITEM_IDENTIFIER_PREFIX);
+ record.setDateOfObjectCreation(OaipmhTGConstants.CREATED);
+ record.setRelationToFurtherMetadataObject(OaipmhTGConstants.EDITION_ISEDITIONOF);
+ record.setRepositoryObjectURIPrefix(OaipmhTGConstants.ITEM_IDENTIFIER_PREFIX);
record.setIdentifierField("textgridUri");
System.out.println("Test for the verb \"GetRecord\" with successful response");
@@ -361,7 +361,7 @@ public class TestTGOAIPMHLocally {
public void testGetRequestListRecordsIDIOMImagesWithResToken() throws ParseException {
System.out.println("Test for the verb \"ListRecords\" with successful response for IMAGES");
- IDIOMImages.getCursorCollector().put("2930c87d-5209-4b14-9d6a-72f10476d947", 129);
+ IdiomImages.getCursorCollector().put("2930c87d-5209-4b14-9d6a-72f10476d947", 129);
String p = this.request.getRequest("ListRecords", "",
"", "", "", "", "2930c87d-5209-4b14-9d6a-72f10476d947");
System.out.println(p);
@@ -376,7 +376,7 @@ public class TestTGOAIPMHLocally {
public void testGetRequestListIdentifiersIDIOMImageswithResToken() throws ParseException {
System.out.println("Test for the verb \"ListIdentifiers\" with successful response");
- IDIOMImages.getCursorCollector().put("8eea2c07-7dc9-4404-a106-c1412b9ce8b4", 129);
+ IdiomImages.getCursorCollector().put("8eea2c07-7dc9-4404-a106-c1412b9ce8b4", 129);
String p = this.request.getRequest("ListIdentifiers", "",
"", "", "", "", "8eea2c07-7dc9-4404-a106-c1412b9ce8b4");
System.out.println(p);
@@ -391,7 +391,7 @@ public class TestTGOAIPMHLocally {
System.out.println("Test for the verb \"GetRecord\" with successful response");
String p = this.request.getRequest("GetRecord", "textgrid:3whkp",
- OAIPMHConstants.METADATA_IDIOM_PREFIX, "", "", "", "");
+ OaipmhConstants.METADATA_IDIOM_PREFIX, "", "", "", "");
System.out.println(p);
System.out.println("-----------------------------------\n");
}
@@ -417,7 +417,7 @@ public class TestTGOAIPMHLocally {
// OAIPMHUtilities.marshal(oar.getRecord("24gv8.0"));
String p = this.request.getRequest("GetRecord", "mk7j.0",
- OAIPMHConstants.METADATA_OPENAIRE_PREFIX, "", "", "", "");
+ OaipmhConstants.METADATA_OPENAIRE_PREFIX, "", "", "", "");
System.out.println(p);
}
@@ -430,12 +430,12 @@ public class TestTGOAIPMHLocally {
public void testLIstRecordsOpenAire() throws IOException {
recordListDATACITE.setOaiEsClient(oaiEsClient);
- recordListDATACITE.setRangeField(TGConstants.RANGE_FIELD);
- recordListDATACITE.setFormatField(TGConstants.FORMAT);
+ recordListDATACITE.setRangeField(OaipmhTGConstants.RANGE_FIELD);
+ recordListDATACITE.setFormatField(OaipmhTGConstants.FORMAT);
recordListDATACITE.setFormatToFilter(TextGridMimetypes.EDITION);
recordListDATACITE.setSearchResponseSize(100);
- String p = this.request.getRequest("ListRecords", "", OAIPMHConstants.METADATA_OPENAIRE_PREFIX,
+ String p = this.request.getRequest("ListRecords", "", OaipmhConstants.METADATA_OPENAIRE_PREFIX,
"", "", "", "");
System.out.println(p);
@@ -460,14 +460,14 @@ public class TestTGOAIPMHLocally {
@Test
public void testListIdentifierSetsDC() throws ParseException {
- TestTGOAIPMHLocally.identifierList.setFieldForRange(TGConstants.RANGE_FIELD);
- TestTGOAIPMHLocally.identifierList
- .setIdentifierListFields(TGConstants.IDENTIFIER_LIST_FIELDS);
- TestTGOAIPMHLocally.identifierList.setDateOfObjectCreation(TGConstants.CREATED);
- TestTGOAIPMHLocally.identifierList
- .setRepositoryObjectURIPrefix(TGConstants.ITEM_IDENTIFIER_PREFIX);
- TestTGOAIPMHLocally.identifierList.setIdentifierField("textgridUri");
- TestTGOAIPMHLocally.identifierList.setSearchResponseSize("100");
+ TestTGOaipmhLocally.identifierList.setFieldForRange(OaipmhTGConstants.RANGE_FIELD);
+ TestTGOaipmhLocally.identifierList
+ .setIdentifierListFields(OaipmhTGConstants.IDENTIFIER_LIST_FIELDS);
+ TestTGOaipmhLocally.identifierList.setDateOfObjectCreation(OaipmhTGConstants.CREATED);
+ TestTGOaipmhLocally.identifierList
+ .setRepositoryObjectURIPrefix(OaipmhTGConstants.ITEM_IDENTIFIER_PREFIX);
+ TestTGOaipmhLocally.identifierList.setIdentifierField("textgridUri");
+ TestTGOaipmhLocally.identifierList.setSearchResponseSize("100");
System.out.println("Test for the verb \"ListIdentifiers\" with successful response");
String p =
this.request.getRequest("ListIdentifiers", "", "oai_dc", "", "2000-02-05", "", "junk");
@@ -482,14 +482,14 @@ public class TestTGOAIPMHLocally {
@Ignore
public void testListIdentifierWithResumptionTokenDC() throws ParseException {
- TestTGOAIPMHLocally.identifierList.setFieldForRange(TGConstants.RANGE_FIELD);
- TestTGOAIPMHLocally.identifierList
- .setIdentifierListFields(TGConstants.IDENTIFIER_LIST_FIELDS);
- TestTGOAIPMHLocally.identifierList.setDateOfObjectCreation(TGConstants.CREATED);
- TestTGOAIPMHLocally.identifierList
- .setRepositoryObjectURIPrefix(TGConstants.ITEM_IDENTIFIER_PREFIX);
- TestTGOAIPMHLocally.identifierList.setIdentifierField("textgridUri");
- TestTGOAIPMHLocally.identifierList.setSearchResponseSize("100");
+ TestTGOaipmhLocally.identifierList.setFieldForRange(OaipmhTGConstants.RANGE_FIELD);
+ TestTGOaipmhLocally.identifierList
+ .setIdentifierListFields(OaipmhTGConstants.IDENTIFIER_LIST_FIELDS);
+ TestTGOaipmhLocally.identifierList.setDateOfObjectCreation(OaipmhTGConstants.CREATED);
+ TestTGOaipmhLocally.identifierList
+ .setRepositoryObjectURIPrefix(OaipmhTGConstants.ITEM_IDENTIFIER_PREFIX);
+ TestTGOaipmhLocally.identifierList.setIdentifierField("textgridUri");
+ TestTGOaipmhLocally.identifierList.setSearchResponseSize("100");
System.out.println("Test for the verb \"ListIdentifiers\" with successful response");
String p = this.request.getRequest("ListIdentifiers", "", "oai_dc", "", "", "", "");
System.out.println(p);
@@ -543,18 +543,18 @@ public class TestTGOAIPMHLocally {
public void testListIdentifierIDIOMWithResumptionToken() throws ParseException {
System.out.println("Test for the verb \"ListIdentifiers\" in IDIOM with successfull response");
- String p = this.request.getRequest("ListIdentifiers", "", OAIPMHConstants.METADATA_IDIOM_PREFIX,
+ String p = this.request.getRequest("ListIdentifiers", "", OaipmhConstants.METADATA_IDIOM_PREFIX,
"", "", "", "");
System.out.println(p);
String resToken = "";
- for (Map.Entry<String, Integer> entry : IdentifierListDelivererIDIOM.getCursorCollector()
+ for (Map.Entry<String, Integer> entry : IdentifierListDelivererIdiom.getCursorCollector()
.entrySet()) {
resToken = entry.getKey();
}
String p2 = this.request.getRequest("ListIdentifiers", "", "", "", "", "", resToken);
System.out.println(p2);
System.out.println("HASH MAP AFTER: ");
- System.out.println(IdentifierListDelivererIDIOM.getCursorCollector());
+ System.out.println(IdentifierListDelivererIdiom.getCursorCollector());
System.out.println("-----------------------------------\n");
}
@@ -565,33 +565,33 @@ public class TestTGOAIPMHLocally {
@Ignore
public void testListRecordSets() throws ParseException {
- TestTGOAIPMHLocally.recordList.setContributors(TGConstants.CONTRIBUTOR_LIST);
- TestTGOAIPMHLocally.recordList.setCoverages(TGConstants.COVERAGE_LIST);
- TestTGOAIPMHLocally.recordList.setCreators(TGConstants.CREATOR_LIST);
- TestTGOAIPMHLocally.recordList.setDates(TGConstants.DATE_LIST);
- TestTGOAIPMHLocally.recordList.setDescriptions(TGConstants.DESCRIPTION_LIST);
- TestTGOAIPMHLocally.recordList.setFormats(TGConstants.FORMAT_LIST);
- TestTGOAIPMHLocally.recordList.setIdentifiers(TGConstants.IDENTIFIER_LIST);
- TestTGOAIPMHLocally.recordList.setLanguages(TGConstants.LANGUAGE_LIST);
- TestTGOAIPMHLocally.recordList.setPublishers(TGConstants.PUBLISHER_LIST);
- TestTGOAIPMHLocally.recordList.setRelations(TGConstants.RELATIONS_LIST);
- TestTGOAIPMHLocally.recordList
- .setRelationsForWork(TGConstants.RELATIONS_FOR_WORK_LIST);
- TestTGOAIPMHLocally.recordList.setRights(TGConstants.RIGHTS_LIST);
- TestTGOAIPMHLocally.recordList.setSources(TGConstants.SOURCE_LIST);
- TestTGOAIPMHLocally.recordList.setSubjects(TGConstants.SUBJECT_LIST);
- TestTGOAIPMHLocally.recordList.setTitles(TGConstants.TITLE_LIST);
- TestTGOAIPMHLocally.recordList.setTypes(TGConstants.TYPE_LIST);
- TestTGOAIPMHLocally.recordList.setFormatField(TGConstants.FORMAT);
- TestTGOAIPMHLocally.recordList.setFormatToFilter(TextGridMimetypes.EDITION);
- TestTGOAIPMHLocally.recordList.setDateOfObjectCreation(TGConstants.CREATED);
- TestTGOAIPMHLocally.recordList
- .setRelationToFurtherMetadataObject(TGConstants.EDITION_ISEDITIONOF);
- TestTGOAIPMHLocally.recordList
- .setRepositoryObjectURIPrefix(TGConstants.ITEM_IDENTIFIER_PREFIX);
- TestTGOAIPMHLocally.recordList.setRangeField(TGConstants.CREATED);
- TestTGOAIPMHLocally.recordList.setModifiedField(TGConstants.MODIFIED_FIELD);
- TestTGOAIPMHLocally.recordList.setIdentifierField("textgridUri");
+ TestTGOaipmhLocally.recordList.setContributors(OaipmhTGConstants.CONTRIBUTOR_LIST);
+ TestTGOaipmhLocally.recordList.setCoverages(OaipmhTGConstants.COVERAGE_LIST);
+ TestTGOaipmhLocally.recordList.setCreators(OaipmhTGConstants.CREATOR_LIST);
+ TestTGOaipmhLocally.recordList.setDates(OaipmhTGConstants.DATE_LIST);
+ TestTGOaipmhLocally.recordList.setDescriptions(OaipmhTGConstants.DESCRIPTION_LIST);
+ TestTGOaipmhLocally.recordList.setFormats(OaipmhTGConstants.FORMAT_LIST);
+ TestTGOaipmhLocally.recordList.setIdentifiers(OaipmhTGConstants.IDENTIFIER_LIST);
+ TestTGOaipmhLocally.recordList.setLanguages(OaipmhTGConstants.LANGUAGE_LIST);
+ TestTGOaipmhLocally.recordList.setPublishers(OaipmhTGConstants.PUBLISHER_LIST);
+ TestTGOaipmhLocally.recordList.setRelations(OaipmhTGConstants.RELATIONS_LIST);
+ TestTGOaipmhLocally.recordList
+ .setRelationsForWork(OaipmhTGConstants.RELATIONS_FOR_WORK_LIST);
+ TestTGOaipmhLocally.recordList.setRights(OaipmhTGConstants.RIGHTS_LIST);
+ TestTGOaipmhLocally.recordList.setSources(OaipmhTGConstants.SOURCE_LIST);
+ TestTGOaipmhLocally.recordList.setSubjects(OaipmhTGConstants.SUBJECT_LIST);
+ TestTGOaipmhLocally.recordList.setTitles(OaipmhTGConstants.TITLE_LIST);
+ TestTGOaipmhLocally.recordList.setTypes(OaipmhTGConstants.TYPE_LIST);
+ TestTGOaipmhLocally.recordList.setFormatField(OaipmhTGConstants.FORMAT);
+ TestTGOaipmhLocally.recordList.setFormatToFilter(TextGridMimetypes.EDITION);
+ TestTGOaipmhLocally.recordList.setDateOfObjectCreation(OaipmhTGConstants.CREATED);
+ TestTGOaipmhLocally.recordList
+ .setRelationToFurtherMetadataObject(OaipmhTGConstants.EDITION_ISEDITIONOF);
+ TestTGOaipmhLocally.recordList
+ .setRepositoryObjectURIPrefix(OaipmhTGConstants.ITEM_IDENTIFIER_PREFIX);
+ TestTGOaipmhLocally.recordList.setRangeField(OaipmhTGConstants.CREATED);
+ TestTGOaipmhLocally.recordList.setModifiedField(OaipmhTGConstants.LAST_MODIFIED);
+ TestTGOaipmhLocally.recordList.setIdentifierField("textgridUri");
System.out.println("Test for the verb \"ListRecords\" with sets with successful response");
// String p = this.request.getRequest("ListRecords", "", "oai_dc",
@@ -617,17 +617,17 @@ public class TestTGOAIPMHLocally {
public void testListRecordWithResumptionTokenForIDIOM() throws ParseException {
System.out.println("Test for the verb \"ListRecords\" for IDIOM with successful response");
- String p = this.request.getRequest("ListRecords", "", OAIPMHConstants.METADATA_IDIOM_PREFIX, "",
+ String p = this.request.getRequest("ListRecords", "", OaipmhConstants.METADATA_IDIOM_PREFIX, "",
"", "", "");
System.out.println(p);
String resToken = "";
- for (Map.Entry<String, Integer> entry : RecordListDelivererIDIOM.getCursorCollector()
+ for (Map.Entry<String, Integer> entry : RecordListDelivererIdiom.getCursorCollector()
.entrySet()) {
resToken = entry.getKey();
String p2 = this.request.getRequest("ListRecords", "", "", "", "", "", resToken);
System.out.println(p2);
System.out.println("HASH MAP AFTER: ");
- System.out.println(RecordListDelivererIDIOM.getCursorCollector());
+ System.out.println(RecordListDelivererIdiom.getCursorCollector());
System.out.println("-----------------------------------\n");
}
}
@@ -652,34 +652,34 @@ public class TestTGOAIPMHLocally {
@Ignore
public void testListRecords2() throws ParseException {
- TestTGOAIPMHLocally.recordList.setContributors(TGConstants.CONTRIBUTOR_LIST);
- TestTGOAIPMHLocally.recordList.setCoverages(TGConstants.COVERAGE_LIST);
- TestTGOAIPMHLocally.recordList.setCreators(TGConstants.CREATOR_LIST);
- TestTGOAIPMHLocally.recordList.setDates(TGConstants.DATE_LIST);
- TestTGOAIPMHLocally.recordList.setDescriptions(TGConstants.DESCRIPTION_LIST);
- TestTGOAIPMHLocally.recordList.setFormats(TGConstants.FORMAT_LIST);
- TestTGOAIPMHLocally.recordList.setIdentifiers(TGConstants.IDENTIFIER_LIST);
- TestTGOAIPMHLocally.recordList.setLanguages(TGConstants.LANGUAGE_LIST);
- TestTGOAIPMHLocally.recordList.setPublishers(TGConstants.PUBLISHER_LIST);
- TestTGOAIPMHLocally.recordList.setRelations(TGConstants.RELATIONS_LIST);
- TestTGOAIPMHLocally.recordList
- .setRelationsForWork(TGConstants.RELATIONS_FOR_WORK_LIST);
- TestTGOAIPMHLocally.recordList.setRights(TGConstants.RIGHTS_LIST);
- TestTGOAIPMHLocally.recordList.setSources(TGConstants.SOURCE_LIST);
- TestTGOAIPMHLocally.recordList.setSubjects(TGConstants.SUBJECT_LIST);
- TestTGOAIPMHLocally.recordList.setTitles(TGConstants.TITLE_LIST);
- TestTGOAIPMHLocally.recordList.setTypes(TGConstants.TYPE_LIST);
- TestTGOAIPMHLocally.recordList.setFormatField(TGConstants.FORMAT);
- TestTGOAIPMHLocally.recordList.setFormatToFilter(TextGridMimetypes.EDITION);
- TestTGOAIPMHLocally.recordList.setDateOfObjectCreation(TGConstants.CREATED);
- TestTGOAIPMHLocally.recordList
- .setRelationToFurtherMetadataObject(TGConstants.EDITION_ISEDITIONOF);
- TestTGOAIPMHLocally.recordList
- .setRepositoryObjectURIPrefix(TGConstants.ITEM_IDENTIFIER_PREFIX);
- TestTGOAIPMHLocally.recordList.setRangeField(TGConstants.CREATED);
- TestTGOAIPMHLocally.recordList.setModifiedField(TGConstants.CREATED);
- TestTGOAIPMHLocally.recordList.setIdentifierField(TGConstants.URI);
- TestTGOAIPMHLocally.recordList.setSearchResponseSize(100);
+ TestTGOaipmhLocally.recordList.setContributors(OaipmhTGConstants.CONTRIBUTOR_LIST);
+ TestTGOaipmhLocally.recordList.setCoverages(OaipmhTGConstants.COVERAGE_LIST);
+ TestTGOaipmhLocally.recordList.setCreators(OaipmhTGConstants.CREATOR_LIST);
+ TestTGOaipmhLocally.recordList.setDates(OaipmhTGConstants.DATE_LIST);
+ TestTGOaipmhLocally.recordList.setDescriptions(OaipmhTGConstants.DESCRIPTION_LIST);
+ TestTGOaipmhLocally.recordList.setFormats(OaipmhTGConstants.FORMAT_LIST);
+ TestTGOaipmhLocally.recordList.setIdentifiers(OaipmhTGConstants.IDENTIFIER_LIST);
+ TestTGOaipmhLocally.recordList.setLanguages(OaipmhTGConstants.LANGUAGE_LIST);
+ TestTGOaipmhLocally.recordList.setPublishers(OaipmhTGConstants.PUBLISHER_LIST);
+ TestTGOaipmhLocally.recordList.setRelations(OaipmhTGConstants.RELATIONS_LIST);
+ TestTGOaipmhLocally.recordList
+ .setRelationsForWork(OaipmhTGConstants.RELATIONS_FOR_WORK_LIST);
+ TestTGOaipmhLocally.recordList.setRights(OaipmhTGConstants.RIGHTS_LIST);
+ TestTGOaipmhLocally.recordList.setSources(OaipmhTGConstants.SOURCE_LIST);
+ TestTGOaipmhLocally.recordList.setSubjects(OaipmhTGConstants.SUBJECT_LIST);
+ TestTGOaipmhLocally.recordList.setTitles(OaipmhTGConstants.TITLE_LIST);
+ TestTGOaipmhLocally.recordList.setTypes(OaipmhTGConstants.TYPE_LIST);
+ TestTGOaipmhLocally.recordList.setFormatField(OaipmhTGConstants.FORMAT);
+ TestTGOaipmhLocally.recordList.setFormatToFilter(TextGridMimetypes.EDITION);
+ TestTGOaipmhLocally.recordList.setDateOfObjectCreation(OaipmhTGConstants.CREATED);
+ TestTGOaipmhLocally.recordList
+ .setRelationToFurtherMetadataObject(OaipmhTGConstants.EDITION_ISEDITIONOF);
+ TestTGOaipmhLocally.recordList
+ .setRepositoryObjectURIPrefix(OaipmhTGConstants.ITEM_IDENTIFIER_PREFIX);
+ TestTGOaipmhLocally.recordList.setRangeField(OaipmhTGConstants.CREATED);
+ TestTGOaipmhLocally.recordList.setModifiedField(OaipmhTGConstants.CREATED);
+ TestTGOaipmhLocally.recordList.setIdentifierField(OaipmhTGConstants.URI);
+ TestTGOaipmhLocally.recordList.setSearchResponseSize(100);
String r = this.request.getRequest("ListRecords", "", "oai_dc", "", "", "", "");
System.out.println(r);
System.out.println("-----------------------------------\n");
@@ -716,10 +716,10 @@ public class TestTGOAIPMHLocally {
@Ignore
public void testListSetsTG() throws ParseException {
- TestTGOAIPMHLocally.setListTextGrid.setFormatField("format");
- TestTGOAIPMHLocally.setListTextGrid.setFormatToFilter(TextGridMimetypes.EDITION);
- TestTGOAIPMHLocally.setListTextGrid.setIdentifierField("textgridUri");
- TestTGOAIPMHLocally.setListTextGrid.setRepositoryObjectURIPrefix("textgrid:");
+ TestTGOaipmhLocally.setListTextGrid.setFormatField("format");
+ TestTGOaipmhLocally.setListTextGrid.setFormatToFilter(TextGridMimetypes.EDITION);
+ TestTGOaipmhLocally.setListTextGrid.setIdentifierField("textgridUri");
+ TestTGOaipmhLocally.setListTextGrid.setRepositoryObjectURIPrefix("textgrid:");
String r = this.request.getRequest("ListSets", "", "", "", "", "", "");
System.out.println(r);
System.out.println("-----------------------------------\n");
@@ -731,13 +731,13 @@ public class TestTGOAIPMHLocally {
@Test
public void testEmptyRequest() throws ParseException {
- TestTGOAIPMHLocally.identifierList.setFieldForRange(TGConstants.RANGE_FIELD);
- TestTGOAIPMHLocally.identifierList
- .setIdentifierListFields(TGConstants.IDENTIFIER_LIST_FIELDS);
- TestTGOAIPMHLocally.identifierList.setDateOfObjectCreation(TGConstants.CREATED);
- TestTGOAIPMHLocally.identifierList.setIdentifierField("textgridUri");
- TestTGOAIPMHLocally.identifierList.setRepositoryObjectURIPrefix("textgrid:");
- TestTGOAIPMHLocally.identifierList.setSearchResponseSize("100");
+ TestTGOaipmhLocally.identifierList.setFieldForRange(OaipmhTGConstants.RANGE_FIELD);
+ TestTGOaipmhLocally.identifierList
+ .setIdentifierListFields(OaipmhTGConstants.IDENTIFIER_LIST_FIELDS);
+ TestTGOaipmhLocally.identifierList.setDateOfObjectCreation(OaipmhTGConstants.CREATED);
+ TestTGOaipmhLocally.identifierList.setIdentifierField("textgridUri");
+ TestTGOaipmhLocally.identifierList.setRepositoryObjectURIPrefix("textgrid:");
+ TestTGOaipmhLocally.identifierList.setSearchResponseSize("100");
String r = this.request.getRequest("", "", "", "", "", "", "");
System.out.println(r);
System.out.println("-----------------------------------\n");
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OAIPMHUtilitiesOnline.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OaipmhUtilitiesOnline.java
similarity index 90%
rename from oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OAIPMHUtilitiesOnline.java
rename to oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OaipmhUtilitiesOnline.java
index acff2f2cf400bfb183de7afc1241332a8d3bdf8a..80f25464dfbdde006265ae7fdf09fea3da14bcfe 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OAIPMHUtilitiesOnline.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OaipmhUtilitiesOnline.java
@@ -8,11 +8,15 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
import java.net.URL;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
import javax.ws.rs.core.Response;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.jaxrs.client.Client;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
@@ -20,9 +24,10 @@ import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.apache.http.HttpStatus;
-import info.textgrid.middleware.OAIPMHProducer;
-import info.textgrid.middleware.OAIPMHUtilities;
-import info.textgrid.middleware.test.online.dh.TestDHOAIPMHOnline;
+import info.textgrid.middleware.OaipmhConstants;
+import info.textgrid.middleware.OaipmhProducer;
+import info.textgrid.middleware.OaipmhUtilities;
+import info.textgrid.middleware.test.online.dh.TestDHOaipmhOnline;
/**
* <p>
@@ -35,7 +40,7 @@ import info.textgrid.middleware.test.online.dh.TestDHOAIPMHOnline;
*
* @author Stefan E. Funk, SUB Göttingen
*/
-public class OAIPMHUtilitiesOnline {
+public class OaipmhUtilitiesOnline {
// **
// FINALS
@@ -43,8 +48,8 @@ public class OAIPMHUtilitiesOnline {
// ## CHANGE SETTINGS BELOW FOR SETTING TEST SCOPE ---------------------------------------------
- public static final String PROPERTIES_FILE = "oaipmh.test.textgridlab-org.properties";
- // public static final String PROPERTIES_FILE = "oaipmh.test.dev-textgridlab-org.properties";
+ // public static final String PROPERTIES_FILE = "oaipmh.test.textgridlab-org.properties";
+ public static final String PROPERTIES_FILE = "oaipmh.test.dev-textgridlab-org.properties";
public static final boolean TEST_ALL_PAGES = false;
// public static final boolean TEST_ALL_PAGES = true;
@@ -258,10 +263,10 @@ public class OAIPMHUtilitiesOnline {
System.out.println("Getting OAI-PMH HTTP client --> " + theEndpoint + " <--");
// Get proxy first, set policy.
- OAIPMHProducer JAXRSClient = JAXRSClientFactory.create(theEndpoint, OAIPMHProducer.class);
+ OaipmhProducer JAXRSClient = JAXRSClientFactory.create(theEndpoint, OaipmhProducer.class);
HTTPConduit conduit = WebClient.getConfig(JAXRSClient).getHttpConduit();
HTTPClientPolicy policy = new HTTPClientPolicy();
- policy.setReceiveTimeout(OAIPMHUtilitiesOnline.OAIPMH_CLIENT_TIMEOUT);
+ policy.setReceiveTimeout(OaipmhUtilitiesOnline.OAIPMH_CLIENT_TIMEOUT);
conduit.setClient(policy);
// Create Web Client from Web Proxy.
@@ -330,6 +335,17 @@ public class OAIPMHUtilitiesOnline {
examineTGHeaderIDs(responseString, theMetadataPrefix);
}
+ // Test if the header dates and record (modification) dates are equal.
+ if (theVerb.equals(VERB_LIST_RECORDS)
+ && theMetadataPrefix.equals(OaipmhConstants.METADATA_IDIOM_PREFIX)) {
+ try {
+ examineTGModificationDates(responseString);
+ } catch (ParseException | DatatypeConfigurationException e) {
+ System.out.println(responseString);
+ throw new IOException(e);
+ }
+ }
+
// Test general metadata content (if verb is listRecords!), must go conform with the metadata
// prefix setting.
if (theVerb.equals(VERB_LIST_RECORDS)) {
@@ -455,7 +471,7 @@ public class OAIPMHUtilitiesOnline {
// If token is provided, test cursor and element count!
if (!restok.isEmpty()) {
- synchronized (OAIPMHUtilitiesOnline.class) {
+ synchronized (OaipmhUtilitiesOnline.class) {
// Check <record> or <header> count, must be recordsExpectedPerRequest!
if (recordCount != recordsExpectedPerRequest) {
String message = recordOrHeader + " count mismatch, must be "
@@ -576,6 +592,40 @@ public class OAIPMHUtilitiesOnline {
}
}
+ /**
+ * <p>
+ * Looks for both dates and compares them. <datestamp> must be equal to <recordChangeDate>!
+ * </p>
+ *
+ * @param theResponseString
+ * @throws DatatypeConfigurationException
+ * @throws ParseException
+ */
+ public static void examineTGModificationDates(String theResponseString)
+ throws ParseException, DatatypeConfigurationException {
+
+ String datestampTag = "<datestamp>";
+ String recordChangeTag = "<recordChangeDate encoding=\"iso8601\">";
+
+ // Count the occurrence of modification date, must be in GetRecord.record.header.datestamp, and
+ // in mets.recordInfo.recordChangeDate!
+ XMLGregorianCalendar datestamp = OaipmhUtilities.convertDateFormat(
+ theResponseString.substring(
+ theResponseString.indexOf(datestampTag) + datestampTag.length(),
+ theResponseString.indexOf("</datestamp>")).trim());
+
+ System.out.println(datestamp);
+
+ XMLGregorianCalendar recordChangeDate = DatatypeFactory.newInstance().newXMLGregorianCalendar(
+ theResponseString.substring(
+ theResponseString.indexOf(recordChangeTag) + recordChangeTag.length(),
+ theResponseString.indexOf("</recordChangeDate>")).trim());
+
+ if (!datestamp.equals(recordChangeDate)) {
+ assertTrue(datestamp + " != " + recordChangeDate, false);
+ }
+ }
+
// **
// DH used methods
// **
@@ -637,7 +687,7 @@ public class OAIPMHUtilitiesOnline {
// If token is provided, and we have less than 100 elements: mekkern!
if (!restok.isEmpty()) {
- synchronized (TestDHOAIPMHOnline.class) {
+ synchronized (TestDHOaipmhOnline.class) {
// Check <record> or <header> count, must be 100!
String message = "";
if (recordCount > 100) {
@@ -801,7 +851,7 @@ public class OAIPMHUtilitiesOnline {
System.out.println("NOT CONTAINED: " + theExpected);
assertTrue(false);
} else {
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
}
@@ -842,13 +892,13 @@ public class OAIPMHUtilitiesOnline {
*/
private static void examineTGIdentifiers(String theIdentifier, String theMetadataPrefix) {
if (theMetadataPrefix.equals(OAI_IDIOMMETS_PREFIX)) {
- if (!OAIPMHUtilities.getTextGridBaseURI(theIdentifier).equals(theIdentifier)) {
+ if (!OaipmhUtilities.getTextGridBaseURI(theIdentifier).equals(theIdentifier)) {
String message =
"ERROR IN OAIPMH RESPONSE: identifier " + theIdentifier + " is NOT a base URI!";
assertTrue(message, false);
}
} else {
- if (OAIPMHUtilities.getTextGridBaseURI(theIdentifier).equals(theIdentifier)) {
+ if (OaipmhUtilities.getTextGridBaseURI(theIdentifier).equals(theIdentifier)) {
String message =
"ERROR IN OAIPMH RESPONSE: identifier " + theIdentifier + " MUST NOT BE a base URI!";
assertTrue(message, false);
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/dh/TestDHOAIPMHOnline.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/dh/TestDHOaipmhOnline.java
similarity index 67%
rename from oaipmh-core/src/test/java/info/textgrid/middleware/test/online/dh/TestDHOAIPMHOnline.java
rename to oaipmh-core/src/test/java/info/textgrid/middleware/test/online/dh/TestDHOaipmhOnline.java
index 28d29ff8c8702ef958b77757040aabb6b83d7c7b..c9c2eb7ae2b9818d53bb7f21a07a2747e7ae3f02 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/dh/TestDHOAIPMHOnline.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/dh/TestDHOaipmhOnline.java
@@ -15,7 +15,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import info.textgrid.middleware.test.online.OAIPMHUtilitiesOnline;
+import info.textgrid.middleware.test.online.OaipmhUtilitiesOnline;
/**
* <p>
@@ -29,7 +29,7 @@ import info.textgrid.middleware.test.online.OAIPMHUtilitiesOnline;
* @author Stefan E. Funk, SUB Göttingen
*/
@Ignore
-public class TestDHOAIPMHOnline {
+public class TestDHOaipmhOnline {
// **
// FINALS
@@ -79,7 +79,7 @@ public class TestDHOAIPMHOnline {
// Load properties file.
Properties p = new Properties();
- p.load(new FileInputStream(OAIPMHUtilitiesOnline.getResource(PROPERTIES_FILE)));
+ p.load(new FileInputStream(OaipmhUtilitiesOnline.getResource(PROPERTIES_FILE)));
System.out.println("Properties file: " + PROPERTIES_FILE);
p.list(System.out);
@@ -110,7 +110,7 @@ public class TestDHOAIPMHOnline {
expectedListSets = p.getProperty("expectedListSets");
// Get web client from endpoint.
- oaipmhWebClient = OAIPMHUtilitiesOnline.getOAIPMHWEebClient(oaipmhEndpoint);
+ oaipmhWebClient = OaipmhUtilitiesOnline.getOAIPMHWEebClient(oaipmhEndpoint);
}
/**
@@ -149,9 +149,9 @@ public class TestDHOAIPMHOnline {
String shouldStartWith = "oaipmh-core";
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#GETVERSION for '" + shouldStartWith + "'");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#GETVERSION for '" + shouldStartWith + "'");
- Response response = OAIPMHUtilitiesOnline.getVersionHttpResponse(oaipmhWebClient);
+ Response response = OaipmhUtilitiesOnline.getVersionHttpResponse(oaipmhWebClient);
int status = response.getStatus();
String versionString = IOUtils.readStringFromStream((InputStream) response.getEntity());
@@ -161,7 +161,7 @@ public class TestDHOAIPMHOnline {
}
System.out.println("\tresponse: " + versionString);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -209,9 +209,9 @@ public class TestDHOAIPMHOnline {
String verb = "Identify";
String shouldContain = "DARIAH-DE Repository";
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#IDENTIFY");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#IDENTIFY");
- Response response = OAIPMHUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient, "verb=" + verb);
+ Response response = OaipmhUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient, "verb=" + verb);
int status = response.getStatus();
String responseString = IOUtils.readStringFromStream((InputStream) response.getEntity());
@@ -222,7 +222,7 @@ public class TestDHOAIPMHOnline {
}
System.out.println("\tresponse: " + responseString);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -230,8 +230,8 @@ public class TestDHOAIPMHOnline {
*/
@Test
public void testListSets() throws IOException {
- OAIPMHUtilitiesOnline.testDHListSet(oaipmhWebClient,
- OAIPMHUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.testDHListSet(oaipmhWebClient,
+ OaipmhUtilitiesOnline.NO_SET,
expectedListSets);
}
@@ -241,12 +241,12 @@ public class TestDHOAIPMHOnline {
@Test
public void testListRecordsOAIDC() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTRECORDS");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTRECORDS");
- OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
- OAIPMHUtilitiesOnline.NO_SET);
+ OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
+ OaipmhUtilitiesOnline.NO_SET);
}
/**
@@ -255,12 +255,12 @@ public class TestDHOAIPMHOnline {
@Test
public void testListRecordsSetOAIDC() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTRECORDS");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTRECORDS");
int pages =
- OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
checkListRecordsDCSet);
if (pages != checkListRecordsDCSetExpectedPages) {
assertTrue(pages + " != " + checkListRecordsDCSetExpectedPages, false);
@@ -275,27 +275,27 @@ public class TestDHOAIPMHOnline {
String uri = checkListRecordsDCSet;
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTRECORDS - HDL PREFIX");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTRECORDS - HDL PREFIX");
- if (!uri.startsWith(OAIPMHUtilitiesOnline.HDL_PREFIX)) {
- assertTrue("missing '" + OAIPMHUtilitiesOnline.HDL_PREFIX + "' prefix!", false);
+ if (!uri.startsWith(OaipmhUtilitiesOnline.HDL_PREFIX)) {
+ assertTrue("missing '" + OaipmhUtilitiesOnline.HDL_PREFIX + "' prefix!", false);
}
- int pages1 = OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ int pages1 = OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
uri);
if (pages1 != checkListRecordsDCSetExpectedPages) {
System.out.println(pages1 + " != " + checkListRecordsDCSetExpectedPages);
}
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTRECORDS - NO PREFIX");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTRECORDS - NO PREFIX");
- if (checkListRecordsDCSet.startsWith(OAIPMHUtilitiesOnline.HDL_PREFIX)) {
+ if (checkListRecordsDCSet.startsWith(OaipmhUtilitiesOnline.HDL_PREFIX)) {
uri = checkListRecordsDCSet.substring(4);
}
- int pages2 = OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ int pages2 = OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
uri);
if (pages2 != checkListRecordsDCSetExpectedPages) {
System.out.println(pages2 + " != " + checkListRecordsDCSetExpectedPages);
@@ -317,16 +317,16 @@ public class TestDHOAIPMHOnline {
// TODO Un-ignore if identifier check is implemented!
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTRECORDS - STAR PREFIX");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTRECORDS - STAR PREFIX");
- if (checkListRecordsDCSet.startsWith(OAIPMHUtilitiesOnline.HDL_PREFIX)) {
+ if (checkListRecordsDCSet.startsWith(OaipmhUtilitiesOnline.HDL_PREFIX)) {
checkListRecordsDCSet =
- OAIPMHUtilitiesOnline.STAR_PREFIX + checkListRecordsDCSet.substring(4);
+ OaipmhUtilitiesOnline.STAR_PREFIX + checkListRecordsDCSet.substring(4);
}
- int pages3 = OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ int pages3 = OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
checkListRecordsDCSet);
if (pages3 != 1) {
System.out.println(pages3 + " != " + 1);
@@ -339,12 +339,12 @@ public class TestDHOAIPMHOnline {
@Test
public void testListRecordsOAIDCFromUntil() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTRECORDS");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTRECORDS");
- OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
- OAIPMHUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
+ OaipmhUtilitiesOnline.NO_SET,
checkListRecordsDCFrom,
checkListRecordsDCUntil);
}
@@ -355,12 +355,12 @@ public class TestDHOAIPMHOnline {
@Test
public void testListRecordsDATASITE() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTRECORDS");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTRECORDS");
- OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX,
- OAIPMHUtilitiesOnline.NO_SET);
+ OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX,
+ OaipmhUtilitiesOnline.NO_SET);
}
/**
@@ -369,12 +369,12 @@ public class TestDHOAIPMHOnline {
@Test
public void testListRecordsDATASITEFromUntil() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTRECORDS");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTRECORDS");
- OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX,
- OAIPMHUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX,
+ OaipmhUtilitiesOnline.NO_SET,
checkListRecordsDATACITEFrom, checkListRecordsDATACITEUntil);
}
@@ -384,12 +384,12 @@ public class TestDHOAIPMHOnline {
@Test
public void testGetRecordOAIDC() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#GETRECORD");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#GETRECORD");
- OAIPMHUtilitiesOnline.testDHRecord(oaipmhWebClient,
+ OaipmhUtilitiesOnline.testDHRecord(oaipmhWebClient,
checkGetRecordDC,
- OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
expectedGetRecordDC);
}
@@ -399,12 +399,12 @@ public class TestDHOAIPMHOnline {
@Test
public void testGetRecordDATASITE() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#GETRECORD");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#GETRECORD");
- OAIPMHUtilitiesOnline.testDHRecord(oaipmhWebClient,
+ OaipmhUtilitiesOnline.testDHRecord(oaipmhWebClient,
checkGetRecordDATACITE,
- OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX,
+ OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX,
expectedGetRecordDATACITE);
}
@@ -414,12 +414,12 @@ public class TestDHOAIPMHOnline {
@Test
public void testListIdentifiersOAIDC() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTIDENTIFIERS");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTIDENTIFIERS");
- OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
- OAIPMHUtilitiesOnline.NO_SET);
+ OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
+ OaipmhUtilitiesOnline.NO_SET);
}
/**
@@ -428,11 +428,11 @@ public class TestDHOAIPMHOnline {
@Test
public void testListIdentifiersSetOAIDC() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTIDENTIFIERS");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTIDENTIFIERS");
- int pages = OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ int pages = OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
checkListIdentifiersSet);
if (pages != checkListIdentifiersSetExpectedPages) {
assertTrue(pages + " != " + checkListIdentifiersSetExpectedPages, false);
@@ -447,29 +447,29 @@ public class TestDHOAIPMHOnline {
String uri = checkListIdentifiersSet;
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTIDENTIFIERS - HDL PREFIX");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTIDENTIFIERS - HDL PREFIX");
- if (!uri.startsWith(OAIPMHUtilitiesOnline.HDL_PREFIX)) {
- assertTrue("missing '" + OAIPMHUtilitiesOnline.HDL_PREFIX + "' prefix!", false);
+ if (!uri.startsWith(OaipmhUtilitiesOnline.HDL_PREFIX)) {
+ assertTrue("missing '" + OaipmhUtilitiesOnline.HDL_PREFIX + "' prefix!", false);
}
System.out.println("uri: " + uri);
- int pages1 = OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ int pages1 = OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
uri);
if (pages1 != checkListIdentifiersSetExpectedPages) {
System.out.println(pages1 + " != " + checkListIdentifiersSetExpectedPages);
}
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTIDENTIFIERS - NO PREFIX");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTIDENTIFIERS - NO PREFIX");
- if (checkListIdentifiersSet.startsWith(OAIPMHUtilitiesOnline.HDL_PREFIX)) {
+ if (checkListIdentifiersSet.startsWith(OaipmhUtilitiesOnline.HDL_PREFIX)) {
uri = checkListIdentifiersSet.substring(4);
}
System.out.println("uri: " + uri);
- int pages2 = OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ int pages2 = OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
uri);
if (pages2 != checkListIdentifiersSetExpectedPages) {
System.out.println(pages2 + " != " + checkListIdentifiersSetExpectedPages);
@@ -492,17 +492,17 @@ public class TestDHOAIPMHOnline {
// TODO Un-ignore if identifier check is implemented!
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTIDENTIFIERS - STAR PREFIX");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTIDENTIFIERS - STAR PREFIX");
- if (checkListIdentifiersSet.startsWith(OAIPMHUtilitiesOnline.HDL_PREFIX)) {
+ if (checkListIdentifiersSet.startsWith(OaipmhUtilitiesOnline.HDL_PREFIX)) {
checkListIdentifiersSet =
- OAIPMHUtilitiesOnline.STAR_PREFIX + checkListIdentifiersSet.substring(4);
+ OaipmhUtilitiesOnline.STAR_PREFIX + checkListIdentifiersSet.substring(4);
}
System.out.println("uri: " + checkListIdentifiersSet);
- int pages3 = OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ int pages3 = OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
checkListIdentifiersSet);
if (pages3 != checkListIdentifiersSetExpectedPages) {
System.out.println(pages3 + " != " + checkListIdentifiersSetExpectedPages);
@@ -515,12 +515,12 @@ public class TestDHOAIPMHOnline {
@Test
public void testListIdentifiersDATASITE() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#LISTIDENTIFIERS");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#LISTIDENTIFIERS");
- OAIPMHUtilitiesOnline.testDHList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX,
- OAIPMHUtilitiesOnline.NO_SET);
+ OaipmhUtilitiesOnline.testDHList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX,
+ OaipmhUtilitiesOnline.NO_SET);
}
// **
@@ -535,9 +535,9 @@ public class TestDHOAIPMHOnline {
private static void testRootURL(String theURL, String shouldContain)
throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "#ROOTURL");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "#ROOTURL");
- Response response = OAIPMHUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient, theURL);
+ Response response = OaipmhUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient, theURL);
int status = response.getStatus();
String responseString = IOUtils
@@ -549,7 +549,7 @@ public class TestDHOAIPMHOnline {
}
System.out.println("\tresponse: " + responseString);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TGOAIPMHResumptionTokenThread.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TGOaipmhResumptionTokenThread.java
similarity index 77%
rename from oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TGOAIPMHResumptionTokenThread.java
rename to oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TGOaipmhResumptionTokenThread.java
index bec197e8e8a7fe21d35873d1c72def93d3b481e1..def943bfc149fd97e7c306d23a79b6bba604facd 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TGOAIPMHResumptionTokenThread.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TGOaipmhResumptionTokenThread.java
@@ -3,7 +3,7 @@ package info.textgrid.middleware.test.online.tg;
import java.io.IOException;
import java.util.concurrent.Callable;
import org.apache.cxf.jaxrs.client.Client;
-import info.textgrid.middleware.test.online.OAIPMHUtilitiesOnline;
+import info.textgrid.middleware.test.online.OaipmhUtilitiesOnline;
/**
* <p>
@@ -11,7 +11,7 @@ import info.textgrid.middleware.test.online.OAIPMHUtilitiesOnline;
* </p>
*/
-public class TGOAIPMHResumptionTokenThread implements Callable<Boolean> {
+public class TGOaipmhResumptionTokenThread implements Callable<Boolean> {
protected Client client;
protected String verb;
@@ -30,7 +30,7 @@ public class TGOAIPMHResumptionTokenThread implements Callable<Boolean> {
* @param recordsExpectedPerRequest
* @param theThreadName
*/
- public TGOAIPMHResumptionTokenThread(Client theClient, String theVerb, String theSet,
+ public TGOaipmhResumptionTokenThread(Client theClient, String theVerb, String theSet,
String theMetadataPrefix, int numberOfPagesToTest, int recordsExpectedPerRequest,
String theThreadName) {
this.client = theClient;
@@ -49,10 +49,10 @@ public class TGOAIPMHResumptionTokenThread implements Callable<Boolean> {
*/
@Override
public Boolean call() throws IOException {
- OAIPMHUtilitiesOnline.examineTGList(this.client, this.verb, this.set, this.metadataPrefix,
+ OaipmhUtilitiesOnline.examineTGList(this.client, this.verb, this.set, this.metadataPrefix,
this.numberOfPagesToTest, this.recordsExpectedPerRequest, this.threadName,
- OAIPMHUtilitiesOnline.NO_FROM, OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_FROM, OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
return true;
}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestClassicMayanOnline.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestClassicMayanOnline.java
index 69183affa62bf2e07d889b0e5bcfc24cd0d725dc..e519dc9c38f9b4a4d6f662c1972fd183da36bc4d 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestClassicMayanOnline.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestClassicMayanOnline.java
@@ -13,7 +13,7 @@ import org.junit.Ignore;
import org.junit.Test;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-import info.textgrid.middleware.IDIOMImages;
+import info.textgrid.middleware.IdiomImages;
/**
*
@@ -36,7 +36,7 @@ public class TestClassicMayanOnline {
public void testGetRecord() throws JSONException, IOException, SAXException, ParseException,
TransformerFactoryConfigurationError, TransformerException {
- IDIOMImages imageList = new IDIOMImages("idiomTgcrudEndpoint", "idiomRbacSessionID");
+ IdiomImages imageList = new IdiomImages("idiomTgcrudEndpoint", "idiomRbacSessionID");
Document document;
try {
@@ -62,7 +62,7 @@ public class TestClassicMayanOnline {
public void testGetMediaList() throws JSONException, IOException, ParseException, SAXException,
TransformerFactoryConfigurationError, TransformerException {
- IDIOMImages imageList = new IDIOMImages("idiomTgcrudEndpoint", "idiomRbacSessionID");
+ IdiomImages imageList = new IdiomImages("idiomTgcrudEndpoint", "idiomRbacSessionID");
imageList.setKindID("1");
imageList.setPerPage("100");
@@ -92,13 +92,11 @@ public class TestClassicMayanOnline {
public void testOAIPMHRequest() throws JSONException, IOException, ParseException, SAXException,
TransformerFactoryConfigurationError, TransformerException {
- // OAIPMHtype request = new OAIPMHtype();
- IDIOMImages imageList = new IDIOMImages("idiomTgcrudEndpoint", "idiomRbacSessionID");
+ IdiomImages imageList = new IdiomImages("idiomTgcrudEndpoint", "idiomRbacSessionID");
imageList.setKindID("1");
imageList.setPerPage("100");
imageList.setPageNumber("1");
- // request.setListRecords(imageList.getAllMedia());
}
}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGBasicsOnline.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGBasicsOnline.java
index f833730d701dc8a89b268dc93abbeb2d13a754b1..2b0b0f7c75b6083dfd4b2fae3a3f2780bebb1316 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGBasicsOnline.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGBasicsOnline.java
@@ -14,7 +14,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import info.textgrid.middleware.test.online.OAIPMHUtilitiesOnline;
+import info.textgrid.middleware.test.online.OaipmhUtilitiesOnline;
/**
* <p>
@@ -53,7 +53,7 @@ public class TestTGBasicsOnline {
// Get properties.
Properties p =
- OAIPMHUtilitiesOnline.getPropertiesFromFile(OAIPMHUtilitiesOnline.PROPERTIES_FILE);
+ OaipmhUtilitiesOnline.getPropertiesFromFile(OaipmhUtilitiesOnline.PROPERTIES_FILE);
// Set properties.
oaipmhEndpoint = p.getProperty("oaipmhEndpoint");
@@ -64,7 +64,7 @@ public class TestTGBasicsOnline {
System.out.println("Getting OAI-PMH HTTP client --> " + oaipmhEndpoint + " <--");
// Get web client from endpoint.
- oaipmhWebClient = OAIPMHUtilitiesOnline.getOAIPMHWEebClient(oaipmhEndpoint);
+ oaipmhWebClient = OaipmhUtilitiesOnline.getOAIPMHWEebClient(oaipmhEndpoint);
}
/**
@@ -103,9 +103,9 @@ public class TestTGBasicsOnline {
String shouldStartWith = "oaipmh-core";
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testGetVersion()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testGetVersion()");
- Response httpResponse = OAIPMHUtilitiesOnline.getVersionHttpResponse(oaipmhWebClient);
+ Response httpResponse = OaipmhUtilitiesOnline.getVersionHttpResponse(oaipmhWebClient);
int status = httpResponse.getStatus();
String response = IOUtils.readStringFromStream((InputStream) httpResponse.getEntity());
@@ -116,7 +116,7 @@ public class TestTGBasicsOnline {
}
System.out.println("\tresponse: " + response);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -125,12 +125,12 @@ public class TestTGBasicsOnline {
@Test
public void testRootUrl() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testRootUrl()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testRootUrl()");
// TODO Still hard coded in OAIPMH service!
String shouldContain = "textgridrep.org";
- Response httpResponse = OAIPMHUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient, "/");
+ Response httpResponse = OaipmhUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient, "/");
int status = httpResponse.getStatus();
String response = IOUtils.readStringFromStream((InputStream) httpResponse.getEntity());
@@ -141,7 +141,7 @@ public class TestTGBasicsOnline {
}
System.out.println("\tresponse: " + response);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -150,13 +150,13 @@ public class TestTGBasicsOnline {
@Test
public void testIdentify() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testIdentify()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testIdentify()");
// TODO Still hard coded in OAIPMH service!
String shouldContain = "textgridrep.org";
- Response httpResponse = OAIPMHUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
- "verb=" + OAIPMHUtilitiesOnline.VERB_IDENTIFY);
+ Response httpResponse = OaipmhUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
+ "verb=" + OaipmhUtilitiesOnline.VERB_IDENTIFY);
int status = httpResponse.getStatus();
String response = IOUtils.readStringFromStream((InputStream) httpResponse.getEntity());
@@ -167,7 +167,7 @@ public class TestTGBasicsOnline {
}
System.out.println("\tresponse: " + response);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -176,14 +176,14 @@ public class TestTGBasicsOnline {
@Test
public void testListMetadataFormats() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListMetadataFormats()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListMetadataFormats()");
- String shouldContainDC = OAIPMHUtilitiesOnline.OAI_DC_PREFIX;
- String shouldContainIDIOM = OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX;
- String shouldContainDATACITE = OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX;
+ String shouldContainDC = OaipmhUtilitiesOnline.OAI_DC_PREFIX;
+ String shouldContainIDIOM = OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX;
+ String shouldContainDATACITE = OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX;
- Response httpResponse = OAIPMHUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
- "verb=" + OAIPMHUtilitiesOnline.VERB_LIST_METADATA_FORMATS);
+ Response httpResponse = OaipmhUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
+ "verb=" + OaipmhUtilitiesOnline.VERB_LIST_METADATA_FORMATS);
int status = httpResponse.getStatus();
String response = IOUtils.readStringFromStream((InputStream) httpResponse.getEntity());
@@ -196,7 +196,7 @@ public class TestTGBasicsOnline {
}
System.out.println("\tresponse: " + response);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -205,10 +205,10 @@ public class TestTGBasicsOnline {
@Test
public void testListSets() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListSets()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListSets()");
- Response httpResponse = OAIPMHUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
- "verb=" + OAIPMHUtilitiesOnline.VERB_LIST_SETS);
+ Response httpResponse = OaipmhUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
+ "verb=" + OaipmhUtilitiesOnline.VERB_LIST_SETS);
int status = httpResponse.getStatus();
String response = IOUtils.readStringFromStream((InputStream) httpResponse.getEntity());
@@ -219,7 +219,7 @@ public class TestTGBasicsOnline {
}
System.out.println("\tresponse: " + response);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGGetRecordOnline.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGGetRecordOnline.java
index 4db99b4f0f93e87d4911cb36c581caef9e9dd14d..c6d20d6f9bb4ecc5555499d4368f4b50cb8a9c3e 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGGetRecordOnline.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGGetRecordOnline.java
@@ -3,6 +3,7 @@ package info.textgrid.middleware.test.online.tg;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.io.InputStream;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -12,6 +13,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import javax.ws.rs.core.Response;
+import javax.xml.datatype.DatatypeConfigurationException;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.jaxrs.client.Client;
import org.apache.http.HttpStatus;
@@ -21,7 +23,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import info.textgrid.middleware.test.online.OAIPMHUtilitiesOnline;
+import info.textgrid.middleware.test.online.OaipmhUtilitiesOnline;
/**
* <p>
@@ -51,14 +53,14 @@ public class TestTGGetRecordOnline {
private static String checkGetRecordDC;
private static String expectedGetRecordDC;
- private static String checkGetRecordDATACITE;
- private static String expectedGetRecordDATACITE;
+ private static String checkGetRecordDatacite;
+ private static String expectedGetRecordDatacite;
- private static String checkGetRecordIDIOM;
- private static String expectedGetRecordIDIOM;
+ private static String checkGetRecordIdiom;
+ private static String expectedGetRecordIdiom;
- private static String checkGetRecordIDIOMImage;
- private static String expectedGetRecordIDIOMImage;
+ private static String checkGetRecordIdiomImage;
+ private static String expectedGetRecordIdiomImage;
private static List<String> checkGetRecordIDList = new ArrayList<String>();
@@ -74,7 +76,7 @@ public class TestTGGetRecordOnline {
// Get properties.
Properties p =
- OAIPMHUtilitiesOnline.getPropertiesFromFile(OAIPMHUtilitiesOnline.PROPERTIES_FILE);
+ OaipmhUtilitiesOnline.getPropertiesFromFile(OaipmhUtilitiesOnline.PROPERTIES_FILE);
// Set properties.
oaipmhEndpoint = p.getProperty("oaipmhEndpoint");
@@ -82,20 +84,20 @@ public class TestTGGetRecordOnline {
checkGetRecordDC = p.getProperty("checkGetRecordDC");
expectedGetRecordDC = p.getProperty("expectedGetRecordDC");
- checkGetRecordDATACITE = p.getProperty("checkGetRecordDATACITE");
- expectedGetRecordDATACITE = p.getProperty("expectedGetRecordDATACITE");
+ checkGetRecordDatacite = p.getProperty("checkGetRecordDatacite");
+ expectedGetRecordDatacite = p.getProperty("expectedGetRecordDatacite");
- checkGetRecordIDIOM = p.getProperty("checkGetRecordIDIOM");
- expectedGetRecordIDIOM = p.getProperty("expectedGetRecordIDIOM");
+ checkGetRecordIdiom = p.getProperty("checkGetRecordIdiom");
+ expectedGetRecordIdiom = p.getProperty("expectedGetRecordIdiom");
- checkGetRecordIDIOMImage = p.getProperty("checkGetRecordIDIOMImage");
- expectedGetRecordIDIOMImage = p.getProperty("expectedGetRecordIDIOMImage");
+ checkGetRecordIdiomImage = p.getProperty("checkGetRecordIdiomImage");
+ expectedGetRecordIdiomImage = p.getProperty("expectedGetRecordIdiomImage");
checkGetRecordIDList =
- OAIPMHUtilitiesOnline.getListFromProperties((String) p.get("checkGetRecordIDList"));
+ OaipmhUtilitiesOnline.getListFromProperties((String) p.get("checkGetRecordIDList"));
// Get web client from endpoint.
- oaipmhWebClient = OAIPMHUtilitiesOnline.getOAIPMHWEebClient(oaipmhEndpoint);
+ oaipmhWebClient = OaipmhUtilitiesOnline.getOAIPMHWEebClient(oaipmhEndpoint);
}
/**
@@ -130,14 +132,14 @@ public class TestTGGetRecordOnline {
* @throws IOException
*/
@Test
- public void testGetRecordOAIDC() throws IOException {
+ public void testGetRecordDC() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testGetRecordOAIDC()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testGetRecordDC()");
- String query = "verb=" + OAIPMHUtilitiesOnline.VERB_GET_RECORD + "&identifier="
- + checkGetRecordDC + "&metadataPrefix=" + OAIPMHUtilitiesOnline.OAI_DC_PREFIX;
+ String query = "verb=" + OaipmhUtilitiesOnline.VERB_GET_RECORD + "&identifier="
+ + checkGetRecordDC + "&metadataPrefix=" + OaipmhUtilitiesOnline.OAI_DC_PREFIX;
- Response httpResponse = OAIPMHUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient, query);
+ Response httpResponse = OaipmhUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient, query);
int status = httpResponse.getStatus();
String response = IOUtils.readStringFromStream((InputStream) httpResponse.getEntity());
@@ -148,94 +150,102 @@ public class TestTGGetRecordOnline {
}
System.out.println("\tresponse: " + response);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
* @throws IOException
+ * @throws DatatypeConfigurationException
+ * @throws ParseException
*/
@Test
- public void testGetRecordIDIOMMETS() throws IOException {
+ public void testGetRecordIdiomMETS()
+ throws IOException, ParseException, DatatypeConfigurationException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testGetRecordIDIOMMETS()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testGetRecordIdiomMETS()");
- String query = "verb=" + OAIPMHUtilitiesOnline.VERB_GET_RECORD + "&identifier="
- + checkGetRecordIDIOM + "&metadataPrefix=" + OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX;
+ String query = "verb=" + OaipmhUtilitiesOnline.VERB_GET_RECORD + "&identifier="
+ + checkGetRecordIdiom + "&metadataPrefix=" + OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX;
- Response httpResponse = OAIPMHUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
+ Response httpResponse = OaipmhUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
query);
int status = httpResponse.getStatus();
String response = IOUtils.readStringFromStream((InputStream) httpResponse.getEntity());
- if (status != HttpStatus.SC_OK || !response.contains(expectedGetRecordIDIOM)) {
- String message = "[" + status + "] response should contain '" + expectedGetRecordIDIOM + "'";
+ if (status != HttpStatus.SC_OK || !response.contains(expectedGetRecordIdiom)) {
+ String message = "[" + status + "] response should contain '" + expectedGetRecordIdiom + "'";
assertTrue(message, false);
}
// Test OAI header.
- OAIPMHUtilitiesOnline.examineTGHeaderIDs(response, OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX);
+ OaipmhUtilitiesOnline.examineTGHeaderIDs(response, OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX);
+ OaipmhUtilitiesOnline.examineTGModificationDates(response);
System.out.println("\tresponse: " + response);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
* @throws IOException
+ * @throws DatatypeConfigurationException
+ * @throws ParseException
*/
@Test
- public void testGetRecordIDIOMMETSImage() throws IOException {
+ public void testGetRecordIDIOMMETSImage()
+ throws IOException, ParseException, DatatypeConfigurationException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testGetRecordIDIOMMETS_Image()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testGetRecordIDIOMMETS_Image()");
String query =
- "verb=" + OAIPMHUtilitiesOnline.VERB_GET_RECORD + "&identifier=" + checkGetRecordIDIOMImage
- + "&metadataPrefix=" + OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX;
+ "verb=" + OaipmhUtilitiesOnline.VERB_GET_RECORD + "&identifier=" + checkGetRecordIdiomImage
+ + "&metadataPrefix=" + OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX;
- Response httpResponse = OAIPMHUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
+ Response httpResponse = OaipmhUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
query);
int status = httpResponse.getStatus();
String response = IOUtils.readStringFromStream((InputStream) httpResponse.getEntity());
- if (status != HttpStatus.SC_OK || !response.contains(expectedGetRecordIDIOMImage)) {
+ if (status != HttpStatus.SC_OK || !response.contains(expectedGetRecordIdiomImage)) {
String message =
- "[" + status + "] response should contain '" + expectedGetRecordIDIOMImage + "'";
+ "[" + status + "] response should contain '" + expectedGetRecordIdiomImage + "'";
assertTrue(message, false);
}
// Test OAI header.
- OAIPMHUtilitiesOnline.examineTGHeaderIDs(response, OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX);
+ OaipmhUtilitiesOnline.examineTGHeaderIDs(response, OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX);
+ OaipmhUtilitiesOnline.examineTGModificationDates(response);
System.out.println("\tresponse: " + response);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
* @throws IOException
*/
@Test
- public void testGetRecordDATACITE() throws IOException {
+ public void testGetRecordDatacite() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testGetRecordDATACITE()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testGetRecordDatacite()");
- String query = "verb=" + OAIPMHUtilitiesOnline.VERB_GET_RECORD + "&identifier="
- + checkGetRecordDATACITE + "&metadataPrefix=" + OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX;
+ String query = "verb=" + OaipmhUtilitiesOnline.VERB_GET_RECORD + "&identifier="
+ + checkGetRecordDatacite + "&metadataPrefix=" + OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX;
- Response httpResponse = OAIPMHUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
+ Response httpResponse = OaipmhUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient,
query);
int status = httpResponse.getStatus();
String response = IOUtils.readStringFromStream((InputStream) httpResponse.getEntity());
- if (status != HttpStatus.SC_OK || !response.contains(expectedGetRecordDATACITE)) {
+ if (status != HttpStatus.SC_OK || !response.contains(expectedGetRecordDatacite)) {
String message =
- "[" + status + "] response should contain '" + expectedGetRecordDATACITE + "'";
+ "[" + status + "] response should contain '" + expectedGetRecordDatacite + "'";
assertTrue(message, false);
}
System.out.println("\tresponse: " + response);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -244,88 +254,88 @@ public class TestTGGetRecordOnline {
* @throws ExecutionException
*/
@Test
- public void testConcurrentlyOAIDCGetRecord() throws InterruptedException, ExecutionException {
+ public void testConcurrentlyDCGetRecord() throws InterruptedException, ExecutionException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testConcurrentlyOAIDCGetRecord()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testConcurrentlyDCGetRecord()");
ExecutorService executor = Executors.newFixedThreadPool(18);
Future<Boolean> f1 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(0), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(0), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f2 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(1), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(1), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f3 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(2), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(2), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f4 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(3), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(3), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f5 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(4), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(4), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f6 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(5), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(5), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f7 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(6), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(6), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f8 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(7), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(7), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f9 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(8), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(8), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f10 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(9), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(9), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f11 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(10), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(10), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f12 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(11), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(11), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f13 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(12), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(12), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f14 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(13), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(13), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f15 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(14), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(14), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f16 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(15), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(15), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f17 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(16), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(16), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
Future<Boolean> f18 =
- executor.submit(new OaiPmhGetRecordTestThread(OAIPMHUtilitiesOnline.VERB_GET_RECORD,
- checkGetRecordIDList.get(17), OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ executor.submit(new OaiPmhGetRecordTestThread(OaipmhUtilitiesOnline.VERB_GET_RECORD,
+ checkGetRecordIDList.get(17), OaipmhUtilitiesOnline.OAI_DC_PREFIX,
"GR[" + checkGetRecordIDList.get(0) + "]"));
executor.shutdown();
- System.out.println(OAIPMHUtilitiesOnline.OK + "[GR1]=" + f1.get() +
+ System.out.println(OaipmhUtilitiesOnline.OK + "[GR1]=" + f1.get() +
", [GR2]=" + f2.get() +
", [GR3]=" + f3.get() +
", [GR4]=" + f4.get() +
@@ -379,7 +389,7 @@ public class TestTGGetRecordOnline {
String query = "verb=" + this.verb + "&identifier=" + this.identifier + "&metadataPrefix="
+ this.metadataPrefix;
- OAIPMHUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient, this.threadName, query);
+ OaipmhUtilitiesOnline.getOAIHttpResponse(oaipmhWebClient, this.threadName, query);
return true;
}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListIdentifiersOnline.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListIdentifiersOnline.java
index 7fff73041aad61b998702c76bbbfcde6c8f3c314..520efd9ec8be94872bb55fb4d299ee3187a80dd4 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListIdentifiersOnline.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListIdentifiersOnline.java
@@ -13,7 +13,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import info.textgrid.middleware.test.online.OAIPMHUtilitiesOnline;
+import info.textgrid.middleware.test.online.OaipmhUtilitiesOnline;
/**
* <p>
@@ -55,7 +55,7 @@ public class TestTGListIdentifiersOnline {
// Get properties.
Properties p =
- OAIPMHUtilitiesOnline.getPropertiesFromFile(OAIPMHUtilitiesOnline.PROPERTIES_FILE);
+ OaipmhUtilitiesOnline.getPropertiesFromFile(OaipmhUtilitiesOnline.PROPERTIES_FILE);
// Set properties.
oaipmhEndpoint = p.getProperty("oaipmhEndpoint");
@@ -63,7 +63,7 @@ public class TestTGListIdentifiersOnline {
checkListIdentifiersSet = p.getProperty("checkListIdentifiersSet");
// Get web client from endpoint.
- oaipmhWebClient = OAIPMHUtilitiesOnline.getOAIPMHWEebClient(oaipmhEndpoint);
+ oaipmhWebClient = OaipmhUtilitiesOnline.getOAIPMHWEebClient(oaipmhEndpoint);
}
/**
@@ -98,43 +98,43 @@ public class TestTGListIdentifiersOnline {
* @throws IOException
*/
@Test
- public void testListIdentifiersOAIDCMorePages() throws IOException {
+ public void testListIdentifiersDCMorePages() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListIdentifiersOAIDCMorePages()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListIdentifiersDCMorePages()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
checkListIdentifiersSet,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
30, 100,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
* @throws IOException
*/
@Test(expected = IOException.class)
- public void testListIdentifiersOAIDCMorePagesAndMetadataFormatWithRestok() throws IOException {
+ public void testListIdentifiersDCMorePagesAndMetadataFormatWithRestok() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING
- + "testListIdentifiersOAIDCMorePagesAndMetadataFormatWithRestok()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING
+ + "testListIdentifiersDCMorePagesAndMetadataFormatWithRestok()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
checkListIdentifiersSet,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
30, 100,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -143,20 +143,20 @@ public class TestTGListIdentifiersOnline {
@Test
public void testListIdentifiersIDIOMMETSAllPages() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListIdentifiersIDIOMMETSAllPages()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListIdentifiersIDIOMMETSAllPages()");
- if (OAIPMHUtilitiesOnline.TEST_ALL_PAGES) {
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ if (OaipmhUtilitiesOnline.TEST_ALL_PAGES) {
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
0, 30,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
} else {
System.out.println("...skipping");
}
@@ -168,19 +168,19 @@ public class TestTGListIdentifiersOnline {
@Test
public void testListIdentifiersIDIOMMETSMorePages() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListIdentifiersIDIOMMETSMorePages()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListIdentifiersIDIOMMETSMorePages()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
6, 30,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -190,20 +190,20 @@ public class TestTGListIdentifiersOnline {
public void testListIdentifiersIDIOMMETSSomePagesAndMetadataFormatWithRestok()
throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING
+ System.out.println(OaipmhUtilitiesOnline.TESTING
+ "testListIdentifiersIDIOMMETSSomePagesAndMetadataFormatWithRestok()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
3, 30,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -213,19 +213,19 @@ public class TestTGListIdentifiersOnline {
public void testListIdentifiersDATACITEMorePages() throws IOException {
System.out
- .println(OAIPMHUtilitiesOnline.TESTING + "testListIdentifiersDATACITEMorePages()");
+ .println(OaipmhUtilitiesOnline.TESTING + "testListIdentifiersDATACITEMorePages()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX,
22, 100,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -238,35 +238,35 @@ public class TestTGListIdentifiersOnline {
throws IOException, InterruptedException, ExecutionException {
System.out.println(
- OAIPMHUtilitiesOnline.TESTING + "testListIdentifiersConcurrentlyIDIOMMETSMorePages()");
+ OaipmhUtilitiesOnline.TESTING + "testListIdentifiersConcurrentlyIDIOMMETSMorePages()");
ExecutorService executor = Executors.newFixedThreadPool(3);
Future<Boolean> f1 = executor
- .submit(new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ .submit(new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
3, 30,
"C1"));
Future<Boolean> f2 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
5, 30,
"C2"));
Future<Boolean> f3 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
8, 30,
"C2"));
executor.shutdown();
- System.out.println(OAIPMHUtilitiesOnline.OK + ": [C1]=" + f1.get() + ", [C2]=" + f2.get()
+ System.out.println(OaipmhUtilitiesOnline.OK + ": [C1]=" + f1.get() + ", [C2]=" + f2.get()
+ ", [C3]=" + f3.get());
}
@@ -280,35 +280,35 @@ public class TestTGListIdentifiersOnline {
throws InterruptedException, ExecutionException {
System.out
- .println(OAIPMHUtilitiesOnline.TESTING + "testRestokConcurrentlyListIdentifiersDC()");
+ .println(OaipmhUtilitiesOnline.TESTING + "testRestokConcurrentlyListIdentifiersDC()");
ExecutorService executor = Executors.newFixedThreadPool(3);
Future<Boolean> f1 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
36, 100,
"A1"));
Future<Boolean> f2 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
27, 100,
"A2"));
Future<Boolean> f3 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
19, 100,
"A3"));
executor.shutdown();
- System.out.println(OAIPMHUtilitiesOnline.OK + ": [A1]=" + f1.get() + ", [A2]=" + f2.get()
+ System.out.println(OaipmhUtilitiesOnline.OK + ": [A1]=" + f1.get() + ", [A2]=" + f2.get()
+ ", [A3]=" + f3.get());
}
@@ -323,35 +323,35 @@ public class TestTGListIdentifiersOnline {
System.out
.println(
- OAIPMHUtilitiesOnline.TESTING + "testRestokConcurrentlyListIdentifiersIDIOM()");
+ OaipmhUtilitiesOnline.TESTING + "testRestokConcurrentlyListIdentifiersIDIOM()");
ExecutorService executor = Executors.newFixedThreadPool(3);
Future<Boolean> f1 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
13, 30,
"A1"));
Future<Boolean> f2 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
35, 30,
"A2"));
Future<Boolean> f3 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
11, 30,
"A3"));
executor.shutdown();
- System.out.println(OAIPMHUtilitiesOnline.OK + ": [A1]=" + f1.get() + ", [A2]=" + f2.get()
+ System.out.println(OaipmhUtilitiesOnline.OK + ": [A1]=" + f1.get() + ", [A2]=" + f2.get()
+ ", [A3]=" + f3.get());
}
@@ -366,35 +366,35 @@ public class TestTGListIdentifiersOnline {
System.out
.println(
- OAIPMHUtilitiesOnline.TESTING + "testRestokConcurrentlyListIdentifiersDATACITE()");
+ OaipmhUtilitiesOnline.TESTING + "testRestokConcurrentlyListIdentifiersDATACITE()");
ExecutorService executor = Executors.newFixedThreadPool(3);
Future<Boolean> f1 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX,
13, 100,
"A1"));
Future<Boolean> f2 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX,
20, 100,
"A2"));
Future<Boolean> f3 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX,
8, 100,
"A3"));
executor.shutdown();
- System.out.println(OAIPMHUtilitiesOnline.OK + ": [A1]=" + f1.get() + ", [A2]=" + f2.get()
+ System.out.println(OaipmhUtilitiesOnline.OK + ": [A1]=" + f1.get() + ", [A2]=" + f2.get()
+ ", [A3]=" + f3.get());
}
@@ -407,36 +407,36 @@ public class TestTGListIdentifiersOnline {
throws InterruptedException, ExecutionException {
System.out.println(
- OAIPMHUtilitiesOnline.TESTING
+ OaipmhUtilitiesOnline.TESTING
+ "testRestokConcurrentlyListIdentifiersDCAndIDIOMMets()");
ExecutorService executor = Executors.newFixedThreadPool(3);
Future<Boolean> f1 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
53, 100,
"DC1"));
Future<Boolean> f2 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
28, 100,
"DC2"));
Future<Boolean> f3 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_IDENTIFIERS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_IDENTIFIERS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
10, 30,
"IDIOM"));
executor.shutdown();
- System.out.println(OAIPMHUtilitiesOnline.OK + ": [DC1]=" + f1.get() + ", [DC2]=" + f2.get()
+ System.out.println(OaipmhUtilitiesOnline.OK + ": [DC1]=" + f1.get() + ", [DC2]=" + f2.get()
+ ", [IDIOM]=" + f3.get());
}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListRecordsOnline.java b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListRecordsOnline.java
index 00f20c544e717374584ad9f96a9cacdd12cabc62..91ebe2a39fb9f142a3618b32376012fb9c0ac73d 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListRecordsOnline.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/test/online/tg/TestTGListRecordsOnline.java
@@ -13,7 +13,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import info.textgrid.middleware.test.online.OAIPMHUtilitiesOnline;
+import info.textgrid.middleware.test.online.OaipmhUtilitiesOnline;
/**
* <p>
@@ -60,7 +60,7 @@ public class TestTGListRecordsOnline {
// Get properties.
Properties p =
- OAIPMHUtilitiesOnline.getPropertiesFromFile(OAIPMHUtilitiesOnline.PROPERTIES_FILE);
+ OaipmhUtilitiesOnline.getPropertiesFromFile(OaipmhUtilitiesOnline.PROPERTIES_FILE);
// Set properties.
oaipmhEndpoint = p.getProperty("oaipmhEndpoint");
@@ -76,7 +76,7 @@ public class TestTGListRecordsOnline {
checkListRecordsIDIOMUntil = p.getProperty("checkListRecordsIDIOMUntil");
// Get web client from endpoint.
- oaipmhWebClient = OAIPMHUtilitiesOnline.getOAIPMHWEebClient(oaipmhEndpoint);
+ oaipmhWebClient = OaipmhUtilitiesOnline.getOAIPMHWEebClient(oaipmhEndpoint);
}
/**
@@ -113,19 +113,19 @@ public class TestTGListRecordsOnline {
@Test
public void testListRecordsOAIDCMorePages() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListRecordsOAIDCMorePages()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListRecordsOAIDCMorePages()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
18, 100,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -134,19 +134,19 @@ public class TestTGListRecordsOnline {
@Test
public void testListRecordsOAIDCSetMorePages() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListRecordsOAIDCSetMorePages()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListRecordsOAIDCSetMorePages()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
checkListRecordsDCSet,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
20, 100,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -155,21 +155,21 @@ public class TestTGListRecordsOnline {
@Test
public void testListRecordsOAIDCAllPages() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListRecordsOAIDCAllPages()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListRecordsOAIDCAllPages()");
- if (OAIPMHUtilitiesOnline.TEST_ALL_PAGES) {
+ if (OaipmhUtilitiesOnline.TEST_ALL_PAGES) {
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
0, 100,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
} else {
System.out.println("...skipping");
}
@@ -181,19 +181,19 @@ public class TestTGListRecordsOnline {
@Test
public void testListRecordsOAIDCMorePagesFromUntil() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListRecordsOAIDCMorePagesFromUntil()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListRecordsOAIDCMorePagesFromUntil()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
checkListRecordsDCSet,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
0, 100,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
checkListRecordsDCFrom,
checkListRecordsDCUntil,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -202,20 +202,20 @@ public class TestTGListRecordsOnline {
@Test(expected = IOException.class)
public void testListRecordsIDIOMMETSSomePagesAndMetadataFormatWithRestok() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING
+ System.out.println(OaipmhUtilitiesOnline.TESTING
+ "testListRecordsIDIOMMETSSomePagesAndMetadataFormatWithRestok()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
3, 30,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -224,21 +224,21 @@ public class TestTGListRecordsOnline {
@Test
public void testListRecordsIDIOMMETSAllPages() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListRecordsIDIOMMETSAllPages()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListRecordsIDIOMMETSAllPages()");
- if (OAIPMHUtilitiesOnline.TEST_ALL_PAGES) {
+ if (OaipmhUtilitiesOnline.TEST_ALL_PAGES) {
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
0, 30,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
} else {
System.out.println("...skipping");
}
@@ -254,19 +254,19 @@ public class TestTGListRecordsOnline {
public void testListRecordsIDIOMMETSMorePagesFromUntil() throws IOException {
System.out
- .println(OAIPMHUtilitiesOnline.TESTING + "testListRecordsIDIOMMETSMorePagesFromUntil()");
+ .println(OaipmhUtilitiesOnline.TESTING + "testListRecordsIDIOMMETSMorePagesFromUntil()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
6, 30,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
checkListRecordsIDIOMFrom,
checkListRecordsIDIOMUntil,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -276,19 +276,19 @@ public class TestTGListRecordsOnline {
public void testListRecordsIDIOMMETSMorePages() throws IOException {
System.out
- .println(OAIPMHUtilitiesOnline.TESTING + "testListRecordsIDIOMMETSMorePages()");
+ .println(OaipmhUtilitiesOnline.TESTING + "testListRecordsIDIOMMETSMorePages()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
6, 30,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -297,19 +297,19 @@ public class TestTGListRecordsOnline {
@Test
public void testListRecordsDATACITEMorePages() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListRecordsDATACITEMorePages()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListRecordsDATACITEMorePages()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX,
15, 100,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -318,20 +318,20 @@ public class TestTGListRecordsOnline {
@Test
public void testListRecordsDATACITEAllPages() throws IOException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testListRecordsDATACITEAllPages()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testListRecordsDATACITEAllPages()");
- if (OAIPMHUtilitiesOnline.TEST_ALL_PAGES) {
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX,
+ if (OaipmhUtilitiesOnline.TEST_ALL_PAGES) {
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX,
0, 100,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
- OAIPMHUtilitiesOnline.NO_FROM,
- OAIPMHUtilitiesOnline.NO_UNTIL,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_FROM,
+ OaipmhUtilitiesOnline.NO_UNTIL,
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
} else {
System.out.println("...skipping");
}
@@ -344,19 +344,19 @@ public class TestTGListRecordsOnline {
public void testListRecordsDATACITEMorePagesFromUntil() throws IOException {
System.out
- .println(OAIPMHUtilitiesOnline.TESTING + "testListRecordsDATACITEMorePagesFromUntil()");
+ .println(OaipmhUtilitiesOnline.TESTING + "testListRecordsDATACITEMorePagesFromUntil()");
- OAIPMHUtilitiesOnline.examineTGList(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DATACITE_PREFIX,
+ OaipmhUtilitiesOnline.examineTGList(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DATACITE_PREFIX,
15, 100,
- OAIPMHUtilitiesOnline.NO_THREAD_NAME,
+ OaipmhUtilitiesOnline.NO_THREAD_NAME,
checkListRecordsDATACITEFrom,
checkListRecordsDATACITEUntil,
- OAIPMHUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
+ OaipmhUtilitiesOnline.NO_METADATA_FORMAT_WITH_RESTOK);
- System.out.println(OAIPMHUtilitiesOnline.OK);
+ System.out.println(OaipmhUtilitiesOnline.OK);
}
/**
@@ -369,35 +369,35 @@ public class TestTGListRecordsOnline {
throws IOException, InterruptedException, ExecutionException {
System.out
- .println(OAIPMHUtilitiesOnline.TESTING + "testListRecordsConcurrentlyIDIOMMETSMorePages()");
+ .println(OaipmhUtilitiesOnline.TESTING + "testListRecordsConcurrentlyIDIOMMETSMorePages()");
ExecutorService executor = Executors.newFixedThreadPool(3);
Future<Boolean> f1 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
2, 30,
"IDIOM1"));
Future<Boolean> f2 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
3, 30,
"IDIOM2"));
Future<Boolean> f3 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
4, 30,
"IDIOM3"));
executor.shutdown();
- System.out.println(OAIPMHUtilitiesOnline.OK + ": [IDIOM1]=" + f1.get() + ", [IDIOM2]="
+ System.out.println(OaipmhUtilitiesOnline.OK + ": [IDIOM1]=" + f1.get() + ", [IDIOM2]="
+ f2.get() + ", [IDIOM3]=" + f3.get());
}
@@ -410,43 +410,43 @@ public class TestTGListRecordsOnline {
public void testRestokConcurrentlyListRecordsDC()
throws InterruptedException, ExecutionException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testRestokConcurrentlyListRecordsDC()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testRestokConcurrentlyListRecordsDC()");
ExecutorService executor = Executors.newFixedThreadPool(4);
Future<Boolean> f1 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
44, 100,
"DC1"));
Future<Boolean> f2 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
33, 100,
"DC2"));
Future<Boolean> f3 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
66, 100,
"DC3"));
Future<Boolean> f4 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
28, 100,
"DC4"));
executor.shutdown();
System.out.println(
- OAIPMHUtilitiesOnline.OK + ": [DC1]=" + f1.get() + ", [DC2]=" + f2.get() + ", [DC3]="
+ OaipmhUtilitiesOnline.OK + ": [DC1]=" + f1.get() + ", [DC2]=" + f2.get() + ", [DC3]="
+ f3.get() + ", [DC4]=" + f4.get());
}
@@ -458,42 +458,42 @@ public class TestTGListRecordsOnline {
@Test
public void testRestokConcurrentlyListRecords() throws InterruptedException, ExecutionException {
- System.out.println(OAIPMHUtilitiesOnline.TESTING + "testRestokConcurrentlyListRecords()");
+ System.out.println(OaipmhUtilitiesOnline.TESTING + "testRestokConcurrentlyListRecords()");
ExecutorService executor = Executors.newFixedThreadPool(3);
Future<Boolean> f1 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
6, 100,
"B1"));
Future<Boolean> f2 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
7, 100,
"B2"));
Future<Boolean> f3 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
8, 100,
"B3"));
Future<Boolean> f4 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
9, 100,
"B4"));
executor.shutdown();
- System.out.println(OAIPMHUtilitiesOnline.OK + ": [B1]=" + f1.get() + ", [B2]=" + f2.get()
+ System.out.println(OaipmhUtilitiesOnline.OK + ": [B1]=" + f1.get() + ", [B2]=" + f2.get()
+ ", [B3]=" + f3.get() + ", [B4]=" + f4.get());
}
@@ -506,35 +506,35 @@ public class TestTGListRecordsOnline {
throws InterruptedException, ExecutionException {
System.out.println(
- OAIPMHUtilitiesOnline.TESTING + "testListRecordsRestokConcurrentlyDCAndIDIOMMets()");
+ OaipmhUtilitiesOnline.TESTING + "testListRecordsRestokConcurrentlyDCAndIDIOMMets()");
ExecutorService executor = Executors.newFixedThreadPool(3);
Future<Boolean> f1 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
34, 100,
"DC1"));
Future<Boolean> f2 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_DC_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_DC_PREFIX,
27, 100,
"DC2"));
Future<Boolean> f3 = executor.submit(
- new TGOAIPMHResumptionTokenThread(oaipmhWebClient,
- OAIPMHUtilitiesOnline.VERB_LIST_RECORDS,
- OAIPMHUtilitiesOnline.NO_SET,
- OAIPMHUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
+ new TGOaipmhResumptionTokenThread(oaipmhWebClient,
+ OaipmhUtilitiesOnline.VERB_LIST_RECORDS,
+ OaipmhUtilitiesOnline.NO_SET,
+ OaipmhUtilitiesOnline.OAI_IDIOMMETS_PREFIX,
5, 30,
"IDIOM"));
executor.shutdown();
- System.out.println(OAIPMHUtilitiesOnline.OK + ": [DC1]=" + f1.get() + ", [DC2]=" + f2.get()
+ System.out.println(OaipmhUtilitiesOnline.OK + ": [DC1]=" + f1.get() + ", [DC2]=" + f2.get()
+ ", [IOIOM]=" + f3.get());
}
diff --git a/oaipmh-core/src/test/resources/oaipmh.test.dev-textgridlab-org.properties b/oaipmh-core/src/test/resources/oaipmh.test.dev-textgridlab-org.properties
index 0619b500a61738cdb07f6da53635f5da24680187..ca3748fa9da09885c0ae180485d31cf3501af82d 100644
--- a/oaipmh-core/src/test/resources/oaipmh.test.dev-textgridlab-org.properties
+++ b/oaipmh-core/src/test/resources/oaipmh.test.dev-textgridlab-org.properties
@@ -5,14 +5,14 @@ oaipmhEndpoint = https://dev.textgridlab.org/1.0/tgoaipmh
checkGetRecordDC = textgrid:vqn0.0
expectedGetRecordDC = Heidi
-checkGetRecordDATACITE = textgrid:mq05.0
-expectedGetRecordDATACITE = Weise Klugredenn
+checkGetRecordDatacite = textgrid:mq05.0
+expectedGetRecordDatacite = Weise Klugredenn
-checkGetRecordIDIOM = textgrid:2sg18.0
-expectedGetRecordIDIOM = Aguateca
+checkGetRecordIdiom = textgrid:2sg18.0
+expectedGetRecordIdiom = Aguateca
-checkGetRecordIDIOMImage = textgrid:407sf.0
-expectedGetRecordIDIOMImage = Acanceh, Structure 1, Stucco Frieze, Detail
+checkGetRecordIdiomImage = textgrid:407sf.0
+expectedGetRecordIdiomImage = Acanceh, Structure 1, Stucco Frieze, Detail
# another image would be: 3vbbt.0
checkGetRecordIDList = textgrid:mq05.0, textgrid:jgv6.0, textgrid:w7rz.0, textgrid:w36b.0, textgrid:mcdv.0, textgrid:v0qx.0, textgrid:xkck.0, textgrid:t3m1.0, textgrid:10rsq.0, textgrid:mq05.0, textgrid:jgv6.0, textgrid:w7rz.0, textgrid:w36b.0, textgrid:mcdv.0, textgrid:v0qx.0, textgrid:xkck.0, textgrid:t3m1.0, textgrid:10rsq.0
@@ -22,11 +22,11 @@ checkListRecordsDCSet = project:TGPR-372fe6dc-57f2-6cd4-01b5-2c4bbefcfd3c
checkListRecordsDCFrom = 2012-01-04T01:00:00
checkListRecordsDCUntil = 2012-01-04T12:00:00
-checkListRecordsIDIOMFrom = 2012-01-04T01:00:00
-checkListRecordsIDIOMUntil = 2022-01-04T12:00:00
+checkListRecordsIdiomFrom = 2012-01-04T01:00:00
+checkListRecordsIdiomUntil = 2022-01-04T12:00:00
-checkListRecordsDATACITEFrom = 2012-01-04T01:00:00
-checkListRecordsDATACITEUntil = 2012-01-04T12:00:00
+checkListRecordsDataciteFrom = 2012-01-04T01:00:00
+checkListRecordsDataciteUntil = 2012-01-04T12:00:00
# ListIdentifiers
checkListIdentifiersSet = project:TGPR-59722e29-efcb-330f-b9b4-5ef2fb08edab
diff --git a/oaipmh-core/src/test/resources/oaipmh.test.repository-de-dariah-eu.properties b/oaipmh-core/src/test/resources/oaipmh.test.repository-de-dariah-eu.properties
index 436febfc77b891e9a69fa16d43c3de59e8cfdc8d..7534039393293335e7e435875e7661aab675c9c2 100644
--- a/oaipmh-core/src/test/resources/oaipmh.test.repository-de-dariah-eu.properties
+++ b/oaipmh-core/src/test/resources/oaipmh.test.repository-de-dariah-eu.properties
@@ -5,8 +5,8 @@ oaipmhEndpoint = https://repository.de.dariah.eu/1.0/oaipmh
checkGetRecordDC = hdl:21.11113/0000-000B-C8F2-2
expectedGetRecordDC = <dc:identifier>hdl:21.11113/0000-000B-C8F2-2</dc:identifier>
-checkGetRecordDATACITE = hdl:21.11113/0000-000B-C8F2-2
-expectedGetRecordDATACITE = <datacite:alternateIdentifier alternateIdentifierType="DOI">10.20375/0000-000B-C8F2-2</datacite:alternateIdentifier>
+checkGetRecordDatacite = hdl:21.11113/0000-000B-C8F2-2
+expectedGetRecordDatacite = <datacite:alternateIdentifier alternateIdentifierType="DOI">10.20375/0000-000B-C8F2-2</datacite:alternateIdentifier>
# ListRecords
checkListRecordsDCSet = hdl:21.11113/0000-000B-C8F2-2
@@ -15,8 +15,8 @@ checkListRecordsDCSetExpectedPages = 4
checkListRecordsDCFrom = 2018-07-02T16:00
checkListRecordsDCUntil = 2018-07-02T23:00
-checkListRecordsDATACITEFrom = 2021-03-23T11:00
-checkListRecordsDATACITEUntil = 2021-07-23T11:00
+checkListRecordsDataciteFrom = 2021-03-23T11:00
+checkListRecordsDataciteUntil = 2021-07-23T11:00
# ListIdentifiers
checkListIdentifiersSet = hdl:21.11113/0000-000B-C8F2-2
diff --git a/oaipmh-core/src/test/resources/oaipmh.test.textgridlab-org.properties b/oaipmh-core/src/test/resources/oaipmh.test.textgridlab-org.properties
index a2c1b6a3ae57557c6fd01d7bb2a9219b1da84475..1fdd4bb6c0faf93af3804e89144b2e69d548ec58 100644
--- a/oaipmh-core/src/test/resources/oaipmh.test.textgridlab-org.properties
+++ b/oaipmh-core/src/test/resources/oaipmh.test.textgridlab-org.properties
@@ -5,14 +5,14 @@ oaipmhEndpoint = https://textgridlab.org/1.0/tgoaipmh
checkGetRecordDC = textgrid:vqn0.0
expectedGetRecordDC = Heidi
-checkGetRecordDATACITE = textgrid:mq05.0
-expectedGetRecordDATACITE = Weise Klugredenn
+checkGetRecordDatacite = textgrid:mq05.0
+expectedGetRecordDatacite = Weise Klugredenn
-checkGetRecordIDIOM = textgrid:2sg18.0
-expectedGetRecordIDIOM = Aguateca
+checkGetRecordIdiom = textgrid:2sg18.0
+expectedGetRecordIdiom = Aguateca
-checkGetRecordIDIOMImage = textgrid:3wmg2.0
-expectedGetRecordIDIOMImage = El Chorro, Altar 1
+checkGetRecordIdiomImage = textgrid:3wmg2.0
+expectedGetRecordIdiomImage = El Chorro, Altar 1
checkGetRecordIDList = textgrid:mq05.0, textgrid:jgv6.0, textgrid:w7rz.0, textgrid:w36b.0, textgrid:mcdv.0, textgrid:v0qx.0, textgrid:xkck.0, textgrid:t3m1.0, textgrid:10rsq.0, textgrid:mq05.0, textgrid:jgv6.0, textgrid:w7rz.0, textgrid:w36b.0, textgrid:mcdv.0, textgrid:v0qx.0, textgrid:xkck.0, textgrid:t3m1.0, textgrid:10rsq.0
@@ -21,11 +21,11 @@ checkListRecordsDC = project:TGPR-372fe6dc-57f2-6cd4-01b5-2c4bbefcfd3c
checkListRecordsDCFrom = 2012-01-04T01:00:00
checkListRecordsDCUntil = 2012-01-04T12:00:00
-checkListRecordsIDIOMFrom = 2020-11-27T15:00
-checkListRecordsIDIOMUntil = 2021-11-27T20:00
+checkListRecordsIdiomFrom = 2020-11-27T15:00
+checkListRecordsIdiomUntil = 2021-11-27T20:00
-checkListRecordsDATACITEFrom = 2012-01-04T01:00:00
-checkListRecordsDATACITEUntil = 2012-01-04T12:00:00
+checkListRecordsDataciteFrom = 2012-01-04T01:00:00
+checkListRecordsDataciteUntil = 2012-01-04T12:00:00
# ListIdentifiers
checkListIdentifiersSet = project:TGPR-372fe6dc-57f2-6cd4-01b5-2c4bbefcfd3c
diff --git a/oaipmh-core/src/test/resources/oaipmh.test.trep-de-dariah-eu.properties b/oaipmh-core/src/test/resources/oaipmh.test.trep-de-dariah-eu.properties
index ae4a60f9f0dd3138859beaba9252364ebf913172..32f1bf6d18f72a6a29fff1b1179721b1e1766aab 100644
--- a/oaipmh-core/src/test/resources/oaipmh.test.trep-de-dariah-eu.properties
+++ b/oaipmh-core/src/test/resources/oaipmh.test.trep-de-dariah-eu.properties
@@ -5,8 +5,8 @@ oaipmhEndpoint = https://trep.de.dariah.eu/1.0/oaipmh
checkGetRecordDC = hdl:21.T11991/0000-000D-2845-9
expectedGetRecordDC = <dc:identifier>doi:10.5072/0000-000D-2845-9</dc:identifier>
-checkGetRecordDATACITE = hdl:21.T11991/0000-000D-2845-9
-expectedGetRecordDATACITE = <datacite:alternateIdentifier alternateIdentifierType="DOI">10.5072/0000-000D-2845-9</datacite:alternateIdentifier>
+checkGetRecordDatacite = hdl:21.T11991/0000-000D-2845-9
+expectedGetRecordDatacite = <datacite:alternateIdentifier alternateIdentifierType="DOI">10.5072/0000-000D-2845-9</datacite:alternateIdentifier>
# ListRecords
checkListRecordsDCSet = hdl:21.T11991/0000-001C-2AA6-8
@@ -15,8 +15,8 @@ checkListRecordsDCSetExpectedPages = 4
checkListRecordsDCFrom = 2018-07-02T16:00
checkListRecordsDCUntil = 2018-07-02T23:00
-checkListRecordsDATACITEFrom = 2018-07-02T16:00
-checkListRecordsDATACITEUntil = 2018-07-02T23:00
+checkListRecordsDataciteFrom = 2018-07-02T16:00
+checkListRecordsDataciteUntil = 2018-07-02T23:00
# ListIdentifiers
checkListIdentifiersSet = hdl:21.T11991/0000-001C-2AA6-8
diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
index ce8467a4641019d3df7e5429d39892f2ff057baa..262d799cc5f64f02bd58e962fd33da92065b5f61 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -13,8 +13,7 @@
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-3.1.xsd">
- <description>Configuration for the TextGrid/DARIAH-DE OAI-PMH Interface
- </description>
+ <description>Configuration for the DARIAH-DE OAI-PMH Interfaces</description>
<import resource="classpath:META-INF/cxf/cxf.xml" />
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
@@ -33,7 +32,7 @@
<!-- ES client beans -->
<bean id="ElasticSearchClient"
- class="info.textgrid.middleware.OAIPMHElasticSearchClient">
+ class="info.textgrid.middleware.OaipmhElasticSearchClient">
<constructor-arg index="0"
value="${elasticSearch.url}" />
<constructor-arg index="1"
@@ -45,7 +44,7 @@
</bean>
<bean id="NonpublicElasticSearchClient"
- class="info.textgrid.middleware.OAIPMHElasticSearchClient">
+ class="info.textgrid.middleware.OaipmhElasticSearchClient">
<constructor-arg index="0"
value="${elasticSearch.url}" />
<constructor-arg index="1"
@@ -59,27 +58,27 @@
<!-- Main class bean -->
- <bean id="oai" class="info.textgrid.middleware.OAIPMHImpl">
+ <bean id="oai" class="info.textgrid.middleware.OaipmhImpl">
<constructor-arg ref="RepIdentification" />
<constructor-arg ref="RecordDC" />
- <constructor-arg ref="RecordIDIOM" />
- <constructor-arg ref="RecordDATACITE" />
+ <constructor-arg ref="RecordIdiom" />
+ <constructor-arg ref="RecordDatacite" />
<constructor-arg ref="RecordListDC" />
- <constructor-arg ref="RecordListIDIOM" />
- <constructor-arg ref="RecordListDATACITE" />
+ <constructor-arg ref="RecordListIdiom" />
+ <constructor-arg ref="RecordListDatacite" />
<constructor-arg ref="${metadataFormatListInstance}" />
<constructor-arg ref="ListSet" />
<constructor-arg ref="ListIdentifierDC" />
- <constructor-arg ref="ListIdentifierIDIOM" />
- <constructor-arg ref="ListIdentifierDATACITE" />
- <constructor-arg ref="IDIOMImages" />
+ <constructor-arg ref="ListIdentifierIdiom" />
+ <constructor-arg ref="ListIdentifierDatacite" />
+ <constructor-arg ref="IdiomImages" />
<property name="textGrid" value="${textgrid}" />
<property name="dariah" value="${dariah}" />
</bean>
- <bean id="IDIOMImages"
- class="info.textgrid.middleware.IDIOMImages">
+ <bean id="IdiomImages"
+ class="info.textgrid.middleware.IdiomImages">
<property name="idiomTgcrudEndpoint"
value="${idiomTgcrudEndpoint}" />
<property name="idiomRbacSessionID"
@@ -153,8 +152,8 @@
<property name="oaiEsClient" ref="ElasticSearchClient" />
</bean>
- <bean id="RecordIDIOM"
- class="info.textgrid.middleware.RecordDelivererIDIOM">
+ <bean id="RecordIdiom"
+ class="info.textgrid.middleware.RecordDelivererIdiom">
<constructor-arg index="0" value="${textgrid}" />
<constructor-arg index="1" value="${dariah}" />
@@ -192,11 +191,11 @@
<property name="oaiEsClient"
ref="NonpublicElasticSearchClient" />
- <property name="idiomImages" ref="IDIOMImages" />
+ <property name="idiomImages" ref="IdiomImages" />
</bean>
- <bean id="RecordDATACITE"
- class="info.textgrid.middleware.RecordDelivererDATACITE">
+ <bean id="RecordDatacite"
+ class="info.textgrid.middleware.RecordDelivererDatacite">
<constructor-arg index="0" value="${textgrid}" />
<constructor-arg index="1" value="${dariah}" />
@@ -305,8 +304,8 @@
<property name="oaiEsClient" ref="ElasticSearchClient" />
</bean>
- <bean id="RecordListIDIOM"
- class="info.textgrid.middleware.RecordListDelivererIDIOM">
+ <bean id="RecordListIdiom"
+ class="info.textgrid.middleware.RecordListDelivererIdiom">
<constructor-arg index="0" value="${textgrid}" />
<constructor-arg index="1" value="${dariah}" />
@@ -333,11 +332,11 @@
<property name="oaiEsClient"
ref="NonpublicElasticSearchClient" />
- <property name="idiomRecord" ref="RecordIDIOM" />
+ <property name="idiomRecord" ref="RecordIdiom" />
</bean>
- <bean id="RecordListDATACITE"
- class="info.textgrid.middleware.RecordListDelivererDATACITE">
+ <bean id="RecordListDatacite"
+ class="info.textgrid.middleware.RecordListDelivererDatacite">
<constructor-arg index="0" value="${textgrid}" />
<constructor-arg index="1" value="${dariah}" />
@@ -360,7 +359,7 @@
<property name="specField" value="${specField}" />
<property name="oaiEsClient" ref="ElasticSearchClient" />
- <property name="dataciteRecord" ref="RecordDATACITE" />
+ <property name="dataciteRecord" ref="RecordDatacite" />
</bean>
<!-- Beans for verb=ListIdentifiers -->
@@ -387,8 +386,8 @@
<property name="oaiEsClient" ref="ElasticSearchClient" />
</bean>
- <bean id="ListIdentifierIDIOM"
- class="info.textgrid.middleware.IdentifierListDelivererIDIOM">
+ <bean id="ListIdentifierIdiom"
+ class="info.textgrid.middleware.IdentifierListDelivererIdiom">
<constructor-arg index="0" value="${textgrid}" />
<constructor-arg index="1" value="${dariah}" />
@@ -409,11 +408,11 @@
<property name="oaiEsClient"
ref="NonpublicElasticSearchClient" />
- <property name="idiomRecord" ref="RecordIDIOM" />
+ <property name="idiomRecord" ref="RecordIdiom" />
</bean>
- <bean id="ListIdentifierDATACITE"
- class="info.textgrid.middleware.IdentifierListDelivererDATACITE">
+ <bean id="ListIdentifierDatacite"
+ class="info.textgrid.middleware.IdentifierListDelivererDatacite">
<constructor-arg index="0" value="${textgrid}" />
<constructor-arg index="1" value="${dariah}" />