CSPACE-3865: Minor cleanup in new Scientific Taxonomy service - deleted extraneous...

diff --git a/services/taxonomy/client/src/test/java/org/collectionspace/services/client/test/TaxonomyAuthorityServiceTest.java b/services/taxonomy/client/src/test/java/org/collectionspace/services/client/test/TaxonomyAuthorityServiceTest.java
index 00ef63c126c1f889be1267a6c41431a373adbc24..c1cb6fafaf307724f8ee75a8b286ec682e279e2f 100644 (file)
--- a/services/taxonomy/client/src/test/java/org/collectionspace/services/client/test/TaxonomyAuthorityServiceTest.java
+++ b/services/taxonomy/client/src/test/java/org/collectionspace/services/client/test/TaxonomyAuthorityServiceTest.java
@@ -446,11 +446,6 @@ public class TaxonomyAuthorityServiceTest extends AbstractServiceTestImpl { //FI
 
             // Check whether we've received a taxon.
             PoxPayloadIn input = new PoxPayloadIn(res.getEntity());
-            String xml = input.getXmlPayload(); // for debugging
-            if (logger.isDebugEnabled()) { // for debugging
-                logger.debug(testName + "#########" + xml);
-            }
-            String cpn = client.getItemCommonPartName(); // for debugging
             TaxonCommon taxon = (TaxonCommon) extractPart(input,
                     client.getItemCommonPartName(), TaxonCommon.class);
             Assert.assertNotNull(taxon);

diff --git a/services/taxonomy/jaxb/src/main/java/org/collectionspace/services/TaxonomyJAXBSchema.java b/services/taxonomy/jaxb/src/main/java/org/collectionspace/services/TaxonomyJAXBSchema.java
deleted file mode 100644 (file)
index 94f24a5..0000000
--- a/services/taxonomy/jaxb/src/main/java/org/collectionspace/services/TaxonomyJAXBSchema.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * 
- */
-package org.collectionspace.services;
-import org.collectionspace.services.common.vocabulary.AuthorityItemJAXBSchema;
-
-public interface TaxonomyJAXBSchema extends AuthorityItemJAXBSchema {
-       final static String TAXON_COMMON = "taxon_common";
-       final static String NAME = "taxonFullName";
-       final static String RANK = "taxonRank";
-
-}
-

diff --git a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonomyConstants.java b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonConstants.java
similarity index 92%
rename from services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonomyConstants.java
rename to services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonConstants.java
index 0133fcaac3d408e294bfd2a5469a288784fd1308..b0cc06fc7da06f0989b82e134b1c13fb7667fdcb 100644 (file)
--- a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonomyConstants.java
+++ b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonConstants.java
@@ -24,10 +24,10 @@
 package org.collectionspace.services.taxonomy.nuxeo;
 
 /**
- * TaxonomyConstants provides constants for Taxonomy documents
+ * TaxonConstants provides constants for Taxonomy documents
  *
  */
-public class TaxonomyConstants {
+public class TaxonConstants {
 
     public final static String NUXEO_DOCTYPE = "Taxon";
     public final static String NUXEO_SCHEMA_NAME = "taxon";

diff --git a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonDocumentModelHandler.java b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonDocumentModelHandler.java
index 95f52bba13837034995cccc7ab6b65ab2a3ae64d..242a08013e75be52d204465b81f6f7f39dc38d35 100644 (file)
--- a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonDocumentModelHandler.java
+++ b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonDocumentModelHandler.java
@@ -175,7 +175,7 @@ public class TaxonDocumentModelHandler
      */
     @Override
     public String getQProperty(String prop) {
-        return TaxonomyConstants.NUXEO_SCHEMA_NAME + ":" + prop;
+        return TaxonConstants.NUXEO_SCHEMA_NAME + ":" + prop;
     }
 }