From ba676069f0ea311b58669edb37d4d618a2dae98b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Sat, 6 Mar 2021 16:56:31 +0100 Subject: [PATCH] cleanup --- .../controller/DescriptionListController.java | 7 ++- .../controller/OccurrenceController.java | 43 +------------------ .../controller/OccurrenceListController.java | 42 +----------------- 3 files changed, 6 insertions(+), 86 deletions(-) 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 771b7873f7..2cb79fe95b 100644 --- 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 2a483605bc..5a11be3baa 100644 --- 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 List complementInitStrategy(Class clazz, List pathProperties) { @@ -92,8 +85,6 @@ public class OccurrenceController extends AbstractIdentifiableController sob = getCdmBaseInstance(uuid, response, DERIVED_UNIT_INIT_STRATEGY); sob = checkExistsAndAccess(sob, NO_UNPUBLISHED, response); @@ -137,7 +128,7 @@ public class OccurrenceController extends AbstractIdentifiableController doListFieldUnitDTO( @PathVariable("uuid") List uuids, HttpServletRequest request, - HttpServletResponse response) throws IOException { + @SuppressWarnings("unused") HttpServletResponse response) { logger.info("doListFieldUnitDTO()" + requestPathAndQuery(request)); List dtos = new ArrayList<>(uuids.size()); @@ -148,36 +139,6 @@ public class OccurrenceController extends AbstractIdentifiableController doGetTypeDesignations( -// @PathVariable("uuid") UUID uuid, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException { -// -// logger.info("doGetSpecimenTypeDesignations()" + requestPathAndQuery(request)); -// -// DerivedUnit sob = (DerivedUnit) getCdmBaseInstance(uuid, response, DERIVED_UNIT_INIT_STRATEGY); -// -// sob = checkExistsAndAccess(sob, NO_UNPUBLISHED, response); -// -// FieldUnitDTO fieldUnitDto = null; -// if(sob instanceof DerivedUnit){ -// -// fieldUnitDto = service.findFieldUnitDTO(new PreservedSpecimenDTO(sob) , new ArrayList(), new HashMap()); -// -// } -// -// return fieldUnitDto; -// } - - /** - * - * @param uuid - * @param request - * @param response - * @return - * @throws IOException - */ @RequestMapping(value = { "extensions" }, method = RequestMethod.GET) public Object doGetExtensions( @PathVariable("uuid") UUID uuid, HttpServletRequest request, 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 cd323d3850..7cb8c72733 100644 --- 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 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 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 -- 2.34.1