ref #9684 updating CdmBaseType constant names to latest model

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/CdmBaseType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/CdmBaseType.java
index 3297dd5d7930368ee409054676cf2713ae522fda..b83eeced2274718101ca0895f950fec9253f7268 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/CdmBaseType.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/CdmBaseType.java
@@ -39,8 +39,8 @@ public enum CdmBaseType {
     /**
      * refers to the baseClass {@link TaxonBase}
      */
-    TAXON(TaxonBase.class),
-    NONVIRALNAME(TaxonName.class),
+    TAXON_BASE(TaxonBase.class),
+    TAXON_NAME(TaxonName.class),
     DESCRIPTION_ELEMENT(DescriptionElementBase.class),
     DESCRIPTION(DescriptionBase.class),
     SPECIMEN_OR_OBSERVATIONBASE(SpecimenOrObservationBase.class),

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java
index 551510a132ff068bd1b2cad1bda7e2b7ea204c67..00c7591693ece860f8ce76cd921d678e0a2646c7 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java
@@ -102,7 +102,7 @@ public class Synonym extends TaxonBase<ITaxonCacheStrategy<Synonym>> {
      * the {@link eu.etaxonomy.cdm.model.name.TaxonName taxon name} used and the {@link eu.etaxonomy.cdm.model.reference.Reference reference}
      * using it as a synonym and not as an ("accepted/correct") {@link Taxon taxon}.
      *
-     * @param  TaxonName    the taxon name used
+     * @param  TAXON_NAME    the taxon name used
      * @param  sec          the reference using the taxon name
      * @see  #Synonym(TaxonName, Reference)
      */

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
index b8a82ca76bd20cac6c2e25a9b2bf3d979a7c34f3..ae29881176915acf8cdc0a489f962c1365332623 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
@@ -772,7 +772,7 @@ public class NameServiceImpl
 
 
         Map<CdmBaseType, String> idFieldMap = new HashMap<CdmBaseType, String>();
-        idFieldMap.put(CdmBaseType.NONVIRALNAME, "id");
+        idFieldMap.put(CdmBaseType.TAXON_NAME, "id");
 
         // --- initialize taxa, highlight matches ....
         ISearchResultBuilder searchResultBuilder = new SearchResultBuilder(luceneSearch, luceneSearch.getQuery());

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
index bcd28815fca08224f647892a18898ed475b3e643..576f6ba7cd9713c12067a2f53857bd83566370b9 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
@@ -1576,7 +1576,7 @@ public class TaxonServiceImpl
         }
 
         Map<CdmBaseType, String> idFieldMap = new HashMap<>();
-        idFieldMap.put(CdmBaseType.TAXON, "id");
+        idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
 
         // ---  initialize taxa, thighlight matches ....
         ISearchResultBuilder searchResultBuilder = new SearchResultBuilder(luceneSearch, luceneSearch.getQuery());
@@ -1644,7 +1644,7 @@ public class TaxonServiceImpl
         }
 
         Map<CdmBaseType, String> idFieldMap = new HashMap<>();
-        idFieldMap.put(CdmBaseType.TAXON, "id");
+        idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
 
         // ---  initialize taxa, thighlight matches ....
         ISearchResultBuilder searchResultBuilder = new SearchResultBuilder(luceneSearch, luceneSearch.getQuery());
@@ -1913,7 +1913,7 @@ public class TaxonServiceImpl
             luceneSearches.add(prepareFindByFullTextSearch(taxonBaseSubclass,
                     queryString, classification, subtree, className,
                     includeUnpublished, languages, highlightFragments, sortFields));
-            idFieldMap.put(CdmBaseType.TAXON, "id");
+            idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
             /* A) does not work!!!!
             if(addDistributionFilter){
                 // in this case we need a filter which uses a join query
@@ -1965,7 +1965,7 @@ public class TaxonServiceImpl
             byCommonNameSearch.setQuery(builder.build());
             byCommonNameSearch.setSortFields(sortFields);
 
-            idFieldMap.put(CdmBaseType.TAXON, "id");
+            idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
 
             luceneSearches.add(byCommonNameSearch);
 
@@ -2008,7 +2008,7 @@ public class TaxonServiceImpl
             luceneSearches.add(prepareFindByTaxonRelationFullTextSearch(
                     new TaxonRelationshipEdge(relTypes, Direction.relatedTo),
                     queryString, classification, subtree, includeUnpublished, languages, highlightFragments, sortFields));
-            idFieldMap.put(CdmBaseType.TAXON, "id");
+            idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
 
             if(addDistributionFilter){
                 String fromField = "inDescription.taxon.id"; // in DescriptionElementBase index
@@ -2063,7 +2063,7 @@ public class TaxonServiceImpl
             luceneSearches.add(prepareFindByTaxonRelationFullTextSearch(
                     new TaxonRelationshipEdge(relTypes, Direction.relatedTo),
                     queryString, classification, subtree, includeUnpublished, languages, highlightFragments, sortFields));
-            idFieldMap.put(CdmBaseType.TAXON, "id");
+            idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
 
             if(addDistributionFilter){
                 String fromField = "inDescription.taxon.id"; // in DescriptionElementBase index
@@ -2271,7 +2271,7 @@ public class TaxonServiceImpl
         ISearchResultBuilder searchResultBuilder = new SearchResultBuilder(multiSearch, multiSearch.getQuery());
 
         Map<CdmBaseType, String> idFieldMap = new HashMap<>();
-        idFieldMap.put(CdmBaseType.TAXON, "id");
+        idFieldMap.put(CdmBaseType.TAXON_BASE, "id");
         idFieldMap.put(CdmBaseType.DESCRIPTION_ELEMENT, "inDescription.taxon.id");
 
         List<SearchResult<TaxonBase>> searchResults = searchResultBuilder.createResultSet(