Cleanup

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java
index a2c93d91aac998c0aa388024083a1014ed5f40c5..8f79f98f651b16f79319a1dc0e4a7083735ce624 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java
@@ -10,8 +10,6 @@
 
 package eu.etaxonomy.cdm.remote.controller;
 
-import io.swagger.annotations.Api;
-
 import java.util.Arrays;
 import java.util.List;
 
@@ -22,17 +20,18 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.model.taxon.Classification;
+import io.swagger.annotations.Api;
 
 /**
  * @author n.hoffmann
  * @created Apr 8, 2010
- * @version 1.0
  */
 @Controller
 @Api("classification")
 @RequestMapping(value = {"/classification"})
 public class ClassificationListController extends IdentifiableListController<Classification,IClassificationService> {
 
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger
             .getLogger(ClassificationListController.class);
 
@@ -42,9 +41,6 @@ public class ClassificationListController extends IdentifiableListController<Cla
     });
 
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.remote.controller.AbstractListController#setService(eu.etaxonomy.cdm.api.service.IService)
-     */
     @Override
     @Autowired
     public void setService(IClassificationService service) {

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
index 9bac94364fea4ddaae94592b4bcc0aaa90742fba..e5abd7b36bf1596fbd8f3f82c5c45e4a0d29a622 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
@@ -10,8 +10,6 @@
 
 package eu.etaxonomy.cdm.remote.controller;
 
-import io.swagger.annotations.Api;
-
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
@@ -46,6 +44,7 @@ import eu.etaxonomy.cdm.remote.editor.TermBaseListPropertyEditor;
 import eu.etaxonomy.cdm.remote.editor.UUIDListPropertyEditor;
 import eu.etaxonomy.cdm.remote.editor.UuidList;
 import eu.etaxonomy.cdm.remote.l10n.LocaleContext;
+import io.swagger.annotations.Api;
 
 /**
  * TODO write controller documentation
@@ -83,9 +82,6 @@ public class DescriptionController extends BaseController<DescriptionBase, IDesc
         binder.registerCustomEditor(DefinedTermBaseList.class, new TermBaseListPropertyEditor<MarkerType>(termService));
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.remote.controller.GenericController#setService(eu.etaxonomy.cdm.api.service.IService)
-     */
     @Autowired
     @Override
     public void setService(IDescriptionService service) {
@@ -101,7 +97,7 @@ public class DescriptionController extends BaseController<DescriptionBase, IDesc
 
         ModelAndView mv = new ModelAndView();
 
-        DescriptionBase description = service.load(uuid);
+        DescriptionBase<?> description = service.load(uuid);
 
         if(!(description instanceof TaxonDescription)){
             HttpStatusMessage.UUID_REFERENCES_WRONG_TYPE.send(response);
@@ -141,7 +137,7 @@ public class DescriptionController extends BaseController<DescriptionBase, IDesc
             HttpServletResponse response) throws IOException {
         logger.info("doGenerateNaturalLanguageDescription() - " + request.getRequestURI());
 
-        DescriptionBase description = service.load(uuid);
+        DescriptionBase<?> description = service.load(uuid);
 
         ModelAndView mv = new ModelAndView();
 

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameController.java
index d900a92953789e003012ffc7123958d11ffc23c7..05ad3a4852d7701f2dbefdcc6e7770bd072c8a15 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameController.java
@@ -10,8 +10,6 @@
 \r
 package eu.etaxonomy.cdm.remote.controller;\r
 \r
-import io.swagger.annotations.Api;\r
-\r
 import java.io.IOException;\r
 import java.util.ArrayList;\r
 import java.util.Arrays;\r
@@ -33,6 +31,7 @@ import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
+import io.swagger.annotations.Api;\r
 \r
 /**\r
  * TODO write controller documentation\r
@@ -65,9 +64,6 @@ public class NameController extends BaseController<TaxonNameBase, INameService>
         setInitializationStrategy(Arrays.asList(new String[]{"$"})); //TODO still needed????\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.remote.controller.GenericController#setService(eu.etaxonomy.cdm.api.service.IService)\r
-     */\r
     @Autowired\r
     @Override\r
     public void setService(INameService service) {\r
@@ -97,7 +93,7 @@ public class NameController extends BaseController<TaxonNameBase, INameService>
         if (request != null) {\r
             logger.info("doGetTypeDesignations()" + request.getRequestURI());\r
         }\r
-        TaxonNameBase tnb = getCdmBaseInstance(uuid, response,\r
+        TaxonNameBase<?,?> tnb = getCdmBaseInstance(uuid, response,\r
                 (List<String>) null);\r
         Pager<TypeDesignationBase> p = service.getTypeDesignations(tnb, null,\r
                 null, null, TYPEDESIGNATION_INIT_STRATEGY);\r
@@ -111,10 +107,10 @@ public class NameController extends BaseController<TaxonNameBase, INameService>
             HttpServletRequest request, HttpServletResponse response)throws IOException {\r
 \r
         logger.info("doGetNameCache()" + request.getRequestURI());\r
-        TaxonNameBase tnb = getCdmBaseInstance(uuid, response, NAME_CACHE_INIT_STRATEGY);\r
-        NonViralName nvn = (NonViralName) tnb;\r
+        TaxonNameBase<?,?> tnb = getCdmBaseInstance(uuid, response, NAME_CACHE_INIT_STRATEGY);\r
+        NonViralName<?> nvn = (NonViralName<?>) tnb;\r
         String nameCacheString = nvn.getNameCache();\r
-        List result = new ArrayList<String>();\r
+        List<String> result = new ArrayList<>();\r
         result.add(nameCacheString);\r
         return result;\r
 \r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotatableServiceBase.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotatableServiceBase.java
index 657a58b07be2decf7ed7e86462d51f6ef2cdb683..b3261b73368eb7c787741829182b5ad4424c1216 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotatableServiceBase.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotatableServiceBase.java
@@ -1,9 +1,9 @@
 // $Id$\r
 /**\r
 * Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
@@ -26,39 +26,44 @@ import eu.etaxonomy.cdm.persistence.query.OrderHint;
 \r
 public abstract class AnnotatableServiceBase<T extends AnnotatableEntity,DAO extends IAnnotatableDao<T>> extends VersionableServiceBase<T, DAO>\r
                implements IAnnotatableService<T> {\r
-       @Transactional(readOnly = true)\r
+       @Override\r
+    @Transactional(readOnly = true)\r
        public Pager<Annotation> getAnnotations(T annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {\r
                Integer numberOfResults = dao.countAnnotations(annotatedObj, status);\r
-               \r
+\r
                List<Annotation> results = new ArrayList<Annotation>();\r
                if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)\r
-                       results = dao.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); \r
+                       results = dao.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);\r
                }\r
-               \r
+\r
                return new DefaultPagerImpl<Annotation>(pageNumber, numberOfResults, pageSize, results);\r
        }\r
-       \r
-       @Transactional(readOnly = true)\r
+\r
+       @Override\r
+    @Transactional(readOnly = true)\r
     public Pager<Marker> getMarkers(T annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {\r
         Integer numberOfResults = dao.countMarkers(annotatableEntity, technical);\r
-               \r
+\r
                List<Marker> results = new ArrayList<Marker>();\r
                if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)\r
                        results = dao.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);\r
                }\r
-               \r
+\r
                return new DefaultPagerImpl<Marker>(pageNumber, numberOfResults, pageSize, results);\r
     }\r
-       \r
 \r
-       @Transactional(readOnly = true)\r
+\r
+       @Override\r
+    @Transactional(readOnly = true)\r
        public List<Object[]> groupMarkers(Class<? extends T> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {\r
                return dao.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);\r
        }\r
 \r
-       @Transactional(readOnly = true)\r
+       @Override\r
+    @Transactional(readOnly = true)\r
        public int countMarkers(Class<? extends T> clazz, Boolean technical) {\r
                return dao.countMarkers(clazz, technical);\r
        }\r
 \r
+\r
 }\r