From: Richard Millet Date: Tue, 12 Jan 2010 17:48:38 +0000 (+0000) Subject: CSPACE-733: Adding a "version" method to children of the the AbstractCollectionSpaceR... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=8233bfea89086cdee57c58d9c4ccc4eaea26178f;p=tmp%2Fjakarta-migration.git CSPACE-733: Adding a "version" method to children of the the AbstractCollectionSpaceResource class. --- diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java index 9261e4d95..f2c19f2b6 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java @@ -62,6 +62,13 @@ public class AccountResource final Logger logger = LoggerFactory.getLogger(AccountResource.class); final StorageClient storageClient = new AccountStorageClient(); + @Override + protected String getVersionString() { + /** The last change revision. */ + final String lastChangeRevision = "$LastChangedRevision: 1165 $"; + return lastChangeRevision; + } + @Override public String getServiceName() { return serviceName; diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java index cfc53eedd..55e0c1f11 100644 --- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java +++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java @@ -65,6 +65,13 @@ public class AcquisitionResource final private String serviceName = "acquisitions"; final Logger logger = LoggerFactory.getLogger(AcquisitionResource.class); + @Override + protected String getVersionString() { + /** The last change revision. */ + final String lastChangeRevision = "$LastChangedRevision: 1165 $"; + return lastChangeRevision; + } + @Override public String getServiceName() { return serviceName; diff --git a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java index 66bf63567..3750ce684 100644 --- a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java +++ b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java @@ -44,6 +44,7 @@ import java.util.Map; import java.util.HashMap; import java.util.StringTokenizer; +import org.collectionspace.services.common.Version; import org.collectionspace.services.common.query.QueryManager; import org.collectionspace.services.common.query.IQueryManager; import org.collectionspace.services.collectionobject.nuxeo.CollectionObjectHandlerFactory; @@ -67,11 +68,16 @@ import org.slf4j.LoggerFactory; public class CollectionObjectResource extends AbstractCollectionSpaceResource { - //FIXME: Remove this static string - final private String lastChangeRevision = "$LastChangedRevision$"; final private String serviceName = "collectionobjects"; final Logger logger = LoggerFactory.getLogger(CollectionObjectResource.class); + @Override + protected String getVersionString() { + /** The last change revision. */ + final String lastChangeRevision = "$LastChangedRevision$"; + return lastChangeRevision; + } + @Override public String getServiceName() { return serviceName; diff --git a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java index 67b916489..9f06264a7 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java +++ b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java @@ -23,6 +23,10 @@ */ package org.collectionspace.services.common; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; + import org.collectionspace.services.common.context.ServiceContext; import org.collectionspace.services.common.document.DocumentHandler; import org.collectionspace.services.common.repository.RepositoryClient; @@ -30,22 +34,39 @@ import org.collectionspace.services.common.repository.RepositoryClientFactory; import org.collectionspace.services.common.storage.StorageClient; import org.collectionspace.services.common.storage.jpa.JpaStorageClient; +/** + * The Class AbstractCollectionSpaceResource. + */ public abstract class AbstractCollectionSpaceResource implements CollectionSpaceResource { // Fields for default client factory and client + /** The repository client factory. */ private RepositoryClientFactory repositoryClientFactory; + + /** The repository client. */ private RepositoryClient repositoryClient; + + /** The storage client. */ private StorageClient storageClient; + /** + * Instantiates a new abstract collection space resource. + */ public AbstractCollectionSpaceResource() { repositoryClientFactory = RepositoryClientFactory.getInstance(); } + /* (non-Javadoc) + * @see org.collectionspace.services.common.CollectionSpaceResource#getServiceName() + */ @Override abstract public String getServiceName(); + /* (non-Javadoc) + * @see org.collectionspace.services.common.CollectionSpaceResource#getRepositoryClient(org.collectionspace.services.common.context.ServiceContext) + */ @Override synchronized public RepositoryClient getRepositoryClient(ServiceContext ctx) { if(repositoryClient != null){ @@ -55,6 +76,9 @@ public abstract class AbstractCollectionSpaceResource return repositoryClient; } + /* (non-Javadoc) + * @see org.collectionspace.services.common.CollectionSpaceResource#getStorageClient(org.collectionspace.services.common.context.ServiceContext) + */ @Override synchronized public StorageClient getStorageClient(ServiceContext ctx) { if(storageClient != null) { @@ -64,6 +88,33 @@ public abstract class AbstractCollectionSpaceResource return storageClient; } + /* (non-Javadoc) + * @see org.collectionspace.services.common.CollectionSpaceResource#createDocumentHandler(org.collectionspace.services.common.context.ServiceContext) + */ @Override abstract public DocumentHandler createDocumentHandler(ServiceContext ctx) throws Exception ; + + /** + * Gets the version string. + * + * @return the version string + */ + abstract protected String getVersionString(); + + /** + * Gets the version. + * + * @return the version + */ + @GET + @Path("/version") + @Produces("application/xml") + public Version getVersion() { + Version result = new Version(); + + result.setVersionString(getVersionString()); + + return result; + } + } diff --git a/services/contact/service/src/main/java/org/collectionspace/services/contact/ContactResource.java b/services/contact/service/src/main/java/org/collectionspace/services/contact/ContactResource.java index 2bfca676e..399bb62d7 100644 --- a/services/contact/service/src/main/java/org/collectionspace/services/contact/ContactResource.java +++ b/services/contact/service/src/main/java/org/collectionspace/services/contact/ContactResource.java @@ -68,6 +68,13 @@ public class ContactResource extends AbstractCollectionSpaceResource { // do nothing } + @Override + protected String getVersionString() { + /** The last change revision. */ + final String lastChangeRevision = "$LastChangedRevision: 1165 $"; + return lastChangeRevision; + } + @Override public String getServiceName() { return serviceName; diff --git a/services/dimension/service/src/main/java/org/collectionspace/services/dimension/DimensionResource.java b/services/dimension/service/src/main/java/org/collectionspace/services/dimension/DimensionResource.java index 55ed1b806..71d962004 100644 --- a/services/dimension/service/src/main/java/org/collectionspace/services/dimension/DimensionResource.java +++ b/services/dimension/service/src/main/java/org/collectionspace/services/dimension/DimensionResource.java @@ -68,6 +68,13 @@ public class DimensionResource extends AbstractCollectionSpaceResource { // do nothing } + @Override + protected String getVersionString() { + /** The last change revision. */ + final String lastChangeRevision = "$LastChangedRevision: 1165 $"; + return lastChangeRevision; + } + @Override public String getServiceName() { return serviceName; diff --git a/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java b/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java index b41f13b03..179a76d65 100644 --- a/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java +++ b/services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java @@ -73,6 +73,13 @@ public class IntakeResource extends AbstractCollectionSpaceResource { // do nothing } + @Override + protected String getVersionString() { + /** The last change revision. */ + final String lastChangeRevision = "$LastChangedRevision: 1165 $"; + return lastChangeRevision; + } + @Override public String getServiceName() { return serviceName; diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/OrgAuthorityResource.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/OrgAuthorityResource.java index 053854bae..62dbf04a5 100644 --- a/services/organization/service/src/main/java/org/collectionspace/services/organization/OrgAuthorityResource.java +++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/OrgAuthorityResource.java @@ -72,6 +72,13 @@ public class OrgAuthorityResource extends AbstractCollectionSpaceResource { // do nothing } + @Override + protected String getVersionString() { + /** The last change revision. */ + final String lastChangeRevision = "$LastChangedRevision: 1165 $"; + return lastChangeRevision; + } + @Override public String getServiceName() { return orgAuthorityServiceName; diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/PersonAuthorityResource.java b/services/person/service/src/main/java/org/collectionspace/services/person/PersonAuthorityResource.java index c922a1a7b..8a3c608ba 100644 --- a/services/person/service/src/main/java/org/collectionspace/services/person/PersonAuthorityResource.java +++ b/services/person/service/src/main/java/org/collectionspace/services/person/PersonAuthorityResource.java @@ -72,6 +72,13 @@ public class PersonAuthorityResource extends AbstractCollectionSpaceResource { // do nothing } + @Override + protected String getVersionString() { + /** The last change revision. */ + final String lastChangeRevision = "$LastChangedRevision: 1165 $"; + return lastChangeRevision; + } + @Override public String getServiceName() { return personAuthorityServiceName; diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java index 436ee70be..e04b2d05b 100644 --- a/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java +++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java @@ -66,6 +66,13 @@ public class NewRelationResource extends AbstractCollectionSpaceResource { public final static String serviceName = "relations"; final Logger logger = LoggerFactory.getLogger(NewRelationResource.class); + @Override + protected String getVersionString() { + /** The last change revision. */ + final String lastChangeRevision = "$LastChangedRevision: 1165 $"; + return lastChangeRevision; + } + @Override public String getServiceName() { return serviceName; diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java index 9b6737ab7..88fed1956 100644 --- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java +++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java @@ -72,6 +72,13 @@ public class VocabularyResource extends AbstractCollectionSpaceResource { // do nothing } + @Override + protected String getVersionString() { + /** The last change revision. */ + final String lastChangeRevision = "$LastChangedRevision: 1165 $"; + return lastChangeRevision; + } + @Override public String getServiceName() { return vocabularyServiceName;