From cf48bbd26475e5f015a04d6e2826a9628714f2ec Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@yahoo.com>
Date: Fri, 24 Aug 2018 17:23:44 -0700
Subject: [PATCH] NOJIRA: Adding support to auto-init Place authority terms.

---
 .../client/CitationAuthorityClientUtils.java  | 22 ++++--------
 .../services/client/PlaceAuthorityClient.java | 11 +++---
 .../client/PlaceAuthorityClientUtils.java     | 34 +++++++++++++++----
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClientUtils.java b/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClientUtils.java
index 3a1b1e668..64271a069 100644
--- a/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClientUtils.java
+++ b/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClientUtils.java
@@ -158,18 +158,6 @@ public class CitationAuthorityClientUtils {
                 requestType.validStatusCodesAsString();
     }
     
-     public static List<CitationTermGroup> getTermGroupInstance(String identifier) {
-        if (Tools.isBlank(identifier)) {
-            identifier = getGeneratedIdentifier();
-        }
-        List<CitationTermGroup> terms = new ArrayList<CitationTermGroup>();
-        CitationTermGroup term = new CitationTermGroup();
-        term.setTermDisplayName(identifier);
-        term.setTermName(identifier);
-        terms.add(term);
-        return terms;
-    }
-    
     private static String getGeneratedIdentifier() {
         return "id" + new Date().getTime(); 
    }
@@ -183,10 +171,10 @@ public class CitationAuthorityClientUtils {
         
         final Map<String, List<String>> EMPTY_CITATION_REPEATABLES_INFO = new HashMap<String, List<String>>();
 
-        return createCitationInstance(null, citationInfo, terms, EMPTY_CITATION_REPEATABLES_INFO, serviceItemCommonPartName);
+        return createCitationInstance(citationInfo, terms, EMPTY_CITATION_REPEATABLES_INFO, serviceItemCommonPartName);
     }
 
-    private static PoxPayloadOut createCitationInstance(Object object, Map<String, String> citationInfo,
+    private static PoxPayloadOut createCitationInstance(Map<String, String> citationInfo,
             List<CitationTermGroup> terms, Map<String, List<String>> citationRepeatablesInfo,
             String serviceItemCommonPartName) {
         
@@ -220,7 +208,7 @@ public class CitationAuthorityClientUtils {
         if (Tools.isBlank(shortIdentifier)) {
             shortIdentifier = getGeneratedIdentifier();
         }
-        if (Tools.isBlank(shortIdentifier)) {
+        if (Tools.isBlank(displayName)) {
             displayName = shortIdentifier;
         }
         
@@ -231,5 +219,9 @@ public class CitationAuthorityClientUtils {
         terms.add(term);
         return terms;
     }
+    
+    private static List<CitationTermGroup> getTermGroupInstance(String identifier) {
+        return getTermGroupInstance(identifier, null);
+    }    
 
 }
diff --git a/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClient.java b/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClient.java
index 5723fbd71..140f2866d 100644
--- a/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClient.java
+++ b/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClient.java
@@ -88,9 +88,10 @@ public class PlaceAuthorityClient extends AuthorityClientImpl<PlaceauthoritiesCo
 		return poxPayloadout.asXML();
 	}
 
-	@Override
-	public String createAuthorityItemInstance(String shortIdentifier, String displayName) {
-		// TODO Auto-generated method stub
-		return null;
-	}
+    @Override
+    public String createAuthorityItemInstance(String shortIdentifier, String displayName) {
+        PoxPayloadOut placeAuthorityInstance = PlaceAuthorityClientUtils.createPlaceInstance(shortIdentifier,
+                displayName, SERVICE_ITEM_COMMON_PART_NAME);
+        return placeAuthorityInstance.asXML();
+    }
 }
diff --git a/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java b/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java
index b2ac7d84d..b92ffb259 100644
--- a/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java
+++ b/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java
@@ -3,12 +3,15 @@ package org.collectionspace.services.client;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
 import org.apache.commons.io.FileUtils;
+
 import org.collectionspace.services.PlaceJAXBSchema;
 import org.collectionspace.services.client.test.ServiceRequestType;
 import org.collectionspace.services.common.api.Tools;
@@ -16,6 +19,7 @@ import org.collectionspace.services.place.PlaceTermGroup;
 import org.collectionspace.services.place.PlaceTermGroupList;
 import org.collectionspace.services.place.PlaceauthoritiesCommon;
 import org.collectionspace.services.place.PlacesCommon;
+
 import org.dom4j.DocumentException;
 import org.jboss.resteasy.client.ClientResponse;
 import org.slf4j.Logger;
@@ -275,20 +279,38 @@ public class PlaceAuthorityClientUtils {
 		return newStr.toString();
     }
     
-    public static List<PlaceTermGroup> getTermGroupInstance(String identifier) {
-        if (Tools.isBlank(identifier)) {
-            identifier = getGeneratedIdentifier();
+    private static List<PlaceTermGroup> getTermGroupInstance(String shortIdentifier, String displayName) {
+        if (Tools.isBlank(shortIdentifier)) {
+            shortIdentifier = getGeneratedIdentifier();
         }
+        if (Tools.isBlank(shortIdentifier)) {
+            displayName = shortIdentifier;
+        }
+        
         List<PlaceTermGroup> terms = new ArrayList<PlaceTermGroup>();
         PlaceTermGroup term = new PlaceTermGroup();
-        term.setTermDisplayName(identifier);
-        term.setTermName(identifier);
+        term.setTermDisplayName(displayName);
+        term.setTermName(shortIdentifier);
         terms.add(term);
         return terms;
+    }    
+    
+    public static List<PlaceTermGroup> getTermGroupInstance(String identifier) {
+        return getTermGroupInstance(identifier, null);
     }
     
     private static String getGeneratedIdentifier() {
         return "id" + new Date().getTime(); 
-   }
+    }
+    
+    public static PoxPayloadOut createPlaceInstance(String shortIdentifier, String displayName,
+            String serviceItemCommonPartName) {
+        List<PlaceTermGroup> terms = getTermGroupInstance(shortIdentifier, displayName);
+        
+        Map<String, String> placeInfo = new HashMap<String, String>();
+        placeInfo.put(PlaceJAXBSchema.SHORT_IDENTIFIER, shortIdentifier);
+
+        return createPlaceInstance(null, placeInfo, terms, serviceItemCommonPartName);
+    }
     
 }
-- 
2.47.3