From bf568bc823ec290e3649ffed35fcace7ce6b2edc Mon Sep 17 00:00:00 2001 From: Sanjay Dalal Date: Fri, 12 Feb 2010 18:35:11 +0000 Subject: [PATCH] CSPACE-916 class name consistency test: service level tests M services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java M services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java M services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java M services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java M services/dimension/service/src/main/java/org/collectionspace/services/dimension/DimensionResource.java M services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java M services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java M services/dimension/client/src/main/java/org/collectionspace/services/client/DimensionClient.java M services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClientFactory.java D services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java M services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java D services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java A + services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java M services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java A + services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java D services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClient.java A + services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java M services/common/src/main/java/org/collectionspace/services/common/query/nuxeo/QueryManagerNuxeoImpl.java A + services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java D services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReader.java D services/common/src/main/java/org/collectionspace/services/common/config/ServicesConfigReader.java D services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReader.java A + services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java A + services/common/src/main/java/org/collectionspace/services/common/config/ServicesConfigReaderImpl.java M services/common/src/main/java/org/collectionspace/services/common/vocabulary/VocabManagerImpl.java D services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandler.java D services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandler.java A + services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandlerImpl.java A + services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java D services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClient.java A + services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java D services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandler.java A + services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java M services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java M services/common/src/main/config/service-config.xml M services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/AcquisitionResource.java M services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java M services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java M services/acquisition/client/src/main/java/org/collectionspace/services/client/AcquisitionClient.java M services/contact/service/src/main/java/org/collectionspace/services/contact/ContactResource.java M services/contact/service/src/main/java/org/collectionspace/services/contact/nuxeo/ContactDocumentModelHandler.java M services/contact/client/src/test/java/org/collectionspace/services/client/test/ContactServiceTest.java M services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java M services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountStorageClient.java M services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java M services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java M services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountServiceTest.java M services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java M services/organization/service/src/main/java/org/collectionspace/services/organization/OrgAuthorityResource.java M services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java M services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java M services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java M services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClient.java M services/person/service/src/main/java/org/collectionspace/services/person/PersonAuthorityResource.java M services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java M services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java M services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java M services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClient.java M services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java M services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java M services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java M services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java M services/vocabulary/client/src/main/java/org/collectionspace/services/client/VocabularyClient.java M services/security/client/src/test/java/org/collectionspace/services/authentication/client/test/AuthenticationServiceTest.java M services/intake/service/src/main/java/org/collectionspace/services/intake/IntakeResource.java M services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java M services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java M services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java M services/relation/service/src/main/java/org/collectionspace/services/relation/NewRelationResource.java M services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java M services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java M services/relation/client/src/main/java/org/collectionspace/services/client/RelationClient.java D services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTest.java A + services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java M services/client/src/main/java/org/collectionspace/services/client/TestServiceClient.java A + services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java D services/client/src/main/java/org/collectionspace/services/client/BaseServiceClient.java --- .../services/client/AccountClient.java | 4 +- .../client/test/AccountServiceTest.java | 46 +++++++++---------- .../services/account/AccountResource.java | 4 +- .../storage/AccountDocumentHandler.java | 4 +- .../account/storage/AccountStorageClient.java | 4 +- .../services/client/AcquisitionClient.java | 2 +- .../client/test/AcquisitionServiceTest.java | 20 ++++---- .../acquisition/AcquisitionResource.java | 4 +- .../AcquisitionDocumentModelHandler.java | 4 +- ...nt.java => AbstractServiceClientImpl.java} | 6 +-- .../services/client/TestServiceClient.java | 2 +- ...Test.java => AbstractServiceTestImpl.java} | 4 +- .../client/CollectionObjectClient.java | 2 +- .../test/CollectionObjectServiceTest.java | 32 ++++++------- .../CollectionObjectResource.java | 4 +- .../CollectionObjectDocumentModelHandler.java | 4 +- .../common/src/main/config/service-config.xml | 2 +- ... AbstractCollectionSpaceResourceImpl.java} | 8 ++-- .../services/common/ServiceMain.java | 16 +++---- ...der.java => AbstractConfigReaderImpl.java} | 6 +-- ...der.java => ServicesConfigReaderImpl.java} | 8 ++-- ...ava => TenantBindingConfigReaderImpl.java} | 8 ++-- ...t.java => AbstractServiceContextImpl.java} | 14 +++--- .../context/RemoteServiceContextImpl.java | 2 +- ....java => AbstractDocumentHandlerImpl.java} | 6 +-- ...AbstractMultipartDocumentHandlerImpl.java} | 8 ++-- .../query/nuxeo/QueryManagerNuxeoImpl.java | 4 +- .../repository/RepositoryClientFactory.java | 4 +- ...eClient.java => JpaStorageClientImpl.java} | 6 +-- .../common/vocabulary/VocabManagerImpl.java | 4 +- .../client/java/DocumentModelHandler.java | 4 +- ...va => RemoteDocumentModelHandlerImpl.java} | 4 +- ...ent.java => RepositoryJavaClientImpl.java} | 6 +-- .../services/client/ContactClient.java | 2 +- .../client/test/ContactServiceTest.java | 20 ++++---- .../services/contact/ContactResource.java | 4 +- .../nuxeo/ContactDocumentModelHandler.java | 4 +- .../services/client/DimensionClient.java | 2 +- .../client/test/DimensionServiceTest.java | 20 ++++---- .../services/dimension/DimensionResource.java | 4 +- .../nuxeo/DimensionDocumentModelHandler.java | 4 +- .../services/client/IntakeClient.java | 4 +- .../client/test/IntakeServiceTest.java | 20 ++++---- .../services/intake/IntakeResource.java | 4 +- .../nuxeo/IntakeDocumentModelHandler.java | 4 +- .../services/client/OrgAuthorityClient.java | 4 +- .../client/test/OrgAuthorityServiceTest.java | 34 +++++++------- .../organization/OrgAuthorityResource.java | 4 +- .../OrgAuthorityDocumentModelHandler.java | 4 +- .../OrganizationDocumentModelHandler.java | 4 +- .../client/PersonAuthorityClient.java | 2 +- .../test/PersonAuthorityServiceTest.java | 34 +++++++------- .../person/PersonAuthorityResource.java | 4 +- .../PersonAuthorityDocumentModelHandler.java | 4 +- .../nuxeo/PersonDocumentModelHandler.java | 4 +- .../services/client/RelationClient.java | 2 +- .../client/test/RelationServiceTest.java | 20 ++++---- .../relation/NewRelationResource.java | 4 +- .../nuxeo/RelationDocumentModelHandler.java | 4 +- .../test/AuthenticationServiceTest.java | 12 ++--- .../services/client/VocabularyClient.java | 2 +- .../client/test/VocabularyServiceTest.java | 34 +++++++------- .../vocabulary/VocabularyResource.java | 4 +- .../nuxeo/VocabularyDocumentModelHandler.java | 4 +- .../VocabularyItemDocumentModelHandler.java | 4 +- 65 files changed, 268 insertions(+), 268 deletions(-) rename services/client/src/main/java/org/collectionspace/services/client/{BaseServiceClient.java => AbstractServiceClientImpl.java} (93%) rename services/client/src/main/java/org/collectionspace/services/client/test/{AbstractServiceTest.java => AbstractServiceTestImpl.java} (99%) rename services/common/src/main/java/org/collectionspace/services/common/{AbstractCollectionSpaceResource.java => AbstractCollectionSpaceResourceImpl.java} (92%) rename services/common/src/main/java/org/collectionspace/services/common/config/{AbstractConfigReader.java => AbstractConfigReaderImpl.java} (95%) rename services/common/src/main/java/org/collectionspace/services/common/config/{ServicesConfigReader.java => ServicesConfigReaderImpl.java} (94%) rename services/common/src/main/java/org/collectionspace/services/common/config/{TenantBindingConfigReader.java => TenantBindingConfigReaderImpl.java} (98%) rename services/common/src/main/java/org/collectionspace/services/common/context/{AbstractServiceContext.java => AbstractServiceContextImpl.java} (96%) rename services/common/src/main/java/org/collectionspace/services/common/document/{AbstractDocumentHandler.java => AbstractDocumentHandlerImpl.java} (98%) rename services/common/src/main/java/org/collectionspace/services/common/document/{AbstractMultipartDocumentHandler.java => AbstractMultipartDocumentHandlerImpl.java} (91%) rename services/common/src/main/java/org/collectionspace/services/common/storage/jpa/{JpaStorageClient.java => JpaStorageClientImpl.java} (99%) rename services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/{RemoteDocumentModelHandler.java => RemoteDocumentModelHandlerImpl.java} (98%) rename services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/{RepositoryJavaClient.java => RepositoryJavaClientImpl.java} (99%) diff --git a/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java b/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java index 05175be33..552d8b956 100644 --- a/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java +++ b/services/account/client/src/main/java/org/collectionspace/services/client/AccountClient.java @@ -41,7 +41,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; * @version $Revision:$ */ -public class AccountClient extends BaseServiceClient { +public class AccountClient extends AbstractServiceClientImpl { /** * @@ -49,7 +49,7 @@ public class AccountClient extends BaseServiceClient { private AccountProxy accountProxy; /* (non-Javadoc) - * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent() + * @see org.collectionspace.services.client.AbstractServiceClientImpl#getServicePathComponent() */ public String getServicePathComponent() { return "accounts"; diff --git a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountServiceTest.java b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountServiceTest.java index aefc914ec..bdeba004d 100644 --- a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountServiceTest.java +++ b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountServiceTest.java @@ -32,7 +32,7 @@ import org.collectionspace.services.client.AccountClient; import org.collectionspace.services.account.AccountsCommon; import org.collectionspace.services.account.AccountsCommonList; import org.collectionspace.services.account.Status; -import org.collectionspace.services.client.test.AbstractServiceTest; +import org.collectionspace.services.client.test.AbstractServiceTestImpl; import org.collectionspace.services.client.test.ServiceRequestType; import org.jboss.resteasy.client.ClientResponse; @@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision: 917 $ * $LastChangedDate: 2009-11-06 12:20:28 -0800 (Fri, 06 Nov 2009) $ */ -public class AccountServiceTest extends AbstractServiceTest { +public class AccountServiceTest extends AbstractServiceTestImpl { private final Logger logger = LoggerFactory.getLogger(AccountServiceTest.class); @@ -60,7 +60,7 @@ public class AccountServiceTest extends AbstractServiceTest { private String resource2Id = null; private String resource3Id = null; /* - * This method is called only by the parent class, AbstractServiceTest + * This method is called only by the parent class, AbstractServiceTestImpl */ @Override @@ -73,7 +73,7 @@ public class AccountServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class) + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class) public void create(String testName) throws Exception { // Perform setup, such as initializing the type of service request @@ -108,7 +108,7 @@ public class AccountServiceTest extends AbstractServiceTest { } } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createWithoutTenant(String testName) throws Exception { @@ -129,7 +129,7 @@ public class AccountServiceTest extends AbstractServiceTest { } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createWithoutUser(String testName) throws Exception { @@ -151,7 +151,7 @@ public class AccountServiceTest extends AbstractServiceTest { //to not cause uniqueness violation for account, createList is removed @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createList(String testName) throws Exception { @@ -205,7 +205,7 @@ public class AccountServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void read(String testName) throws Exception { @@ -231,7 +231,7 @@ public class AccountServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readNonExistent(String testName) throws Exception { @@ -257,7 +257,7 @@ public class AccountServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void readList(String testName) throws Exception { @@ -285,7 +285,7 @@ public class AccountServiceTest extends AbstractServiceTest { } } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void searchScreenName(String testName) throws Exception { @@ -313,7 +313,7 @@ public class AccountServiceTest extends AbstractServiceTest { } } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void searchUserId(String testName) throws Exception { @@ -341,7 +341,7 @@ public class AccountServiceTest extends AbstractServiceTest { } } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void searchEmail(String testName) throws Exception { @@ -369,7 +369,7 @@ public class AccountServiceTest extends AbstractServiceTest { } } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void searchScreenNameEmail(String testName) throws Exception { @@ -404,7 +404,7 @@ public class AccountServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"read", "readList", "readNonExistent"}) public void update(String testName) throws Exception { @@ -454,7 +454,7 @@ public class AccountServiceTest extends AbstractServiceTest { "Data in updated object did not match submitted data."); } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"update"}) public void updatePassword(String testName) throws Exception { @@ -503,7 +503,7 @@ public class AccountServiceTest extends AbstractServiceTest { // "Data in updated object did not match submitted data."); } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"update"}) public void updatePasswordWithoutUser(String testName) throws Exception { @@ -546,7 +546,7 @@ public class AccountServiceTest extends AbstractServiceTest { } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"updatePasswordWithoutUser"}) public void deactivate(String testName) throws Exception { @@ -612,7 +612,7 @@ public class AccountServiceTest extends AbstractServiceTest { } @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"deactivate", "readNonExistent", "testSubmitRequest"}) public void updateNonExistent(String testName) throws Exception { @@ -639,7 +639,7 @@ public class AccountServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"deactivate", "readNonExistent", "testSubmitRequest"}) public void updateWrongUser(String testName) throws Exception { @@ -687,7 +687,7 @@ public class AccountServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"testSubmitRequest", "updateWrongUser"}) public void delete(String testName) throws Exception { @@ -708,7 +708,7 @@ public class AccountServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"testSubmitRequest", "updateWrongUser"}) public void deleteList(String testName) throws Exception { @@ -736,7 +736,7 @@ public class AccountServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) public void deleteNonExistent(String testName) throws Exception { 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 2ff00573e..3c55b483a 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 @@ -39,7 +39,7 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import org.collectionspace.services.account.storage.AccountStorageClient; -import org.collectionspace.services.common.AbstractCollectionSpaceResource; +import org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl; import org.collectionspace.services.common.context.RemoteServiceContextImpl; import org.collectionspace.services.common.context.ServiceContext; import org.collectionspace.services.common.document.BadRequestException; @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; @Consumes("application/xml") @Produces("application/xml") public class AccountResource - extends AbstractCollectionSpaceResource { + extends AbstractCollectionSpaceResourceImpl { final private String serviceName = "accounts"; final Logger logger = LoggerFactory.getLogger(AccountResource.class); diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java index f35de7731..482a14a1b 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountDocumentHandler.java @@ -29,7 +29,7 @@ import org.collectionspace.services.account.AccountsCommon; import org.collectionspace.services.account.AccountsCommonList; import org.collectionspace.services.account.AccountsCommonList.AccountListItem; import org.collectionspace.services.account.Status; -import org.collectionspace.services.common.document.AbstractDocumentHandler; +import org.collectionspace.services.common.document.AbstractDocumentHandlerImpl; import org.collectionspace.services.common.document.BadRequestException; import org.collectionspace.services.common.document.DocumentFilter; import org.collectionspace.services.common.document.DocumentWrapper; @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; * @author */ public class AccountDocumentHandler - extends AbstractDocumentHandler { + extends AbstractDocumentHandlerImpl { private final Logger logger = LoggerFactory.getLogger(AccountDocumentHandler.class); private AccountsCommon account; diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountStorageClient.java b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountStorageClient.java index f0d479ca5..e34f7bdfb 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountStorageClient.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/storage/AccountStorageClient.java @@ -38,7 +38,7 @@ import org.collectionspace.services.common.document.DocumentNotFoundException; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.common.document.DocumentWrapperImpl; import org.collectionspace.services.common.security.SecurityUtils; -import org.collectionspace.services.common.storage.jpa.JpaStorageClient; +import org.collectionspace.services.common.storage.jpa.JpaStorageClientImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; * state in persistent storage * @author */ -public class AccountStorageClient extends JpaStorageClient { +public class AccountStorageClient extends JpaStorageClientImpl { private final Logger logger = LoggerFactory.getLogger(AccountStorageClient.class); diff --git a/services/acquisition/client/src/main/java/org/collectionspace/services/client/AcquisitionClient.java b/services/acquisition/client/src/main/java/org/collectionspace/services/client/AcquisitionClient.java index 0b0c31f38..5c98b8b92 100644 --- a/services/acquisition/client/src/main/java/org/collectionspace/services/client/AcquisitionClient.java +++ b/services/acquisition/client/src/main/java/org/collectionspace/services/client/AcquisitionClient.java @@ -16,7 +16,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; * @version $Revision:$ */ -public class AcquisitionClient extends BaseServiceClient { +public class AcquisitionClient extends AbstractServiceClientImpl { /* (non-Javadoc) * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent() diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java index e1c55e5d9..8ff593edd 100644 --- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java +++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision: 621 $ * $LastChangedDate: 2009-09-02 16:49:01 -0700 (Wed, 02 Sep 2009) $ */ -public class AcquisitionServiceTest extends AbstractServiceTest { +public class AcquisitionServiceTest extends AbstractServiceTestImpl { private final Logger logger = LoggerFactory.getLogger(AcquisitionServiceTest.class); @@ -66,7 +66,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class) + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class) public void create(String testName) throws Exception { // Perform setup, such as initializing the type of service request @@ -110,7 +110,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { } @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createList(String testName) throws Exception { for(int i = 0; i < 3; i++){ @@ -190,7 +190,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void read(String testName) throws Exception { @@ -219,7 +219,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readNonExistent(String testName) throws Exception { @@ -245,7 +245,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void readList(String testName) throws Exception { @@ -294,7 +294,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void update(String testName) throws Exception { @@ -468,7 +468,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { */ @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"update", "testSubmitRequest"}) public void updateNonExistent(String testName) throws Exception { @@ -498,7 +498,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create", "read", "update"}) public void delete(String testName) throws Exception { @@ -521,7 +521,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) public void deleteNonExistent(String testName) throws Exception { 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 951146ea0..1db3cfadf 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 @@ -38,7 +38,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import org.collectionspace.services.common.AbstractCollectionSpaceResource; +import org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl; import org.collectionspace.services.common.context.MultipartServiceContext; import org.collectionspace.services.common.context.MultipartServiceContextFactory; import org.collectionspace.services.common.context.ServiceContext; @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; @Consumes("multipart/mixed") @Produces("multipart/mixed") public class AcquisitionResource - extends AbstractCollectionSpaceResource { + extends AbstractCollectionSpaceResourceImpl { final private String serviceName = "acquisitions"; final Logger logger = LoggerFactory.getLogger(AcquisitionResource.class); diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java index ec48ddbc1..c79eb3890 100644 --- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java +++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java @@ -34,7 +34,7 @@ import org.collectionspace.services.acquisition.AcquisitionsCommonList; import org.collectionspace.services.acquisition.AcquisitionsCommonList.AcquisitionListItem; import org.collectionspace.services.common.document.DocumentHandler.Action; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class AcquisitionDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(AcquisitionDocumentModelHandler.class); /** diff --git a/services/client/src/main/java/org/collectionspace/services/client/BaseServiceClient.java b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java similarity index 93% rename from services/client/src/main/java/org/collectionspace/services/client/BaseServiceClient.java rename to services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java index b74368d36..aef848a5c 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/BaseServiceClient.java +++ b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java @@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory; /** * BaseServiceClient is an abstract base client of all service clients */ -public abstract class BaseServiceClient implements CollectionSpaceClient { +public abstract class AbstractServiceClientImpl implements CollectionSpaceClient { - protected final Logger logger = LoggerFactory.getLogger(BaseServiceClient.class); + protected final Logger logger = LoggerFactory.getLogger(AbstractServiceClientImpl.class); private Properties properties = new Properties(); private URL url; private HttpClient httpClient; @@ -55,7 +55,7 @@ public abstract class BaseServiceClient implements CollectionSpaceClient { abstract public String getServicePathComponent(); - protected BaseServiceClient() { + protected AbstractServiceClientImpl() { readProperties(); setupHttpClient(); } diff --git a/services/client/src/main/java/org/collectionspace/services/client/TestServiceClient.java b/services/client/src/main/java/org/collectionspace/services/client/TestServiceClient.java index 365621051..a9741fbe1 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/TestServiceClient.java +++ b/services/client/src/main/java/org/collectionspace/services/client/TestServiceClient.java @@ -28,7 +28,7 @@ package org.collectionspace.services.client; * @version $Revision:$ */ -public class TestServiceClient extends BaseServiceClient { +public class TestServiceClient extends AbstractServiceClientImpl { /** * * Default constructor for CollectionObjectClient class. diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTest.java b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java similarity index 99% rename from services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTest.java rename to services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java index ea950e9ef..88e01f77f 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTest.java +++ b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java @@ -58,10 +58,10 @@ import org.slf4j.LoggerFactory; * * For Javadoc descriptions of this class's methods, see the ServiceTest interface. */ -public abstract class AbstractServiceTest implements ServiceTest { +public abstract class AbstractServiceTestImpl implements ServiceTest { private final Logger logger = - LoggerFactory.getLogger(AbstractServiceTest.class); + LoggerFactory.getLogger(AbstractServiceTestImpl.class); // A base-level client, used (only) to obtain the base service URL. protected static final TestServiceClient serviceClient = new TestServiceClient(); diff --git a/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java b/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java index dc2bfea3c..e2796443b 100644 --- a/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java +++ b/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java @@ -43,7 +43,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; * @version $Revision:$ */ -public class CollectionObjectClient extends BaseServiceClient { +public class CollectionObjectClient extends AbstractServiceClientImpl { /** * 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 776d2b0a7..5c7871adb 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 @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision$ * $LastChangedDate$ */ -public class CollectionObjectServiceTest extends AbstractServiceTest { +public class CollectionObjectServiceTest extends AbstractServiceTestImpl { private final Logger logger = LoggerFactory.getLogger(CollectionObjectServiceTest.class); @@ -74,7 +74,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class) + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class) public void create(String testName) throws Exception { // Perform setup, such as initializing the type of service request @@ -120,7 +120,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { * @see org.collectionspace.services.client.test.ServiceTest#createList() */ @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createList(String testName) throws Exception { for (int i = 0; i < 3; i++) { @@ -132,12 +132,12 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { // Placeholders until the three tests below can be uncommented. // See Issue CSPACE-401. @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class) + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class) public void createWithEmptyEntityBody(String testName) throws Exception { } @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class) + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class) public void createWithMalformedXml(String testName) throws Exception { setupCreate(testName); @@ -159,7 +159,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { } @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class) + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class) public void createWithWrongXmlSchema(String testName) throws Exception { } @@ -248,7 +248,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void read(String testName) throws Exception { @@ -289,7 +289,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readNonExistent(String testName) throws Exception { @@ -315,7 +315,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void readList(String testName) throws Exception { @@ -363,7 +363,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void update(String testName) throws Exception { @@ -446,13 +446,13 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { // Placeholders until the three tests below can be uncommented. // See Issue CSPACE-401. @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void updateWithEmptyEntityBody(String testName) throws Exception { } @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void updateWithMalformedXml(String testName) throws Exception { // Perform setup. @@ -488,7 +488,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { } @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void updateWithWrongXmlSchema(String testName) throws Exception { } @@ -573,7 +573,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { } */ @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"update", "testSubmitRequest"}) public void updateNonExistent(String testName) throws Exception { @@ -606,7 +606,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"create", "readList", "testSubmitRequest", "update"}) public void delete(String testName) throws Exception { @@ -629,7 +629,7 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) public void deleteNonExistent(String testName) throws Exception { 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 189f6612c..449668b17 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 @@ -47,7 +47,7 @@ import javax.ws.rs.core.UriInfo; import org.collectionspace.services.common.query.QueryManager; import org.collectionspace.services.common.query.IQueryManager; -import org.collectionspace.services.common.AbstractCollectionSpaceResource; +import org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl; import org.collectionspace.services.common.context.MultipartServiceContext; import org.collectionspace.services.common.context.MultipartServiceContextFactory; import org.collectionspace.services.common.context.ServiceContext; @@ -77,7 +77,7 @@ import org.collectionspace.services.relation.RelationsCommon; @Consumes("multipart/mixed") @Produces("multipart/mixed") public class CollectionObjectResource - extends AbstractCollectionSpaceResource { + extends AbstractCollectionSpaceResourceImpl { static final public String serviceName = "collectionobjects"; final Logger logger = LoggerFactory.getLogger(CollectionObjectResource.class); diff --git a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java index cdad7f58b..3194e3937 100644 --- a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java +++ b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java @@ -31,7 +31,7 @@ import org.collectionspace.services.collectionobject.CollectionobjectsCommon; import org.collectionspace.services.collectionobject.CollectionobjectsCommonList; import org.collectionspace.services.collectionobject.CollectionobjectsCommonList.CollectionObjectListItem; import org.collectionspace.services.common.document.DocumentWrapper; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class CollectionObjectDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(CollectionObjectDocumentModelHandler.class); /** diff --git a/services/common/src/main/config/service-config.xml b/services/common/src/main/config/service-config.xml index d4eb87b3b..7cea39a03 100644 --- a/services/common/src/main/config/service-config.xml +++ b/services/common/src/main/config/service-config.xml @@ -22,7 +22,7 @@ Administrator Administrator java - org.collectionspace.services.nuxeo.client.java.RepositoryJavaClient + org.collectionspace.services.nuxeo.client.java.RepositoryJavaClientImpl diff --git a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java similarity index 92% rename from services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java rename to services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java index 9f06264a7..21ba6ed4d 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResource.java +++ b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java @@ -32,12 +32,12 @@ import org.collectionspace.services.common.document.DocumentHandler; import org.collectionspace.services.common.repository.RepositoryClient; import org.collectionspace.services.common.repository.RepositoryClientFactory; import org.collectionspace.services.common.storage.StorageClient; -import org.collectionspace.services.common.storage.jpa.JpaStorageClient; +import org.collectionspace.services.common.storage.jpa.JpaStorageClientImpl; /** * The Class AbstractCollectionSpaceResource. */ -public abstract class AbstractCollectionSpaceResource +public abstract class AbstractCollectionSpaceResourceImpl implements CollectionSpaceResource { // Fields for default client factory and client @@ -53,7 +53,7 @@ public abstract class AbstractCollectionSpaceResource /** * Instantiates a new abstract collection space resource. */ - public AbstractCollectionSpaceResource() { + public AbstractCollectionSpaceResourceImpl() { repositoryClientFactory = RepositoryClientFactory.getInstance(); } @@ -84,7 +84,7 @@ public abstract class AbstractCollectionSpaceResource if(storageClient != null) { return storageClient; } - storageClient = new JpaStorageClient(); + storageClient = new JpaStorageClientImpl(); return storageClient; } diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java index e079530a6..3426171ec 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java +++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java @@ -4,8 +4,8 @@ package org.collectionspace.services.common; import java.util.Hashtable; -import org.collectionspace.services.common.config.ServicesConfigReader; -import org.collectionspace.services.common.config.TenantBindingConfigReader; +import org.collectionspace.services.common.config.ServicesConfigReaderImpl; +import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl; import org.collectionspace.services.nuxeo.client.java.NuxeoConnector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,8 +24,8 @@ public class ServiceMain { final Logger logger = LoggerFactory.getLogger(ServiceMain.class); private NuxeoConnector nuxeoConnector; private String serverRootDir = null; - private ServicesConfigReader servicesConfigReader; - private TenantBindingConfigReader tenantBindingConfigReader; + private ServicesConfigReaderImpl servicesConfigReader; + private TenantBindingConfigReaderImpl tenantBindingConfigReader; private ServiceMain() { } @@ -85,10 +85,10 @@ public class ServiceMain { private void readConfig() throws Exception { //read service config - servicesConfigReader = new ServicesConfigReader(getServerRootDir()); + servicesConfigReader = new ServicesConfigReaderImpl(getServerRootDir()); getServicesConfigReader().read(); - tenantBindingConfigReader = new TenantBindingConfigReader(getServerRootDir()); + tenantBindingConfigReader = new TenantBindingConfigReaderImpl(getServerRootDir()); getTenantBindingConfigReader().read(); } @@ -135,14 +135,14 @@ public class ServiceMain { /** * @return the servicesConfigReader */ - public ServicesConfigReader getServicesConfigReader() { + public ServicesConfigReaderImpl getServicesConfigReader() { return servicesConfigReader; } /** * @return the tenantBindingConfigReader */ - public TenantBindingConfigReader getTenantBindingConfigReader() { + public TenantBindingConfigReaderImpl getTenantBindingConfigReader() { return tenantBindingConfigReader; } } diff --git a/services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReader.java b/services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java similarity index 95% rename from services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReader.java rename to services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java index 8621caa35..ed79fa52a 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReader.java +++ b/services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java @@ -35,13 +35,13 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision: $ * $LastChangedDate: $ */ -public abstract class AbstractConfigReader +public abstract class AbstractConfigReaderImpl implements ConfigReader { - private final Logger logger = LoggerFactory.getLogger(AbstractConfigReader.class); + private final Logger logger = LoggerFactory.getLogger(AbstractConfigReaderImpl.class); private String serverRootDir; - AbstractConfigReader(String serverRootDir) { + AbstractConfigReaderImpl(String serverRootDir) { this.serverRootDir = serverRootDir; } diff --git a/services/common/src/main/java/org/collectionspace/services/common/config/ServicesConfigReader.java b/services/common/src/main/java/org/collectionspace/services/common/config/ServicesConfigReaderImpl.java similarity index 94% rename from services/common/src/main/java/org/collectionspace/services/common/config/ServicesConfigReader.java rename to services/common/src/main/java/org/collectionspace/services/common/config/ServicesConfigReaderImpl.java index 9ce98deac..7a15ab374 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/config/ServicesConfigReader.java +++ b/services/common/src/main/java/org/collectionspace/services/common/config/ServicesConfigReaderImpl.java @@ -34,16 +34,16 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision: $ * $LastChangedDate: $ */ -public class ServicesConfigReader - extends AbstractConfigReader { +public class ServicesConfigReaderImpl + extends AbstractConfigReaderImpl { final private static String CONFIG_FILE_NAME = "service-config.xml"; - final Logger logger = LoggerFactory.getLogger(ServicesConfigReader.class); + final Logger logger = LoggerFactory.getLogger(ServicesConfigReaderImpl.class); private ServiceConfig serviceConfig; private ClientType clientType; private String clientClassName; - public ServicesConfigReader(String serverRootDir) { + public ServicesConfigReaderImpl(String serverRootDir) { super(serverRootDir); } diff --git a/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReader.java b/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java similarity index 98% rename from services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReader.java rename to services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java index d7559124b..f2131416f 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReader.java +++ b/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java @@ -42,11 +42,11 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision: $ * $LastChangedDate: $ */ -public class TenantBindingConfigReader - extends AbstractConfigReader { +public class TenantBindingConfigReaderImpl + extends AbstractConfigReaderImpl { final private static String CONFIG_FILE_NAME = "tenant-bindings.xml"; - final Logger logger = LoggerFactory.getLogger(TenantBindingConfigReader.class); + final Logger logger = LoggerFactory.getLogger(TenantBindingConfigReaderImpl.class); private TenantBindingConfig tenantBindingConfig; //tenant name, tenant binding private Hashtable tenantBindings = @@ -57,7 +57,7 @@ public class TenantBindingConfigReader //tenant-qualified service, workspace private Hashtable serviceWorkspaces = new Hashtable(); - public TenantBindingConfigReader(String serverRootDir) { + public TenantBindingConfigReaderImpl(String serverRootDir) { super(serverRootDir); } diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java b/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java similarity index 96% rename from services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java rename to services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java index 0bdca628f..58a412ca4 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java +++ b/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java @@ -37,7 +37,7 @@ import org.collectionspace.authentication.CSpaceTenant; import org.collectionspace.services.common.ClientType; import org.collectionspace.services.common.ServiceMain; -import org.collectionspace.services.common.config.TenantBindingConfigReader; +import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl; import org.collectionspace.services.common.document.DocumentHandler; import org.collectionspace.services.common.document.ValidatorHandler; import org.collectionspace.services.common.security.UnauthorizedException; @@ -54,10 +54,10 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision: $ * $LastChangedDate: $ */ -public abstract class AbstractServiceContext +public abstract class AbstractServiceContextImpl implements ServiceContext { - final Logger logger = LoggerFactory.getLogger(AbstractServiceContext.class); + final Logger logger = LoggerFactory.getLogger(AbstractServiceContextImpl.class); Map properties = new HashMap(); Map objectPartMap = new HashMap(); private ServiceBindingType serviceBinding; @@ -66,8 +66,8 @@ public abstract class AbstractServiceContext private List valHandlers = null; private DocumentHandler docHandler = null; - public AbstractServiceContext(String serviceName) throws UnauthorizedException { - TenantBindingConfigReader tReader = + public AbstractServiceContextImpl(String serviceName) throws UnauthorizedException { + TenantBindingConfigReaderImpl tReader = ServiceMain.getInstance().getTenantBindingConfigReader(); //FIXME retrieveTenantId is not working consistently in non-auth mode //TODO: get tenant binding from security context @@ -130,7 +130,7 @@ public abstract class AbstractServiceContext @Override public String getQualifiedServiceName() { - return TenantBindingConfigReader.getTenantQualifiedServiceName(getTenantId(), getServiceName()); + return TenantBindingConfigReaderImpl.getTenantQualifiedServiceName(getTenantId(), getServiceName()); } @Override @@ -154,7 +154,7 @@ public abstract class AbstractServiceContext @Override public String getRepositoryWorkspaceId() { - TenantBindingConfigReader tbConfigReader = ServiceMain.getInstance().getTenantBindingConfigReader(); + TenantBindingConfigReaderImpl tbConfigReader = ServiceMain.getInstance().getTenantBindingConfigReader(); return tbConfigReader.getWorkspaceId(getTenantId(), getServiceName()); } diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java b/services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java index ca4da8099..9391805f4 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/common/context/RemoteServiceContextImpl.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class RemoteServiceContextImpl - extends AbstractServiceContext + extends AbstractServiceContextImpl implements RemoteServiceContext { final Logger logger = LoggerFactory.getLogger(RemoteServiceContextImpl.class); diff --git a/services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandler.java b/services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandlerImpl.java similarity index 98% rename from services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandler.java rename to services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandlerImpl.java index a6d388f00..3abbe7c93 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandler.java +++ b/services/common/src/main/java/org/collectionspace/services/common/document/AbstractDocumentHandlerImpl.java @@ -39,15 +39,15 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision: $ * $LastChangedDate: $ */ -public abstract class AbstractDocumentHandler +public abstract class AbstractDocumentHandlerImpl implements DocumentHandler { - private final Logger logger = LoggerFactory.getLogger(AbstractDocumentHandler.class); + private final Logger logger = LoggerFactory.getLogger(AbstractDocumentHandlerImpl.class); private Map properties = new HashMap(); private DocumentFilter docFilter = new DocumentFilter(); private ServiceContext serviceContext; - public AbstractDocumentHandler() { + public AbstractDocumentHandlerImpl() { } @Override diff --git a/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandler.java b/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java similarity index 91% rename from services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandler.java rename to services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java index db763c958..360b429de 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandler.java +++ b/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java @@ -34,13 +34,13 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision: $ * $LastChangedDate: $ */ -public abstract class AbstractMultipartDocumentHandler - extends AbstractDocumentHandler +public abstract class AbstractMultipartDocumentHandlerImpl + extends AbstractDocumentHandlerImpl implements MultipartDocumentHandler { - private final Logger logger = LoggerFactory.getLogger(AbstractMultipartDocumentHandler.class); + private final Logger logger = LoggerFactory.getLogger(AbstractMultipartDocumentHandlerImpl.class); - public AbstractMultipartDocumentHandler() { + public AbstractMultipartDocumentHandlerImpl() { } @Override diff --git a/services/common/src/main/java/org/collectionspace/services/common/query/nuxeo/QueryManagerNuxeoImpl.java b/services/common/src/main/java/org/collectionspace/services/common/query/nuxeo/QueryManagerNuxeoImpl.java index 736bce98d..972a47638 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/query/nuxeo/QueryManagerNuxeoImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/common/query/nuxeo/QueryManagerNuxeoImpl.java @@ -41,14 +41,14 @@ import org.nuxeo.ecm.core.api.repository.RepositoryInstance; import org.nuxeo.ecm.core.client.NuxeoClient; import org.collectionspace.services.nuxeo.client.java.NuxeoConnector; -import org.collectionspace.services.nuxeo.client.java.RepositoryJavaClient; +import org.collectionspace.services.nuxeo.client.java.RepositoryJavaClientImpl; import org.collectionspace.services.common.document.DocumentFilter; import org.collectionspace.services.common.query.IQueryManager; public class QueryManagerNuxeoImpl implements IQueryManager { private final Logger logger = LoggerFactory - .getLogger(RepositoryJavaClient.class); + .getLogger(RepositoryJavaClientImpl.class); //TODO: This is currently just an example fixed query. This should eventually be // removed or replaced with a more generic method. diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClientFactory.java b/services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClientFactory.java index 5d8083cca..4db266ded 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClientFactory.java +++ b/services/common/src/main/java/org/collectionspace/services/common/repository/RepositoryClientFactory.java @@ -26,7 +26,7 @@ package org.collectionspace.services.common.repository; import java.util.Hashtable; import org.collectionspace.services.common.RepositoryClientConfigType; import org.collectionspace.services.common.ServiceMain; -import org.collectionspace.services.common.config.ServicesConfigReader; +import org.collectionspace.services.common.config.ServicesConfigReaderImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,7 @@ public class RepositoryClientFactory { private RepositoryClientFactory() { try{ - ServicesConfigReader scReader = ServiceMain.getInstance().getServicesConfigReader(); + ServicesConfigReaderImpl scReader = ServiceMain.getInstance().getServicesConfigReader(); RepositoryClientConfigType repositoryClientConfig = scReader.getConfiguration().getRepositoryClient(); String clientClassName = repositoryClientConfig.getClientClass(); String clientName = repositoryClientConfig.getName(); diff --git a/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClient.java b/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java similarity index 99% rename from services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClient.java rename to services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java index 7e8495f4d..1f0b3c927 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClient.java +++ b/services/common/src/main/java/org/collectionspace/services/common/storage/jpa/JpaStorageClientImpl.java @@ -46,10 +46,10 @@ import org.slf4j.LoggerFactory; * * $LastChangedRevision: $ $LastChangedDate: $ */ -public class JpaStorageClient implements StorageClient { +public class JpaStorageClientImpl implements StorageClient { /** The logger. */ - private final Logger logger = LoggerFactory.getLogger(JpaStorageClient.class); + private final Logger logger = LoggerFactory.getLogger(JpaStorageClientImpl.class); /** The Constant CS_PERSISTENCE_UNIT. */ protected final static String CS_PERSISTENCE_UNIT = "org.collectionspace.services"; @@ -57,7 +57,7 @@ public class JpaStorageClient implements StorageClient { /** * Instantiates a new jpa storage client. */ - public JpaStorageClient() { + public JpaStorageClientImpl() { } /* (non-Javadoc) diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/VocabManagerImpl.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/VocabManagerImpl.java index 3323f07df..600c043ef 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/VocabManagerImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/VocabManagerImpl.java @@ -9,13 +9,13 @@ import org.nuxeo.ecm.core.api.repository.RepositoryInstance; import org.nuxeo.ecm.core.client.NuxeoClient; import org.collectionspace.services.nuxeo.client.java.NuxeoConnector; -import org.collectionspace.services.nuxeo.client.java.RepositoryJavaClient; +import org.collectionspace.services.nuxeo.client.java.RepositoryJavaClientImpl; import org.collectionspace.services.common.query.IQueryManager; public class VocabManagerImpl implements IVocabManager { private final Logger logger = LoggerFactory - .getLogger(RepositoryJavaClient.class); + .getLogger(RepositoryJavaClientImpl.class); public void exampleMethod(String someParam) { } diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java index 67f8e88cf..3a97be2a1 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocumentModelHandler.java @@ -23,7 +23,7 @@ */ package org.collectionspace.services.nuxeo.client.java; -import org.collectionspace.services.common.document.AbstractMultipartDocumentHandler; +import org.collectionspace.services.common.document.AbstractMultipartDocumentHandlerImpl; import org.collectionspace.services.common.document.DocumentFilter; import org.collectionspace.services.common.document.DocumentWrapper; import org.collectionspace.services.nuxeo.client.*; @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public abstract class DocumentModelHandler - extends AbstractMultipartDocumentHandler { + extends AbstractMultipartDocumentHandlerImpl { private final Logger logger = LoggerFactory.getLogger(DocumentModelHandler.class); private RepositoryInstance repositorySession; diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandler.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java similarity index 98% rename from services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandler.java rename to services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java index 699e4d9d6..3e86596f8 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandler.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java @@ -49,10 +49,10 @@ import org.w3c.dom.Document; * $LastChangedRevision: $ * $LastChangedDate: $ */ -public abstract class RemoteDocumentModelHandler +public abstract class RemoteDocumentModelHandlerImpl extends DocumentModelHandler { - private final Logger logger = LoggerFactory.getLogger(RemoteDocumentModelHandler.class); + private final Logger logger = LoggerFactory.getLogger(RemoteDocumentModelHandlerImpl.class); @Override public void setServiceContext(ServiceContext ctx) { diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClient.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java similarity index 99% rename from services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClient.java rename to services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java index 01f9ab81d..aca19680b 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClient.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java @@ -51,11 +51,11 @@ import org.slf4j.LoggerFactory; * * $LastChangedRevision: $ $LastChangedDate: $ */ -public class RepositoryJavaClient implements RepositoryClient { +public class RepositoryJavaClientImpl implements RepositoryClient { - private final Logger logger = LoggerFactory.getLogger(RepositoryJavaClient.class); + private final Logger logger = LoggerFactory.getLogger(RepositoryJavaClientImpl.class); - public RepositoryJavaClient() { + public RepositoryJavaClientImpl() { } /** diff --git a/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java b/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java index 464badc39..5171d3d88 100644 --- a/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java +++ b/services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java @@ -35,7 +35,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; * $LastChangedDate: $ */ -public class ContactClient extends BaseServiceClient { +public class ContactClient extends AbstractServiceClientImpl { /* (non-Javadoc) * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent() diff --git a/services/contact/client/src/test/java/org/collectionspace/services/client/test/ContactServiceTest.java b/services/contact/client/src/test/java/org/collectionspace/services/client/test/ContactServiceTest.java index 04d661b69..dcd62e5a0 100644 --- a/services/contact/client/src/test/java/org/collectionspace/services/client/test/ContactServiceTest.java +++ b/services/contact/client/src/test/java/org/collectionspace/services/client/test/ContactServiceTest.java @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision: 917 $ * $LastChangedDate: 2009-11-06 12:20:28 -0800 (Fri, 06 Nov 2009) $ */ -public class ContactServiceTest extends AbstractServiceTest { +public class ContactServiceTest extends AbstractServiceTestImpl { private final Logger logger = LoggerFactory.getLogger(ContactServiceTest.class); @@ -66,7 +66,7 @@ public class ContactServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class) + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class) public void create(String testName) throws Exception { // Perform setup, such as initializing the type of service request @@ -110,7 +110,7 @@ public class ContactServiceTest extends AbstractServiceTest { } @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createList(String testName) throws Exception { for(int i = 0; i < 3; i++){ @@ -218,7 +218,7 @@ public class ContactServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void read(String testName) throws Exception { @@ -246,7 +246,7 @@ public class ContactServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readNonExistent(String testName) throws Exception { @@ -272,7 +272,7 @@ public class ContactServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readList(String testName) throws Exception { @@ -319,7 +319,7 @@ public class ContactServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void update(String testName) throws Exception { @@ -470,7 +470,7 @@ public class ContactServiceTest extends AbstractServiceTest { */ @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"update", "testSubmitRequest"}) public void updateNonExistent(String testName) throws Exception { @@ -502,7 +502,7 @@ public class ContactServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create", "readList", "testSubmitRequest", "update"}) public void delete(String testName) throws Exception { @@ -525,7 +525,7 @@ public class ContactServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) public void deleteNonExistent(String testName) throws Exception { 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 22fc2dad0..9d1eb50d2 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 @@ -37,7 +37,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import org.collectionspace.services.common.AbstractCollectionSpaceResource; +import org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl; import org.collectionspace.services.common.ClientType; import org.collectionspace.services.common.ServiceMain; import org.collectionspace.services.common.context.MultipartServiceContext; @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; @Path("/contacts") @Consumes("multipart/mixed") @Produces("multipart/mixed") -public class ContactResource extends AbstractCollectionSpaceResource { +public class ContactResource extends AbstractCollectionSpaceResourceImpl { private final static String serviceName = "contacts"; final Logger logger = LoggerFactory.getLogger(ContactResource.class); diff --git a/services/contact/service/src/main/java/org/collectionspace/services/contact/nuxeo/ContactDocumentModelHandler.java b/services/contact/service/src/main/java/org/collectionspace/services/contact/nuxeo/ContactDocumentModelHandler.java index 51ae5256c..7898d4ff1 100644 --- a/services/contact/service/src/main/java/org/collectionspace/services/contact/nuxeo/ContactDocumentModelHandler.java +++ b/services/contact/service/src/main/java/org/collectionspace/services/contact/nuxeo/ContactDocumentModelHandler.java @@ -33,7 +33,7 @@ import org.collectionspace.services.contact.ContactsCommon; import org.collectionspace.services.contact.ContactsCommonList; import org.collectionspace.services.contact.ContactsCommonList.ContactListItem; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class ContactDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(ContactDocumentModelHandler.class); /** diff --git a/services/dimension/client/src/main/java/org/collectionspace/services/client/DimensionClient.java b/services/dimension/client/src/main/java/org/collectionspace/services/client/DimensionClient.java index 888d14ff5..af3cd48e9 100644 --- a/services/dimension/client/src/main/java/org/collectionspace/services/client/DimensionClient.java +++ b/services/dimension/client/src/main/java/org/collectionspace/services/client/DimensionClient.java @@ -43,7 +43,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; * @version $Revision:$ */ -public class DimensionClient extends BaseServiceClient { +public class DimensionClient extends AbstractServiceClientImpl { /* (non-Javadoc) * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent() diff --git a/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java b/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java index 13702704d..6c8ba6023 100644 --- a/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java +++ b/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionServiceTest.java @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision: 917 $ * $LastChangedDate: 2009-11-06 12:20:28 -0800 (Fri, 06 Nov 2009) $ */ -public class DimensionServiceTest extends AbstractServiceTest { +public class DimensionServiceTest extends AbstractServiceTestImpl { private final Logger logger = LoggerFactory.getLogger(DimensionServiceTest.class); @@ -66,7 +66,7 @@ public class DimensionServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class) + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class) public void create(String testName) throws Exception { // Perform setup, such as initializing the type of service request @@ -110,7 +110,7 @@ public class DimensionServiceTest extends AbstractServiceTest { } @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createList(String testName) throws Exception { for(int i = 0; i < 3; i++){ @@ -218,7 +218,7 @@ public class DimensionServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void read(String testName) throws Exception { @@ -246,7 +246,7 @@ public class DimensionServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readNonExistent(String testName) throws Exception { @@ -272,7 +272,7 @@ public class DimensionServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readList(String testName) throws Exception { @@ -319,7 +319,7 @@ public class DimensionServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void update(String testName) throws Exception { @@ -471,7 +471,7 @@ public class DimensionServiceTest extends AbstractServiceTest { */ @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"update", "testSubmitRequest"}) public void updateNonExistent(String testName) throws Exception { @@ -503,7 +503,7 @@ public class DimensionServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create", "readList", "testSubmitRequest", "update"}) public void delete(String testName) throws Exception { @@ -526,7 +526,7 @@ public class DimensionServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) public void deleteNonExistent(String testName) throws Exception { 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 c7d27878e..549a4cb85 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 @@ -37,7 +37,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import org.collectionspace.services.common.AbstractCollectionSpaceResource; +import org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl; import org.collectionspace.services.dimension.DimensionsCommonList.*; import org.collectionspace.services.common.ClientType; @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; @Path("/dimensions") @Consumes("multipart/mixed") @Produces("multipart/mixed") -public class DimensionResource extends AbstractCollectionSpaceResource { +public class DimensionResource extends AbstractCollectionSpaceResourceImpl { private final static String serviceName = "dimensions"; final Logger logger = LoggerFactory.getLogger(DimensionResource.class); diff --git a/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java b/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java index e2c8eff52..cf36a1868 100644 --- a/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java +++ b/services/dimension/service/src/main/java/org/collectionspace/services/dimension/nuxeo/DimensionDocumentModelHandler.java @@ -33,7 +33,7 @@ import org.collectionspace.services.dimension.DimensionsCommon; import org.collectionspace.services.dimension.DimensionsCommonList; import org.collectionspace.services.dimension.DimensionsCommonList.DimensionListItem; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class DimensionDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(DimensionDocumentModelHandler.class); /** diff --git a/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java b/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java index def477e60..5a86a8fff 100644 --- a/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java +++ b/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java @@ -43,10 +43,10 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; * @version $Revision:$ */ -public class IntakeClient extends BaseServiceClient { +public class IntakeClient extends AbstractServiceClientImpl { /* (non-Javadoc) - * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent() + * @see org.collectionspace.services.client.AbstractServiceClientImpl#getServicePathComponent() */ public String getServicePathComponent() { return "intakes"; diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java index 30d8468c1..cc7403d82 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision$ * $LastChangedDate$ */ -public class IntakeServiceTest extends AbstractServiceTest { +public class IntakeServiceTest extends AbstractServiceTestImpl { private final Logger logger = LoggerFactory.getLogger(IntakeServiceTest.class); @@ -66,7 +66,7 @@ public class IntakeServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class) + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class) public void create(String testName) throws Exception { // Perform setup, such as initializing the type of service request @@ -110,7 +110,7 @@ public class IntakeServiceTest extends AbstractServiceTest { } @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createList(String testName) throws Exception { for(int i = 0; i < 3; i++){ @@ -218,7 +218,7 @@ public class IntakeServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void read(String testName) throws Exception { @@ -246,7 +246,7 @@ public class IntakeServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readNonExistent(String testName) throws Exception { @@ -272,7 +272,7 @@ public class IntakeServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void readList(String testName) throws Exception { @@ -319,7 +319,7 @@ public class IntakeServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void update(String testName) throws Exception { @@ -471,7 +471,7 @@ public class IntakeServiceTest extends AbstractServiceTest { */ @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"update", "testSubmitRequest"}) public void updateNonExistent(String testName) throws Exception { @@ -503,7 +503,7 @@ public class IntakeServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create", "readList", "testSubmitRequest", "update"}) public void delete(String testName) throws Exception { @@ -526,7 +526,7 @@ public class IntakeServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) public void deleteNonExistent(String testName) throws Exception { 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 40714aae8..1a0326280 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 @@ -39,7 +39,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import org.collectionspace.services.common.AbstractCollectionSpaceResource; +import org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl; import org.collectionspace.services.common.ClientType; import org.collectionspace.services.common.ServiceMain; @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; @Path("/intakes") @Consumes("multipart/mixed") @Produces("multipart/mixed") -public class IntakeResource extends AbstractCollectionSpaceResource { +public class IntakeResource extends AbstractCollectionSpaceResourceImpl { private final static String serviceName = "intakes"; final Logger logger = LoggerFactory.getLogger(IntakeResource.class); diff --git a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java index 2f4cbc695..e141437a1 100644 --- a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java +++ b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java @@ -33,7 +33,7 @@ import org.collectionspace.services.intake.IntakesCommon; import org.collectionspace.services.intake.IntakesCommonList; import org.collectionspace.services.intake.IntakesCommonList.IntakeListItem; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class IntakeDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(IntakeDocumentModelHandler.class); /** 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 669fd1622..6555e3e4b 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 @@ -18,10 +18,10 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; * @version $Revision:$ */ -public class OrgAuthorityClient extends BaseServiceClient { +public class OrgAuthorityClient extends AbstractServiceClientImpl { /* (non-Javadoc) - * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent() + * @see org.collectionspace.services.client.AbstractServiceClientImpl#getServicePathComponent() */ @Override public String getServicePathComponent() { diff --git a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java index 707277aa1..51ce7db4a 100644 --- a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java +++ b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java @@ -54,7 +54,7 @@ import org.testng.annotations.Test; * $LastChangedRevision: 753 $ * $LastChangedDate: 2009-09-23 11:03:36 -0700 (Wed, 23 Sep 2009) $ */ -public class OrgAuthorityServiceTest extends AbstractServiceTest { +public class OrgAuthorityServiceTest extends AbstractServiceTestImpl { private final Logger logger = LoggerFactory.getLogger(OrgAuthorityServiceTest.class); @@ -77,7 +77,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class) + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class) public void create(String testName) throws Exception { // Perform setup, such as initializing the type of service request @@ -128,7 +128,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createItem(String testName) { setupCreate(testName); @@ -192,7 +192,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { } @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create", "createItem"}) public void createList(String testName) throws Exception { for (int i = 0; i < 3; i++) { @@ -308,7 +308,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void read(String testName) throws Exception { @@ -370,7 +370,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { } */ - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createItem", "read"}) public void readItem(String testName) throws Exception { @@ -406,7 +406,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readNonExistent(String testName) { @@ -427,7 +427,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"readItem", "readNonExistent"}) public void readItemNonExistent(String testName) { @@ -453,7 +453,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void readList(String testName) throws Exception { @@ -557,7 +557,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void update(String testName) throws Exception { @@ -616,7 +616,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { "Data in updated object did not match submitted data."); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"readItem", "update"}) public void updateItem(String testName) throws Exception { @@ -773,7 +773,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"update", "testSubmitRequest"}) public void updateNonExistent(String testName) throws Exception { @@ -800,7 +800,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"updateItem", "testItemSubmitRequest"}) public void updateNonExistentItem(String testName) throws Exception { @@ -838,7 +838,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create", "readList", "testSubmitRequest", "update"}) public void delete(String testName) throws Exception { @@ -859,7 +859,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createItem", "readItemList", "testItemSubmitRequest", "updateItem"}) public void deleteItem(String testName) throws Exception { @@ -883,7 +883,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) public void deleteNonExistent(String testName) throws Exception { @@ -904,7 +904,7 @@ public class OrgAuthorityServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"deleteItem"}) public void deleteNonExistentItem(String testName) { 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 6f592b92c..9aea39b41 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 @@ -40,7 +40,7 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import org.collectionspace.services.OrganizationJAXBSchema; -import org.collectionspace.services.common.AbstractCollectionSpaceResource; +import org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl; import org.collectionspace.services.common.ClientType; import org.collectionspace.services.common.ServiceMain; import org.collectionspace.services.common.context.MultipartServiceContext; @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; @Path("/orgauthorities") @Consumes("multipart/mixed") @Produces("multipart/mixed") -public class OrgAuthorityResource extends AbstractCollectionSpaceResource { +public class OrgAuthorityResource extends AbstractCollectionSpaceResourceImpl { private final static String orgAuthorityServiceName = "orgauthorities"; private final static String organizationServiceName = "organizations"; diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java index 15131cdc9..53eb29e29 100644 --- a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java +++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java @@ -33,7 +33,7 @@ import org.collectionspace.services.organization.OrgauthoritiesCommon; import org.collectionspace.services.organization.OrgauthoritiesCommonList; import org.collectionspace.services.organization.OrgauthoritiesCommonList.OrgauthorityListItem; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class OrgAuthorityDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(OrgAuthorityDocumentModelHandler.class); /** diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java index eed15d509..469b32440 100644 --- a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java +++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationDocumentModelHandler.java @@ -28,7 +28,7 @@ import java.util.List; import org.collectionspace.services.OrganizationJAXBSchema; import org.collectionspace.services.common.document.DocumentWrapper; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.collectionspace.services.organization.OrganizationsCommon; import org.collectionspace.services.organization.OrganizationsCommonList; @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class OrganizationDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(OrganizationDocumentModelHandler.class); /** 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 ac8d0eced..4a04d0a7e 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 @@ -18,7 +18,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; * @version $Revision:$ */ -public class PersonAuthorityClient extends BaseServiceClient { +public class PersonAuthorityClient extends AbstractServiceClientImpl { /* (non-Javadoc) * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent() diff --git a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java index ae3ce7a43..bff29e9d3 100644 --- a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java +++ b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthorityServiceTest.java @@ -54,7 +54,7 @@ import org.testng.annotations.Test; * $LastChangedRevision: 753 $ * $LastChangedDate: 2009-09-23 11:03:36 -0700 (Wed, 23 Sep 2009) $ */ -public class PersonAuthorityServiceTest extends AbstractServiceTest { +public class PersonAuthorityServiceTest extends AbstractServiceTestImpl { private final Logger logger = LoggerFactory.getLogger(PersonAuthorityServiceTest.class); @@ -77,7 +77,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class) + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class) public void create(String testName) throws Exception { // Perform setup, such as initializing the type of service request @@ -128,7 +128,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createItem(String testName) { setupCreate(testName); @@ -200,7 +200,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { } @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create", "createItem"}) public void createList(String testName) throws Exception { for (int i = 0; i < 3; i++) { @@ -316,7 +316,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void read(String testName) throws Exception { @@ -378,7 +378,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { } */ - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createItem", "read"}) public void readItem(String testName) throws Exception { @@ -414,7 +414,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readNonExistent(String testName) { @@ -435,7 +435,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"readItem", "readNonExistent"}) public void readItemNonExistent(String testName) { @@ -461,7 +461,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void readList(String testName) throws Exception { @@ -563,7 +563,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void update(String testName) throws Exception { @@ -622,7 +622,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { "Data in updated object did not match submitted data."); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"readItem", "update"}) public void updateItem(String testName) throws Exception { @@ -779,7 +779,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"update", "testSubmitRequest"}) public void updateNonExistent(String testName) throws Exception { @@ -809,7 +809,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"updateItem", "testItemSubmitRequest"}) public void updateNonExistentItem(String testName) throws Exception { @@ -848,7 +848,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create", "readList", "testSubmitRequest", "update"}) public void delete(String testName) throws Exception { @@ -869,7 +869,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createItem", "readItemList", "testItemSubmitRequest", "updateItem"}) public void deleteItem(String testName) throws Exception { @@ -893,7 +893,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) public void deleteNonExistent(String testName) throws Exception { @@ -914,7 +914,7 @@ public class PersonAuthorityServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"deleteItem"}) public void deleteNonExistentItem(String testName) { 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 45f9f9c23..fd58d224a 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 @@ -40,7 +40,7 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import org.collectionspace.services.PersonJAXBSchema; -import org.collectionspace.services.common.AbstractCollectionSpaceResource; +import org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl; import org.collectionspace.services.common.ClientType; import org.collectionspace.services.common.ServiceMain; import org.collectionspace.services.common.context.MultipartServiceContext; @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; @Path("/personauthorities") @Consumes("multipart/mixed") @Produces("multipart/mixed") -public class PersonAuthorityResource extends AbstractCollectionSpaceResource { +public class PersonAuthorityResource extends AbstractCollectionSpaceResourceImpl { private final static String personAuthorityServiceName = "personauthorities"; private final static String personServiceName = "persons"; diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java index 5a435c591..e86aef3a2 100644 --- a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java +++ b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java @@ -33,7 +33,7 @@ import org.collectionspace.services.person.PersonauthoritiesCommon; import org.collectionspace.services.person.PersonauthoritiesCommonList; import org.collectionspace.services.person.PersonauthoritiesCommonList.PersonauthorityListItem; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class PersonAuthorityDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(PersonAuthorityDocumentModelHandler.class); /** diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java index a2e0973ff..483bc96cf 100644 --- a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java +++ b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonDocumentModelHandler.java @@ -30,7 +30,7 @@ import java.util.List; import org.collectionspace.services.PersonJAXBSchema; import org.collectionspace.services.common.document.DocumentWrapper; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.collectionspace.services.person.PersonsCommon; import org.collectionspace.services.person.PersonsCommonList; @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; * */ public class PersonDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(PersonDocumentModelHandler.class); /** diff --git a/services/relation/client/src/main/java/org/collectionspace/services/client/RelationClient.java b/services/relation/client/src/main/java/org/collectionspace/services/client/RelationClient.java index 66a2a5ebd..5bed9b5db 100644 --- a/services/relation/client/src/main/java/org/collectionspace/services/client/RelationClient.java +++ b/services/relation/client/src/main/java/org/collectionspace/services/client/RelationClient.java @@ -17,7 +17,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; * @version $Revision:$ */ -public class RelationClient extends BaseServiceClient implements RelationProxy { +public class RelationClient extends AbstractServiceClientImpl implements RelationProxy { /* (non-Javadoc) * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent() diff --git a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java index caf99f6b6..a763fc206 100644 --- a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java +++ b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision$ * $LastChangedDate$ */ -public class RelationServiceTest extends AbstractServiceTest { +public class RelationServiceTest extends AbstractServiceTestImpl { private final Logger logger = LoggerFactory.getLogger(RelationServiceTest.class); @@ -66,7 +66,7 @@ public class RelationServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class) + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class) public void create(String testName) throws Exception { // Perform setup, such as initializing the type of service request @@ -107,7 +107,7 @@ public class RelationServiceTest extends AbstractServiceTest { } @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createList(String testName) throws Exception { for(int i = 0; i < 3; i++){ @@ -212,7 +212,7 @@ public class RelationServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void read(String testName) throws Exception { @@ -242,7 +242,7 @@ public class RelationServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readNonExistent(String testName) throws Exception { @@ -268,7 +268,7 @@ public class RelationServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void readList(String testName) throws Exception { @@ -315,7 +315,7 @@ public class RelationServiceTest extends AbstractServiceTest { // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void update(String testName) throws Exception { @@ -474,7 +474,7 @@ public class RelationServiceTest extends AbstractServiceTest { */ @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"update", "testSubmitRequest"}) public void updateNonExistent(String testName) throws Exception { @@ -504,7 +504,7 @@ public class RelationServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create", "readList", "testSubmitRequest", "update"}) public void delete(String testName) throws Exception { @@ -527,7 +527,7 @@ public class RelationServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) public void deleteNonExistent(String testName) throws Exception { 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 1dc04fc0d..ae883fb17 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 @@ -42,7 +42,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import org.collectionspace.services.common.AbstractCollectionSpaceResource; +import org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl; import org.collectionspace.services.common.context.MultipartServiceContext; import org.collectionspace.services.common.context.MultipartServiceContextFactory; import org.collectionspace.services.common.context.ServiceContext; @@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory; @Path("/relations") @Consumes("multipart/mixed") @Produces("multipart/mixed") -public class NewRelationResource extends AbstractCollectionSpaceResource { +public class NewRelationResource extends AbstractCollectionSpaceResourceImpl { /** The Constant serviceName. */ public final static String serviceName = "relations"; diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java index 5b6bb5658..c1524552c 100644 --- a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java +++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java @@ -37,7 +37,7 @@ import org.collectionspace.services.relation.RelationsCommonList; import org.collectionspace.services.relation.RelationsCommonList.RelationListItem; import org.collectionspace.services.common.document.DocumentWrapper; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; import org.slf4j.Logger; @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class RelationDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(RelationDocumentModelHandler.class); /** diff --git a/services/security/client/src/test/java/org/collectionspace/services/authentication/client/test/AuthenticationServiceTest.java b/services/security/client/src/test/java/org/collectionspace/services/authentication/client/test/AuthenticationServiceTest.java index 7e6823e4e..46a7a91f0 100644 --- a/services/security/client/src/test/java/org/collectionspace/services/authentication/client/test/AuthenticationServiceTest.java +++ b/services/security/client/src/test/java/org/collectionspace/services/authentication/client/test/AuthenticationServiceTest.java @@ -37,7 +37,7 @@ import org.testng.annotations.Test; import org.collectionspace.services.collectionobject.CollectionobjectsCommon; import org.collectionspace.services.client.CollectionObjectClient; import org.collectionspace.services.client.CollectionSpaceClient; -import org.collectionspace.services.client.test.AbstractServiceTest; +import org.collectionspace.services.client.test.AbstractServiceTestImpl; import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput; import org.jboss.resteasy.plugins.providers.multipart.OutputPart; import org.slf4j.Logger; @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; * $LastChangedRevision: 434 $ $LastChangedDate: 2009-07-28 14:34:15 -0700 (Tue, * 28 Jul 2009) $ */ -public class AuthenticationServiceTest extends AbstractServiceTest { +public class AuthenticationServiceTest extends AbstractServiceTestImpl { /** The known resource id. */ private String knownResourceId = null; @@ -69,7 +69,7 @@ public class AuthenticationServiceTest extends AbstractServiceTest { return null; } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class) + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class) public void createAccounts(String testName) throws Exception { // Perform setup, such as initializing the type of service request // (e.g. CREATE, DELETE), its valid and expected status codes, and @@ -127,7 +127,7 @@ public class AuthenticationServiceTest extends AbstractServiceTest { /* (non-Javadoc) * @see org.collectionspace.services.client.test.AbstractServiceTest#create() */ - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"createAccounts"}) @Override public void create(String testName) { @@ -340,7 +340,7 @@ public class AuthenticationServiceTest extends AbstractServiceTest { * @see org.collectionspace.services.client.test.AbstractServiceTest#delete() */ @Override - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void delete(String testName) { setupDelete(testName); @@ -374,7 +374,7 @@ public class AuthenticationServiceTest extends AbstractServiceTest { Response.Status.OK.getStatusCode(), "expected " + Response.Status.OK.getStatusCode()); } - @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTest.class, + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) public void deleteAccounts(String testName) throws Exception { 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 d081b6984..1a0a66b45 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 @@ -18,7 +18,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; * @version $Revision:$ */ -public class VocabularyClient extends BaseServiceClient { +public class VocabularyClient extends AbstractServiceClientImpl { /* (non-Javadoc) * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent() diff --git a/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java b/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java index 7a441b289..e390e05e2 100644 --- a/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java +++ b/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java @@ -54,7 +54,7 @@ import org.testng.annotations.Test; * $LastChangedRevision: 753 $ * $LastChangedDate: 2009-09-23 11:03:36 -0700 (Wed, 23 Sep 2009) $ */ -public class VocabularyServiceTest extends AbstractServiceTest { +public class VocabularyServiceTest extends AbstractServiceTestImpl { private final Logger logger = LoggerFactory.getLogger(VocabularyServiceTest.class); @@ -81,7 +81,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class) + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class) public void create(String testName) throws Exception { // Perform setup, such as initializing the type of service request @@ -125,7 +125,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void createItem(String testName) { setupCreate(testName); @@ -140,7 +140,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { } @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create", "createItem"}) public void createList(String testName) throws Exception { for (int i = 0; i < 3; i++) { @@ -254,7 +254,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) public void read(String testName) throws Exception { @@ -316,7 +316,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { } */ - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createItem", "read"}) public void readItem(String testName) throws Exception { @@ -346,7 +346,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void readNonExistent(String testName) { @@ -367,7 +367,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"readItem", "readNonExistent"}) public void readItemNonExistent(String testName) { @@ -393,7 +393,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) public void readList(String testName) throws Exception { @@ -494,7 +494,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) public void update(String testName) throws Exception { @@ -553,7 +553,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { "Data in updated object did not match submitted data."); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"readItem", "update"}) public void updateItem(String testName) throws Exception { @@ -710,7 +710,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"update", "testSubmitRequest"}) public void updateNonExistent(String testName) throws Exception { @@ -740,7 +740,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"updateItem", "testItemSubmitRequest"}) public void updateNonExistentItem(String testName) throws Exception { @@ -775,7 +775,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { // --------------------------------------------------------------- // Success outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"create", "readList", "testSubmitRequest", "update"}) public void delete(String testName) throws Exception { @@ -796,7 +796,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"createItem", "readItemList", "testItemSubmitRequest", "updateItem"}) public void deleteItem(String testName) throws Exception { @@ -820,7 +820,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { // Failure outcomes @Override - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) public void deleteNonExistent(String testName) throws Exception { @@ -841,7 +841,7 @@ public class VocabularyServiceTest extends AbstractServiceTest { Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); } - @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class, + @Test(dataProvider="testName", dataProviderClass=AbstractServiceTestImpl.class, dependsOnMethods = {"deleteItem"}) public void deleteNonExistentItem(String testName) { 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 d933061bd..4de20de80 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 @@ -40,7 +40,7 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import org.collectionspace.services.VocabularyItemJAXBSchema; -import org.collectionspace.services.common.AbstractCollectionSpaceResource; +import org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl; import org.collectionspace.services.common.ClientType; import org.collectionspace.services.common.ServiceMain; import org.collectionspace.services.common.context.MultipartServiceContext; @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; @Path("/vocabularies") @Consumes("multipart/mixed") @Produces("multipart/mixed") -public class VocabularyResource extends AbstractCollectionSpaceResource { +public class VocabularyResource extends AbstractCollectionSpaceResourceImpl { private final static String vocabularyServiceName = "vocabularies"; private final static String vocabularyItemServiceName = "vocabularyitems"; diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java index 6c88da385..b6de61c66 100644 --- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java +++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java @@ -33,7 +33,7 @@ import org.collectionspace.services.vocabulary.VocabulariesCommon; import org.collectionspace.services.vocabulary.VocabulariesCommonList; import org.collectionspace.services.vocabulary.VocabulariesCommonList.VocabularyListItem; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.nuxeo.ecm.core.api.DocumentModel; import org.nuxeo.ecm.core.api.DocumentModelList; @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class VocabularyDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(VocabularyDocumentModelHandler.class); /** diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java index 279f4dc3f..e10ba0300 100644 --- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java +++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java @@ -28,7 +28,7 @@ import java.util.List; import org.collectionspace.services.VocabularyItemJAXBSchema; import org.collectionspace.services.common.document.DocumentWrapper; -import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandler; +import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl; import org.collectionspace.services.nuxeo.util.NuxeoUtils; import org.collectionspace.services.vocabulary.VocabularyitemsCommon; import org.collectionspace.services.vocabulary.VocabularyitemsCommonList; @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; * $LastChangedDate: $ */ public class VocabularyItemDocumentModelHandler - extends RemoteDocumentModelHandler { + extends RemoteDocumentModelHandlerImpl { private final Logger logger = LoggerFactory.getLogger(VocabularyItemDocumentModelHandler.class); /** -- 2.47.3