CSPACE-5137: Fixed error in comparison logic in authority item validator handlers.

diff --git a/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java b/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java
index 1bd1a5b56d2f4e31303d1c099508cdaf7cc145fc..12a758aac0807fdfd31ea67f16e843685be7af52 100644 (file)
--- a/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java
+++ b/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java
@@ -138,7 +138,7 @@ public class ConceptValidatorHandler extends ValidatorHandlerImpl {
         ConceptTermGroupList termGroupList = concept.getConceptTermGroupList();
         List<ConceptTermGroup> termGroups = termGroupList.getConceptTermGroup();
         for (ConceptTermGroup termGroup : termGroups) {
-            if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) {
+            if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) {
                 return false;
             }
         }

diff --git a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java
index ac1e52f0d1a108dc84aa8500f4a3e4f0e0452ae5..fd72db9ab775e73002b372a33206b4b69744528d 100644 (file)
--- a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java
+++ b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java
@@ -138,7 +138,7 @@ public class LocationValidatorHandler extends ValidatorHandlerImpl {
         LocTermGroupList termGroupList = person.getLocTermGroupList();
         List<LocTermGroup> termGroups = termGroupList.getLocTermGroup();
         for (LocTermGroup termGroup : termGroups) {
-            if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) {
+            if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) {
                 return false;
             }
         }

diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java
index 36b4acadd747b2784cd62111fc9bd1bdf5a353cb..a48aa48996139118ef927b61cda9d7fceb31ba4b 100644 (file)
--- a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java
+++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java
@@ -138,7 +138,7 @@ public class OrganizationValidatorHandler extends ValidatorHandlerImpl {
         OrgTermGroupList termGroupList = organization.getOrgTermGroupList();
         List<OrgTermGroup> termGroups = termGroupList.getOrgTermGroup();
         for (OrgTermGroup termGroup : termGroups) {
-            if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) {
+            if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) {
                 return false;
             }
         }

diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java
index 2066c5c1134ad1ee34453323b116ae5b2e94704c..bca6a4fdf7bbb97d293d1a5e96f180a3256b639b 100644 (file)
--- a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java
+++ b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java
@@ -137,7 +137,7 @@ public class PersonValidatorHandler extends ValidatorHandlerImpl {
         PersonTermGroupList termGroupList = person.getPersonTermGroupList();
         List<PersonTermGroup> termGroups = termGroupList.getPersonTermGroup();
         for (PersonTermGroup termGroup : termGroups) {
-            if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) {
+            if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) {
                 return false;
             }
         }

diff --git a/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java b/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java
index d5c2c5d87eb207d47d5dceb24f30eecf9afcdf09..9b330b5e36f2985b7e48cdd58b5ad250b778d81f 100644 (file)
--- a/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java
+++ b/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java
@@ -139,7 +139,7 @@ public class PlaceValidatorHandler extends ValidatorHandlerImpl {
         PlaceTermGroupList termGroupList = place.getPlaceTermGroupList();
         List<PlaceTermGroup> termGroups = termGroupList.getPlaceTermGroup();
         for (PlaceTermGroup termGroup : termGroups) {
-            if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) {
+            if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) {
                 return false;
             }
         }

diff --git a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java
index 51b85ff947f8e3e50e41776ab8baf82970d6aa70..7d455a36c3e84eaf95eb361f848703579924476e 100644 (file)
--- a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java
+++ b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java
@@ -138,7 +138,7 @@ public class TaxonValidatorHandler extends ValidatorHandlerImpl {
         TaxonTermGroupList termGroupList = organization.getTaxonTermGroupList();
         List<TaxonTermGroup> termGroups = termGroupList.getTaxonTermGroup();
         for (TaxonTermGroup termGroup : termGroups) {
-            if (Tools.isBlank(termGroup.getTermName()) || Tools.isBlank(termGroup.getTermDisplayName())) {
+            if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) {
                 return false;
             }
         }