CSPACE-3268: Fixed errors related to loanStatusGroupList and its child elements in...

diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd
index d29df396ffc0fef12b9ca802746065e1ae581858..beee4fe4938e60a40c4e4d3a157592b15bce2d1c 100644 (file)
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd
@@ -30,7 +30,7 @@
     <xs:element name="lendersAuthorizationDate" type="xs:date"/>\r
     <xs:element name="lendersContact" type="xs:string"/>\r
 \r
-    <xs:element name="loanedObjectStatusGroupList" type="loanedObjectStatusGroupList"/>\r
+    <xs:element name="loanStatusGroupList" type="loanStatusGroupList"/>\r
     \r
     <xs:element name="loanOutDate" type="xs:date"/>\r
     <xs:element name="loanReturnDate" type="xs:date"/>\r
@@ -39,9 +39,9 @@
     <xs:element name="loanOutNote" type="xs:string"/>\r
     <xs:element name="loanPurpose" type="xs:string"/>\r
 \r
-    <xs:complexType name="loanedObjectStatusGroupList">\r
+    <xs:complexType name="loanStatusGroupList">\r
         <xs:sequence>\r
-            <xs:element name="loanedObjectStatusGroup" type="loanedObjectStatusGroup" minOccurs="0" maxOccurs="unbounded"/>\r
+            <xs:element name="loanStatusGroup" type="loanStatusGroup" minOccurs="0" maxOccurs="unbounded"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r

diff --git a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java
index e33b8f3e7d08750bf55da2abd201ad9d9677027e..346b757f10abe97e84e8d7b27d80e972b344f455 100644 (file)
--- a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java
+++ b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java
@@ -35,8 +35,8 @@ import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.AbstractCommonListUtils;
 import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUtils;
 import org.collectionspace.services.jaxb.AbstractCommonList;
-import org.collectionspace.services.loanout.LoanedObjectStatusGroup;
-import org.collectionspace.services.loanout.LoanedObjectStatusGroupList;
+import org.collectionspace.services.loanout.LoanStatusGroup;
+import org.collectionspace.services.loanout.LoanStatusGroupList;
 import org.collectionspace.services.loanout.LoansoutCommon;
 
 import org.jboss.resteasy.client.ClientResponse;
