CSPACE-3311 acquisition return primary value of owner and acquisitionSource in summar...

diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
index cadcaedc96e0706b826ab3484b0230a1bf3908ea..5863acaddbf976aa38b247fb2dee50c4b1a6805a 100644 (file)
--- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
+++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
@@ -414,11 +414,10 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl {
                     item.getCsid());
                 logger.debug(testName + ": list-item[" + i + "] objectNumber=" +
                     item.getAcquisitionReferenceNumber());
-                logger.debug(testName + ": list-item[" + i + "] acquisitionSources:");
-                AcquisitionSourceList acqSource = item.getAcquisitionSources();
-                for (String acquisitionSource : acqSource.getAcquisitionSource()) {
-                    logger.debug("acquisitionSource=" + acquisitionSource);
-                }
+                logger.debug(testName + ": list-item[" + i + "] acquisitionSource=" +
+                    item.getAcquisitionSource());
+                logger.debug(testName + ": list-item[" + i + "] owner=" +
+                    item.getOwner());
                 logger.debug(testName + ": list-item[" + i + "] URI=" +
                     item.getUri());
                 i++;

diff --git a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
index 9ee57f594d57c8ef909454fd09e501effd738b04..cde3b8e75d9ff965df3b8826f40a99978118a35c 100644 (file)
--- a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
+++ b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
@@ -2,8 +2,13 @@ package org.collectionspace.services;
 \r
 public interface AcquisitionListItemJAXBSchema {\r
        final static String ACQUISITION_REFERENCE_NUMBER = "acquisitionReferenceNumber";\r
-       final static String ACQUISITION_SOURCES = "acquisitionSources";\r
-       final static String OWNERS = "owners";\r
-       final static String CSID = "csid";\r
+    final static String ACQUISITION_SOURCE = "acquisitionSource";\r
+    final static String ACQUISITION_SOURCES = "acquisitionSources";\r
+    //final static String ACQUISITION_SOURCE_LIST = "acquisitionSourceList";\r
+\r
+    final static String OWNER = "owner";\r
+    final static String OWNERS = "owners";\r
+    //final static String OWNER_LIST = "ownerList";\r
+    final static String CSID = "csid";\r
        final static String URI = "url";\r
 }\r

diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index c6dd5a403e77d4846cfcdf6ae4cf6a97ee3652f5..ac8d05288fc355260cc05d6a0975c9038c14b6c4 100644 (file)
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -123,9 +123,9 @@
                                 <xs:sequence>
                                     <xs:element name="acquisitionReferenceNumber" type="xs:string"
                                         minOccurs="1" />
-                                    <xs:element name="acquisitionSources" type="acquisitionSourceList"
+                                    <xs:element name="acquisitionSource" type="xs:string"
                                         minOccurs="1" />
-                                    <xs:element name="owners" type="ownerList"
+                                    <xs:element name="owner" type="xs:string"
                                         minOccurs="1" />
                                     <!-- uri to retrive acquisition details -->
                                     <xs:element name="uri" type="xs:anyURI"

diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
index ce32851fc150ccf41e486355478d5d53d1fc44bc..6267b2c72b833534574a97ed517d498782f67f7f 100644 (file)
--- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
+++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
@@ -119,28 +119,17 @@ public class AcquisitionDocumentModelHandler
         while (iter.hasNext()) {
             DocumentModel docModel = iter.next();
             AcquisitionListItem listItem = new AcquisitionListItem();
+
             listItem.setAcquisitionReferenceNumber((String) docModel.getProperty(label,
                     AcquisitionListItemJAXBSchema.ACQUISITION_REFERENCE_NUMBER));
-            
-            // docModel.getProperty returns an ArrayList here.
-            List<String> acquisitionSources =
-                 (List<String>) docModel.getProperty(label,
-                     AcquisitionListItemJAXBSchema.ACQUISITION_SOURCES);
-            AcquisitionSourceList acquisitionSourceList = new AcquisitionSourceList();
-            for (String acquisitionSource : acquisitionSources) {
-                  acquisitionSourceList.getAcquisitionSource().add(acquisitionSource);
-            }
-            listItem.setAcquisitionSources(acquisitionSourceList);
-
-            // and here ...
-            List<String> owners = 
-                 (List<String>) docModel.getProperty(label,
-                     AcquisitionListItemJAXBSchema.OWNERS);
-            OwnerList ownerList = new OwnerList();
-            for (String owner : owners) {
-                  ownerList.getOwner().add(owner);
-            }
-            listItem.setOwners(ownerList);
+
+            List<Object> acquisitionSources =(List<Object>) docModel.getProperty(label,AcquisitionListItemJAXBSchema.ACQUISITION_SOURCES);
+            String primaryAcquisitionSource = primaryValueFromMultivalue(acquisitionSources,AcquisitionListItemJAXBSchema.ACQUISITION_SOURCE);
+            listItem.setAcquisitionSource(primaryAcquisitionSource);
+
+            List<Object> owners =(List<Object>) docModel.getProperty(label,AcquisitionListItemJAXBSchema.OWNERS);
+            String primaryOwner = primaryValueFromMultivalue(owners,AcquisitionListItemJAXBSchema.OWNER);
+            listItem.setOwner(primaryOwner);
 
             //need fully qualified context for URI
             String id = NuxeoUtils.extractId(docModel.getPathAsString());