From b59a9e4aa723ff9456bbea5759c38e872214ebef Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Fri, 3 Aug 2012 15:58:16 -0700 Subject: [PATCH] CSPACE-4774: Removed obsolete, legacy loanInContact field from the Loan In record in the services layer. Since v2.0, this field has been effectively replaced by the borrowersContact field. --- .../services/tenants/tenant-bindings-proto.xml | 4 ---- .../main/resources/OSGI-INF/layouts-contrib.xml | 14 -------------- .../src/main/resources/schemas/loansin_common.xsd | 1 - .../services/client/test/LoaninAuthRefsTest.java | 14 +++++++------- .../collectionspace/services/LoaninJAXBSchema.java | 1 - .../jaxb/src/main/resources/loansin-common.xsd | 1 - 6 files changed, 7 insertions(+), 28 deletions(-) diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml index d38dc67e4..311e46cba 100644 --- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml +++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml @@ -861,10 +861,6 @@ authRef borrowersContact - - authRef - loanInContact - termRef diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/layouts-contrib.xml index e7cabb079..a237e924c 100644 --- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/layouts-contrib.xml +++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/layouts-contrib.xml @@ -31,7 +31,6 @@ $LastChangedDate: $ lendersAuthorizer lendersAuthorizationDate lendersContact - loanInContact loanInConditions loanInDate loanReturnDate @@ -106,19 +105,6 @@ $LastChangedDate: $ - - - - - true - - loanInContact - - - dataInputText - - - diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd index 6503d151b..cbbecf1ac 100644 --- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd +++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd @@ -23,7 +23,6 @@ - diff --git a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java index d83dc751e..e79023f93 100644 --- a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java +++ b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java @@ -78,7 +78,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest { private String lenderRefName = null; private String lendersAuthorizerRefName = null; private String lendersContactRefName = null; - private String loanInContactRefName = null; + private String borrowersContactRefName = null; private String borrowersAuthorizerRefName = null; private final int NUM_AUTH_REFS_EXPECTED = 5; private final static String CURRENT_DATE_UTC = @@ -126,7 +126,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest { lenderRefName, lendersAuthorizerRefName, lendersContactRefName, - loanInContactRefName, + borrowersContactRefName, borrowersAuthorizerRefName); ClientResponse response = loaninClient.create(multipart); int statusCode = response.getStatus(); @@ -192,9 +192,9 @@ public class LoaninAuthRefsTest extends BaseServiceTest { personIdsCreated.add(csid); lendersContactRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null); - csid = createPerson("Carrie", "Loanincontact", "carrieLoanincontact", authRefName); + csid = createPerson("Carrie", "Borrowerscontact", "carrieBorrowerscontact", authRefName); personIdsCreated.add(csid); - loanInContactRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null); + borrowersContactRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null); csid = createPerson("Bonnie", "Borrowersauthorizer", "bonnieBorrowersauthorizer", authRefName); personIdsCreated.add(csid); @@ -260,7 +260,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest { // Assert.assertEquals(loaninCommon.getLendersAuthorizer(), lendersAuthorizerRefName); // Assert.assertEquals(loaninCommon.getLendersContact(), lendersContactRefName); // - Assert.assertEquals(loaninCommon.getLoanInContact(), loanInContactRefName); + Assert.assertEquals(loaninCommon.getBorrowersContact(), borrowersContactRefName); Assert.assertEquals(loaninCommon.getBorrowersAuthorizer(), borrowersAuthorizerRefName); // Get the auth refs and check them @@ -373,7 +373,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest { String lender, String lendersAuthorizer, String lendersContact, - String loaninContact, + String borrowersContact, String borrowersAuthorizer) { LoansinCommon loaninCommon = new LoansinCommon(); loaninCommon.setLoanInNumber(loaninNumber); @@ -385,7 +385,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest { lenderGroup.setLendersContact(lendersContact); lenderGroupList.getLenderGroup().add(lenderGroup); loaninCommon.setLenderGroupList(lenderGroupList); - loaninCommon.setLoanInContact(loaninContact); + loaninCommon.setBorrowersContact(borrowersContact); loaninCommon.setBorrowersAuthorizer(borrowersAuthorizer); PoxPayloadOut multipart = new PoxPayloadOut(this.getServicePathComponent()); diff --git a/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninJAXBSchema.java b/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninJAXBSchema.java index cc1d031b0..ea7e5e085 100644 --- a/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninJAXBSchema.java +++ b/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninJAXBSchema.java @@ -10,7 +10,6 @@ public interface LoaninJAXBSchema { final static String LENDERS_AUTHORIZER = "lendersAuthorizer"; final static String LENDERS_AUTHORIZATION_DATE = "lendersAuthorizationDate"; final static String LENDERS_CONTACT = "lendersContact"; - final static String LOAN_IN_CONTACT = "loanInContact"; final static String LOAN_IN_CONDITIONS = "loanInConditions"; final static String LOAN_IN_DATE = "loanInDate"; final static String LOAN_RETURN_DATE = "loanReturnDate"; diff --git a/services/loanin/jaxb/src/main/resources/loansin-common.xsd b/services/loanin/jaxb/src/main/resources/loansin-common.xsd index f330feae4..65c9e6df8 100644 --- a/services/loanin/jaxb/src/main/resources/loansin-common.xsd +++ b/services/loanin/jaxb/src/main/resources/loansin-common.xsd @@ -33,7 +33,6 @@ - -- 2.47.3