From 2d0596be42b594f14a02237a9af2e71f09d5453d Mon Sep 17 00:00:00 2001 From: Sanjay Dalal Date: Fri, 20 Nov 2009 18:30:34 +0000 Subject: [PATCH] NOJIRA removed redundant getDocumentType since the doc type is available from service context test: mvn test passes on service level --- .../nuxeo/AcquisitionDocumentModelHandler.java | 7 ------- .../nuxeo/CollectionObjectDocumentModelHandler.java | 5 ----- .../services/nuxeo/client/java/DocumentModelHandler.java | 6 ------ .../nuxeo/client/java/RemoteDocumentModelHandler.java | 3 --- .../intake/nuxeo/IntakeDocumentModelHandler.java | 9 --------- .../relation/nuxeo/RelationDocumentModelHandler.java | 4 ---- .../vocabulary/nuxeo/VocabularyDocumentModelHandler.java | 8 -------- .../nuxeo/VocabularyItemDocumentModelHandler.java | 7 ------- 8 files changed, 49 deletions(-) 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 a86fdb849..1f83eb560 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 @@ -149,13 +149,6 @@ public class AcquisitionDocumentModelHandler } - /* (non-Javadoc) - * @see org.collectionspace.services.nuxeo.client.java.DocumentModelHandler#getDocumentType() - */ - public String getDocumentType() { - return AcquisitionConstants.NUXEO_DOCTYPE; - } - /** * getQProperty converts the given property to qualified schema property * @param prop 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 f57c35630..72fb11e42 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 @@ -141,11 +141,6 @@ public class CollectionObjectDocumentModelHandler docModel.setPropertyValue("dublincore:title", CollectionObjectConstants.NUXEO_DC_TITLE); } - @Override - public String getDocumentType() { - return CollectionObjectConstants.NUXEO_DOCTYPE; - } - @Override public String getQProperty(String prop) { return CollectionObjectConstants.NUXEO_SCHEMA_NAME + ":" + prop; 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 ff1d0c603..f0ca2fb3d 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 @@ -112,10 +112,4 @@ public abstract class DocumentModelHandler @Override public abstract void setCommonPartList(TL obj); - /** - * Gets the document type. - * - * @return the document type - */ - public abstract String getDocumentType(); } 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/RemoteDocumentModelHandler.java index 31e42a2a3..699e4d9d6 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/RemoteDocumentModelHandler.java @@ -64,9 +64,6 @@ public abstract class RemoteDocumentModelHandler } } - @Override - public abstract String getDocumentType(); - @Override public void completeUpdate(DocumentWrapper wrapDoc) throws Exception { DocumentModel docModel = wrapDoc.getWrappedObject(); 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 2a6e36fe0..c6ddab720 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 @@ -133,15 +133,6 @@ public class IntakeDocumentModelHandler return coList; } - - /* (non-Javadoc) - * @see org.collectionspace.services.nuxeo.client.java.DocumentModelHandler#getDocumentType() - */ - @Override - public String getDocumentType() { - return IntakeConstants.NUXEO_DOCTYPE; - } - /** * getQProperty converts the given property to qualified schema property * @param prop 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 aabd73ce5..b5dadabe7 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 @@ -155,10 +155,6 @@ public class RelationDocumentModelHandler docModel.setPropertyValue("dublincore:title", RelationConstants.NUXEO_DC_TITLE); } - @Override - public String getDocumentType() { - return RelationConstants.NUXEO_DOCTYPE; - } @Override public String getQProperty(String prop) { 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 4dbf3c87b..40ee88cdd 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 @@ -136,14 +136,6 @@ public class VocabularyDocumentModelHandler } - /* (non-Javadoc) - * @see org.collectionspace.services.nuxeo.client.java.DocumentModelHandler#getDocumentType() - */ - @Override - public String getDocumentType() { - return VocabularyConstants.NUXEO_DOCTYPE; - } - /** * getQProperty converts the given property to qualified schema property * @param prop 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 ff4d3c7e5..be8ca9f38 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 @@ -153,13 +153,6 @@ public class VocabularyItemDocumentModelHandler } - /* (non-Javadoc) - * @see org.collectionspace.services.nuxeo.client.java.DocumentModelHandler#getDocumentType() - */ - @Override - public String getDocumentType() { - return VocabularyItemConstants.NUXEO_DOCTYPE; - } /** * getQProperty converts the given property to qualified schema property -- 2.47.3