revert deduplication for term DTOs

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImpl.java
index 2035535528dc50a5e2a91a6f79e8c0e2a23ea72e..23036112bc203378c95a883d93af8c54d24274f1 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImpl.java
@@ -62,7 +62,6 @@ import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;
-import eu.etaxonomy.cdm.model.term.TermBase;
 import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.model.view.AuditEvent;
@@ -138,7 +137,6 @@ public class DefinedTermDaoImpl
                @SuppressWarnings({ "unchecked", "rawtypes" })
                List<DefinedTermBase> result = deduplicateResult(query.list());
                return result;
-
        }
 
        @Override
@@ -394,7 +392,7 @@ public class DefinedTermDaoImpl
                    }
 
                    @SuppressWarnings("unchecked")
-            List<NamedArea> result = query.getResultList();
+            List<NamedArea> result = deduplicateResult(query.getResultList());
                    return result;
                }
        }
@@ -623,7 +621,7 @@ public class DefinedTermDaoImpl
      * @param orginals
      * @return
      */
-    protected static <S extends TermBase> List<S> deduplicateResult(List<S> orginals) {
+    protected static <S extends CdmBase> List<S> deduplicateResult(List<S> orginals) {
         List<S> result = new ArrayList<>();
         Iterator<S> it = orginals.iterator();
         S last = null;
@@ -804,8 +802,8 @@ public class DefinedTermDaoImpl
     }
 
     @Override
-    public Collection<TermDto> getKindOfsAsDto(
-            TermDto parentTerm) {
+    public Collection<TermDto> getKindOfsAsDto(TermDto parentTerm) {
+
         String queryString;
         if (parentTerm.getTermType().equals(TermType.NamedArea)){
             queryString = TermDto.getTermDtoSelectNamedArea();
@@ -817,7 +815,7 @@ public class DefinedTermDaoImpl
         query.setParameter("parentUuid", parentTerm.getUuid());
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         List<TermDto> list = TermDto.termDtoListFrom(result);
         return list;
@@ -837,7 +835,7 @@ public class DefinedTermDaoImpl
         }
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         List<TermDto> list = TermDto.termDtoListFrom(result);
         return list;
@@ -855,7 +853,7 @@ public class DefinedTermDaoImpl
         query.setParameter("termType", termType);
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         List<TermDto> list = TermDto.termDtoListFrom(result);
         return list;
@@ -878,7 +876,7 @@ public class DefinedTermDaoImpl
         }
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         List<TermDto> list = TermDto.termDtoListFrom(result);
         return list;
@@ -906,7 +904,7 @@ public class DefinedTermDaoImpl
         query.setParameterList("supportedCategories", supportedCategories);
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         list = TermDto.termDtoListFrom(result);
         return list;
@@ -926,7 +924,7 @@ public class DefinedTermDaoImpl
         query.setParameterList("uuidList", uuidList);
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         list = TermDto.termDtoListFrom(result);
         return list;
@@ -946,7 +944,7 @@ public class DefinedTermDaoImpl
         query.setParameterList("uuidList", uuidList);
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         list = FeatureDto.termDtoListFrom(result);
         return list;
@@ -965,10 +963,9 @@ public class DefinedTermDaoImpl
 
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         List<TermDto> list = FeatureDto.termDtoListFrom(result);
         return list;
     }
-
-}
+}
\ No newline at end of file

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/TermVocabularyDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/TermVocabularyDaoImpl.java
index 307aafd535ed1bf8892612a758c66efea15b9b73..194c310e850338901dd59a34bfa2ae72529f68ba 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/TermVocabularyDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/TermVocabularyDaoImpl.java
@@ -254,7 +254,7 @@ public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> i
            query.setParameterList("vocabularyUuids", vocabularyUuids);
 
            @SuppressWarnings("unchecked")
-           List<Object[]> result = DefinedTermDaoImpl.deduplicateResult(query.list());
+           List<Object[]> result = query.list();
 
            List<TermDto> list = TermDto.termDtoListFrom(result);
            return list;
@@ -269,7 +269,7 @@ public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> i
            query.setParameter("vocabularyUuid", vocabularyUuid);
 
            @SuppressWarnings("unchecked")
-           List<Object[]> result = DefinedTermDaoImpl.deduplicateResult(query.list());
+           List<Object[]> result = query.list();
 
            List<TermDto> list = TermDto.termDtoListFrom(result);
            return list;
@@ -284,7 +284,7 @@ public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> i
         query.setParameterList("vocabularyUuids", vocabularyUuids);
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = DefinedTermDaoImpl.deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         List<TermDto> list = TermDto.termDtoListFrom(result);
         return list;
@@ -300,7 +300,7 @@ public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> i
         query.setParameter("vocabularyUuid", vocabularyUuid);
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = DefinedTermDaoImpl.deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         List<TermDto> list = TermDto.termDtoListFrom(result);
         return list;
@@ -324,7 +324,7 @@ public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> i
         query.setParameter("vocabularyUuid", vocabularyUuid);
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = DefinedTermDaoImpl.deduplicateResult(query.list());
+        List<Object[]> result = query.list();
         List<TermDto> list = null;
         if (type.equals(TermType.Feature)|| type.isKindOf(TermType.Feature)){
             list = FeatureDto.termDtoListFrom(result);
@@ -360,7 +360,7 @@ public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> i
         query.setParameter("feature", TermType.Feature);
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = DefinedTermDaoImpl.deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         List<TermVocabularyDto>  dtos = TermVocabularyDto.termVocabularyDtoListFrom(result);
 
@@ -407,7 +407,7 @@ public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> i
             query.setParameter("pattern", pattern);
         }
         @SuppressWarnings("unchecked")
-        List<Object[]> result = DefinedTermDaoImpl.deduplicateResult(query.list());
+        List<Object[]> result = query.list();
         List<TermVocabularyDto> dtos = TermVocabularyDto.termVocabularyDtoListFrom(result);
         return dtos;
 
@@ -480,7 +480,7 @@ public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> i
         query.setParameter("uuid", vocUuid);
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = DefinedTermDaoImpl.deduplicateResult(query.list());
+        List<Object[]> result = query.list();
         if (result.size() == 1){
             return TermVocabularyDto.termVocabularyDtoListFrom(result).get(0);
         }
@@ -502,7 +502,7 @@ public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> i
         query.setParameterList("uuidList", vocUuids);
 
         @SuppressWarnings("unchecked")
-        List<Object[]> result = DefinedTermDaoImpl.deduplicateResult(query.list());
+        List<Object[]> result = query.list();
 
         list = TermVocabularyDto.termVocabularyDtoListFrom(result);
         return list;