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 1099468a19a53497b1286873410b0a1d78aa82b6..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
@@ -13,6 +13,7 @@ import java.io.IOException;
 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
@@ -37,6 +38,8 @@ import io.swagger.annotations.Api;
 @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
@@ -44,7 +47,7 @@ public class NameListController extends AbstractIdentifiableListController<Taxon
     }\r
 \r
     @RequestMapping(method = RequestMethod.GET, value={"findTitleCache"})\r
-    public Pager<TaxonName> doFindTitleCache(\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
@@ -58,7 +61,6 @@ public class NameListController extends AbstractIdentifiableListController<Taxon
 \r
         PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);\r
         pagerParams.normalizeAndValidate(response);\r
-\r
         return service.findTitleCache(null, query, pagerParams.getPageSize(), pagerParams.getPageIndex(), null, matchMode);\r
     }\r
 \r
@@ -73,6 +75,6 @@ public class NameListController extends AbstractIdentifiableListController<Taxon
         PagerParameters pagerParameters = new PagerParameters(pageSize, pageNumber);\r
         pagerParameters.normalizeAndValidate(response);\r
 \r
-        return service.findByTitle(TaxonName.class, query, matchMode, null, pageSize, pageNumber, null, getInitializationStrategy());\r
+        return service.findByTitleWithRestrictions(TaxonName.class, query, matchMode, null, pageSize, pageNumber, null, getInitializationStrategy());\r
     }\r
 }