fix missing type designations of synonyms on specimen page

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java
index 9b10b40a4106ccfabfad7a5180ff61d48281a12a..ba5beb77ff6a48228acd967f32ade99d45bc8815 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java
@@ -678,7 +678,7 @@ public class OccurrenceDaoHibernateImpl
 \r
     private <T extends SpecimenOrObservationBase> Query createSpecimenQuery(String select, Class<T> clazz,\r
             Taxon associatedTaxon, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths){\r
-        Set<SpecimenOrObservationBase> setOfAll = new HashSet<>();\r
+//        Set<SpecimenOrObservationBase> setOfAll = new HashSet<>();\r
         Set<Integer> setOfAllIds = new HashSet<>();\r
 \r
         Criteria criteria = null;\r
@@ -737,7 +737,7 @@ public class OccurrenceDaoHibernateImpl
         for(HomotypicalGroup homotypicalGroup :  associatedTaxon.getHomotypicSynonymyGroups()) {\r
             List<SpecimenTypeDesignation> byHomotypicalGroup = homotypicalGroupDao.getTypeDesignations(homotypicalGroup, SpecimenTypeDesignation.class, null, null, 0, null);\r
             for (SpecimenTypeDesignation specimenTypeDesignation : byHomotypicalGroup) {\r
-                setOfAll.add(specimenTypeDesignation.getTypeSpecimen());\r
+                setOfAllIds.add(specimenTypeDesignation.getTypeSpecimen().getId());\r
             }\r
         }\r
 \r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/DerivateDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/DerivateDTO.java
index abf4ec74be678954f6354d6ad458f28660e63d89..848a04d60ff5566a57f45cb139e8e78a05c39d7b 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/DerivateDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/DerivateDTO.java
@@ -62,7 +62,7 @@ public abstract class DerivateDTO extends TypedEntityReference{
     private String preservationMethod;
     private Set<DerivateDTO> derivates;
 
-    private Set<SpecimenTypeDesignationDTO> specimenTypeDesignations;
+    private Set<SpecimenTypeDesignation> specimenTypeDesignations;
 
     private DerivationEventDTO derivationEvent;
 
@@ -151,7 +151,7 @@ public abstract class DerivateDTO extends TypedEntityReference{
         this.preservationMethod = preservationMethod;
     }
 
-    public Set<SpecimenTypeDesignationDTO> getSpecimenTypeDesignations() {
+    public Set<SpecimenTypeDesignation> getSpecimenTypeDesignations() {
         return specimenTypeDesignations;
     }
 
@@ -159,7 +159,7 @@ public abstract class DerivateDTO extends TypedEntityReference{
         this.specimenTypeDesignations = new HashSet<>();
         for (SpecimenTypeDesignation typeDes: specimenTypeDesignations){
             if (typeDes != null){
-                this.specimenTypeDesignations.add(new SpecimenTypeDesignationDTO(typeDes, this));
+                this.specimenTypeDesignations.add(typeDes);
             }
         }