ref #6967 implementing /registration/{identifier} in RegistrationController

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

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameListController.java
index 1c3868a8711a46c39455dd71b5939eeeb035a84e..d2a1c7089ab60e7057682dcb729a2945af05a13e 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameListController.java
@@ -1,4 +1,3 @@
-// $Id$\r
 /**\r
  * Copyright (C) 2009 EDIT European Distributed Institute of Taxonomy\r
  * http://www.e-taxonomy.eu\r
@@ -9,8 +8,6 @@
 \r
 package eu.etaxonomy.cdm.remote.controller;\r
 \r
-import io.swagger.annotations.Api;\r
-\r
 import java.io.IOException;\r
 \r
 import javax.servlet.http.HttpServletRequest;\r
@@ -24,32 +21,30 @@ import org.springframework.web.bind.annotation.RequestParam;
 \r
 import eu.etaxonomy.cdm.api.service.INameService;\r
 import eu.etaxonomy.cdm.api.service.pager.Pager;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.persistence.query.MatchMode;\r
 import eu.etaxonomy.cdm.remote.controller.util.PagerParameters;\r
+import io.swagger.annotations.Api;\r
 \r
 /**\r
  * TODO write controller documentation\r
  *\r
  * @author a.kohlbecker\r
- * @date 24.03.2009\r
+ * @since 24.03.2009\r
  */\r
 @Controller\r
 @Api("name")\r
 @RequestMapping(value = {"/name"})\r
-public class NameListController extends IdentifiableListController<TaxonNameBase, INameService> {\r
+public class NameListController extends AbstractIdentifiableListController<TaxonName, INameService> {\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.remote.controller.BaseListController#setService(eu.etaxonomy.cdm.api.service.IService)\r
-     */\r
     @Override\r
     @Autowired\r
     public void setService(INameService service) {\r
         this.service = service;\r
     }\r
 \r
-   @RequestMapping(method = RequestMethod.GET, value={"findTitleCache"})\r
-    public Pager<TaxonNameBase> doFindTitleCache(\r
+    @RequestMapping(method = RequestMethod.GET, value={"findTitleCache"})\r
+    public Pager<TaxonName> doFindTitleCache(\r
             @RequestParam(value = "query", required = true) String query,\r
             @RequestParam(value = "pageNumber", required = false) Integer pageNumber,\r
             @RequestParam(value = "pageSize", required = false) Integer pageSize,\r
@@ -65,11 +60,10 @@ public class NameListController extends IdentifiableListController<TaxonNameBase
         pagerParams.normalizeAndValidate(response);\r
 \r
         return service.findTitleCache(null, query, pagerParams.getPageSize(), pagerParams.getPageIndex(), null, matchMode);\r
-\r
     }\r
 \r
     @RequestMapping(value = "findByName", method = RequestMethod.GET)\r
-    public Pager<TaxonNameBase> doFindByName(\r
+    public Pager<TaxonName> doFindByName(\r
             @RequestParam(value = "query", required = true) String query,\r
             @RequestParam(value = "pageNumber", required = false) Integer pageNumber,\r
             @RequestParam(value = "pageSize", required = false) Integer pageSize,\r
@@ -79,7 +73,6 @@ public class NameListController extends IdentifiableListController<TaxonNameBase
         PagerParameters pagerParameters = new PagerParameters(pageSize, pageNumber);\r
         pagerParameters.normalizeAndValidate(response);\r
 \r
-        return service.findByTitle(TaxonNameBase.class, query, matchMode, null, pageSize, pageNumber, null, getInitializationStrategy());\r
+        return service.findByTitleWithRestrictions(TaxonName.class, query, matchMode, null, pageSize, pageNumber, null, getInitializationStrategy());\r
     }\r
-\r
-}
\ No newline at end of file
+}