From f0e728c9f6e0781a079753f194661583db8f76e8 Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Fri, 6 Aug 2010 19:52:44 +0000 Subject: [PATCH] Added a couple of controllers --- .gitattributes | 3 ++ .../cdm/remote/controller/BaseController.java | 1 - .../ClassificationListController.java | 2 +- .../controller/FeatureNodeController.java | 40 +++++++++++++++++++ .../controller/FeatureTreeController.java | 40 +++++++++++++++++++ .../controller/FeatureTreeListController.java | 40 +++++++++++++++++++ .../cdm/api/service/IDescriptionService.java | 3 -- 7 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureNodeController.java create mode 100644 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeController.java create mode 100644 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeListController.java diff --git a/.gitattributes b/.gitattributes index 0252490b20..acee8f87cd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2685,6 +2685,9 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListCo cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java -text cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ExternalGeoController.java -text cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureListController.java -text +cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureNodeController.java -text +cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeController.java -text +cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeListController.java -text cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/HttpStatusMessage.java -text cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/IdDoesNotExistException.java -text cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ManagementController.java -text diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.java index d85cece2f9..1f284e9785 100644 --- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.java +++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.java @@ -16,7 +16,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.lang.reflect.TypeVariable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; 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 c365d5a1fa..8193d7bc27 100644 --- 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 @@ -27,7 +27,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonomicTree; * @version 1.0 */ @Controller -@RequestMapping(value = {"/classification"}) +@RequestMapping(value = {"/classifications"}) public class ClassificationListController extends BaseListController { private static final Logger logger = Logger diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureNodeController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureNodeController.java new file mode 100644 index 0000000000..c858a3aed3 --- /dev/null +++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureNodeController.java @@ -0,0 +1,40 @@ +// $Id$ +/** +* Copyright (C) 2007 EDIT +* 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. +*/ + +package eu.etaxonomy.cdm.remote.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import eu.etaxonomy.cdm.api.service.IFeatureNodeService; +import eu.etaxonomy.cdm.model.description.FeatureNode; + +/** + * @author n.hoffmann + * @created Aug 6, 2010 + * @version 1.0 + */ +@Controller +@RequestMapping(value = {"/featurenode/{uuid}"}) +public class FeatureNodeController extends BaseController { + private static final Logger logger = Logger + .getLogger(FeatureNodeController.class); + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.remote.controller.BaseController#setService(eu.etaxonomy.cdm.api.service.IService) + */ + @Override + @Autowired + public void setService(IFeatureNodeService service) { + this.service = service; + } +} diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeController.java new file mode 100644 index 0000000000..713ced71e7 --- /dev/null +++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeController.java @@ -0,0 +1,40 @@ +// $Id$ +/** +* Copyright (C) 2007 EDIT +* 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. +*/ + +package eu.etaxonomy.cdm.remote.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import eu.etaxonomy.cdm.api.service.IFeatureTreeService; +import eu.etaxonomy.cdm.model.description.FeatureTree; + +/** + * @author n.hoffmann + * @created Aug 6, 2010 + * @version 1.0 + */ +@Controller +@RequestMapping(value = {"/featuretree/{uuid}"}) +public class FeatureTreeController extends BaseController { + private static final Logger logger = Logger + .getLogger(FeatureTreeController.class); + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.remote.controller.BaseController#setService(eu.etaxonomy.cdm.api.service.IService) + */ + @Override + @Autowired + public void setService(IFeatureTreeService service) { + this.service = service; + } +} diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeListController.java new file mode 100644 index 0000000000..65bea0c2be --- /dev/null +++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeListController.java @@ -0,0 +1,40 @@ +// $Id$ +/** +* Copyright (C) 2007 EDIT +* 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. +*/ + +package eu.etaxonomy.cdm.remote.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import eu.etaxonomy.cdm.api.service.IFeatureTreeService; +import eu.etaxonomy.cdm.model.description.FeatureTree; + +/** + * @author n.hoffmann + * @created Aug 6, 2010 + * @version 1.0 + */ +@Controller +@RequestMapping(value = {"/featuretrees"}) +public class FeatureTreeListController extends BaseListController { + private static final Logger logger = Logger + .getLogger(FeatureTreeListController.class); + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.remote.controller.BaseController#setService(eu.etaxonomy.cdm.api.service.IService) + */ + @Override + @Autowired + public void setService(IFeatureTreeService service) { + this.service = service; + } +} diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java index 86accf1791..face95d87d 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java @@ -21,12 +21,9 @@ import eu.etaxonomy.cdm.model.common.Annotation; import eu.etaxonomy.cdm.model.common.Language; import eu.etaxonomy.cdm.model.common.MarkerType; import eu.etaxonomy.cdm.model.common.TermVocabulary; -import eu.etaxonomy.cdm.model.common.VersionableEntity; import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.cdm.model.description.DescriptionElementBase; -import eu.etaxonomy.cdm.model.description.Distribution; import eu.etaxonomy.cdm.model.description.Feature; -import eu.etaxonomy.cdm.model.description.FeatureNode; import eu.etaxonomy.cdm.model.description.FeatureTree; import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase; import eu.etaxonomy.cdm.model.description.Scope; -- 2.34.1