From: Richard Millet Date: Sat, 24 Apr 2010 05:29:47 +0000 (+0000) Subject: NOJIRA: Updating Javadoc comments and commented out unnecessary import statements. X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=39bf2e341c534d1383b4b357417a162b2da8f897;p=tmp%2Fjakarta-migration.git 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 77ecb4746..a8427608c 100644 --- 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 df2b554b9..b7bc3ffb4 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 @@ -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 9ad8bcce7..3565db486 100644 --- 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; /** - * The Class AbstractCollectionSpaceResource. + * The Class AbstractCollectionSpaceResourceImpl. + * + * @param the generic type + * @param the generic type */ public abstract class AbstractCollectionSpaceResourceImpl implements CollectionSpaceResource { 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 5fac316cb..9b8b1451b 100644 --- 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 the generic type + * @param the generic type */ public interface CollectionSpaceResource { /** - * 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 ctx); /** - * getStorageClient - * @param ctx service context + * Gets the storage client. + * + * @param ctx the ctx + * @return the storage client */ public StorageClient getStorageClient(ServiceContext 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 ctx) throws Exception; + /** + * Gets the service context factory. + * + * @return the service context factory + */ public ServiceContextFactory 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 e3ecb77f5..d3cec99b8 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 @@ -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 08ca4bb92..797b8aa5b 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 @@ -320,7 +320,6 @@ public class IntakeResource extends * * @return the intake list */ - @Deprecated public IntakesCommonList getIntakeList(List csidList) { IntakesCommonList intakeObjectList = new IntakesCommonList(); try {