From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 7 May 2012 21:26:02 +0000 (-0700)
Subject: CSPACE-5155: Minor change to boilerplate generation of term lists, used in client... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=8befd2fb4f41c6a1d6bc42d714e6386b99e0014c;p=tmp%2Fjakarta-migration.git

CSPACE-5155: Minor change to boilerplate generation of term lists, used in client tests.
---

diff --git a/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java b/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java
index 992cedae8..41f514470 100644
--- a/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java
+++ b/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java
@@ -11,6 +11,7 @@ import javax.ws.rs.core.Response;
 import org.apache.commons.io.FileUtils;
 import org.collectionspace.services.LocationJAXBSchema;
 import org.collectionspace.services.client.test.ServiceRequestType;
+import org.collectionspace.services.common.api.Tools;
 import org.collectionspace.services.location.*;
 import org.dom4j.DocumentException;
 import org.jboss.resteasy.client.ClientResponse;
@@ -300,6 +301,9 @@ public class LocationAuthorityClientUtils {
     }
     
     public static List<LocTermGroup> getTermGroupInstance(String identifier) {
+        if (Tools.isBlank(identifier)) {
+            identifier = getGeneratedIdentifier();
+        }
         List<LocTermGroup> terms = new ArrayList<LocTermGroup>();
         LocTermGroup term = new LocTermGroup();
         term.setTermDisplayName(identifier);
diff --git a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
index 8c60df3b7..7ada74135 100644
--- a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
+++ b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
@@ -26,6 +26,7 @@ import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
 import org.collectionspace.services.OrganizationJAXBSchema;
 import org.collectionspace.services.client.test.ServiceRequestType;
+import org.collectionspace.services.common.api.Tools;
 import org.collectionspace.services.organization.ContactNameList;
 import org.collectionspace.services.organization.FunctionList;
 import org.collectionspace.services.organization.GroupList;
@@ -389,6 +390,9 @@ public class OrgAuthorityClientUtils {
     }
 
     public static List<OrgTermGroup> getTermGroupInstance(String identifier) {
+        if (Tools.isBlank(identifier)) {
+            identifier = getGeneratedIdentifier();
+        }
         List<OrgTermGroup> terms = new ArrayList<OrgTermGroup>();
         OrgTermGroup term = new OrgTermGroup();
         term.setTermDisplayName(identifier);
diff --git a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java
index 50563e42c..83ccfd6e3 100644
--- a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java
+++ b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
 
 import org.collectionspace.services.PersonJAXBSchema;
 import org.collectionspace.services.client.test.ServiceRequestType;
+import org.collectionspace.services.common.api.Tools;
 import org.collectionspace.services.person.GroupList;
 import org.collectionspace.services.person.NationalityList;
 import org.collectionspace.services.person.OccupationList;
@@ -448,6 +449,9 @@ public class PersonAuthorityClientUtils {
     }
     
     public static List<PersonTermGroup> getTermGroupInstance(String identifier) {
+        if (Tools.isBlank(identifier)) {
+            identifier = getGeneratedIdentifier();
+        }
         List<PersonTermGroup> terms = new ArrayList<PersonTermGroup>();
         PersonTermGroup term = new PersonTermGroup();
         term.setTermDisplayName(identifier);