refactoring taxon controllers, reducing code duplication

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

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
index bd08c5e6d7daac3ec35995ebd4861ba7964e44b3..6b8679a91d0c2eb189898bd42f66799e5aab435f 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.cdm.remote.controller;
 import java.io.IOException;\r
 import java.util.ArrayList;\r
 import java.util.Arrays;\r
+import java.util.Collection;\r
 import java.util.EnumSet;\r
 import java.util.HashSet;\r
 import java.util.List;\r
@@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;\r
 import org.springframework.web.bind.WebDataBinder;\r
 import org.springframework.web.bind.annotation.InitBinder;\r
+import org.springframework.web.bind.annotation.PathVariable;\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
@@ -68,6 +70,11 @@ import eu.etaxonomy.cdm.remote.editor.UuidList;
 public class TaxonListController extends IdentifiableListController<TaxonBase, ITaxonService> {\r
 \r
 \r
+    private static final List<String> SIMPLE_TAXON_INIT_STRATEGY = DEFAULT_INIT_STRATEGY;\r
+    protected List<String> getSimpleTaxonInitStrategy() {\r
+        // TODO Auto-generated method stub\r
+        return SIMPLE_TAXON_INIT_STRATEGY;\r
+    }\r
 \r
     /**\r
      *\r
@@ -187,7 +194,7 @@ public class TaxonListController extends IdentifiableListController<TaxonBase, I
         return service.findTaxaAndNamesByFullText(searchModes, query,\r
                 classification, areaSet, status, null,\r
                 false, pagerParams.getPageSize(), pagerParams.getPageIndex(),\r
-                OrderHint.NOMENCLATURAL_SORT_ORDER, initializationStrategy);\r
+                OrderHint.NOMENCLATURAL_SORT_ORDER, getSimpleTaxonInitStrategy());\r
     }\r
 \r
     /**\r
@@ -225,8 +232,8 @@ public class TaxonListController extends IdentifiableListController<TaxonBase, I
      *         the following strategy {@link #SIMPLE_TAXON_INIT_STRATEGY}\r
      * @throws IOException\r
      */\r
-    @RequestMapping(method = RequestMethod.GET, value={"findTaxaAndNames"}) // TODO should be find, see TaxonListPortaController\r
-    public Pager<IdentifiableEntity> doFindTaxaAndNames(\r
+    @RequestMapping(method = RequestMethod.GET, value={"find"})\r
+    public Pager<IdentifiableEntity> doFind(\r
             @RequestParam(value = "query", required = true) String query,\r
             @RequestParam(value = "tree", required = false) UUID treeUuid,\r
             @RequestParam(value = "area", required = false) Set<NamedArea> areas,\r
@@ -243,15 +250,12 @@ public class TaxonListController extends IdentifiableListController<TaxonBase, I
              throws IOException {\r
 \r
 \r
-        logger.info("findTaxaAndNames : " + request.getRequestURI() + "?" + request.getQueryString() );\r
+        logger.info("find : " + request.getRequestURI() + "?" + request.getQueryString() );\r
 \r
         PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);\r
         pagerParams.normalizeAndValidate(response);\r
 \r
         IFindTaxaAndNamesConfigurator config = new FindTaxaAndNamesConfiguratorImpl();\r
-\r
-        config.setTaxonPropertyPath(initializationStrategy);\r
-\r
         config.setPageNumber(pagerParams.getPageIndex());\r
         config.setPageSize(pagerParams.getPageSize());\r
         config.setTitleSearchString(query);\r
@@ -260,7 +264,7 @@ public class TaxonListController extends IdentifiableListController<TaxonBase, I
         config.setDoMisappliedNames(doMisappliedNames != null ? doMisappliedNames : Boolean.FALSE);\r
         config.setDoTaxaByCommonNames(doTaxaByCommonNames != null ? doTaxaByCommonNames : Boolean.FALSE );\r
         config.setMatchMode(matchMode != null ? matchMode : MatchMode.BEGINNING);\r
-//        config.setTaxonPropertyPath(SIMPLE_TAXON_INIT_STRATEGY);\r
+        config.setTaxonPropertyPath(getSimpleTaxonInitStrategy());\r
         config.setNamedAreas(areas);\r
         if(treeUuid != null){\r
             Classification classification = classificationService.find(treeUuid);\r
@@ -324,8 +328,8 @@ public class TaxonListController extends IdentifiableListController<TaxonBase, I
 \r
         Pager<SearchResult<TaxonBase>> pager = service.findByDescriptionElementFullText(\r
                 clazz, queryString, classification, features, languages, highlighting,\r
-                pagerParams.getPageSize(), pagerParams.getPageIndex(), ((List<OrderHint>)null),\r
-                initializationStrategy);\r
+                pagerParams.getPageSize(), pagerParams.getPageIndex(),\r
+                ((List<OrderHint>)null), getSimpleTaxonInitStrategy());\r
         return pager;\r
     }\r
 \r
@@ -358,7 +362,7 @@ public class TaxonListController extends IdentifiableListController<TaxonBase, I
         }\r
 \r
         Pager<SearchResult<TaxonBase>> pager = service.findByFullText(clazz, queryString, classification, languages,\r
-                highlighting, pagerParams.getPageSize(), pagerParams.getPageIndex(), (List<OrderHint>  null),\r
+                highlighting, pagerParams.getPageSize(), pagerParams.getPageIndex(), ((List<OrderHint>)  null),\r
                 initializationStrategy);\r
         return pager;\r
     }\r
@@ -402,17 +406,29 @@ public class TaxonListController extends IdentifiableListController<TaxonBase, I
      * @param areaSet\r
      */\r
     static public void includeAllSubAreas(Set<NamedArea> areaSet, ITermService termService) {\r
-        Set<NamedArea> tmpAreaSet = areaSet;\r
+        Collection<NamedArea> tmpAreas = new HashSet<NamedArea>(areaSet);\r
         // expand all areas to include also the sub areas\r
         Pager<NamedArea> pager = null;\r
         while(true){\r
-            pager = termService.getIncludes(tmpAreaSet, 1000, null, null);\r
+            pager = termService.getIncludes(tmpAreas, 1000, null, null);\r
             if(pager.getCount() == 0){\r
                 break;\r
             }\r
-            tmpAreaSet = (Set<NamedArea>) pager.getRecords();\r
-            areaSet.addAll(tmpAreaSet);\r
-\r
+            tmpAreas = pager.getRecords();\r
+            tmpAreas.removeAll(areaSet);\r
+            areaSet.addAll(tmpAreas);\r
         }\r
     }\r
+\r
+    @RequestMapping(value = "bestMatchingTaxon/{taxonName}", method = RequestMethod.GET)\r
+    public TaxonBase doFindBestMatchingTaxon(\r
+             @PathVariable("taxonName") String taxonName,\r
+            HttpServletRequest request,\r
+            HttpServletResponse response)throws IOException {\r
+\r
+        Taxon bestMatchingTaxon =  service.findBestMatchingTaxon(taxonName);\r
+\r
+        return bestMatchingTaxon;\r
+    }\r
+\r
 }
\ No newline at end of file