cleanup TypeDesignationSetManager

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManager.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManager.java
index 0c696da827f544e07dc8b01450bf38f890cd8a9f..bcac6ed57b644f17a4853021ffd271d0c877cfc8 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManager.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetManager.java
@@ -27,7 +27,6 @@ import org.hibernate.search.hcore.util.impl.HibernateHelper;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy;
 import eu.etaxonomy.cdm.api.service.exception.RegistrationValidationException;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
@@ -90,7 +89,7 @@ public class TypeDesignationSetManager {
     private static final String SOURCE_SEPARATOR = ", ";
     private static final String POST_STATUS_SEPARATOR = ": ";
 
-    private Map<UUID,TypeDesignationBase<?>> typeDesignations;
+    private Map<UUID,TypeDesignationBase<?>> typeDesignations = new HashMap<>();
 
     private NameTypeBaseEntityType nameTypeBaseEntityType = NameTypeBaseEntityType.NAME_TYPE_DESIGNATION;
 
@@ -120,9 +119,6 @@ public class TypeDesignationSetManager {
     }
 
     public TypeDesignationSetManager(Collection<TypeDesignationBase> typeDesignations, TaxonName typifiedName) throws RegistrationValidationException  {
-        if (this.typeDesignations == null){
-            this.typeDesignations = new HashMap<>();
-        }
         for (TypeDesignationBase<?> typeDes:typeDesignations){
             this.typeDesignations.put(typeDes.getUuid(), typeDes);
         }
@@ -140,10 +136,7 @@ public class TypeDesignationSetManager {
     }
 
     public TypeDesignationSetManager(HomotypicalGroup group) {
-        if (this.typeDesignations == null){
-            this.typeDesignations = new HashMap<>();
-        }
-        for (TypeDesignationBase<?> typeDes:group.getTypeDesignations()){
+        for (TypeDesignationBase<?> typeDes: group.getTypeDesignations()){
             this.typeDesignations.put(typeDes.getUuid(), typeDes);
         }
         //findTypifiedName();
@@ -151,7 +144,6 @@ public class TypeDesignationSetManager {
     }
 
     public TypeDesignationSetManager(TaxonName typifiedName) {
-        this.typeDesignations = new HashMap<>();
         this.typifiedNameRef = new EntityReference(typifiedName.getUuid(), typifiedName.getTitleCache());
     }
 
@@ -162,7 +154,7 @@ public class TypeDesignationSetManager {
      * @param containgEntity
      * @param typeDesignations
      */
-    public void addTypeDesigations(CdmBase containingEntity, TypeDesignationBase<?> ... typeDesignations){
+    public void addTypeDesigations(TypeDesignationBase<?> ... typeDesignations){
         for (TypeDesignationBase<?> typeDes: typeDesignations){
             this.typeDesignations.put(typeDes.getUuid(), typeDes);
         }
@@ -209,7 +201,7 @@ public class TypeDesignationSetManager {
     protected VersionableEntity baseEntity(TypeDesignationBase<?> td) throws DataIntegrityException {
 
         VersionableEntity baseEntity = null;
-        if(td  instanceof SpecimenTypeDesignation){
+        if(td instanceof SpecimenTypeDesignation){
             SpecimenTypeDesignation std = (SpecimenTypeDesignation) td;
             FieldUnit fu = findFieldUnit(std.getTypeSpecimen());
             if(fu != null){
@@ -362,7 +354,7 @@ public class TypeDesignationSetManager {
                             workingsetBuilder.add(TagEnum.separator, TYPE_STATUS_SEPARATOR);
                         }
                         boolean isPlural = typeDesignationWorkingSet.get(typeStatus).size() > 1;
-                        if(!typeStatus.equals(NULL_STATUS)) {
+                        if(typeStatus != NULL_STATUS){
                             if (withCitation){
                                 //TODO maybe
                                 workingsetBuilder.add(TagEnum.separator, TYPE_STATUS_PARENTHESIS_LEFT);
@@ -401,7 +393,7 @@ public class TypeDesignationSetManager {
                                     workingsetBuilder.add(TagEnum.separator, REFERENCE_PARENTHESIS_RIGHT);
                                 }
 
-                                if ((!typeStatus.equals(NULL_STATUS)) &&(typeDesignationCount ==  typeDesignationWorkingSet.get(typeStatus).size())){
+                                if ((typeStatus != NULL_STATUS) &&(typeDesignationCount == typeDesignationWorkingSet.get(typeStatus).size())){
                                     workingsetBuilder.add(TagEnum.separator, TYPE_STATUS_PARENTHESIS_RIGHT);
                                 }
 
@@ -725,8 +717,6 @@ public class TypeDesignationSetManager {
 
         private VersionableEntity baseEntity;
 
-        private List<DerivedUnit> derivedUnits = null;
-
         public TypeDesignationWorkingSet(VersionableEntity baseEntity, TypedEntityReference<? extends VersionableEntity> baseEntityReference) {
             this.baseEntity = baseEntity;
             this.baseEntityReference = baseEntityReference;

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TypeDesignationSetManagerTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TypeDesignationSetManagerTest.java
index 41cdbac296c8bdf8315dde09f7d0dabfbbc6e310..f8b37008476580dde87bf39fdadd224b0d744d15 100755 (executable)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TypeDesignationSetManagerTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TypeDesignationSetManagerTest.java
@@ -234,7 +234,7 @@ public class TypeDesignationSetManagerTest extends TermTestBase{
                     );
 
             typifiedName.addTypeDesignation(ntd, false);
-            typeDesignationManager.addTypeDesigations(null, ntd);
+            typeDesignationManager.addTypeDesigations(ntd);
 
             assertEquals(
                     "Prionus L. Nametype: Prionus coriatius L."
@@ -242,7 +242,7 @@ public class TypeDesignationSetManagerTest extends TermTestBase{
                     );
 
             typifiedName.addTypeDesignation(std_HT, false);
-            typeDesignationManager.addTypeDesigations(null, std_HT);
+            typeDesignationManager.addTypeDesigations(std_HT);
 
             assertEquals(
                     "Prionus L. Type: Testland, near Bughausen, A.Kohlbecker 81989, 2017 Holotype: OHA; Nametype: Prionus coriatius L."
@@ -256,7 +256,7 @@ public class TypeDesignationSetManagerTest extends TermTestBase{
             TaxonName typifiedName = TaxonNameFactory.NewBacterialInstance(Rank.SPECIES());
             typifiedName.setTitleCache("Prionus coriatius L.", true);
             TypeDesignationSetManager typeDesignationManager = new TypeDesignationSetManager(typifiedName);
-            typeDesignationManager.addTypeDesigations(null, std_LT);
+            typeDesignationManager.addTypeDesigations(std_LT);
             Reference citation = ReferenceFactory.newBook();
             citation.setDatePublished(TimePeriodParser.parseStringVerbatim("1989"));
             citation.setAuthorship(Team.NewTitledInstance("Miller", "Mill."));
@@ -268,7 +268,7 @@ public class TypeDesignationSetManagerTest extends TermTestBase{
             typifiedName = TaxonNameFactory.NewBacterialInstance(Rank.GENUS());
             typifiedName.setTitleCache("Prionus L.", true);
             typeDesignationManager = new TypeDesignationSetManager(typifiedName);
-            typeDesignationManager.addTypeDesigations(null, ntd_LT);
+            typeDesignationManager.addTypeDesigations(ntd_LT);
             ntd_LT.addPrimaryTaxonomicSource(citation, "66");
             typeDesignationManager.buildStringWithCitation();
             //TODO capital letter or not still needs to be discussed, currently it differs for SpecimenTD and NameTD in original csv data
@@ -288,8 +288,8 @@ public class TypeDesignationSetManagerTest extends TermTestBase{
                 typifiedName.addTypeDesignation(mtd_IT_unpublished, false);
 
                 TypeDesignationSetManager typeDesignationManager = new TypeDesignationSetManager(typifiedName);
-                typeDesignationManager.addTypeDesigations(null, mtd_HT_published);
-                typeDesignationManager.addTypeDesigations(null, mtd_IT_unpublished);
+                typeDesignationManager.addTypeDesigations(mtd_HT_published);
+                typeDesignationManager.addTypeDesigations(mtd_IT_unpublished);
 
                 assertEquals("failed after repreating " + i + " times",
                         "Prionus coriatius L. Type: Testland, near Bughausen, A.Kohlbecker 81989, 2017 Holotype: [icon] p.33 in A.K. & W.K (2008) Algae of the BGBM; Isotype: [icon] B Slide A565656."