NOJIRA: Added support to Work and Citation to allow them to be initialized with confi...

diff --git a/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java b/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java
index 4eb49e814672b8d23c2c4279327dcc88c1d250c6..8403b7d218602659b96b7fae5943ee044d710f27 100644 (file)
--- a/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java
+++ b/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java
@@ -97,7 +97,7 @@ public class CitationAuthorityClient extends AuthorityClientImpl<Citationauthori
 
        @Override
        public String createAuthorityItemInstance(String shortIdentifier, String displayName) {
-               // TODO Auto-generated method stub
-               return null;
-       }
+        PoxPayloadOut citationAuthorityInstance = CitationAuthorityClientUtils.createCitationInstance(shortIdentifier, displayName, SERVICE_ITEM_COMMON_PART_NAME);
+        return citationAuthorityInstance.asXML();
+    }
 }

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 7cee06e85ded769668f8a09896606a873d0c1d2e..3a1b1e668ec0f490b0d16289b2c4a55142b1f273 100644 (file)
--- 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
@@ -3,17 +3,24 @@ 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.CitationJAXBSchema;
 import org.collectionspace.services.citation.CitationTermGroup;
+import org.collectionspace.services.citation.CitationTermGroupList;
 import org.collectionspace.services.citation.CitationauthoritiesCommon;
+import org.collectionspace.services.citation.CitationsCommon;
 import org.collectionspace.services.client.test.ServiceRequestType;
 import org.collectionspace.services.common.api.Tools;
+
 import org.dom4j.DocumentException;
 import org.jboss.resteasy.client.ClientResponse;
 import org.slf4j.Logger;
@@ -167,4 +174,62 @@ public class CitationAuthorityClientUtils {
         return "id" + new Date().getTime(); 
    }
 
+    public static PoxPayloadOut createCitationInstance(String shortIdentifier, String displayName,
+            String serviceItemCommonPartName) {
+        List<CitationTermGroup> terms = getTermGroupInstance(shortIdentifier, displayName);
+        
+        Map<String, String> citationInfo = new HashMap<String, String>();
+        citationInfo.put(CitationJAXBSchema.SHORT_IDENTIFIER, shortIdentifier);
+        
+        final Map<String, List<String>> EMPTY_CITATION_REPEATABLES_INFO = new HashMap<String, List<String>>();
+
+        return createCitationInstance(null, citationInfo, terms, EMPTY_CITATION_REPEATABLES_INFO, serviceItemCommonPartName);
+    }
+
+    private static PoxPayloadOut createCitationInstance(Object object, Map<String, String> citationInfo,
+            List<CitationTermGroup> terms, Map<String, List<String>> citationRepeatablesInfo,
+            String serviceItemCommonPartName) {
+        
+        CitationsCommon citation = new CitationsCommon();
+        String shortId = citationInfo.get(CitationJAXBSchema.SHORT_IDENTIFIER);
+        if (shortId == null || shortId.isEmpty()) {
+            throw new IllegalArgumentException("shortIdentifier cannot be null or empty");
+        }       
+        citation.setShortIdentifier(shortId);
+        
+        // Set values in the Term Information Group
+        CitationTermGroupList termList = new CitationTermGroupList();
+        if (terms == null || terms.isEmpty()) {
+            terms = getTermGroupInstance(getGeneratedIdentifier());
+        }
+        termList.getCitationTermGroup().addAll(terms); 
+        citation.setCitationTermGroupList(termList);
+
+        PoxPayloadOut multipart = new PoxPayloadOut(CitationAuthorityClient.SERVICE_ITEM_PAYLOAD_NAME);
+        PayloadOutputPart commonPart = multipart.addPart(citation, MediaType.APPLICATION_XML_TYPE);
+        commonPart.setLabel(serviceItemCommonPartName);
+
+        if (logger.isDebugEnabled()){
+                logger.debug("to be created, organization common ", citation, CitationsCommon.class);
+        }
+
+        return multipart;
+    }
+
+    private static List<CitationTermGroup> getTermGroupInstance(String shortIdentifier, String displayName) {
+        if (Tools.isBlank(shortIdentifier)) {
+            shortIdentifier = getGeneratedIdentifier();
+        }
+        if (Tools.isBlank(shortIdentifier)) {
+            displayName = shortIdentifier;
+        }
+        
+        List<CitationTermGroup> terms = new ArrayList<CitationTermGroup>();
+        CitationTermGroup term = new CitationTermGroup();
+        term.setTermDisplayName(displayName);
+        term.setTermName(shortIdentifier);
+        terms.add(term);
+        return terms;
+    }
+
 }

