NOJIRA: Updating Javadoc comments and commented out unnecessary import statements.

diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
index 77ecb474650db8bd9716570ee9cb24f2cc38d32e..a8427608c7231c2de9bdf8ab77ee5f50b37a6a51 100644 (file)
--- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
+++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
@@ -132,32 +132,39 @@ public class CollectionObjectServiceTest extends AbstractServiceTestImpl {
     @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
         dependsOnMethods = {"create", "testSubmitRequest"})
     public void createFromXmlRFWS1(String testName) throws Exception {
+       String testDataDir = System.getProperty("test-data.fileName");
         String newId =
-            createFromXmlFile(testName, "./target/test-classes/test-data/repfield_whitesp1.xml", false);
+            //createFromXmlFile(testName, "./target/test-classes/test-data/repfield_whitesp1.xml", false);
+               createFromXmlFile(testName, testDataDir + "/repfield_whitesp1.xml", false);
         testSubmitRequest(newId);
     }
 
     @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
         dependsOnMethods = {"create", "testSubmitRequest"})
     public void createFromXmlRFWS2(String testName) throws Exception {
+       String testDataDir = System.getProperty("test-data.fileName");
         String newId =
-            createFromXmlFile(testName, "./target/test-classes/test-data/repfield_whitesp2.xml", false);
+            //createFromXmlFile(testName, "./target/test-classes/test-data/repfield_whitesp2.xml", false);
+               createFromXmlFile(testName, testDataDir + "/repfield_whitesp2.xml", false);
         testSubmitRequest(newId);
     }
 
     @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
         dependsOnMethods = {"create", "testSubmitRequest"})
     public void createFromXmlRFWS3(String testName) throws Exception {
+       String testDataDir = System.getProperty("test-data.fileName");
         String newId =
-            createFromXmlFile(testName, "./target/test-classes/test-data/repfield_whitesp3.xml", false);
+            //createFromXmlFile(testName, "./target/test-classes/test-data/repfield_whitesp3.xml", false);
+               createFromXmlFile(testName, testDataDir + "/repfield_whitesp3.xml", false);
         testSubmitRequest(newId);
     }
 
     @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
         dependsOnMethods = {"create", "testSubmitRequest"})
     public void createFromXmlRFWS4(String testName) throws Exception {
+       String testDataDir = System.getProperty("test-data.fileName");
         String newId =
-            createFromXmlFile(testName, "./target/test-classes/test-data/repfield_whitesp4.xml", false);
+            createFromXmlFile(testName, testDataDir + "/repfield_whitesp4.xml", false);
         testSubmitRequest(newId);
     }
 
