cleanup

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
index eed118be68b2e9f667c9650c1d894721c24a72bd..a5b363b76ffb69c94bf863049b7b2592aeaf0645 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
@@ -84,7 +84,7 @@ public class TaxonDaoHibernateImplTest extends CdmTransactionalIntegrationTest {
     private IReferenceDao referenceDao;
 
     @SpringBeanByType
-    IDefinedTermDao definedTermDao;
+    private IDefinedTermDao definedTermDao;
 
     private UUID uuid;
     private UUID sphingidae;
@@ -102,7 +102,6 @@ public class TaxonDaoHibernateImplTest extends CdmTransactionalIntegrationTest {
 
     private UUID northernAmericaUuid;
     private UUID southernAmericaUuid;
-    private UUID antarcticaUuid;
 
     private UUID classificationUuid;
 
@@ -150,7 +149,6 @@ public class TaxonDaoHibernateImplTest extends CdmTransactionalIntegrationTest {
 
         northernAmericaUuid = UUID.fromString("2757e726-d897-4546-93bd-7951d203bf6f");
         southernAmericaUuid = UUID.fromString("6310b3ba-96f4-4855-bb5b-326e7af188ea");
-        antarcticaUuid = UUID.fromString("791b3aa0-54dd-4bed-9b68-56b4680aad0c");
 
         classificationUuid = UUID.fromString("aeee7448-5298-4991-b724-8d5b75a0a7a9");
         includeUnpublished = true;

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 add67bcef0e7e5875fa379a6ddfb81ac684ad0cc..bed2caa53eb58668585f567ee8f734c64c4ef800 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
@@ -205,16 +205,17 @@ public class NameServiceImpl
         }else if (name != null && typeDesignation != null){
             removeSingleDesignation(name, typeDesignation);
         }else if (name != null){
+            @SuppressWarnings("rawtypes")
             Set<TypeDesignationBase> designationSet = new HashSet<>(name.getTypeDesignations());
-            for (TypeDesignationBase<?> o : designationSet){
-                TypeDesignationBase<?> desig = CdmBase.deproxy(o);
+            for (TypeDesignationBase<?> desig : designationSet){
+                desig = CdmBase.deproxy(desig);
                 removeSingleDesignation(name, desig);
             }
         }else if (typeDesignation != null){
             @SuppressWarnings("unchecked")
             Set<TaxonName> nameSet = new HashSet<>(typeDesignation.getTypifiedNames());
-            for (Object o : nameSet){
-                TaxonName singleName = CdmBase.deproxy(o, TaxonName.class);
+            for (TaxonName singleName : nameSet){
+                singleName = CdmBase.deproxy(singleName);
                 removeSingleDesignation(singleName, typeDesignation);
             }
         }