cleanup

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/facade/DerivedUnitFacadeCacheStrategy.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/facade/DerivedUnitFacadeCacheStrategy.java
index ed9f8a439b0c97956ea736f749b9ac30f4196e67..15010a7c7f1eb98d41c5ee73ee9f733ff0c343c1 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/facade/DerivedUnitFacadeCacheStrategy.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/facade/DerivedUnitFacadeCacheStrategy.java
@@ -27,7 +27,7 @@ import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
  * @author a.mueller
  * @since 03.06.2010
  *
- * @deprecated with #9678 a similar cache strategy (DerivedUnitCacheStrategy)
+ * @deprecated with #9678 a similar cache strategy (DerivedUnitDefaultCacheStrategy)
  *      was implemented in cdmlib-model. This class may be removed in future.
  */
 @Deprecated
@@ -150,6 +150,7 @@ public class DerivedUnitFacadeCacheStrategy
      */
     private String getUnitNumber(DerivedUnitFacade facade) {
         String result;
+
         if (isNotBlank(facade.getAccessionNumber())){
             result = facade.getAccessionNumber();
         }else if (isNotBlank(facade.getBarcode())){

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java
index ba8a1236ea1c2e2b7cb27bab4d63f669a1b60998..c223c8eb2eb003c4dcd2c9bc54305c318e8bdc11 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java
@@ -47,7 +47,8 @@ import io.swagger.annotations.Api;
 @Controller
 @Api("derivedUnitFacade")
 @RequestMapping(value = {"/derivedUnitFacade/{uuid}"})
-public class DerivedUnitFacadeController extends AbstractController<SpecimenOrObservationBase, IOccurrenceService>{
+public class DerivedUnitFacadeController
+        extends AbstractController<SpecimenOrObservationBase, IOccurrenceService>{
 
     private static final Logger logger = LogManager.getLogger();
 
@@ -105,7 +106,7 @@ public class DerivedUnitFacadeController extends AbstractController<SpecimenOrOb
     public List<MediaDTO> doGetFieldObjectMediaDTO(
         @PathVariable("uuid") UUID occurrenceUuid,
         HttpServletRequest request,
-        HttpServletResponse response) {
+        @SuppressWarnings("unused") HttpServletResponse response) {
 
         logger.info("doGetFieldObjectMediaDTO() - " + readPathParameter(request, null));
 
@@ -133,7 +134,6 @@ public class DerivedUnitFacadeController extends AbstractController<SpecimenOrOb
         return mv;
     }
 
-
 // TODO
     //@RequestMapping(method = RequestMethod.GET, value = "{uuid}/collectingareas")
     @RequestMapping(
@@ -164,11 +164,9 @@ public class DerivedUnitFacadeController extends AbstractController<SpecimenOrOb
         return duf.getCollection();
     }
 
-
     //TODO:
     // public Point getExactLocation() => valueProcessor?
 
-
     // public Collection getCollection() {
     // public AgentBase getCollector() {
     // public DerivedUnit getDerivedUnit() {
@@ -214,15 +212,4 @@ public class DerivedUnitFacadeController extends AbstractController<SpecimenOrOb
         }
         return null;
     }
-
-
-
-
-
-
-
-
-
-
-
-}
+}
\ No newline at end of file

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java
index 378e8c6542554c6dba95434e1c5750d04f24fdab..54a55fe3f740578bea1e6c27fef1cebb5d894a99 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java
@@ -8,23 +8,22 @@
 */\r
 package eu.etaxonomy.cdm.remote.controller;\r
 \r
-import io.swagger.annotations.Api;\r
-\r
 import java.util.Arrays;\r
 \r
 import org.springframework.stereotype.Controller;\r
 import org.springframework.web.bind.annotation.RequestMapping;\r
 \r
+import io.swagger.annotations.Api;\r
+\r
 /**\r
  * @author a.kohlbecker\r
  * @since 14.10.2010\r
- *\r
  */\r
 @Controller\r
 @Api("portal_derivedUnitFacade")\r
 @RequestMapping(value = {"/portal/derivedUnitFacade/{uuid}"})\r
-public class DerivedUnitFacadePortalController extends\r
-        DerivedUnitFacadeController {\r
+public class DerivedUnitFacadePortalController\r
+        extends DerivedUnitFacadeController {\r
 \r
     public DerivedUnitFacadePortalController(){\r
         super();\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/remote/dto/rdf/Rdf.java b/cdmlib-remote/src/main/java/eu/etaxonomy/remote/dto/rdf/Rdf.java
index 17360ec042b379b730950d3cb0ae302b6cc1e650..6aef477f5a889c0cae01b0c71cce65cdc14839a0 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/remote/dto/rdf/Rdf.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/remote/dto/rdf/Rdf.java
@@ -13,8 +13,6 @@
 // Any modifications to this file will be lost upon recompilation of the source schema.\r
 // Generated on: 2007.08.01 at 10:51:47 AM BST\r
 //\r
-\r
-\r
 package eu.etaxonomy.remote.dto.rdf;\r
 \r
 import java.util.HashSet;\r
@@ -44,7 +42,7 @@ public class Rdf {
          @XmlElement(name = "SpeciesProfileModel", namespace = "http://rs.tdwg.org/ontology/voc/SpeciesProfileModel#", type = SpeciesProfileModel.class),\r
          @XmlElement(name = "NameInformation", namespace = "http://cybertaxonomy.org/cdm/ontology/voc/NameInformation#")\r
     })\r
-    protected Set<BaseThing> things = new HashSet<BaseThing>();\r
+    protected Set<BaseThing> things = new HashSet<>();\r
 \r
        public Set<BaseThing> getThings() {\r
                return things;\r
@@ -57,4 +55,4 @@ public class Rdf {
        public void removeThing(BaseThing thing) {\r
                this.things.remove(thing);\r
        }\r
-}\r
+}
\ No newline at end of file

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/facade/DerivedUnitFacadeCacheStrategyTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/facade/DerivedUnitFacadeCacheStrategyTest.java
index d1f8c8566525d7109ea57c3796e33438abd6afe1..c23ed1a36ad1e680ac1613fcf2f94cea43495433 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/facade/DerivedUnitFacadeCacheStrategyTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/facade/DerivedUnitFacadeCacheStrategyTest.java
@@ -12,7 +12,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.Language;