Merge branch 'develop' into 'main'

New RELEASE :-D

See merge request dariah-de/dariah-de-oai-pmh-services!82

oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDatacite.java

@@ -181,7 +181,7 @@ public class RecordDelivererDatacite extends RecordDelivererAbstract {
     Resource result = new Resource();
 
     Titles titles = addTitles();
-    if (!titles.getTitle().isEmpty()) {
+    if (titles != null && !titles.getTitle().isEmpty()) {
       result.setTitles(titles);
     }
     String publisher = addPublisher();
@@ -193,11 +193,11 @@ public class RecordDelivererDatacite extends RecordDelivererAbstract {
       result.setPublicationYear(publicationYear);
     }
     Dates dates = this.addDates();
-    if (!dates.getDate().isEmpty()) {
+    if (dates != null && !dates.getDate().isEmpty()) {
       result.setDates(dates);
     }
     Contributors contributors = addContributors();
-    if (!contributors.getContributor().isEmpty()) {
+    if (contributors != null && !contributors.getContributor().isEmpty()) {
       result.setContributors(contributors);
     }
     String language = addLanguage();
@@ -205,39 +205,40 @@ public class RecordDelivererDatacite extends RecordDelivererAbstract {
       result.setLanguage(language);
     }
     AlternateIdentifiers alternateIdentifiers = addAlternateIdentifiers();
-    if (!alternateIdentifiers.getAlternateIdentifier().isEmpty()) {
+    if (alternateIdentifiers != null && !alternateIdentifiers.getAlternateIdentifier().isEmpty()) {
       result.setAlternateIdentifiers(alternateIdentifiers);
     }
     Formats formats = addFormats();
-    if (!formats.getFormat().isEmpty()) {
+    if (formats != null && !formats.getFormat().isEmpty()) {
       result.setFormats(formats);
     }
     RightsList rights = addRights();
-    if (!rights.getRights().isEmpty()) {
+    if (rights != null && !rights.getRights().isEmpty()) {
       result.setRightsList(rights);
     }
     Descriptions descriptions = addDescriptions();
-    if (!descriptions.getDescription().isEmpty()) {
+    if (descriptions != null && !descriptions.getDescription().isEmpty()) {
       result.setDescriptions(descriptions);
     }
     RelatedIdentifiers relatedIdentifiers = addRelatedIdentifiers();
-    if (!relatedIdentifiers.getRelatedIdentifier().isEmpty()) {
+    if (relatedIdentifiers != null && !relatedIdentifiers.getRelatedIdentifier().isEmpty()) {
       result.setRelatedIdentifiers(relatedIdentifiers);
     }
     Identifier identifier = addIdentifier();
-    if (!identifier.getValue().isEmpty() && !identifier.getIdentifierType().isEmpty()) {
+    if (identifier != null && !identifier.getValue().isEmpty()
+        && identifier.getIdentifierType() != null && !identifier.getIdentifierType().isEmpty()) {
       result.setIdentifier(identifier);
     }
     Creators creators = addCreators();
-    if (!creators.getCreator().isEmpty()) {
+    if (creators != null && !creators.getCreator().isEmpty()) {
       result.setCreators(creators);
     }
     GeoLocations geoLocations = addGeoLocation();
-    if (!geoLocations.getGeoLocation().isEmpty()) {
+    if (geoLocations != null && !geoLocations.getGeoLocation().isEmpty()) {
       result.setGeoLocations(geoLocations);
     }
     ResourceType resourceType = addResourceType();
-    if (!resourceType.getValue().isEmpty()) {
+    if (resourceType != null && !resourceType.getValue().isEmpty()) {
       result.setResourceType(resourceType);
     }
     String version = addVersion();
@@ -245,11 +246,11 @@ public class RecordDelivererDatacite extends RecordDelivererAbstract {
       result.setVersion(version);
     }
     Subjects subjects = addSubjects();
-    if (!subjects.getSubject().isEmpty()) {
+    if (subjects != null && !subjects.getSubject().isEmpty()) {
       result.setSubjects(subjects);
     }
     Sizes sizes = addSizes();
-    if (!sizes.getSize().isEmpty()) {
+    if (sizes != null && !sizes.getSize().isEmpty()) {
       result.setSizes(sizes);
     }
 

oaipmh-core/src/test/java/info/textgrid/middleware/test/online/OaipmhUtilitiesOnline.java

@@ -48,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;

oaipmh-core/src/test/resources/oaipmh.test.textgridlab-org.properties

@@ -6,7 +6,7 @@ checkGetRecordDC = textgrid:vqn0.0
 expectedGetRecordDC = Heidi
 
 checkGetRecordDatacite = textgrid:mq05.0
-expectedGetRecordDatacite = Weise Klugredenn
+expectedGetRecordDatacite = Wer dich kennt - der kaufft dich nit
 
 checkGetRecordIdiom = textgrid:2sg18.0
 expectedGetRecordIdiom = Aguateca