@@ -306,14 +306,14 @@ public class LoanoutServiceTest extends AbstractServiceTestImpl {
         // Check selected fields in the common part.
         Assert.assertNotNull(loanoutCommon.getLoanOutNumber());
 
-        LoanedObjectStatusGroupList statusGroupList = loanoutCommon.getLoanedObjectStatusGroupList();
+        LoanStatusGroupList statusGroupList = loanoutCommon.getLoanStatusGroupList();
         Assert.assertNotNull(statusGroupList);
-        List<LoanedObjectStatusGroup> statusGroups = statusGroupList.getLoanedObjectStatusGroup();
+        List<LoanStatusGroup> statusGroups = statusGroupList.getLoanStatusGroup();
         Assert.assertNotNull(statusGroups);
         Assert.assertTrue(statusGroups.size() > 0);
-        LoanedObjectStatusGroup statusGroup = statusGroups.get(0);
+        LoanStatusGroup statusGroup = statusGroups.get(0);
         Assert.assertNotNull(statusGroup);
-        Assert.assertNotNull(statusGroup.getLoanedObjectStatus());
+        Assert.assertNotNull(statusGroup.getLoanStatus());
 
         // Check the values of fields containing Unicode UTF-8 (non-Latin-1) characters.
         if (logger.isDebugEnabled()) {
@@ -439,18 +439,18 @@ public class LoanoutServiceTest extends AbstractServiceTestImpl {
 
         // Update the content of this resource.
         loanoutCommon.setLoanOutNumber("updated-" + loanoutCommon.getLoanOutNumber());
-        LoanedObjectStatusGroupList statusGroupList = loanoutCommon.getLoanedObjectStatusGroupList();
+        LoanStatusGroupList statusGroupList = loanoutCommon.getLoanStatusGroupList();
         Assert.assertNotNull(statusGroupList);
-        List<LoanedObjectStatusGroup> statusGroups = statusGroupList.getLoanedObjectStatusGroup();
+        List<LoanStatusGroup> statusGroups = statusGroupList.getLoanStatusGroup();
         Assert.assertNotNull(statusGroups);
         Assert.assertTrue(statusGroups.size() > 0);
-        LoanedObjectStatusGroup statusGroup = statusGroups.get(0);
+        LoanStatusGroup statusGroup = statusGroups.get(0);
         Assert.assertNotNull(statusGroup);
-        String loanedObjectStatus = statusGroup.getLoanedObjectStatus();
-        Assert.assertNotNull(loanedObjectStatus);
-        String updatedLoanedObjectStatus = "updated-" + loanedObjectStatus;
-        statusGroups.get(0).setLoanedObjectStatus(updatedLoanedObjectStatus);
-        loanoutCommon.setLoanedObjectStatusGroupList(statusGroupList);
+        String loanStatus = statusGroup.getLoanStatus();
+        Assert.assertNotNull(loanStatus);
+        String updatedLoanStatus = "updated-" + loanStatus;
+        statusGroups.get(0).setLoanStatus(updatedLoanStatus);
+        loanoutCommon.setLoanStatusGroupList(statusGroupList);
         if (logger.isDebugEnabled()) {
             logger.debug("to be updated object");
             logger.debug(objectAsXmlString(loanoutCommon, LoansoutCommon.class));
@@ -486,16 +486,16 @@ public class LoanoutServiceTest extends AbstractServiceTestImpl {
                 loanoutCommon.getLoanOutNumber(),
                 "Data in updated object did not match submitted data.");
 
-        LoanedObjectStatusGroupList updatedStatusGroupList =
-                updatedLoanoutCommon.getLoanedObjectStatusGroupList();
+        LoanStatusGroupList updatedStatusGroupList =
+                updatedLoanoutCommon.getLoanStatusGroupList();
         Assert.assertNotNull(updatedStatusGroupList);
-        List<LoanedObjectStatusGroup> updatedStatusGroups =
-                updatedStatusGroupList.getLoanedObjectStatusGroup();
+        List<LoanStatusGroup> updatedStatusGroups =
+                updatedStatusGroupList.getLoanStatusGroup();
         Assert.assertNotNull(updatedStatusGroups);
         Assert.assertTrue(updatedStatusGroups.size() > 0);
         Assert.assertNotNull(updatedStatusGroups.get(0));
-        Assert.assertEquals(updatedLoanedObjectStatus,
-                updatedStatusGroups.get(0).getLoanedObjectStatus(),
+        Assert.assertEquals(updatedLoanStatus,
+                updatedStatusGroups.get(0).getLoanStatus(),
                 "Data in updated object did not match submitted data.");
 
         // Check the values of fields containing Unicode UTF-8 (non-Latin-1) characters.
@@ -795,13 +795,13 @@ public class LoanoutServiceTest extends AbstractServiceTestImpl {
         loanoutCommon.setBorrowersContact(
                 "urn:cspace:org.collectionspace.demo:personauthorities:name(TestPersonAuth):item:name(ChrisContact)'Chris Contact'");
         loanoutCommon.setLoanPurpose("Allow people in cold climes to share the magic of Surfboards of the 1960s.");
-        LoanedObjectStatusGroupList statusGroupList = new LoanedObjectStatusGroupList();
-        List<LoanedObjectStatusGroup> statusGroups = statusGroupList.getLoanedObjectStatusGroup();
-        LoanedObjectStatusGroup statusGroup = new LoanedObjectStatusGroup();
-        statusGroup.setLoanedObjectStatus("returned");
-        statusGroup.setLoanedObjectStatusNote("Left under the front mat.");
+        LoanStatusGroupList statusGroupList = new LoanStatusGroupList();
+        List<LoanStatusGroup> statusGroups = statusGroupList.getLoanStatusGroup();
+        LoanStatusGroup statusGroup = new LoanStatusGroup();
+        statusGroup.setLoanStatus("returned");
+        statusGroup.setLoanStatusNote("Left under the front mat.");
         statusGroups.add(statusGroup);
-        loanoutCommon.setLoanedObjectStatusGroupList(statusGroupList);
+        loanoutCommon.setLoanStatusGroupList(statusGroupList);
         loanoutCommon.setLoanOutNote(getUTF8DataFragment());  // For UTF-8 tests
 
         PoxPayloadOut multipart = new PoxPayloadOut(this.getServicePathComponent());

diff --git a/services/loanout/jaxb/src/main/resources/loansout-common.xsd b/services/loanout/jaxb/src/main/resources/loansout-common.xsd
index ce575b2d02ee0c0580521192eb15d6abe0580a68..0bbb9b50e24e74a6f56e6e1e46d2f3df61309a47 100644 (file)
--- a/services/loanout/jaxb/src/main/resources/loansout-common.xsd
+++ b/services/loanout/jaxb/src/main/resources/loansout-common.xsd
@@ -41,7 +41,7 @@
                 <xs:element name="lendersAuthorizationDate" type="xs:string"/>
                 <xs:element name="lendersContact" type="xs:string"/>
                 
-                <xs:element name="loanedObjectStatusGroupList" type="loanedObjectStatusGroupList"/>
+                <xs:element name="loanStatusGroupList" type="loanStatusGroupList"/>
 
                 <xs:element name="loanOutDate" type="xs:string"/>
                 <xs:element name="loanReturnDate" type="xs:string"/>
@@ -53,20 +53,19 @@
         </xs:complexType>
     </xs:element>
 
-    <xs:complexType name="loanedObjectStatusGroupList">
+    <xs:complexType name="loanStatusGroupList">
         <xs:sequence>
-            <xs:element name="loanedObjectStatusGroup" type="loanedObjectStatusGroup" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="loanStatusGroup" type="loanStatusGroup" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="loanedObjectStatusGroup">
+    <xs:complexType name="loanStatusGroup">
         <xs:sequence>
-            <xs:element name="loanedObjectStatus" type="xs:string"/>
-            <xs:element name="loanedObjectStatusDate" type="xs:string"/>
-            <xs:element name="loanedObjectStatusNote" type="xs:string"/>
+            <xs:element name="loanStatus" type="xs:string"/>
+            <xs:element name="loanStatusDate" type="xs:date"/>
+            <xs:element name="loanStatusNote" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
     
-    
 </xs:schema>