cleanup
authorAndreas Müller <a.mueller@bgbm.org>
Fri, 25 Nov 2016 16:22:40 +0000 (17:22 +0100)
committerAndreas Müller <a.mueller@bgbm.org>
Fri, 25 Nov 2016 16:22:40 +0000 (17:22 +0100)
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermController.java
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/converter/TimePeriodConverter.java

index f4dca2b06564e1c9478e246883380f44013db50c..a1b72a142f43f504a9f5f2aed333d787e31c5c27 100644 (file)
@@ -43,10 +43,6 @@ public class TermController extends AbstractIdentifiableController<DefinedTermBa
             "vocabulary"\r
     });\r
 \r
-\r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.remote.controller.BaseController#setService(eu.etaxonomy.cdm.api.service.IService)\r
-     */\r
     @Autowired\r
     @Override\r
     public void setService(ITermService service) {\r
@@ -82,5 +78,4 @@ public class TermController extends AbstractIdentifiableController<DefinedTermBa
         return mv;\r
     }\r
 \r
-\r
 }\r
index 4d1e52d98ffaf5e5ee9d219c07cc82b5d7108029..807223810ae95390826e717ab14e206394485977 100644 (file)
@@ -9,14 +9,13 @@
 */\r
 package eu.etaxonomy.cdm.remote.controller;\r
 \r
-import io.swagger.annotations.Api;\r
-\r
 import org.springframework.beans.factory.annotation.Autowired;\r
 import org.springframework.stereotype.Controller;\r
 import org.springframework.web.bind.annotation.RequestMapping;\r
 \r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import io.swagger.annotations.Api;\r
 \r
 /**\r
  * TODO write controller documentation\r
@@ -30,10 +29,6 @@ import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 @RequestMapping(value = {"/term"})\r
 public class TermListController extends AbstractIdentifiableListController<DefinedTermBase, ITermService> {\r
 \r
-\r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.remote.controller.AbstractListController#setService(eu.etaxonomy.cdm.api.service.IService)\r
-     */\r
     @Autowired\r
     @Override\r
     public void setService(ITermService service) {\r
index 1eff12f793d9a29fc094b4e17b273ec4edd3757a..d2cd950533343f98c3909e2a3c98b0bb07cedf93 100644 (file)
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -18,32 +18,30 @@ import eu.etaxonomy.cdm.model.common.TimePeriod;
 
 public class TimePeriodConverter implements CustomConverter {
 
-       /* (non-Javadoc)
-        * @see net.sf.dozer.util.mapping.converters.CustomConverter#convert(java.lang.Object, java.lang.Object, java.lang.Class, java.lang.Class)
-        */
+    @Override
        public Object convert(Object existingDestinationFieldValue, Object source, Class<?> destClass, Class<?> sourceClass) {
-       
+
                if (source == null) {
                        return null;
                }
-               if (source instanceof TimePeriod) {        
-                       
+               if (source instanceof TimePeriod) {
+
                        //convert from TimePeriod -> DateTime
                        //FIXME .toDateTime(null) most probably not correct
                        if(((TimePeriod)source).getStart() != null){
-                               return ((TimePeriod)source).getStart().toDateTime(null); 
+                               return ((TimePeriod)source).getStart().toDateTime(null);
                        } else {
                                return null;
                        }
-                       
+
                } else if (source instanceof DateTime) {
-                       
+
                        //convert from DateTime -> TimePeriod
                        //FIXME implement
-                       return null; 
-                       
+                       return null;
+
                } else {
-                       
+
                        throw new MappingException("Converter TestCustomConverter used incorrectly. Arguments passed in were:"
                                        + existingDestinationFieldValue + " and " + source);
                }