cleanup

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java
index 771b7873f7b45f920c03c8976803fd33137e1a2f..2cb79fe95b8fd49470c1037382aa9673420ace55 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java
@@ -308,11 +308,10 @@ public class DescriptionListController
                         getDescriptionInfoInitStrategy(), condensedConfig, distributionOrder,
                         ignoreDistributionStatusUndefined);
                 mv.addObject(dto);
+                return mv;
             } catch (Exception e) {
-                //TODO
-                mv.addObject(e.getStackTrace().toString());
+                HttpStatusMessage.create("Exception when retrieving distribution info for " + taxonUuid, 500).send(response);
+                return null;
             }
-
-            return mv;
     }
 }
\ No newline at end of file

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceController.java
index 2a483605bc93c0832868967b21a42c47ef34458b..5a11be3baace26e08c0f2046b085b2a50923cda3 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceController.java
@@ -67,19 +67,12 @@ public class OccurrenceController extends AbstractIdentifiableController<Specime
             "extensions.type",\r
     });\r
 \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(IOccurrenceService service) {\r
         this.service = service;\r
     }\r
 \r
-\r
-\r
     @Override\r
     protected <CDM_BASE extends CdmBase> List<String> complementInitStrategy(Class<CDM_BASE> clazz,\r
             List<String> pathProperties) {\r
@@ -92,8 +85,6 @@ public class OccurrenceController extends AbstractIdentifiableController<Specime
         return pathProperties;\r
     }\r
 \r
-\r
-\r
     @RequestMapping(value = { "derivedFrom" }, method = RequestMethod.GET)\r
     public DerivationEvent doGetDerivedFrom(\r
             @PathVariable("uuid") UUID uuid, HttpServletRequest request,\r
@@ -121,7 +112,7 @@ public class OccurrenceController extends AbstractIdentifiableController<Specime
 \r
         logger.info("doGetFieldUnitDTO()" + requestPathAndQuery(request));\r
 \r
-        SpecimenOrObservationBase sob = getCdmBaseInstance(uuid, response, DERIVED_UNIT_INIT_STRATEGY);\r
+        SpecimenOrObservationBase<?> sob = getCdmBaseInstance(uuid, response, DERIVED_UNIT_INIT_STRATEGY);\r
 \r
         sob = checkExistsAndAccess(sob, NO_UNPUBLISHED, response);\r
 \r
@@ -137,7 +128,7 @@ public class OccurrenceController extends AbstractIdentifiableController<Specime
     public  List<FieldUnitDTO> doListFieldUnitDTO(\r
             @PathVariable("uuid") List<UUID> uuids,\r
             HttpServletRequest request,\r
-            HttpServletResponse response) throws IOException {\r
+            @SuppressWarnings("unused") HttpServletResponse response) {\r
 \r
         logger.info("doListFieldUnitDTO()" + requestPathAndQuery(request));\r
         List<FieldUnitDTO> dtos = new ArrayList<>(uuids.size());\r
@@ -148,36 +139,6 @@ public class OccurrenceController extends AbstractIdentifiableController<Specime
         return dtos;\r
     }\r
 \r
-//    @RequestMapping(value = { "specimenTypeDesignations" }, method = RequestMethod.GET)\r
-//    public  List<SpecimenTypeDesignation> doGetTypeDesignations(\r
-//            @PathVariable("uuid") UUID uuid,\r
-//            HttpServletRequest request,\r
-//            HttpServletResponse response) throws IOException {\r
-//\r
-//        logger.info("doGetSpecimenTypeDesignations()" + requestPathAndQuery(request));\r
-//\r
-//        DerivedUnit sob = (DerivedUnit) getCdmBaseInstance(uuid, response, DERIVED_UNIT_INIT_STRATEGY);\r
-//\r
-//        sob = checkExistsAndAccess(sob, NO_UNPUBLISHED, response);\r
-//\r
-//        FieldUnitDTO fieldUnitDto = null;\r
-//        if(sob instanceof DerivedUnit){\r
-//\r
-//            fieldUnitDto = service.findFieldUnitDTO(new PreservedSpecimenDTO(sob) , new ArrayList<FieldUnitDTO>(), new HashMap<UUID, DerivateDTO>());\r
-//\r
-//        }\r
-//\r
-//        return fieldUnitDto;\r
-//    }\r
-\r
-    /**\r
-     *\r
-     * @param uuid\r
-     * @param request\r
-     * @param response\r
-     * @return\r
-     * @throws IOException\r
-     */\r
     @RequestMapping(value = { "extensions" }, method = RequestMethod.GET)\r
     public Object doGetExtensions(\r
             @PathVariable("uuid") UUID uuid, HttpServletRequest request,\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java
index cd323d38503d6389e78ca6bbca30aef9f0349e09..7cb8c72733f364429a043f70ca40c110ad07bd77 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java
@@ -61,9 +61,6 @@ public class OccurrenceListController extends AbstractIdentifiableListController
     @Autowired
     private ITermService termService;
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.remote.controller.BaseListController#setService(eu.etaxonomy.cdm.api.service.IService)
-     */
     @Override
     @Autowired
     public void setService(IOccurrenceService service) {
@@ -183,41 +180,6 @@ public class OccurrenceListController extends AbstractIdentifiableListController
         return pager;
     }
 
-    /**
-    *
-    * @param queryString
-    * @param request
-    * @param response
-    * @return
-    * @throws IOException
-    * @throws ParseException
-    */
-//   @RequestMapping(method = RequestMethod.GET, value={"byGeneticAccessionNumber"})
-//   public Pager<DerivedUnit> dofindByGeneticAccessionNumber(
-//           @RequestParam(value = "query", required = false) String queryString,
-//           @RequestParam(value = "pageNumber", required = false) Integer pageNumber,
-//           @RequestParam(value = "pageSize", required = false) Integer pageSize,
-//           HttpServletRequest request,
-//           HttpServletResponse response
-//           )
-//            throws IOException {
-//
-//        logger.info("dofindByIdentifier() " + requestPathAndQuery(request) );
-//
-//        PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);
-//        pagerParams.normalizeAndValidate(response);
-//
-//
-//        if(queryString == null ) {
-//            HttpStatusMessage.create("Query must be given", 400).send(response);
-//            return null;
-//        }
-//
-//       Pager<DerivedUnit> pager = service.findByAccessionNumber(queryString,pageSize, pageNumber, null,this.initializationStrategy);
-//
-//       return pager;
-//   }
-
     @RequestMapping(method = RequestMethod.GET, value = "byGeneticAccessionNumber" )
     public SpecimenOrObservationBaseDTO doGetByGeneticAccessionNumber(
             @RequestParam(value="accessionNumber", required = true) String accessionNumber,
@@ -233,6 +195,4 @@ public class OccurrenceListController extends AbstractIdentifiableListController
        }
        return sobDto;
     }
-
-
-}
+}
\ No newline at end of file