cleanup

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java
index ed5fc423bad8fefa5b04f9437304df35e1e1e469..bd3949829ee2cb110e5fc9949f56cf46cdded6ef 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java
@@ -31,17 +31,14 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author k.luther
  * @since 27.04.2018
- *
  */
 public class CdmPreferenceCache {
-    Map<String,List<CdmPreference>> preferenceCache = new HashMap();
+    Map<String,List<CdmPreference>> preferenceCache = new HashMap<>();
 
     private static CdmPreferenceCache instance;
 
     private final static Logger logger = Logger.getLogger(CdmPreferenceCache.class);
 
-
-
     public static CdmPreferenceCache instance(){
         if(instance == null){
             instance = new CdmPreferenceCache();
@@ -94,12 +91,10 @@ public class CdmPreferenceCache {
             cachedPreferences.remove(prefToRemove);
             cachedPreferences.add(pref);
         }else{
-            List<CdmPreference> prefs = new ArrayList();
+            List<CdmPreference> prefs = new ArrayList<>();
             prefs.add(pref);
             preferenceCache.put(pref.getPredicate(), prefs);
         }
-
-
     }
 
     public boolean remove(CdmPreference pref){
@@ -114,7 +109,6 @@ public class CdmPreferenceCache {
             cachedPreferences.remove(prefToRemove);
         }
         return true;
-
     }
 
     public void getAllTaxEditorDBPreferences(){
@@ -133,7 +127,7 @@ public class CdmPreferenceCache {
             if (!PreferencesUtil.getOverrideForPreference(PreferencePredicate.AvailableDistributionStatus.getKey()) || !get(key).isAllowOverride()){
                 //get terms for the uuids... and add them to the termManager as preferred terms
                 ITermService termService = CdmStore.getService(ITermService.class);
-                List<UUID> uuidList = new ArrayList();
+                List<UUID> uuidList = new ArrayList<>();
                 if (get(key).getValue() != null){
                     String[] uuidArray =findBestMatching(key).getValue().split(";");
                     for (String uuidString:uuidArray){
@@ -147,7 +141,7 @@ public class CdmPreferenceCache {
 
                 List<DefinedTermBase> definedTermBases = termService.load(uuidList, null);
                 List<TermDto> dtos = new ArrayList<>();
-                for (DefinedTermBase term: definedTermBases){
+                for (DefinedTermBase<?> term: definedTermBases){
                     dtos.add(TermDto.fromTerm(term));
                 }
                 CdmStore.getTermManager().setPreferredTermsByType(dtos, TermType.PresenceAbsenceTerm);
@@ -159,7 +153,7 @@ public class CdmPreferenceCache {
             if (!PreferencesUtil.getOverrideForPreference(PreferencePredicate.AvailableRanks.getKey()) || !get(key).isAllowOverride()){
                 //get terms for the uuids... and add them to the termManager as preferred terms
                 ITermService termService = CdmStore.getService(ITermService.class);
-                List<UUID> uuidList = new ArrayList();
+                List<UUID> uuidList = new ArrayList<>();
                 if (get(key).getValue() != null){
                     String[] uuidArray =findBestMatching(key).getValue().split(";");
                     for (String uuidString:uuidArray){
@@ -172,8 +166,8 @@ public class CdmPreferenceCache {
                 }
 
                 List<DefinedTermBase> definedTermBases = termService.load(uuidList, null);
-                List<TermDto> dtos = new ArrayList();
-                for (DefinedTermBase term: definedTermBases){
+                List<TermDto> dtos = new ArrayList<>();
+                for (DefinedTermBase<?> term: definedTermBases){
                     dtos.add(TermDto.fromTerm(term));
                 }
                 CdmStore.getTermManager().setPreferredTermsByType(dtos, TermType.Rank);
@@ -186,7 +180,7 @@ public class CdmPreferenceCache {
             if (!PreferencesUtil.getOverrideForPreference(PreferencePredicate.AvailableNomenclaturalStatus.getKey()) || !get(key).isAllowOverride()){
                 //get terms for the uuids... and add them to the termManager as preferred terms
                 ITermService termService = CdmStore.getService(ITermService.class);
-                List<UUID> uuidList = new ArrayList();
+                List<UUID> uuidList = new ArrayList<>();
                 if (get(key).getValue() != null){
                     String[] uuidArray =findBestMatching(key).getValue().split(";");
                     for (String uuidString:uuidArray){
@@ -199,8 +193,8 @@ public class CdmPreferenceCache {
                 }
 
                 List<DefinedTermBase> definedTermBases = termService.load(uuidList, null);
-                List<TermDto> dtos = new ArrayList();
-                for (DefinedTermBase term: definedTermBases){
+                List<TermDto> dtos = new ArrayList<>();
+                for (DefinedTermBase<?> term: definedTermBases){
                     dtos.add(TermDto.fromTerm(term));
                 }
                 CdmStore.getTermManager().setPreferredTermsByType(dtos, TermType.NomenclaturalStatusType);
@@ -208,15 +202,11 @@ public class CdmPreferenceCache {
         }
     }
 
-
-
     public CdmPreference findBestMatching(PrefKey key) {
-        List<CdmPreference> allPrefs = new ArrayList();
+        List<CdmPreference> allPrefs = new ArrayList<>();
         for (String predicate: preferenceCache.keySet()){
             allPrefs.addAll(preferenceCache.get(predicate));
         }
-       return PreferenceResolver.resolve(allPrefs, key);
-
+        return PreferenceResolver.resolve(allPrefs, key);
     }
-
 }