revert commit e358ae186 and adapt return type

[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 837c4fc96716b170b127e98aa559001d58a8a2fc..6eee2bd4101e344a0b6799b0a9e8fb2b8591a406 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,35 +1,80 @@
-// $Id$\r
 /**\r
  * Copyright (C) 2009 EDIT European Distributed Institute of Taxonomy\r
  * http://www.e-taxonomy.eu\r
- * \r
+ *\r
  * The contents of this file are subject to the Mozilla Public License Version\r
  * 1.1 See LICENSE.TXT at the top of this package for the full license terms.\r
  */\r
 \r
 package eu.etaxonomy.cdm.remote.controller;\r
 \r
+import java.io.IOException;\r
+\r
+import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
+\r
+import org.apache.log4j.Logger;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
 import org.springframework.stereotype.Controller;\r
 import org.springframework.web.bind.annotation.RequestMapping;\r
+import org.springframework.web.bind.annotation.RequestMethod;\r
+import org.springframework.web.bind.annotation.RequestParam;\r
 \r
 import eu.etaxonomy.cdm.api.service.INameService;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.api.service.pager.Pager;\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
-@RequestMapping(value = {"/*/name/"})\r
-public class NameListController extends BaseListController<TaxonNameBase, 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
-}
\ No newline at end of file
+@Api("name")\r
+@RequestMapping(value = {"/name"})\r
+public class NameListController extends AbstractIdentifiableListController<TaxonName, INameService> {\r
+\r
+    private static final Logger logger = Logger.getLogger(NameListController.class);\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<String> 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
+            @RequestParam(value = "matchMode", required = false) MatchMode matchMode,\r
+            HttpServletRequest request,\r
+            HttpServletResponse response\r
+            )\r
+             throws IOException {\r
+\r
+        logger.info("doFind : " + request.getRequestURI() + "?" + request.getQueryString() );\r
+\r
+        PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);\r
+        pagerParams.normalizeAndValidate(response);\r
+        return service.findTitleCache(null, query, pagerParams.getPageSize(), pagerParams.getPageIndex(), null, matchMode);\r
+    }\r
+\r
+    @RequestMapping(value = "findByName", method = RequestMethod.GET)\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
+            @RequestParam(value = "matchMode", required = false) MatchMode matchMode, HttpServletRequest request, HttpServletResponse response)\r
+            throws IOException {\r
+\r
+        PagerParameters pagerParameters = new PagerParameters(pageSize, pageNumber);\r
+        pagerParameters.normalizeAndValidate(response);\r
+\r
+        return service.findByTitleWithRestrictions(TaxonName.class, query, matchMode, null, pageSize, pageNumber, null, getInitializationStrategy());\r
+    }\r
+}