diff --git a/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClient.java b/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClient.java
index 8057795eb5436a143fae51d62bc1af16c8d3adf1..d537096c3221b07f342ee422d4f9227860546612 100644 (file)
--- a/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClient.java
+++ b/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClient.java
@@ -90,7 +90,7 @@ public class WorkAuthorityClient extends AuthorityClientImpl<WorkauthoritiesComm
 
        @Override
        public String createAuthorityItemInstance(String shortIdentifier, String displayName) {
-               // TODO Auto-generated method stub
-               return null;
-       }
+        PoxPayloadOut workAuthorityInstance = WorkAuthorityClientUtils.createWorkInstance(shortIdentifier, displayName, SERVICE_ITEM_COMMON_PART_NAME);
+        return workAuthorityInstance.asXML();
+    }
 }

diff --git a/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClientUtils.java b/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClientUtils.java
index 980d4d3d6eb528a670bb2b02f9c689e7397c5a50..81ef2739fd18f1a175ccd5a2edd7227a1549975e 100644 (file)
--- a/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClientUtils.java
+++ b/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClientUtils.java
@@ -3,12 +3,14 @@ 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.WorkJAXBSchema;
 import org.collectionspace.services.client.test.ServiceRequestType;
 import org.collectionspace.services.common.api.Tools;
@@ -16,6 +18,7 @@ import org.collectionspace.services.work.WorkTermGroup;
 import org.collectionspace.services.work.WorkTermGroupList;
 import org.collectionspace.services.work.WorkauthoritiesCommon;
 import org.collectionspace.services.work.WorksCommon;
+
 import org.dom4j.DocumentException;
 import org.jboss.resteasy.client.ClientResponse;
 import org.slf4j.Logger;
@@ -287,8 +290,66 @@ public class WorkAuthorityClientUtils {
         return terms;
     }
     
+    private static List<WorkTermGroup> getTermGroupInstance(String shortIdentifier, String displayName) {
+        if (Tools.isBlank(shortIdentifier)) {
+            shortIdentifier = getGeneratedIdentifier();
+        }
+        if (Tools.isBlank(shortIdentifier)) {
+            displayName = shortIdentifier;
+        }
+        
+        List<WorkTermGroup> terms = new ArrayList<WorkTermGroup>();
+        WorkTermGroup term = new WorkTermGroup();
+        term.setTermDisplayName(displayName);
+        term.setTermName(shortIdentifier);
+        terms.add(term);
+        return terms;
+    }
+    
     private static String getGeneratedIdentifier() {
         return "id" + new Date().getTime(); 
    }
     
+    public static PoxPayloadOut createWorkInstance(String shortIdentifier, String displayName,
+            String serviceItemCommonPartName) {
+        List<WorkTermGroup> terms = getTermGroupInstance(shortIdentifier, displayName);
+        
+        Map<String, String> workInfo = new HashMap<String, String>();
+        workInfo.put(WorkJAXBSchema.SHORT_IDENTIFIER, shortIdentifier);
+        
+        final Map<String, List<String>> EMPTY_WORK_REPEATABLES_INFO = new HashMap<String, List<String>>();
+
+        return createWorkInstance(null, workInfo, terms, EMPTY_WORK_REPEATABLES_INFO, serviceItemCommonPartName);
+    }
+
+    private static PoxPayloadOut createWorkInstance(Object object, Map<String, String> orgInfo,
+            List<WorkTermGroup> terms, Map<String, List<String>> workRepeatablesInfo,
+            String serviceItemCommonPartName) {
+        
+        WorksCommon work = new WorksCommon();
+        String shortId = orgInfo.get(WorkJAXBSchema.SHORT_IDENTIFIER);
+        if (shortId == null || shortId.isEmpty()) {
+            throw new IllegalArgumentException("shortIdentifier cannot be null or empty");
+        }       
+        work.setShortIdentifier(shortId);
+        
+        // Set values in the Term Information Group
+        WorkTermGroupList termList = new WorkTermGroupList();
+        if (terms == null || terms.isEmpty()) {
+            terms = getTermGroupInstance(getGeneratedIdentifier());
+        }
+        termList.getWorkTermGroup().addAll(terms); 
+        work.setWorkTermGroupList(termList);
+        
+        PoxPayloadOut multipart = new PoxPayloadOut(WorkAuthorityClient.SERVICE_ITEM_PAYLOAD_NAME);
+        PayloadOutputPart commonPart = multipart.addPart(work, MediaType.APPLICATION_XML_TYPE);
+        commonPart.setLabel(serviceItemCommonPartName);
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("to be created, organization common ", work, WorksCommon.class);
+        }
+
+        return multipart;
+    }
+    
 }