From 89bba1598799e0b123d016996c386d49546e7ce4 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Mon, 9 May 2011 17:14:05 +0000 Subject: [PATCH] CSPACE-3865: Minor cleanup in new Scientific Taxonomy service - deleted extraneous class, renamed second class, removed debug statements. --- .../client/test/TaxonomyAuthorityServiceTest.java | 5 ----- .../services/TaxonomyJAXBSchema.java | 13 ------------- .../{TaxonomyConstants.java => TaxonConstants.java} | 4 ++-- .../taxonomy/nuxeo/TaxonDocumentModelHandler.java | 2 +- 4 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 services/taxonomy/jaxb/src/main/java/org/collectionspace/services/TaxonomyJAXBSchema.java rename services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/{TaxonomyConstants.java => TaxonConstants.java} (92%) 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 00ef63c12..c1cb6fafa 100644 --- 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 index 94f24a51b..000000000 --- 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 0133fcaac..b0cc06fc7 100644 --- 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 95f52bba1..242a08013 100644 --- 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; } } -- 2.47.3