From 86b06cb8c7159a8060d35821fb0744a7c1cbfdab Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Fri, 12 Jul 2024 13:44:12 -0600 Subject: [PATCH] DRYD-1330: Updates to new claim (#415) --- services/JaxRsServiceProvider/pom.xml | 2 +- .../CollectionSpaceJaxRsApplication.java | 4 +- .../db/postgresql/load_id_generators.sql | 36 ---- .../src/main/resources/nagpra_common.xsd | 10 +- .../services/NagpraclaimJAXBSchema.java | 17 -- .../NagpraclaimListItemJAXBSchema.java | 20 -- .../main/resources/nagpraclaims_common.xsd | 176 ------------------ .../nuxeo/NagpraClaimConstants.java | 33 ---- services/pom.xml | 2 +- .../build.xml | 6 +- .../client/pom.xml | 31 +-- .../client/RepatriationClaimClient.java} | 16 +- .../client/RepatriationClaimProxy.java} | 6 +- .../test/RepatriationClaimServiceTest.java} | 74 ++++---- .../jaxb/pom.xml | 13 +- .../resources/repatriationclaims_common.xsd | 67 +++++++ .../pom.xml | 4 +- .../service/pom.xml | 12 +- .../RepatriationClaimResource.java} | 21 +-- ...epatriationClaimDocumentModelHandler.java} | 9 +- .../RepatriationClaimValidatorHandler.java} | 18 +- 21 files changed, 171 insertions(+), 406 deletions(-) delete mode 100644 services/nagpraclaim/jaxb/src/main/java/org/collectionspace/services/NagpraclaimJAXBSchema.java delete mode 100644 services/nagpraclaim/jaxb/src/main/java/org/collectionspace/services/NagpraclaimListItemJAXBSchema.java delete mode 100644 services/nagpraclaim/jaxb/src/main/resources/nagpraclaims_common.xsd delete mode 100644 services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimConstants.java rename services/{nagpraclaim => repatriationclaim}/build.xml (96%) rename services/{nagpraclaim => repatriationclaim}/client/pom.xml (59%) rename services/{nagpraclaim/client/src/main/java/org/collectionspace/services/client/NagpraClaimClient.java => repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimClient.java} (67%) rename services/{nagpraclaim/client/src/main/java/org/collectionspace/services/client/NagpraClaimProxy.java => repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimProxy.java} (81%) rename services/{nagpraclaim/client/src/test/java/org/collectionspace/services/client/test/NagpraClaimServiceTest.java => repatriationclaim/client/src/test/java/org/collectionspace/services/client/test/RepatriationClaimServiceTest.java} (85%) rename services/{nagpraclaim => repatriationclaim}/jaxb/pom.xml (64%) create mode 100644 services/repatriationclaim/jaxb/src/main/resources/repatriationclaims_common.xsd rename services/{nagpraclaim => repatriationclaim}/pom.xml (93%) rename services/{nagpraclaim => repatriationclaim}/service/pom.xml (85%) rename services/{nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/NagpraClaimResource.java => repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/RepatriationClaimResource.java} (66%) rename services/{nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimDocumentModelHandler.java => repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimDocumentModelHandler.java} (75%) rename services/{nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimValidatorHandler.java => repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimValidatorHandler.java} (69%) diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index a1b61e04d..f93d7ecf4 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -243,7 +243,7 @@ org.collectionspace.services - org.collectionspace.services.nagpraclaim.service + org.collectionspace.services.repatriationclaim.service ${project.version} diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java index d7fa36618..eab5e0093 100644 --- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java +++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java @@ -39,7 +39,7 @@ import org.collectionspace.services.intake.IntakeResource; import org.collectionspace.services.index.IndexResource; import org.collectionspace.services.loanin.LoaninResource; import org.collectionspace.services.loanout.LoanoutResource; -import org.collectionspace.services.nagpraclaim.NagpraClaimResource; +import org.collectionspace.services.repatriationclaim.RepatriationClaimResource; import org.collectionspace.services.nagprainventory.NagpraInventoryResource; import org.collectionspace.services.summarydocumentation.SummaryDocumentationResource; import org.collectionspace.services.transport.TransportResource; @@ -165,7 +165,7 @@ public class CollectionSpaceJaxRsApplication extends Application addResourceToMapAndSingletons(new PropagationResource()); addResourceToMapAndSingletons(new PottagResource()); addResourceToMapAndSingletons(new ClaimResource()); - addResourceToMapAndSingletons(new NagpraClaimResource()); + addResourceToMapAndSingletons(new RepatriationClaimResource()); addResourceToMapAndSingletons(new ReportResource()); addResourceToMapAndSingletons(new PublicItemResource()); addResourceToMapAndSingletons(new TransportResource()); diff --git a/services/common/src/main/resources/db/postgresql/load_id_generators.sql b/services/common/src/main/resources/db/postgresql/load_id_generators.sql index 4a6bc990e..6e7a77835 100644 --- a/services/common/src/main/resources/db/postgresql/load_id_generators.sql +++ b/services/common/src/main/resources/db/postgresql/load_id_generators.sql @@ -1127,42 +1127,6 @@ INSERT INTO id_generators FROM id_generators ); --- NAGPRA_CLAIM_REFERENCE_NUMBER - -INSERT INTO id_generators - (csid, displayname, description, priority, last_generated_id, id_generator_state) - SELECT - 'c4045ef4-a934-4a2e-8f92-edbf4069b64b', - 'NAGPRA Claim Reference Number', - 'Identifies a nagpra claim.', - '9', - '', -' - - - NCL - NCL - - - - - - . - . - - - 6 - 1 - -1 - - -' - WHERE 'c4045ef4-a934-4a2e-8f92-edbf4069b64b' NOT IN - ( - SELECT csid - FROM id_generators - ); - -- NAGPRAINVENTORY_REFERENCE_NUMBER INSERT INTO id_generators diff --git a/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd b/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd index 60e7a3fc7..0f0a775dd 100644 --- a/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd +++ b/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd @@ -23,16 +23,16 @@ - + - + - + - - + + diff --git a/services/nagpraclaim/jaxb/src/main/java/org/collectionspace/services/NagpraclaimJAXBSchema.java b/services/nagpraclaim/jaxb/src/main/java/org/collectionspace/services/NagpraclaimJAXBSchema.java deleted file mode 100644 index 62aea882b..000000000 --- a/services/nagpraclaim/jaxb/src/main/java/org/collectionspace/services/NagpraclaimJAXBSchema.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * This document is a part of the source code and related artifacts - * for CollectionSpace, an open source collections management system - * for museums and related institutions: - * - * http://www.collectionspace.org - * http://wiki.collectionspace.org - * - * Licensed under the Educational Community License (ECL), Version 2.0. - * You may not use this file except in compliance with this License. - * - * You may obtain a copy of the ECL 2.0 License at - * https://source.collectionspace.org/collection-space/LICENSE.txt - */ -package org.collectionspace.services; - -public interface NagpraclaimJAXBSchema {} diff --git a/services/nagpraclaim/jaxb/src/main/java/org/collectionspace/services/NagpraclaimListItemJAXBSchema.java b/services/nagpraclaim/jaxb/src/main/java/org/collectionspace/services/NagpraclaimListItemJAXBSchema.java deleted file mode 100644 index d07581719..000000000 --- a/services/nagpraclaim/jaxb/src/main/java/org/collectionspace/services/NagpraclaimListItemJAXBSchema.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This document is a part of the source code and related artifacts - * for CollectionSpace, an open source collections management system - * for museums and related institutions: - * - * http://www.collectionspace.org - * http://wiki.collectionspace.org - * - * Licensed under the Educational Community License (ECL), Version 2.0. - * You may not use this file except in compliance with this License. - * - * You may obtain a copy of the ECL 2.0 License at - * https://source.collectionspace.org/collection-space/LICENSE.txt - */ -package org.collectionspace.services; - -public interface NagpraclaimListItemJAXBSchema { - String CSID = "csid"; - String URI = "url"; -} diff --git a/services/nagpraclaim/jaxb/src/main/resources/nagpraclaims_common.xsd b/services/nagpraclaim/jaxb/src/main/resources/nagpraclaims_common.xsd deleted file mode 100644 index c47644ec0..000000000 --- a/services/nagpraclaim/jaxb/src/main/resources/nagpraclaims_common.xsd +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimConstants.java b/services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimConstants.java deleted file mode 100644 index 0e181785d..000000000 --- a/services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimConstants.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This document is a part of the source code and related artifacts - * for CollectionSpace, an open source collections management system - * for museums and related institutions: - * - * http://www.collectionspace.org - * http://wiki.collectionspace.org - * - * Licensed under the Educational Community License (ECL), Version 2.0. - * You may not use this file except in compliance with this License. - * - * You may obtain a copy of the ECL 2.0 License at - * - * https://source.collectionspace.org/collection-space/LICENSE.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.collectionspace.services.nagpraclaim.nuxeo; - -/** - * NagpraclaimConstants specifies constants for the Nagpraclaim service - * - */ -public class NagpraClaimConstants { - - public static final String NUXEO_DOCTYPE = "Nagpraclaim"; - public static final String NUXEO_SCHEMA_NAME = "nagpraclaim"; - public static final String NUXEO_DC_TITLE = "CollectionSpace-Nagpraclaim"; -} diff --git a/services/pom.xml b/services/pom.xml index 5ca7ab40e..e85ee69fc 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -99,7 +99,7 @@ publicitem iterationreport chronology - nagpraclaim + repatriationclaim nagprainventory summarydocumentation heldintrust diff --git a/services/nagpraclaim/build.xml b/services/repatriationclaim/build.xml similarity index 96% rename from services/nagpraclaim/build.xml rename to services/repatriationclaim/build.xml index b799eed44..e51d9e3de 100644 --- a/services/nagpraclaim/build.xml +++ b/services/repatriationclaim/build.xml @@ -1,6 +1,6 @@ - + - nagpraclaim service + repatriationclaim service @@ -103,4 +103,4 @@ - \ No newline at end of file + diff --git a/services/nagpraclaim/client/pom.xml b/services/repatriationclaim/client/pom.xml similarity index 59% rename from services/nagpraclaim/client/pom.xml rename to services/repatriationclaim/client/pom.xml index 917610337..f8a9ea58e 100644 --- a/services/nagpraclaim/client/pom.xml +++ b/services/repatriationclaim/client/pom.xml @@ -4,32 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> org.collectionspace.services - org.collectionspace.services.nagpraclaim + org.collectionspace.services.repatriationclaim ${revision} 4.0.0 - org.collectionspace.services.nagpraclaim.client - services.nagpraclaim.client + org.collectionspace.services.repatriationclaim.client + services.repatriationclaim.client - - org.collectionspace.services - org.collectionspace.services.authority.jaxb - true - ${project.version} - - - org.collectionspace.services - org.collectionspace.services.jaxb - ${project.version} - - - org.collectionspace.services - org.collectionspace.services.common - true - org.collectionspace.services org.collectionspace.services.client @@ -37,12 +21,7 @@ org.collectionspace.services - org.collectionspace.services.nagpraclaim.jaxb - ${project.version} - - - org.collectionspace.services - org.collectionspace.services.person.client + org.collectionspace.services.repatriationclaim.jaxb ${project.version} @@ -77,6 +56,6 @@ - collectionspace-services-nagpraclaim-client + collectionspace-services-repatriationclaim-client \ No newline at end of file diff --git a/services/nagpraclaim/client/src/main/java/org/collectionspace/services/client/NagpraClaimClient.java b/services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimClient.java similarity index 67% rename from services/nagpraclaim/client/src/main/java/org/collectionspace/services/client/NagpraClaimClient.java rename to services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimClient.java index 90237b2bf..13ebf7d51 100644 --- a/services/nagpraclaim/client/src/main/java/org/collectionspace/services/client/NagpraClaimClient.java +++ b/services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimClient.java @@ -14,24 +14,24 @@ */ package org.collectionspace.services.client; -import org.collectionspace.services.nagpraclaim.NagpraclaimsCommon; +import org.collectionspace.services.repatriationclaim.RepatriationClaimsCommon; /** - * NagpraclaimClient.java + * RepatriationClaimClient.java */ -public class NagpraClaimClient extends AbstractCommonListPoxServiceClientImpl { +public class RepatriationClaimClient extends AbstractCommonListPoxServiceClientImpl { - public static final String SERVICE_NAME = "nagpraclaims"; + public static final String SERVICE_NAME = "repatriationclaims"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT; public static final String SERVICE_PATH_PROXY = SERVICE_PATH + "/"; public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME; - public NagpraClaimClient() throws Exception { + public RepatriationClaimClient() throws Exception { super(); } - public NagpraClaimClient(String clientPropertiesFilename) throws Exception { + public RepatriationClaimClient(String clientPropertiesFilename) throws Exception { super(clientPropertiesFilename); } @@ -46,7 +46,7 @@ public class NagpraClaimClient extends AbstractCommonListPoxServiceClientImpl getProxyClass() { - return NagpraClaimProxy.class; + public Class getProxyClass() { + return RepatriationClaimProxy.class; } } diff --git a/services/nagpraclaim/client/src/main/java/org/collectionspace/services/client/NagpraClaimProxy.java b/services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimProxy.java similarity index 81% rename from services/nagpraclaim/client/src/main/java/org/collectionspace/services/client/NagpraClaimProxy.java rename to services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimProxy.java index 77706ffdb..77ab4e970 100644 --- a/services/nagpraclaim/client/src/main/java/org/collectionspace/services/client/NagpraClaimProxy.java +++ b/services/repatriationclaim/client/src/main/java/org/collectionspace/services/client/RepatriationClaimProxy.java @@ -19,9 +19,9 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; /** - * NagpraClaimProxy.java + * RepatriationClaimProxy.java */ -@Path(NagpraClaimClient.SERVICE_PATH_PROXY) +@Path(RepatriationClaimClient.SERVICE_PATH_PROXY) @Produces({"application/xml"}) @Consumes({"application/xml"}) -public interface NagpraClaimProxy extends CollectionSpaceCommonListPoxProxy {} +public interface RepatriationClaimProxy extends CollectionSpaceCommonListPoxProxy {} diff --git a/services/nagpraclaim/client/src/test/java/org/collectionspace/services/client/test/NagpraClaimServiceTest.java b/services/repatriationclaim/client/src/test/java/org/collectionspace/services/client/test/RepatriationClaimServiceTest.java similarity index 85% rename from services/nagpraclaim/client/src/test/java/org/collectionspace/services/client/test/NagpraClaimServiceTest.java rename to services/repatriationclaim/client/src/test/java/org/collectionspace/services/client/test/RepatriationClaimServiceTest.java index 6885ec420..d80f05b40 100644 --- a/services/nagpraclaim/client/src/test/java/org/collectionspace/services/client/test/NagpraClaimServiceTest.java +++ b/services/repatriationclaim/client/src/test/java/org/collectionspace/services/client/test/RepatriationClaimServiceTest.java @@ -25,37 +25,37 @@ package org.collectionspace.services.client.test; import javax.ws.rs.core.Response; import org.collectionspace.services.client.AbstractCommonListUtils; import org.collectionspace.services.client.CollectionSpaceClient; -import org.collectionspace.services.client.NagpraClaimClient; +import org.collectionspace.services.client.RepatriationClaimClient; import org.collectionspace.services.client.PayloadInputPart; import org.collectionspace.services.client.PayloadOutputPart; import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.jaxb.AbstractCommonList; -import org.collectionspace.services.nagpraclaim.NagpraclaimsCommon; +import org.collectionspace.services.repatriationclaim.RepatriationClaimsCommon; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; -public class NagpraClaimServiceTest extends AbstractPoxServiceTestImpl { +public class RepatriationClaimServiceTest extends AbstractPoxServiceTestImpl { - private final Logger logger = LoggerFactory.getLogger(NagpraClaimServiceTest.class); + private final Logger logger = LoggerFactory.getLogger(RepatriationClaimServiceTest.class); /** The service path component. */ - final String SERVICE_NAME = "nagpraclaims"; + final String SERVICE_NAME = "repatriationclaims"; - final String SERVICE_PATH_COMPONENT = "nagpraclaims"; + final String SERVICE_PATH_COMPONENT = "repatriationclaims"; /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance() */ @Override protected CollectionSpaceClient getClientInstance() throws Exception { - return new NagpraClaimClient(); + return new RepatriationClaimClient(); } @Override protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) throws Exception { - return new NagpraClaimClient(clientPropertiesFilename); + return new RepatriationClaimClient(clientPropertiesFilename); } /* (non-Javadoc) @@ -83,9 +83,9 @@ public class NagpraClaimServiceTest extends AbstractPoxServiceTestImpl - org.collectionspace.services.nagpraclaim + org.collectionspace.services.repatriationclaim org.collectionspace.services ${revision} 4.0.0 - org.collectionspace.services.nagpraclaim.jaxb - services.nagpraclaim.jaxb + org.collectionspace.services.repatriationclaim.jaxb + services.repatriationclaim.jaxb @@ -18,10 +18,15 @@ org.collectionspace.services.jaxb ${project.version} + + org.collectionspace.services + org.collectionspace.services.nagpra-jaxb + ${project.version} + - collectionspace-services-nagpraclaim-jaxb + collectionspace-services-repatriationclaim-jaxb install diff --git a/services/repatriationclaim/jaxb/src/main/resources/repatriationclaims_common.xsd b/services/repatriationclaim/jaxb/src/main/resources/repatriationclaims_common.xsd new file mode 100644 index 000000000..2ae005c3b --- /dev/null +++ b/services/repatriationclaim/jaxb/src/main/resources/repatriationclaims_common.xsd @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/nagpraclaim/pom.xml b/services/repatriationclaim/pom.xml similarity index 93% rename from services/nagpraclaim/pom.xml rename to services/repatriationclaim/pom.xml index 5978236a8..532cfe3b3 100644 --- a/services/nagpraclaim/pom.xml +++ b/services/repatriationclaim/pom.xml @@ -9,8 +9,8 @@ 4.0.0 - org.collectionspace.services.nagpraclaim - services.nagpraclaim + org.collectionspace.services.repatriationclaim + services.repatriationclaim pom diff --git a/services/nagpraclaim/service/pom.xml b/services/repatriationclaim/service/pom.xml similarity index 85% rename from services/nagpraclaim/service/pom.xml rename to services/repatriationclaim/service/pom.xml index 2b14c4fb9..1d3cbc1b2 100644 --- a/services/nagpraclaim/service/pom.xml +++ b/services/repatriationclaim/service/pom.xml @@ -5,13 +5,13 @@ org.collectionspace.services - org.collectionspace.services.nagpraclaim + org.collectionspace.services.repatriationclaim ${revision} 4.0.0 - org.collectionspace.services.nagpraclaim.service - services.nagpraclaim.service + org.collectionspace.services.repatriationclaim.service + services.repatriationclaim.service jar @@ -21,12 +21,12 @@ org.collectionspace.services - org.collectionspace.services.nagpraclaim.jaxb + org.collectionspace.services.repatriationclaim.jaxb ${project.version} org.collectionspace.services - org.collectionspace.services.nagpraclaim.client + org.collectionspace.services.repatriationclaim.client ${project.version} @@ -88,6 +88,6 @@ - collectionspace-services-nagpraclaim + collectionspace-services-repatriationclaim \ No newline at end of file diff --git a/services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/NagpraClaimResource.java b/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/RepatriationClaimResource.java similarity index 66% rename from services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/NagpraClaimResource.java rename to services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/RepatriationClaimResource.java index 18d9e6f3d..9b43bc465 100644 --- a/services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/NagpraClaimResource.java +++ b/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/RepatriationClaimResource.java @@ -19,36 +19,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.collectionspace.services.nagpraclaim; +package org.collectionspace.services.repatriationclaim; import javax.ws.rs.Consumes; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import org.collectionspace.services.client.NagpraClaimClient; +import org.collectionspace.services.client.RepatriationClaimClient; import org.collectionspace.services.common.NuxeoBasedResource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -@Path(NagpraClaimClient.SERVICE_PATH) +@Path(RepatriationClaimClient.SERVICE_PATH) @Consumes("application/xml") @Produces("application/xml") -public class NagpraClaimResource extends NuxeoBasedResource { - - final Logger logger = LoggerFactory.getLogger(NagpraClaimResource.class); +public class RepatriationClaimResource extends NuxeoBasedResource { @Override protected String getVersionString() { - final String lastChangeRevision = "$LastChangedRevision$"; - return lastChangeRevision; + return "$LastChangedRevision$"; } @Override public String getServiceName() { - return NagpraClaimClient.SERVICE_NAME; + return RepatriationClaimClient.SERVICE_NAME; } @Override - public Class getCommonPartClass() { - return NagpraclaimsCommon.class; + public Class getCommonPartClass() { + return RepatriationClaimsCommon.class; } } diff --git a/services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimDocumentModelHandler.java b/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimDocumentModelHandler.java similarity index 75% rename from services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimDocumentModelHandler.java rename to services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimDocumentModelHandler.java index 4f28d73f9..3358056f4 100644 --- a/services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimDocumentModelHandler.java +++ b/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimDocumentModelHandler.java @@ -19,11 +19,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.collectionspace.services.nagpraclaim.nuxeo; +package org.collectionspace.services.repatriationclaim.nuxeo; -import org.collectionspace.services.nagpraclaim.NagpraclaimsCommon; import org.collectionspace.services.nuxeo.client.java.NuxeoDocumentModelHandler; +import org.collectionspace.services.repatriationclaim.RepatriationClaimsCommon; -/** NagpraClaimDocumentModelHandler +/** + * RepatriationClaimDocumentModelHandler */ -public class NagpraClaimDocumentModelHandler extends NuxeoDocumentModelHandler {} +public class RepatriationClaimDocumentModelHandler extends NuxeoDocumentModelHandler {} diff --git a/services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimValidatorHandler.java b/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimValidatorHandler.java similarity index 69% rename from services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimValidatorHandler.java rename to services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimValidatorHandler.java index f76b28867..80ef8ae24 100644 --- a/services/nagpraclaim/service/src/main/java/org/collectionspace/services/nagpraclaim/nuxeo/NagpraClaimValidatorHandler.java +++ b/services/repatriationclaim/service/src/main/java/org/collectionspace/services/repatriationclaim/nuxeo/RepatriationClaimValidatorHandler.java @@ -12,35 +12,35 @@ * You may obtain a copy of the ECL 2.0 License at * https://source.collectionspace.org/collection-space/LICENSE.txt */ -package org.collectionspace.services.nagpraclaim.nuxeo; +package org.collectionspace.services.repatriationclaim.nuxeo; import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.common.document.InvalidDocumentException; import org.collectionspace.services.common.document.ValidatorHandlerImpl; -import org.collectionspace.services.nagpraclaim.NagpraclaimsCommon; +import org.collectionspace.services.repatriationclaim.RepatriationClaimsCommon; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Validation handler for NagpraClaim. Checks for the common part and claimNumber on create. + * Validation handler for a RepatriationClaim. Checks for the common part and claimNumber on create. */ -public class NagpraClaimValidatorHandler extends ValidatorHandlerImpl { +public class RepatriationClaimValidatorHandler extends ValidatorHandlerImpl { - private static final String COMMON_PART_MISSING = "Validation exception: nagpraclaims_common part is missing"; + private static final String COMMON_PART_MISSING = "Validation exception: repatriationclaims_common part is missing"; private static final String CLAIM_NUMBER_MISSING = - "Validation exception: The nagpra claim field \"claimNumber\" cannot be empty or missing"; + "Validation exception: The repatriation claim field \"claimNumber\" cannot be empty or missing"; - private final Logger logger = LoggerFactory.getLogger(NagpraClaimValidatorHandler.class); + private final Logger logger = LoggerFactory.getLogger(RepatriationClaimValidatorHandler.class); @Override protected Class getCommonPartClass() { - return NagpraclaimsCommon.class; + return RepatriationClaimsCommon.class; } @Override protected void handleCreate() throws InvalidDocumentException { - final NagpraclaimsCommon claim = (NagpraclaimsCommon) getCommonPart(); + final RepatriationClaimsCommon claim = (RepatriationClaimsCommon) getCommonPart(); if (claim == null) { logger.error(COMMON_PART_MISSING); throw new InvalidDocumentException(COMMON_PART_MISSING); -- 2.47.3