From a421253d36ff28935a2d6efd65b166bcd4f32d3c Mon Sep 17 00:00:00 2001 From: remillet Date: Tue, 10 May 2016 21:02:20 -0700 Subject: [PATCH] CSPACE-6949: Adding more SAS authority tests. --- .../6.0-HF21/config/vcsconfig.sql.txt | 23 -- .../common/vocabulary/AuthorityResource.java | 3 +- .../nuxeo/AuthorityDocumentModelHandler.java | 10 +- .../client/CitationAuthorityClient.java | 3 +- .../services/client/AuthorityClient.java | 12 +- .../services/client/AuthorityClientImpl.java | 10 +- .../services/client/AuthorityProxy.java | 10 +- .../client/GenericAuthorityClientImpl.java | 2 +- .../test/AbstractAuthorityServiceTest.java | 223 +++++++++++++++--- .../test/AbstractPoxServiceTestImpl.java | 36 +++ .../client/test/AbstractServiceTestImpl.java | 7 +- ...tMultiPartCollectionSpaceResourceImpl.java | 44 ++-- .../common/context/ServiceBindingUtils.java | 1 + .../services/common/init/AddIndices.java | 28 ++- .../vocabulary/RefNameServiceUtils.java | 2 +- .../client/java/NuxeoDocumentException.java | 7 +- .../java/RemoteDocumentModelHandlerImpl.java | 2 +- .../client/ConceptAuthorityClient.java | 3 +- .../client/AuthorityWithContactsClient.java | 4 +- .../AuthorityWithContactsClientImpl.java | 6 +- .../client/LocationAuthorityClient.java | 3 +- .../client/MaterialAuthorityClient.java | 3 +- .../services/client/OrgAuthorityClient.java | 3 +- .../client/PersonAuthorityClient.java | 3 +- .../services/client/PlaceAuthorityClient.java | 3 +- .../client/TaxonomyAuthorityClient.java | 3 +- .../services/client/VocabularyClient.java | 3 +- .../services/client/WorkAuthorityClient.java | 3 +- 28 files changed, 347 insertions(+), 113 deletions(-) diff --git a/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/vcsconfig.sql.txt b/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/vcsconfig.sql.txt index 57f78f8fc..275fc1d65 100644 --- a/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/vcsconfig.sql.txt +++ b/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/vcsconfig.sql.txt @@ -5,29 +5,6 @@ #CATEGORY: afterTableCreation -# -# Add a unique constraint to the shortidentifier column of the vocabularies_common table. -# -LOG.INFO Adding a unique constraint to the shortidentifier column of the vocabularies_common table - -#TEST: -SELECT constraint_name FROM information_schema.constraint_column_usage WHERE table_name = 'vocabularies_common' AND constraint_name = 'shortid_unique'; - -#IF: emptyResult -ALTER TABLE vocabularies_common add CONSTRAINT shortid_unique UNIQUE (shortidentifier); - -# -# Add a unique constraint to the shortidentifier column of the persons_common table. -# -LOG.INFO Adding a unique constraint to the shortidentifier column of the persons_common table - -#TEST: -SELECT constraint_name FROM information_schema.constraint_column_usage WHERE table_name = 'persons_common' AND constraint_name = 'persons_shortid_unique'; - -#IF: emptyResult -ALTER TABLE persons_common add CONSTRAINT persons_shortid_unique UNIQUE (shortidentifier); - - # # Add a unique constraint to the report 'name' column of the reports_common table. # diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java index a7eeab8e4..758ee4e1e 100644 --- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java +++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java @@ -1416,6 +1416,5 @@ public abstract class AuthorityResource uriRegistryEntriesMap.putAll(getUriRegistryEntries(tenantId, getItemDocType(tenantId), UriTemplateFactory.ITEM)); } return uriRegistryEntriesMap; - } - + } } diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java index d56218d32..5cf02866d 100644 --- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java +++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java @@ -132,6 +132,7 @@ public abstract class AuthorityDocumentModelHandler // Get the rev number of the authority so we can compare with rev number of shared authority // DocumentModel docModel = NuxeoUtils.getDocFromSpecifier(ctx, getRepositorySession(), authorityCommonSchemaName, specifier); + String authorityCsid = docModel.getName(); Long localRev = (Long) NuxeoUtils.getProperyValue(docModel, AuthorityJAXBSchema.REV); String shortId = (String) NuxeoUtils.getProperyValue(docModel, AuthorityJAXBSchema.SHORT_IDENTIFIER); // @@ -160,6 +161,10 @@ public abstract class AuthorityDocumentModelHandler ctx.setOutput(payloadOut); result = true; } + // + // We need to transition the authority into a replicated state now that we've sync'd it. + // + authorityResource.updateWorkflowWithTransition(ctx, authorityCsid, WorkflowClient.WORKFLOWTRANSITION_REPLICATE); } return result; @@ -571,8 +576,9 @@ public abstract class AuthorityDocumentModelHandler */ @Override public void handleWorkflowTransition(ServiceContext ctx, DocumentWrapper wrapDoc, TransitionDef transitionDef) throws Exception { - // Update the revision number - updateRevNumbers(wrapDoc); + if (this.getShouldUpdateRevNumber() == true) { // We don't update the rev number of synchronization requests + updateRevNumbers(wrapDoc); + } } @Override diff --git a/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java b/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java index a7a468295..5bc99f70f 100644 --- a/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java +++ b/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java @@ -17,12 +17,13 @@ */ package org.collectionspace.services.client; +import org.collectionspace.services.citation.CitationauthoritiesCommon; import org.collectionspace.services.citation.CitationsCommon; /** * The Class CitationAuthorityClient. */ -public class CitationAuthorityClient extends AuthorityClientImpl { +public class CitationAuthorityClient extends AuthorityClientImpl { public static final String SERVICE_NAME = "citationauthorities"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; diff --git a/services/client/src/main/java/org/collectionspace/services/client/AuthorityClient.java b/services/client/src/main/java/org/collectionspace/services/client/AuthorityClient.java index 341214430..4a8d5666f 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/AuthorityClient.java +++ b/services/client/src/main/java/org/collectionspace/services/client/AuthorityClient.java @@ -1,11 +1,7 @@ package org.collectionspace.services.client; -import javax.ws.rs.PathParam; import javax.ws.rs.core.Response; -import org.jboss.resteasy.client.ClientResponse; -import org.collectionspace.services.common.authorityref.AuthorityRefDocList; -import org.collectionspace.services.common.authorityref.AuthorityRefList; import org.collectionspace.services.jaxb.AbstractCommonList; /* @@ -13,12 +9,13 @@ import org.collectionspace.services.jaxb.AbstractCommonList; * ILT - Authority item list type * P - Proxy type */ -public interface AuthorityClient +public interface AuthorityClient extends CollectionSpacePoxClient { /** The uri path element for items in an authority */ public static String ITEMS = "items"; //used to construct uri's in service paths for authorities. public static final String SHORT_IDENTIFIER = "shortIdentifier"; + public static final String IN_AUTHORITY = "inAuthority"; public static final String TERM_DISPLAY_NAME = "termDisplayName"; public static final String VOCAB_DISPLAY_NAME = "displayName"; public static final String REF_NAME = "refName"; @@ -31,7 +28,7 @@ public interface AuthorityClient // Get the inAuthorityCsid (the item's parent) String getInAuthority(AUTHORITY_ITEM_TYPE item); - + // Get the inAuthorityCsid (the item's parent) void setInAuthority(AUTHORITY_ITEM_TYPE item, String inAuthorityCsid); @@ -46,6 +43,9 @@ public interface AuthorityClient //(U)pdate Item Response updateItem(String vcsid, String csid, PoxPayloadOut poxPayloadOut); + + //(U)pdate Item + Response updateNamedItemInNamedAuthority(String authShortId, String itemShortId, PoxPayloadOut poxPayloadOut); //(D)elete Item Response deleteItem(String vcsid, String csid); diff --git a/services/client/src/main/java/org/collectionspace/services/client/AuthorityClientImpl.java b/services/client/src/main/java/org/collectionspace/services/client/AuthorityClientImpl.java index bba117095..77bb53b38 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/AuthorityClientImpl.java +++ b/services/client/src/main/java/org/collectionspace/services/client/AuthorityClientImpl.java @@ -1,14 +1,15 @@ package org.collectionspace.services.client; import javax.ws.rs.core.Response; + import org.collectionspace.services.jaxb.AbstractCommonList; /* * P - Proxy type */ -public abstract class AuthorityClientImpl +public abstract class AuthorityClientImpl extends AbstractPoxServiceClientImpl - implements AuthorityClient { + implements AuthorityClient { private static final String INCLUDE_DELETE_TRUE = Boolean.TRUE.toString(); @@ -46,6 +47,11 @@ public abstract class AuthorityClientImpl { + AuthorityClientImpl { @Override public String getItemCommonPartName() { diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java index 609fe3eeb..14f7142e7 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java +++ b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java @@ -1,5 +1,7 @@ package org.collectionspace.services.client.test; +import java.lang.reflect.Array; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -16,6 +18,7 @@ import org.collectionspace.services.client.PayloadOutputPart; import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.client.XmlTools; +import org.collectionspace.services.client.workflow.WorkflowClient; import org.collectionspace.services.jaxb.AbstractCommonList; import org.dom4j.Document; import org.slf4j.Logger; @@ -43,9 +46,12 @@ public abstract class AbstractAuthorityServiceTest knownSASItemIdentifiersList = new ArrayList(); protected String knownSASItemResourceId = null; protected HashMap allSASResourceItemIdsCreated = new HashMap(); /* itemURN, parentURN */; @@ -219,8 +225,7 @@ public abstract class AbstractAuthorityServiceTest client = - (AuthorityClientImpl)this.getClientInstance(); + AuthorityClient client = (AuthorityClient)this.getClientInstance(); Response res = client.readItem(knownResourceId, knownItemResourceId); AUTHORITY_ITEM_TYPE vitem = null; try { @@ -298,9 +303,10 @@ public abstract class AbstractAuthorityServiceTest client = - (AuthorityClientImpl)this.getClientInstance(); + AuthorityClient client = (AuthorityClient)this.getClientInstance(); Response res = client.readItem(knownResourceId, knownItemResourceId); try { if (logger.isDebugEnabled()) { @@ -761,6 +852,81 @@ public abstract class AbstractAuthorityServiceTest parentCtx = createServiceContext(uriInfo); - DocumentHandler targetDocHandler = this.createDocumentHandler(parentCtx); + ServiceContext parentCtx = createServiceContext(ctx.getUriInfo()); + DocumentHandler targetDocHandler = createDocumentHandler(parentCtx); ctx.setProperty(WorkflowClient.TARGET_DOCHANDLER, targetDocHandler); //added as a context param for the workflow document handler -it will call the parent's dochandler "prepareForWorkflowTranstion" method // When looking for the document, we need to use the parent's workspace name -not the "workflow" workspace name @@ -277,6 +270,29 @@ public abstract class AbstractMultiPartCollectionSpaceResourceImpl extends Abstr } catch (Exception e) { throw bigReThrow(e, ServiceMessages.UPDATE_FAILED + WorkflowClient.SERVICE_PAYLOAD_NAME, csid); } + + return result; + + } + + /* + * We should consider changing this code. The RepositoryClient (from call to getRepositoryClient) could support a call doWorkflowTransition() instead? + */ + @PUT + @Path("{csid}" + WorkflowClient.SERVICE_PATH + "/" + "{transition}") + public byte[] updateWorkflowWithTransition( + @Context UriInfo uriInfo, + @PathParam("csid") String csid, + @PathParam("transition") String transition) { + PoxPayloadOut result = null; + + try { + ServiceContext ctx = (ServiceContext) createServiceContext(WorkflowClient.SERVICE_NAME, uriInfo); + result = this.updateWorkflowWithTransition(ctx, csid, transition); + } catch (Exception e) { + throw bigReThrow(e, ServiceMessages.UPDATE_FAILED + WorkflowClient.SERVICE_PAYLOAD_NAME, csid); + } + return result.getBytes(); } diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java index 84b8f2cc5..3d2afa09d 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java @@ -34,6 +34,7 @@ public class ServiceBindingUtils { public static final String SERVICE_TYPE_OBJECT = "object"; public static final String SERVICE_TYPE_PROCEDURE = "procedure"; public static final String SERVICE_TYPE_AUTHORITY = "authority"; + public static final String SERVICE_TYPE_VOCABULARY = "vocabulary"; public static final String SERVICE_TYPE_UTILITY = "utility"; public static final String SERVICE_TYPE_SECURITY = "security"; public static final String SERVICE_COMMONPART_ID = "1"; diff --git a/services/common/src/main/java/org/collectionspace/services/common/init/AddIndices.java b/services/common/src/main/java/org/collectionspace/services/common/init/AddIndices.java index d4e0b1d31..24bacdef7 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/init/AddIndices.java +++ b/services/common/src/main/java/org/collectionspace/services/common/init/AddIndices.java @@ -86,6 +86,10 @@ public class AddIndices extends InitHandler implements IInitHandler { private final static String INDEX_SEP = "_"; private final static String INDEX_SUFFIX = INDEX_SEP + "idx"; private final static String SHORT_ID = AuthorityClient.SHORT_IDENTIFIER.toLowerCase(); + private final static String IN_AUTHORITY = AuthorityClient.IN_AUTHORITY.toLowerCase(); + + private final static String AUTHORITY_TYPE = ServiceBindingUtils.SERVICE_TYPE_AUTHORITY; + private final static String VOCABULARY_TYPE = ServiceBindingUtils.SERVICE_TYPE_VOCABULARY; /** See the class javadoc for this class: it shows the syntax supported in the configuration params. @@ -139,7 +143,8 @@ public class AddIndices extends InitHandler implements IInitHandler { * @return * @throws Exception */ - private boolean shortIdConstraintExists(String dataSourceName, + private boolean shortIdConstraintExists(ServiceBindingType sbt, + String dataSourceName, String repositoryName, String cspaceInstanceId, String tableName) throws Exception { @@ -195,7 +200,8 @@ public class AddIndices extends InitHandler implements IInitHandler { return result; } - private boolean createShortIdConstraint(String dataSourceName, + private boolean createShortIdConstraint(ServiceBindingType sbt, + String dataSourceName, String repositoryName, String cspaceInstanceId, String tableName) { @@ -207,8 +213,18 @@ public class AddIndices extends InitHandler implements IInitHandler { DatabaseProductType databaseProductType = JDBCTools.getDatabaseProductType(dataSourceName, repositoryName); if (databaseProductType == DatabaseProductType.POSTGRESQL) { String constraintName = String.format("%s_%s_unique", tableName, SHORT_ID); - sql = String.format("ALTER TABLE %s add CONSTRAINT %s UNIQUE (%s)", - tableName, constraintName, SHORT_ID); + // + // Check if we've got a parent or an item. Parents need the constraint on the short id, but items + // have the constraint on the combined shortidentifier and inauthority (parent's CSID) columns + // + String serviceType = sbt.getType(); + if (serviceType.equalsIgnoreCase(AUTHORITY_TYPE) || serviceType.equalsIgnoreCase(VOCABULARY_TYPE)) { + sql = String.format("ALTER TABLE %s add CONSTRAINT %s UNIQUE (%s, %s)", // constraint for an item + tableName, constraintName, SHORT_ID, IN_AUTHORITY); + } else { + sql = String.format("ALTER TABLE %s add CONSTRAINT %s UNIQUE (%s)", // constraint for a parent + tableName, constraintName, SHORT_ID); + } } else { errorMsg = String.format("Database server type '%s' is not supported by CollectionSpace. Could not create constraint on column '%s' of table '%s'.", databaseProductType.getName(), SHORT_ID, tableName); @@ -295,8 +311,8 @@ public class AddIndices extends InitHandler implements IInitHandler { // // If the constraint doesn't exist, create it. // - if (shortIdConstraintExists(dataSourceName, repositoryName, cspaceInstanceId, tableName) == false) { - if (createShortIdConstraint(dataSourceName, repositoryName, cspaceInstanceId, tableName) == true) { + if (shortIdConstraintExists(sbt, dataSourceName, repositoryName, cspaceInstanceId, tableName) == false) { + if (createShortIdConstraint(sbt, dataSourceName, repositoryName, cspaceInstanceId, tableName) == true) { logger.info(String.format("Created uniqueness constraint on '%s' column of table '%s' in repository '%s'.", SHORT_ID, tableName, repositoryName)); } else { diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java index 3a64e357b..6db4c8d15 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java @@ -714,7 +714,7 @@ public class RefNameServiceUtils { + " AND " + (authTermInfo.inAuthority.name != null ? authTermInfo.inAuthority.name : authTermInfo.inAuthority.csid) + " AND " + (authTermInfo.name != null - ? authTermInfo.name : authTermInfo.csid); // REM - This seems likely to cause trouble. We should consider searching for the full refname -excluding the display name suffix + ? authTermInfo.name : authTermInfo.csid); // REM - This seems likely to cause trouble? We should consider searching for the full refname -excluding the display name suffix? String whereClauseStr = QueryManager.createWhereClauseFromKeywords(keywords); diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java index 67b60efeb..1ed3cfe00 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/NuxeoDocumentException.java @@ -2,6 +2,9 @@ package org.collectionspace.services.nuxeo.client.java; import org.collectionspace.services.common.CSWebApplicationException; import org.collectionspace.services.common.document.DocumentException; +import org.apache.http.HttpStatus; + +import org.nuxeo.ecm.core.api.ConcurrentUpdateException; import org.nuxeo.ecm.core.api.WrappedException; public class NuxeoDocumentException extends DocumentException { @@ -37,7 +40,9 @@ public class NuxeoDocumentException extends DocumentException { public NuxeoDocumentException(Throwable cause) { super(cause); - // TODO Auto-generated constructor stub + if (cause instanceof ConcurrentUpdateException) { + this.setErrorCode(HttpStatus.SC_CONFLICT); // HttpStatus.CONFLICT_409 + } } private static String getExceptionClassName(Throwable exception) { diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java index 0d46995d5..94e0d3533 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java @@ -193,7 +193,7 @@ public abstract class RemoteDocumentModelHandlerImpl @Override public void handleWorkflowTransition(ServiceContext ctx, DocumentWrapper wrapDoc, TransitionDef transitionDef) throws Exception { - // Do nothing by default, but children can override if they want. The real workflow transition happens in the WorkflowDocumemtModelHandler class + // Do nothing by default, but children can override if they want. The real workflow transition happens in the WorkflowDocumentModelHandler class } @Override diff --git a/services/concept/client/src/main/java/org/collectionspace/services/client/ConceptAuthorityClient.java b/services/concept/client/src/main/java/org/collectionspace/services/client/ConceptAuthorityClient.java index 59676e355..ff1688fe4 100644 --- a/services/concept/client/src/main/java/org/collectionspace/services/client/ConceptAuthorityClient.java +++ b/services/concept/client/src/main/java/org/collectionspace/services/client/ConceptAuthorityClient.java @@ -23,12 +23,13 @@ */ package org.collectionspace.services.client; +import org.collectionspace.services.concept.ConceptauthoritiesCommon; import org.collectionspace.services.concept.ConceptsCommon; /** * The Class ConceptAuthorityClient. */ -public class ConceptAuthorityClient extends AuthorityClientImpl { +public class ConceptAuthorityClient extends AuthorityClientImpl { public static final String SERVICE_NAME = "conceptauthorities"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; diff --git a/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClient.java b/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClient.java index 55b87c584..1c36c3560 100644 --- a/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClient.java +++ b/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClient.java @@ -10,8 +10,8 @@ import org.jboss.resteasy.client.ClientResponse; * ILT - Authority item list type * P - Proxy type */ -public interface AuthorityWithContactsClient - extends AuthorityClient { +public interface AuthorityWithContactsClient + extends AuthorityClient { /** * Creates the contact. * diff --git a/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClientImpl.java b/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClientImpl.java index 6429f633f..b69f4ce78 100644 --- a/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClientImpl.java +++ b/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClientImpl.java @@ -10,9 +10,9 @@ import org.collectionspace.services.jaxb.AbstractCommonList; * ILT - Authority item list type * P - Proxy type */ -public abstract class AuthorityWithContactsClientImpl - extends AuthorityClientImpl - implements AuthorityWithContactsClient { +public abstract class AuthorityWithContactsClientImpl + extends AuthorityClientImpl + implements AuthorityWithContactsClient { public AuthorityWithContactsClientImpl(String clientPropertiesFilename) { super(clientPropertiesFilename); diff --git a/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClient.java b/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClient.java index 1d77e339c..bb08ef000 100644 --- a/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClient.java +++ b/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClient.java @@ -17,12 +17,13 @@ */ package org.collectionspace.services.client; +import org.collectionspace.services.location.LocationauthoritiesCommon; import org.collectionspace.services.location.LocationsCommon; /** * The Class LocationAuthorityClient. */ -public class LocationAuthorityClient extends AuthorityClientImpl { +public class LocationAuthorityClient extends AuthorityClientImpl { public static final String SERVICE_NAME = "locationauthorities"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; diff --git a/services/material/client/src/main/java/org/collectionspace/services/client/MaterialAuthorityClient.java b/services/material/client/src/main/java/org/collectionspace/services/client/MaterialAuthorityClient.java index 789bb9d92..75cae9f9d 100644 --- a/services/material/client/src/main/java/org/collectionspace/services/client/MaterialAuthorityClient.java +++ b/services/material/client/src/main/java/org/collectionspace/services/client/MaterialAuthorityClient.java @@ -15,12 +15,13 @@ */ package org.collectionspace.services.client; +import org.collectionspace.services.material.MaterialauthoritiesCommon; import org.collectionspace.services.material.MaterialsCommon; /** * The Class MaterialAuthorityClient. */ -public class MaterialAuthorityClient extends AuthorityClientImpl { +public class MaterialAuthorityClient extends AuthorityClientImpl { public static final String SERVICE_NAME = "materialauthorities"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; diff --git a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClient.java b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClient.java index 9ccf7c46b..5898a026b 100644 --- a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClient.java +++ b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClient.java @@ -24,11 +24,12 @@ package org.collectionspace.services.client; import org.collectionspace.services.organization.OrganizationsCommon; +import org.collectionspace.services.organization.OrgauthoritiesCommon; /** * The Class OrgAuthorityClient. */ -public class OrgAuthorityClient extends AuthorityWithContactsClientImpl { +public class OrgAuthorityClient extends AuthorityWithContactsClientImpl { public static final String SERVICE_NAME = "orgauthorities"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; diff --git a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClient.java b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClient.java index 9d10f853a..b16c5406c 100644 --- a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClient.java +++ b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClient.java @@ -17,12 +17,13 @@ */ package org.collectionspace.services.client; +import org.collectionspace.services.person.PersonauthoritiesCommon; import org.collectionspace.services.person.PersonsCommon; /** * The Class PersonAuthorityClient. */ -public class PersonAuthorityClient extends AuthorityWithContactsClientImpl { +public class PersonAuthorityClient extends AuthorityWithContactsClientImpl { public static final String SERVICE_NAME = "personauthorities"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; diff --git a/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClient.java b/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClient.java index 1bd6ebefc..512cc54c0 100644 --- a/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClient.java +++ b/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClient.java @@ -15,12 +15,13 @@ */ package org.collectionspace.services.client; +import org.collectionspace.services.place.PlaceauthoritiesCommon; import org.collectionspace.services.place.PlacesCommon; /** * The Class PlaceAuthorityClient. */ -public class PlaceAuthorityClient extends AuthorityClientImpl { +public class PlaceAuthorityClient extends AuthorityClientImpl { public static final String SERVICE_NAME = "placeauthorities"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; diff --git a/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java b/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java index 99a45d757..1e5841a34 100644 --- a/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java +++ b/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java @@ -27,11 +27,12 @@ package org.collectionspace.services.client; import org.collectionspace.services.taxonomy.TaxonCommon; +import org.collectionspace.services.taxonomy.TaxonomyauthorityCommon; /** * The Class TaxonomyAuthorityClient. */ -public class TaxonomyAuthorityClient extends AuthorityClientImpl { +public class TaxonomyAuthorityClient extends AuthorityClientImpl { public static final String SERVICE_NAME = "taxonomyauthority"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; diff --git a/services/vocabulary/client/src/main/java/org/collectionspace/services/client/VocabularyClient.java b/services/vocabulary/client/src/main/java/org/collectionspace/services/client/VocabularyClient.java index c9822ec14..af335dabb 100644 --- a/services/vocabulary/client/src/main/java/org/collectionspace/services/client/VocabularyClient.java +++ b/services/vocabulary/client/src/main/java/org/collectionspace/services/client/VocabularyClient.java @@ -26,12 +26,13 @@ */ package org.collectionspace.services.client; +import org.collectionspace.services.vocabulary.VocabulariesCommon; import org.collectionspace.services.vocabulary.VocabularyitemsCommon; /** * The Class VocabularyClient. */ -public class VocabularyClient extends AuthorityClientImpl { +public class VocabularyClient extends AuthorityClientImpl { public static final String SERVICE_NAME = "vocabularies"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT; diff --git a/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClient.java b/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClient.java index 6809c39f7..4c1d84183 100644 --- a/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClient.java +++ b/services/work/client/src/main/java/org/collectionspace/services/client/WorkAuthorityClient.java @@ -15,12 +15,13 @@ */ package org.collectionspace.services.client; +import org.collectionspace.services.work.WorkauthoritiesCommon; import org.collectionspace.services.work.WorksCommon; /** * The Class WorkAuthorityClient. */ -public class WorkAuthorityClient extends AuthorityClientImpl { +public class WorkAuthorityClient extends AuthorityClientImpl { public static final String SERVICE_NAME = "workauthorities"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; -- 2.47.3