cleanup

[cdmlib.git] / cdmlib-remote / src / main / java / eu / etaxonomy / cdm / remote / controller / TaxonController.java

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java
index 85636b5593840efb6e5ff6d9a473a5500bf0bfd8..4d8a034903a7aa574f77089c94e33002882c5809 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java
@@ -109,7 +109,7 @@ public class TaxonController extends AbstractIdentifiableController<TaxonBase, I
     @Override\r
     public void initBinder(WebDataBinder binder) {\r
         super.initBinder(binder);\r
-        binder.registerCustomEditor(MarkerType.class, new TermBasePropertyEditor<MarkerType>(termService));\r
+        binder.registerCustomEditor(MarkerType.class, new TermBasePropertyEditor<>(termService));\r
     }\r
 \r
     protected List<String> getTaxonDescriptionInitStrategy() {\r
@@ -120,6 +120,7 @@ public class TaxonController extends AbstractIdentifiableController<TaxonBase, I
         return getInitializationStrategy();\r
     }\r
 \r
+\r
     /**\r
      * Get the accepted {@link Taxon} for a given\r
      * {@link TaxonBase} entity identified by the <code>{taxon-uuid}</code>.\r
@@ -305,24 +306,25 @@ public class TaxonController extends AbstractIdentifiableController<TaxonBase, I
             @RequestParam(value="onlyCongruent", required=false) final boolean onlyCongruent,\r
             HttpServletResponse response,\r
             HttpServletRequest request) throws IOException {\r
-            ModelAndView mv = new ModelAndView();\r
-            /**\r
-             * List<UUID> classificationFilter,\r
-             * boolean includeDoubtful,\r
-             * boolean onlyCongruent)\r
-             */\r
-            List<UUID> classificationFilter = null;\r
-            if( classificationStringList != null ){\r
-                classificationFilter = new ArrayList<UUID>();\r
-                for(String classString :classificationStringList){\r
-                    classificationFilter.add(UUID.fromString(classString));\r
-                }\r
+\r
+        ModelAndView mv = new ModelAndView();\r
+        /**\r
+         * List<UUID> classificationFilter,\r
+         * boolean includeDoubtful,\r
+         * boolean onlyCongruent)\r
+         */\r
+        List<UUID> classificationFilter = null;\r
+        if( classificationStringList != null ){\r
+            classificationFilter = new ArrayList<>();\r
+            for(String classString :classificationStringList){\r
+                classificationFilter.add(UUID.fromString(classString));\r
             }\r
-            final IncludedTaxonConfiguration configuration =\r
-                    new IncludedTaxonConfiguration(classificationFilter, includeDoubtful, onlyCongruent);\r
-            IncludedTaxaDTO listIncludedTaxa = service.listIncludedTaxa(uuid, configuration);\r
-            mv.addObject(listIncludedTaxa);\r
-            return mv;\r
+        }\r
+        IncludedTaxonConfiguration configuration =\r
+                new IncludedTaxonConfiguration(classificationFilter, includeDoubtful, onlyCongruent);\r
+        IncludedTaxaDTO listIncludedTaxa = service.listIncludedTaxa(uuid, configuration);\r
+        mv.addObject(listIncludedTaxa);\r
+        return mv;\r
     }\r
 \r
     // TODO ================================================================================ //\r
@@ -378,7 +380,7 @@ public class TaxonController extends AbstractIdentifiableController<TaxonBase, I
 \r
         ModelAndView mv = new ModelAndView();\r
 \r
-        List<DescriptionElementBase> allElements = new ArrayList<DescriptionElementBase>();\r
+        List<DescriptionElementBase> allElements = new ArrayList<>();\r
         List<DescriptionElementBase> elements;\r
         int count = 0;\r
 \r
@@ -386,7 +388,7 @@ public class TaxonController extends AbstractIdentifiableController<TaxonBase, I
 \r
         Taxon t = getCdmBaseInstance(Taxon.class, uuid, response, (List<String>)null);\r
 \r
-        Set<MarkerType> markerTypesSet = new HashSet<MarkerType>();\r
+        Set<MarkerType> markerTypesSet = new HashSet<>();\r
         if (markerTypes == null) {\r
             markerTypesSet.addAll(markerTypes);\r
         }\r