CSPACE-5119,CSPACE-5135: Updated common fields in repeatable term information group...

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 60bcc7b6ecd7d18373b91de95f0147852615cbcf..fd60d287a3960367563b3f72ee35f63e0c003f4d 100644 (file)
--- 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
@@ -288,7 +288,7 @@ public class PersonAuthorityClientUtils {
         \r
         String displayName = "";\r
         if (terms !=null && terms.size() > 0) {\r
-            displayName = terms.get(0).getDisplayName();\r
+            displayName = terms.get(0).getTermDisplayName();\r
         }\r
        \r
        if(logger.isDebugEnabled()){\r

diff --git a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthoritySearchTest.java b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthoritySearchTest.java
index 675d303eafc9f47160f4073aef2350223668b0cc..a9b1cf7dc0673726eda6de52f7c42d1e38e9f010 100644 (file)
--- a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthoritySearchTest.java
+++ b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthoritySearchTest.java
@@ -612,8 +612,8 @@ public class PersonAuthoritySearchTest extends BaseServiceTest<AbstractCommonLis
         
         List<PersonTermGroup> partialTerms = new ArrayList<PersonTermGroup>();
         PersonTermGroup term = new PersonTermGroup();
-        term.setDisplayName(TEST_PARTIAL_TERM_DISPLAY_NAME_UNICODE);
-        term.setTerm(TEST_PARTIAL_TERM_DISPLAY_NAME_UNICODE);
+        term.setTermDisplayName(TEST_PARTIAL_TERM_DISPLAY_NAME_UNICODE);
+        term.setTermName(TEST_PARTIAL_TERM_DISPLAY_NAME_UNICODE);
         term.setForeName(TEST_PARTIAL_TERM_FORE_NAME);
         term.setSurName(TEST_PARTIAL_TERM_SUR_NAME_UNICODE);
         partialTerms.add(term);
@@ -631,7 +631,7 @@ public class PersonAuthoritySearchTest extends BaseServiceTest<AbstractCommonLis
         partialTermPersonMap.put(PersonJAXBSchema.SHORT_IDENTIFIER, TEST_SHORT_ID_QUOTE );
         partialTermPersonMap.put(PersonJAXBSchema.BIO_NOTE, TEST_KWD_BIO_NOTE_DBL_QUOTES);
         
-        partialTerms.get(0).setDisplayName(TEST_PARTIAL_TERM_DISPLAY_NAME_QUOTE);
+        partialTerms.get(0).setTermDisplayName(TEST_PARTIAL_TERM_DISPLAY_NAME_QUOTE);
         partialTerms.get(0).setSurName(TEST_PARTIAL_TERM_SUR_NAME_QUOTE);
 
         createItem(testName, authorityCsid, null /*authRefName*/, client, 

diff --git a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServicePerfTest.java b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServicePerfTest.java
index d475409d963e0c32bf08cd3bfee76c766e27e268..158326ae18c08e360259531dc63fe5b6cd508721 100644 (file)
--- a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServicePerfTest.java
+++ b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServicePerfTest.java
@@ -207,8 +207,8 @@ public class PersonAuthorityServicePerfTest extends BaseServiceTest<AbstractComm
         
         List<PersonTermGroup> terms = new ArrayList<PersonTermGroup>();
         PersonTermGroup term = new PersonTermGroup();
-        term.setDisplayName(firstName + " " + lastName);
-        term.setTerm(firstName + " " + lastName);
+        term.setTermDisplayName(firstName + " " + lastName);
+        term.setTermName(firstName + " " + lastName);
         term.setForeName(firstName);
         term.setSurName(lastName);
         terms.add(term);

diff --git a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java
index 32cb21cc7708dfb3c961ac20b656dc86c3b49432..fab22ad46957b9fa5baab77e514a5c69379b71f4 100644 (file)
--- a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java
+++ b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java
@@ -192,8 +192,8 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest<Per
         
         List<PersonTermGroup> terms = new ArrayList<PersonTermGroup>();
         PersonTermGroup term = new PersonTermGroup();
-        term.setDisplayName("John Wayne Temp");
-        term.setTerm("JohnWayneTemp");
+        term.setTermDisplayName("John Wayne Temp");
+        term.setTermName("JohnWayneTemp");
         terms.add(term);
         
         return PersonAuthorityClientUtils.createPersonInstance(parentCsid, identifier, personInfo, terms, headerLabel);
@@ -233,8 +233,8 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest<Per
 
         List<PersonTermGroup> johnWayneTerms = new ArrayList<PersonTermGroup>();
         PersonTermGroup term = new PersonTermGroup();
-        term.setDisplayName("John Wayne DisplayName");
-        term.setTerm("John Wayne");
+        term.setTermDisplayName("John Wayne DisplayName");
+        term.setTermName("John Wayne");
         term.setForeName(TEST_FORE_NAME);
         term.setSurName(TEST_SUR_NAME);
         johnWayneTerms.add(term);
@@ -419,8 +419,8 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest<Per
         
         List<PersonTermGroup> terms = new ArrayList<PersonTermGroup>();
         PersonTermGroup term = new PersonTermGroup();
-        term.setDisplayName(shortId);
-        term.setTerm(shortId);
+        term.setTermDisplayName(shortId);
+        term.setTermName(shortId);
         terms.add(term);
         
         final Map NULL_REPEATABLE_FIELD_PROPERTIES = null;
@@ -663,8 +663,8 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest<Per
         // Try to Update with no displayName
         List<PersonTermGroup> johnWayneTerms = new ArrayList<PersonTermGroup>();
         PersonTermGroup term = new PersonTermGroup();
-        term.setDisplayName("John Wayne DisplayName");
-        term.setTerm("John Wayne");
+        term.setTermDisplayName("John Wayne DisplayName");
+        term.setTermName("John Wayne");
         term.setForeName(TEST_FORE_NAME);
         term.setSurName(TEST_SUR_NAME);
         johnWayneTerms.add(term);
@@ -673,7 +673,7 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest<Per
         Assert.assertNotNull(termList);
         List<PersonTermGroup> terms = termList.getPersonTermGroup();
         Assert.assertNotNull(terms);
-        terms.get(0).setDisplayName(null);
+        terms.get(0).setTermDisplayName(null);
 
         // Submit the updated resource to the service and store the response.
         PoxPayloadOut output = new PoxPayloadOut(PersonAuthorityClient.SERVICE_ITEM_PAYLOAD_NAME);