refactoring listTaxonDescriptionMedia into ITaxonService

[cdmlib.git] / cdmlib-remote / src / main / java / eu / etaxonomy / cdm / remote / controller / ClassificationController.java

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java
index 7b8a23484171861e23670c4f5b13fdd9e5f0e5ea..db1b59ec524af55108e07825a8547600a85e3326 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java
@@ -24,14 +24,13 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;\r
 import org.springframework.web.bind.annotation.RequestMethod;\r
 \r
-import eu.etaxonomy.cdm.api.service.ITaxonTreeService;\r
+import eu.etaxonomy.cdm.api.service.IClassificationService;\r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonomicTree;\r
+import eu.etaxonomy.cdm.model.taxon.Classification;\r
 import eu.etaxonomy.cdm.remote.editor.RankPropertyEditor;\r
-import eu.etaxonomy.cdm.remote.editor.UUIDPropertyEditor;\r
 \r
 /**\r
  * @author a.kohlbecker\r
@@ -40,7 +39,7 @@ import eu.etaxonomy.cdm.remote.editor.UUIDPropertyEditor;
  */\r
 @Controller\r
 @RequestMapping(value = {"/classification/{uuid}"})\r
-public class ClassificationController extends AnnotatableController<TaxonomicTree,ITaxonTreeService> {\r
+public class ClassificationController extends BaseController<Classification,IClassificationService> {\r
 \r
 \r
        private ITermService termService;\r
@@ -50,7 +49,7 @@ public class ClassificationController extends AnnotatableController<TaxonomicTre
         */\r
        @Override\r
        @Autowired\r
-       public void setService(ITaxonTreeService service) {\r
+       public void setService(IClassificationService service) {\r
                this.service = service;\r
        }\r
        \r
@@ -63,19 +62,15 @@ public class ClassificationController extends AnnotatableController<TaxonomicTre
        @InitBinder\r
        @Override\r
     public void initBinder(WebDataBinder binder) {\r
+               super.initBinder(binder);\r
                binder.registerCustomEditor(Rank.class, new RankPropertyEditor());\r
        }\r
        \r
        private List<String> NODE_INIT_STRATEGY(){\r
                return Arrays.asList(new String[]{\r
                        "taxon.sec", \r
-                       "taxon.name.taggedName",\r
-//                     "taxon.name.combinationAuthorTeam.*",\r
-//                     "taxon.name.exCombinationAuthorTeam.*",\r
-//                     "taxon.name.basionymAuthorTeam.*",\r
-//                     "taxon.name.exBasionymAuthorTeam.*",\r
-                       "taxon.name.titleCache",\r
-                       "taxonomicTree"\r
+                       "taxon.name",\r
+                       "classification"\r
        });}\r
        \r
        /**\r
@@ -85,7 +80,7 @@ public class ClassificationController extends AnnotatableController<TaxonomicTre
         * @throws IOException\r
         */\r
        @RequestMapping(\r
-                       value = {"childNodes/"},\r
+                       value = {"childNodes"},\r
                        method = RequestMethod.GET)\r
        public List<TaxonNode> getChildNodes(\r
                        @PathVariable("uuid") UUID classificationUuid,\r
@@ -96,7 +91,7 @@ public class ClassificationController extends AnnotatableController<TaxonomicTre
        }\r
        \r
        @RequestMapping(\r
-                       value = {"childNodesAt/{rankUuid}/"},\r
+                       value = {"childNodesAt/{rankUuid}"},\r
                        method = RequestMethod.GET)\r
        public List<TaxonNode> getChildNodesAtRank(\r
                        @PathVariable("uuid") UUID classificationUuid,\r
@@ -105,7 +100,7 @@ public class ClassificationController extends AnnotatableController<TaxonomicTre
                        ) throws IOException {\r
                \r
                logger.info("getChildNodesAtRank()");\r
-               TaxonomicTree tree = null;\r
+               Classification tree = null;\r
                Rank rank = null;\r
                if(classificationUuid != null){\r
                        // get view and rank\r