@@ -170,8 +177,9 @@ public class CollectionObjectServiceTest extends AbstractServiceTestImpl {
     @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
         dependsOnMethods = {"create", "testSubmitRequest"})
     public void createWithNullValueRepeatableField(String testName) throws Exception {
-        String newId =
-            createFromXmlFile(testName, "./target/test-classes/test-data/repfield_null1.xml", false);
+       String testDataDir = System.getProperty("test-data.fileName");
+       String newId =
+            createFromXmlFile(testName, testDataDir + "/repfield_null1.xml", false);
         if (logger.isDebugEnabled()) {
             logger.debug("Successfully created record with null value repeatable field.");
             logger.debug("Attempting to retrieve just-created record ...");

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 df2b554b9487bc9fe060470b3b0aabee15eae686..b7bc3ffb44eb266b097b6ae5f7d0a626e4272316 100644 (file)
--- 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
@@ -93,7 +93,7 @@ public class CollectionObjectResource
      * @see org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl#getVersionString()
      */
     @Override
-    protected String getVersionString() {
+    public String getVersionString() {
         /** The last change revision. */
         final String lastChangeRevision = "$LastChangedRevision$";
         return lastChangeRevision;

diff --git a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java
index 9ad8bcce7b8ba000de59f8a021e1481499e3875b..3565db4863eb9aa7cb70a2a1d2a254f3f29ed1b0 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java
@@ -38,7 +38,10 @@ import org.collectionspace.services.common.storage.StorageClient;
 import org.collectionspace.services.common.storage.jpa.JpaStorageClientImpl;\r
 \r
 /**\r
- * The Class AbstractCollectionSpaceResource.\r
+ * The Class AbstractCollectionSpaceResourceImpl.\r
+ *\r
+ * @param <IT> the generic type\r
+ * @param <OT> the generic type\r
  */\r
 public abstract class AbstractCollectionSpaceResourceImpl<IT, OT>\r
         implements CollectionSpaceResource<IT, OT> {\r

diff --git a/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java b/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java
index 5fac316cb0874ec221e92258dd59cba51898b699..9b8b1451b2f6b222947eec2f715733940f3c6dc8 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/CollectionSpaceResource.java
@@ -30,46 +30,58 @@ import org.collectionspace.services.common.repository.RepositoryClient;
 import org.collectionspace.services.common.storage.StorageClient;
 
 /**
- * CollectionSpaceResource is a resource interface implemented by every
- * entity/service in CollectionSpace
+ * The Interface CollectionSpaceResource.
+ *
+ * @param <IT> the generic type
+ * @param <OT> the generic type
  */
 public interface CollectionSpaceResource<IT, OT> {
 
     /**
-     * getServiceName returns the name of the service
+     * Gets the service name.
+     *
+     * @return the service name
      */
     public String getServiceName();
     
     /**
-     * Gets the common class.
-     * 
-     * @return the common class
+     * Gets the common part class.
+     *
+     * @return the common part class
      */
-    public Class getCommonPartClass();
+    public Class<?> getCommonPartClass();
 
     /**
-     * getRepositoryClient
-     * @param ctx service context
+     * Gets the repository client.
+     *
+     * @param ctx the ctx
+     * @return the repository client
      */
     public RepositoryClient getRepositoryClient(ServiceContext<IT, OT> ctx);
 
     /**
-     * getStorageClient
-     * @param ctx service context
+     * Gets the storage client.
+     *
+     * @param ctx the ctx
+     * @return the storage client
      */
     public StorageClient getStorageClient(ServiceContext<IT, OT> ctx);
     
     /**
-     * createDocumentHandler creates a document handler and populates it with given
-     * service context. document handler should never be used
-     * across service invocations. it is a stateful object that holds request,
-     * response and service context
-     * @param ctx
-     * @return
+     * Creates the document handler.
+     *
+     * @param ctx the ctx
+     * @return the document handler
+     * @throws Exception the exception
      */
     public DocumentHandler createDocumentHandler(ServiceContext<IT, OT> ctx) throws Exception;
     
     
+    /**
+     * Gets the service context factory.
+     *
+     * @return the service context factory
+     */
     public ServiceContextFactory<IT, OT> getServiceContextFactory();
 
 }

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 e3ecb77f5e10ef92a61fd36438d2ab6e121d8258..d3cec99b822aca0d0e23e5b7a6752f0c231518cb 100644 (file)
--- 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
@@ -43,8 +43,8 @@ import org.collectionspace.services.common.AbstractMultiPartCollectionSpaceResou
 
 import org.collectionspace.services.common.ClientType;
 import org.collectionspace.services.common.ServiceMain;
-import org.collectionspace.services.common.context.MultipartServiceContext;
-import org.collectionspace.services.common.context.MultipartServiceContextFactory;
+//import org.collectionspace.services.common.context.MultipartServiceContext;
+//import org.collectionspace.services.common.context.MultipartServiceContextFactory;
 import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.document.DocumentNotFoundException;
 import org.collectionspace.services.common.document.DocumentHandler;
@@ -83,7 +83,7 @@ public class DimensionResource extends
      * @see org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl#getVersionString()
      */
     @Override
-    protected String getVersionString() {
+    public String getVersionString() {
        /** The last change revision. */
        final String lastChangeRevision = "$LastChangedRevision$";
        return lastChangeRevision;

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 08ca4bb9203242f92a7779b54f9875e9ca83c499..797b8aa5be8fd53f4696dee1078f089480102a88 100644 (file)
--- 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
@@ -320,7 +320,6 @@ public class IntakeResource extends
      * 
      * @return the intake list
      */
-    @Deprecated
     public IntakesCommonList getIntakeList(List<String> csidList) {
         IntakesCommonList intakeObjectList = new IntakesCommonList();
         try {