ref #6612 cleanup generics

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmEntityDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmEntityDao.java
index f8ded53c447c9988d7cb268d3c34665a2a0aa24c..077725f47227a180509f23657b77d427a4a83fbc 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmEntityDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmEntityDao.java
@@ -29,7 +29,6 @@ import eu.etaxonomy.cdm.persistence.query.OrderHint;
 /**
  * An data access interface that all data access classes implement
  * @author m.doering
- * @version 1.0
  * @created 02-Nov-2007 19:36:10
  */
 public interface ICdmEntityDao<T extends CdmBase> {

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/RegistrationServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/RegistrationServiceImpl.java
index 8bb246686c2c9b9cd4b55861177feebd5f5a03a8..1a1234d76f6b0e9efb3ebdadc01ef3aa0b1ce435 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/RegistrationServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/RegistrationServiceImpl.java
@@ -74,15 +74,15 @@ public class RegistrationServiceImpl extends AnnotatableServiceBase<Registration
 
         List<Restriction<? extends Object>> restrictions = new ArrayList<>();
         if(submitter != null){
-            restrictions.add(new Restriction<User>("submitter", MatchMode.EXACT, submitter));
+            restrictions.add(new Restriction<>("submitter", MatchMode.EXACT, submitter));
         }
         if(includedStatus != null && !includedStatus.isEmpty()){
-            restrictions.add(new Restriction<RegistrationStatus>("status", MatchMode.EXACT, includedStatus.toArray(new RegistrationStatus[includedStatus.size()])));
+            restrictions.add(new Restriction<>("status", MatchMode.EXACT, includedStatus.toArray(new RegistrationStatus[includedStatus.size()])));
         }
 
         long numberOfResults = dao.count(Registration.class, restrictions);
 
-        List<Registration> results = new ArrayList<Registration>();
+        List<Registration> results = new ArrayList<>();
         Integer [] limitStart = AbstractPagerImpl.limitStartforRange(numberOfResults, pageIndex, pageSize);
         if(limitStart != null) {
             results = dao.list(Registration.class, restrictions, limitStart[0], limitStart[1], orderHints, propertyPaths);