cleanup

[cdmlib.git] / cdmlib-persistence / src / main / java / eu / etaxonomy / cdm / persistence / dao / hibernate / common / CdmEntityDaoBase.java

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
index 8c243d8436b752cdf502f879c09f8554d3042120..981e1f408930c5a5ed1e568f7f01d69b8f27658f 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
@@ -21,7 +21,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.hibernate.Criteria;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
@@ -387,6 +388,7 @@ public abstract class CdmEntityDaoBase<T extends CdmBase>
             return null;
         }
 
+        // Ben Clark:
         // Merge the object in if it is detached
         //
         // I think this is preferable to catching lazy initialization errors
@@ -1152,7 +1154,7 @@ public abstract class CdmEntityDaoBase<T extends CdmBase>
             List<OrderHint> orderHints, List<String> propertyPaths) {
 
         List<Restriction<?>> allRestrictions = new ArrayList<>();
-        allRestrictions.add(new Restriction<String>(param, matchmode, queryString));
+        allRestrictions.add(new Restriction<>(param, matchmode, queryString));
         if(restrictions != null){
             allRestrictions.addAll(restrictions);
         }
@@ -1166,7 +1168,6 @@ public abstract class CdmEntityDaoBase<T extends CdmBase>
         List<S> result = criteria.list();
         defaultBeanInitializer.initializeAll(result, propertyPaths);
         return result;
-
     }
 
     @Override
@@ -1174,7 +1175,7 @@ public abstract class CdmEntityDaoBase<T extends CdmBase>
             MatchMode matchmode, List<Restriction<?>> restrictions) {
 
         List<Restriction<?>> allRestrictions = new ArrayList<>();
-        allRestrictions.add(new Restriction<String>(param, matchmode, queryString));
+        allRestrictions.add(new Restriction<>(param, matchmode, queryString));
         if(restrictions != null){
             allRestrictions.addAll(restrictions);
         }