cleanup

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 b5333f0d78418f0c1e7a3d266f4fdff169883998..3ca8b32c3e100886e0ac1fcea5fc91645c749057 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
@@ -84,7 +84,8 @@ public class DefinedTermDaoImpl
 
     private static final Logger logger = Logger.getLogger(DefinedTermDaoImpl.class);
 
-       public DefinedTermDaoImpl() {
+       @SuppressWarnings("unchecked")
+    public DefinedTermDaoImpl() {
                super(DefinedTermBase.class);
                indexedClasses = new Class[25];
                indexedClasses[0] = Rank.class;
@@ -255,9 +256,9 @@ public class DefinedTermDaoImpl
 
                String queryStr;
                if (isIso639_1){
-                       queryStr = "from Language where iso639_1 = :isoCode";
+                       queryStr = "FROM Language WHERE iso639_1 = :isoCode";
                }else{
-                       queryStr = "from Language where idInVocabulary = :isoCode and vocabulary.uuid = :vocUuid";
+                       queryStr = "FROM Language WHERE idInVocabulary = :isoCode AND vocabulary.uuid = :vocUuid";
                }
                AuditEvent auditEvent = getAuditEventFromContext();
                if(auditEvent.equals(AuditEvent.CURRENT_VIEW)) {
@@ -286,7 +287,7 @@ public class DefinedTermDaoImpl
         */
        @Override
     public List<Language> getLanguagesByIso(List<String> iso639List) {
-               List<Language> languages = new ArrayList<Language>(iso639List.size());
+               List<Language> languages = new ArrayList<>(iso639List.size());
                for (String iso639 : iso639List) {
                        languages.add(getLanguageByIso(iso639));
                }
@@ -295,7 +296,7 @@ public class DefinedTermDaoImpl
 
        @Override
     public List<Language> getLanguagesByLocale(Enumeration<Locale> locales) {
-               List<Language> languages = new ArrayList<Language>();
+               List<Language> languages = new ArrayList<>();
                while(locales.hasMoreElements()) {
                        Locale locale = locales.nextElement();
                        languages.add(getLanguageByIso(locale.getLanguage()));
@@ -347,7 +348,11 @@ public class DefinedTermDaoImpl
        @Override
     public List<Media> getMedia(DefinedTermBase definedTerm, Integer pageSize, Integer pageNumber) {
                checkNotInPriorView("DefinedTermDaoImpl.getMedia(DefinedTermBase definedTerm, Integer pageSize, Integer pageNumber)");
-               Query query = getSession().createQuery("select media from DefinedTermBase definedTerm join definedTerm.media media where definedTerm = :definedTerm");
+               Query query = getSession().createQuery(
+                          "SELECT media "
+                       + " FROM DefinedTermBase definedTerm "
+                       + " JOIN definedTerm.media media "
+                       + " WHERE definedTerm = :definedTerm");
                query.setParameter("definedTerm", definedTerm);
 
                addPageSizeAndNumber(query, pageSize, pageNumber);
@@ -510,7 +515,7 @@ public class DefinedTermDaoImpl
                    defaultBeanInitializer.initializeAll(results, propertyPaths);
                    return results;
                } else {
-                       List<T> result = new ArrayList<T>();
+                       List<T> result = new ArrayList<>();
                        for(T t : partOf) {
                                AuditQuery query = makeAuditQuery(DefinedTermBase.class, auditEvent);
                                query.add(AuditEntity.relatedId("partOf").eq(t.getId()));
@@ -846,9 +851,7 @@ public class DefinedTermDaoImpl
                 + " where a.termType = :termType ";
         Query query =  getSession().createQuery(queryString);
 
-        if(termType!=null){
-            query.setParameter("termType", termType);
-        }
+        query.setParameter("termType", termType);
 
         @SuppressWarnings("unchecked")
         List<Object[]> result = query.list();

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
index 5c539ede32583ae83ab92ff8888d402902cf710a..b8a82ca76bd20cac6c2e25a9b2bf3d979a7c34f3 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
@@ -1248,6 +1248,7 @@ public class NameServiceImpl
                     }
                 }
                 Reference nomRef = name.getNomenclaturalReference();
+
                 //authors
                 IParsedMatchStrategy authorMatcher = MatchStrategyFactory.NewParsedTeamOrPersonInstance();
                 if (name.getCombinationAuthorship()!= null && !name.getCombinationAuthorship().isPersited()){
@@ -1320,7 +1321,7 @@ public class NameServiceImpl
     }
 
     private <M extends IMatchable> M findBestMatching(M matchable, List<M> matchingList,
-            IMatchStrategy referenceMatcher) {
+            IMatchStrategy matcher) {
         // FIXME TODO resolve multiple duplications. Use first match for a start
         if(matchingList.isEmpty()){
             return null;
@@ -1328,7 +1329,4 @@ public class NameServiceImpl
         M bestMatching = matchingList.iterator().next();
         return bestMatching;
     }
-
-
-
 }
\ No newline at end of file

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/DerivedUnitDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/DerivedUnitDTO.java
index 2a5176ca1daad5232f0a4c5e2da8c8605ea2cf3a..46db816bcb0848fa5d11371d1bbb5820be8251c8 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/DerivedUnitDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/DerivedUnitDTO.java
@@ -257,7 +257,7 @@ public class DerivedUnitDTO extends SpecimenOrObservationBaseDTO{
     }
     public void addTypes(String typeStatus, List<String> typedTaxa){
         if(types==null){
-            types = new HashMap<String, List<String>>();
+            types = new HashMap<>();
         }
         types.put(typeStatus, typedTaxa);
     }
@@ -275,22 +275,24 @@ public class DerivedUnitDTO extends SpecimenOrObservationBaseDTO{
     public void setPreferredStableUri(URI preferredStableUri) {
         this.preferredStableUri = preferredStableUri;
     }
-
     public URI getPreferredStableUri() {
         return preferredStableUri;
     }
+
     public String getSpecimenShortTitle() {
         return specimenShortTitle;
     }
     public void setSpecimenShortTitle(String specimenIdentifier) {
         this.specimenShortTitle = specimenIdentifier;
     }
+
     public String getMostSignificantIdentifier() {
         return mostSignificantIdentifier;
     }
     public void setMostSignificantIdentifier(String mostSignificantIdentifier) {
         this.mostSignificantIdentifier = mostSignificantIdentifier;
     }
+
     public TypedEntityReference<TaxonName> getStoredUnder() {
         return storedUnder;
     }
@@ -304,6 +306,7 @@ public class DerivedUnitDTO extends SpecimenOrObservationBaseDTO{
     public void setOriginalLabelInfo(String originalLabelInfo) {
         this.originalLabelInfo = originalLabelInfo;
     }
+
     public String getExsiccatum() {
         return exsiccatum;
     }
@@ -311,14 +314,9 @@ public class DerivedUnitDTO extends SpecimenOrObservationBaseDTO{
         this.exsiccatum = exsiccatum;
     }
 
-    public void setCollection(CollectionDTO collection) {
-        this.collection = collection;
-    }
-
     public String getCatalogNumber() {
         return catalogNumber;
     }
-
     public void setCatalogNumber(String catalogNumber) {
         this.catalogNumber = catalogNumber;
     }
@@ -326,7 +324,6 @@ public class DerivedUnitDTO extends SpecimenOrObservationBaseDTO{
     public String getBarcode() {
         return barcode;
     }
-
     public void setBarcode(String barcode) {
         this.barcode = barcode;
     }
@@ -334,35 +331,13 @@ public class DerivedUnitDTO extends SpecimenOrObservationBaseDTO{
     public String getPreservationMethod() {
         return preservationMethod;
     }
-
     public void setPreservationMethod(String preservationMethod) {
         this.preservationMethod = preservationMethod;
     }
 
-    /**
-     * @return the collection
-     *
-     * @deprecated TODO remove as it only duplicates the information contained in the collectionDTO
-     */
-    @Deprecated
-    public String getCollectionCode() {
-        if (collection != null){
-            return collection.getCode();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return the collection
-     */
     public CollectionDTO getCollection() {
         return collection;
     }
-
-    /**
-     * @param collection the collection to set
-     */
     public void setCollectioDTO(CollectionDTO collection) {
         this.collection = collection;
     }
@@ -370,7 +345,5 @@ public class DerivedUnitDTO extends SpecimenOrObservationBaseDTO{
     @Override
     protected void updateTreeDependantData() {
         // TODO DerivationTreeSummaryDTO should be updated here once it is refactored so that it can operate on dtos
-
     }
-
-}
+}
\ No newline at end of file