DRYD-1378: Updates for objectCountGroup (#389)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml
index 5d46bb54f5426394d8d8e05cff6a7b7f20770788..338484b2965682bf439ea2daeb1f4eafa2ec794c 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml
@@ -4,6 +4,7 @@
 <briefDescriptions> <briefDescription> briefDescription</briefDescription></briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>1</numberOfObjects>
+<objectCountGroupList> <objectCountGroup><objectCount>1</objectCount></objectCountGroup></objectCountGroupList>
 <!-- test whitespace as first child node -->
 <responsibleDepartments> <responsibleDepartment> responsibleDept1</responsibleDepartment><responsibleDepartment>responsibleDept2</responsibleDepartment></responsibleDepartments>
 <titleGroupList><titleGroup><title>title</title></titleGroup></titleGroupList>

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml
index 8a24b2e0739d748c825a0a2b7137059ca17ec877..998f9241391d3bb8347aaebb669c883544599c4d 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml
@@ -8,6 +8,11 @@
 </briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>1</numberOfObjects>
+<objectCountGroupList>
+<objectCountGroup>
+<objectCount>1</objectCount>
+</objectCountGroup>
+</objectCountGroupList>
 <!-- test newline whitespace -->
 <responsibleDepartments>
 <responsibleDepartment>responsibleDept1</responsibleDepartment>

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml
index 1d6d30e5d0fb83657087b7b2ea854edf9d7cdc48..2ca0df5eb44b3c9e5b1e7046ec41d675f5f5456c 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml
@@ -10,6 +10,13 @@
 
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>1</numberOfObjects>
+
+<objectCountGroupList>
+<objectCountGroup>
+<objectCount>1</objectCount>
+</objectCountGroup>
+</objectCountGroupList>
+
 <!-- test newline whitespace -->
 <responsibleDepartments>
 <!-- test childnode as whitespace -->

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml
index b692b2ca5cd5a7cf31623a240a3f4195c6a32f3a..762de165066c5cab0303dbe9b12039b371546b74 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml
@@ -8,6 +8,11 @@
 </briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>1</numberOfObjects>
+<objectCountGroupList>
+    <objectCountGroup>
+        <objectCount>1</objectCount>
+    </objectCountGroup>
+</objectCountGroupList>
 <!-- test newline and tab whitespace -->
 <responsibleDepartments>
     <responsibleDepartment>responsibleDept1</responsibleDepartment>

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml
index 6eea3b41cd2f18eee87d63f63225adf012c83170..ca314afc4dab9907a406fc54865206d230044665 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml
@@ -5,6 +5,11 @@
   <comments>comments</comments>
   <distinguishingFeatures>distFeatures</distinguishingFeatures>
   <numberOfObjects>1</numberOfObjects>
+  <objectCountGroupList>
+    <objectCountGroup>
+      <objectCount>1</objectCount>
+    </objectCountGroup>
+  </objectCountGroupList>
   <responsibleDepartments>
   </responsibleDepartments>
   <titleGroupList>

diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
index 18022aecf752b20f8ca8ba7de56c63ea163dde76..41c6b4c0d11f3d95095a1eb6cbeeaedf1b6b25cc 100644 (file)
--- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
+++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
@@ -28,21 +28,6 @@ import java.util.List;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//import org.collectionspace.services.client.AbstractServiceClientImpl;
 import org.collectionspace.services.client.CollectionObjectClient;
 import org.collectionspace.services.client.CollectionObjectFactory;
 import org.collectionspace.services.client.CollectionSpaceClient;

diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
index 5e0e0eda15ad32acaa1d441381966fd93f13d139..c88e26a2cb62e221e341c05181bc6c224abb6e60 100644 (file)
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
@@ -5,6 +5,7 @@
 <briefDescriptions> <briefDescription> briefDescription</briefDescription></briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
+<objectCountGroupList> <objectCountGroup><objectCount>1</objectCount></objectCountGroup></objectCountGroupList>
 <!-- test whitespace as first child node -->
 <responsibleDepartments> <responsibleDepartment> responsibleDept1</responsibleDepartment><responsibleDepartment>responsibleDept2</responsibleDepartment></responsibleDepartments>
 </ns2:collectionobjects_common> 

diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
index 3dc3a28ddd2b6248b3d34faa8652ca3e25dd3ee6..0e838d6bb42cb33aabab525efad3c98c8dfcb7e2 100644 (file)
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
@@ -8,6 +8,11 @@
 </briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
+<objectCountGroupList>
+<objectCountGroup>
+<objectCount>1</objectCount>
+</objectCountGroup>
+</objectCountGroupList>
 <!-- test newline whitespace -->
 <responsibleDepartments>
 <responsibleDepartment>responsibleDept1</responsibleDepartment>

diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
index 8529c5897ae4b184c4881874da61d449fca99fc4..5dbc260a4b8c176736ab4f9e30e7f2a4c569d286 100644 (file)
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
@@ -10,6 +10,13 @@
 
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
+
+<objectCountGroupList>
+<objectCountGroup>
+<objectCount>1</objectCount>
+</objectCountGroup>
+</objectCountGroupList>
+
 <!-- test newline whitespace -->
 <responsibleDepartments>
 <!-- test childnode as whitespace -->

diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
index 58b5b169b0c978c502595988423705dd0ef3e9e7..e30484b338a035ad9e11cb018bc69f685d90ec1c 100644 (file)
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
@@ -8,6 +8,11 @@
 </briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
+<objectCountGroupList>
+    <objectCountGroup>
+        <objectCount>1</objectCount>
+    </objectCountGroup>
+</objectCountGroupList>
 <!-- test newline and tab whitespace -->
 <responsibleDepartments>
     <responsibleDepartment>responsibleDept1</responsibleDepartment>

diff --git a/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml b/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml
index 30dd4ef199db629ae3f81c63c3978cb358973687..6757f9a9ac9e891dc6fd5341c9e7e32cf903e546 100644 (file)
--- a/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml
@@ -11,4 +11,9 @@
   <objectNumber>objectNumber</objectNumber>
   <distinguishingFeatures>distFeatures</distinguishingFeatures>
   <numberOfObjects>numberOfObjects</numberOfObjects>
-</ns2:collectionobjects_common> 
+  <objectCountGroupList>
+    <objectCountGroup>
+      <objectCount>1</objectCount>
+    </objectCountGroup>
+  </objectCountGroupList>
+</ns2:collectionobjects_common>

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index ee8cc303392776b09bb9117cacb69a490f9ef3d6..89d0a3d6e77b27232c418c8fc04db0077881d047 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -42,6 +42,7 @@
                 <xs:element name="comments" type="commentList"/>
                 <xs:element name="distinguishingFeatures" type="xs:string"/>
                 <xs:element name="numberOfObjects" type="xs:integer"/>
+                <xs:element name="objectCountGroupList" type="objectCountGroupList" />
                 <xs:element name="objectNameList" type="ns:objectNameList"/>
                 <xs:element name="responsibleDepartments" type="responsibleDepartmentList"/>
                 <xs:element name="collection" type="xs:string"/>
@@ -173,6 +174,22 @@
         </xs:complexType>
     </xs:element>
 
+    <xs:complexType name="objectCountGroupList">
+        <xs:sequence>
+            <xs:element name="objectCountGroup" type="objectCountGroup" minOccurs="0"
+                        maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="objectCountGroup">
+        <xs:sequence>
+            <xs:element name="objectCount" type="xs:integer" />
+            <xs:element name="objectCountType" type="xs:string" />
+            <xs:element name="objectCountCountedBy" type="xs:string" />
+            <xs:element name="objectCountDate" type="xs:date" />
+            <xs:element name="objectCountNote" type="xs:string" />
+        </xs:sequence>
+    </xs:complexType>
+
     <xs:complexType name="otherNumberList">
         <xs:sequence>
             <xs:element name="otherNumber" type="otherNumber" minOccurs="0" maxOccurs="unbounded"/>

diff --git a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
index 0ea5aa8abefa0f50b728984df2eb3edb4116535c..667459fa86f019d96580a935b71b3d2d28d2436c 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
@@ -34,6 +34,7 @@
                                                        "collectionobjects_common:materialGroupList",
                                                        "collectionobjects_common:measuredPartGroupList",
                                                        "collectionobjects_common:numberOfObjects",
+                                                       "collectionobjects_common:objectCountGroupList",
                                                        "collectionobjects_common:objectHistoryNote",
                                                        "collectionobjects_common:objectNameList",
                                                        "collectionobjects_common:objectNumber",

diff --git a/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml
index be470110e233bcd0730b43354eee8a5d307ce8d0..266f381c828d25002bd2f4775404d389140006a7 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml
@@ -28,6 +28,7 @@
                                                        "collectionobjects_common:materialGroupList",
                                                        "collectionobjects_common:measuredPartGroupList",
                                                        "collectionobjects_common:numberOfObjects",
+                                                       "collectionobjects_common:objectCountGroupList",
                                                        "collectionobjects_common:objectHistoryNote",
                                                        "collectionobjects_common:objectNameList",
                                                        "collectionobjects_common:objectNumber",

diff --git a/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
index 33e44639b018c0d3ac8ccf4a31222cac3e31542e..635c908ec318e9cbcdd7ee664bb752d20e9b9b50 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
@@ -28,6 +28,7 @@
                                                        "collectionobjects_common:materialGroupList",
                                                        "collectionobjects_common:measuredPartGroupList",
                                                        "collectionobjects_common:numberOfObjects",
+                                                       "collectionobjects_common:objectCountGroupList",
                                                        "collectionobjects_common:objectHistoryNote",
                                                        "collectionobjects_common:objectNameList",
                                                        "collectionobjects_common:objectNumber",

diff --git a/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
index 624494ad54c04c9eaad6e625990cd0b3b970afcc..96830c7d2b8e33d5840698061df4373a127a023e 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
@@ -89,6 +89,7 @@
                     "collectionobjects_materials:materialGenericColors",
                     "collectionobjects_materials:materialFinishGroupList",
                     "collectionobjects_common:numberOfObjects",
+                    "collectionobjects_common:objectCountGroupList",
                     "collectionobjects_common:briefDescriptions",
                     "collectionobjects_common:measuredPartGroupList",
                     "collectionobjects_common:viewersContributionNote",

diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
index 3a6c4c9613311bf35d0094d047968d7c54825931..85eb752264cc5acdbbf05b967cd5b6b62c9f4b27 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
@@ -1159,6 +1159,7 @@
                                                        "collectionobjects_common:materialGroupList",
                                                        "collectionobjects_common:measuredPartGroupList",
                                                        "collectionobjects_common:numberOfObjects",
+                                                       "collectionobjects_common:objectCountGroupList",
                                                        "collectionobjects_common:objectHistoryNote",
                                                        "collectionobjects_common:objectNameList",
                                                        "collectionobjects_common:objectNumber",

diff --git a/services/imports/service/src/test/resources/requests/collectionobject-request.xml b/services/imports/service/src/test/resources/requests/collectionobject-request.xml
index 1d229a32de0fac0e372165dfedfe0b908471dc91..c9340dfa4ce5ee8881f6979ebadff2822368c572 100644 (file)
--- a/services/imports/service/src/test/resources/requests/collectionobject-request.xml
+++ b/services/imports/service/src/test/resources/requests/collectionobject-request.xml
@@ -81,6 +81,11 @@
               <contentConcept></contentConcept>
             </collectionobjects_common:contentConcepts>
             <collectionobjects_common:numberOfObjects>1</collectionobjects_common:numberOfObjects>
+            <collectionobjects_common:objectCountGroupList>
+              <collectionobjects_common:objectCountGroup>
+                <collectionobjects_common:objectCount>1</collectionobjects_common:objectCount>
+              </collectionobjects_common:objectCountGroup>
+            </collectionobjects_common:objectCountGroupList>
             <collectionobjects_common:ownershipExchangePriceCurrency>poundsterling</collectionobjects_common:ownershipExchangePriceCurrency>
             <collectionobjects_common:contentOtherGroupList>
               <contentOtherGroup>