From 69d199a53560be60afae826e834bd51e1b0cab24 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Thu, 6 May 2021 19:47:37 +0200
Subject: [PATCH] cleanup

---
 .../cdm/persistence/dao/common/IIdentifiableDao.java   |  3 ++-
 .../dao/hibernate/term/TermVocabularyDaoImpl.java      | 10 ++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IIdentifiableDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IIdentifiableDao.java
index 4ee756fb7b..0d46efbc50 100644
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IIdentifiableDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IIdentifiableDao.java
@@ -25,7 +25,8 @@ import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;
 
-public interface IIdentifiableDao <T extends IdentifiableEntity> extends IAnnotatableDao<T>, ITitledDao<T>, ISearchableDao<T>{
+public interface IIdentifiableDao <T extends IdentifiableEntity>
+        extends IAnnotatableDao<T>, ITitledDao<T>, ISearchableDao<T>{
 
 	/**
 	 * Return an object by LSID. NOTE: Because of the fact that LSIDs are supposed to
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 119a312e75..1c02821e38 100644
--- 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
@@ -20,6 +20,7 @@ import java.util.UUID;
 import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.Session;
+import org.hibernate.criterion.CriteriaSpecification;
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.envers.query.AuditEntity;
 import org.hibernate.envers.query.AuditQuery;
@@ -42,15 +43,11 @@ import eu.etaxonomy.cdm.persistence.query.OrderHint;
 
 /**
  * @author a.mueller
- *
  */
 @Repository
 public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> implements
 		ITermVocabularyDao {
 
-	/**
-	 * @param type
-	 */
 	public TermVocabularyDaoImpl() {
 		super(TermVocabulary.class);
 		indexedClasses = new Class[2];
@@ -113,7 +110,6 @@ public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> i
 	    	TermVocabulary<T> result = (TermVocabulary<T>)query.uniqueResult();
 	    	return result;
 		} else {
-			@SuppressWarnings("unchecked")
             AuditQuery query = makeAuditQuery(clazz, auditEvent);
 			query.add(AuditEntity.property("termSourceUri").eq(termSourceUri));
 
@@ -123,19 +119,17 @@ public class TermVocabularyDaoImpl extends IdentifiableDaoBase<TermVocabulary> i
 		}
 	}
 
-
 	@Override
     public <T extends DefinedTermBase> List<T> getTerms(TermVocabulary<T> termVocabulary, Integer pageSize,	Integer pageNumber) {
 		return getTerms(termVocabulary, pageSize, pageNumber, null, null);
 	}
 
-
     @Override
     public <T extends DefinedTermBase> List<TermVocabulary<T>> findByTermType(TermType termType, List<String> propertyPaths) {
 
         Criteria criteria = getSession().createCriteria(type);
         criteria.add(Restrictions.eq("termType", termType));
-        criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
+        criteria.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
         //this.addOrder(criteria, orderHints);
 
         @SuppressWarnings("unchecked")
-- 
2.34.1