fix #8438 removing all featureTree/* web services

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeController.java
index 9df9273939585ac25fb3f5599da78317944cb173..af158a95f056aa426c69b23a13a4871a074c7714 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeController.java
@@ -21,7 +21,7 @@ import io.swagger.annotations.Api;
 
 @Controller
 @Api("termTree")
-@RequestMapping(value = {"/featureTree/{uuid}", "/termTree/{uuid}"})
+@RequestMapping(value = {"/termTree/{uuid}"})
 public class TermTreeController extends AbstractIdentifiableController<TermTree, ITermTreeService> {
     @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(TermTreeController.class);

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeListController.java
index 4238c7d2441b7db941e578b4e1a4bec22d5d23a1..141fe108e1cdaa7205756f9322dc571712c9cb90 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeListController.java
@@ -34,7 +34,7 @@ import io.swagger.annotations.Api;
 
 @Controller
 @Api("termTree")
-@RequestMapping(value = {"/featureTree", "/termTree"})
+@RequestMapping(value = {"/termTree"})
 public class TermTreeListController extends AbstractIdentifiableListController<TermTree, ITermTreeService> {
 
     @Override
@@ -54,11 +54,7 @@ public class TermTreeListController extends AbstractIdentifiableListController<T
             HttpServletRequest request,
             HttpServletResponse response) throws IOException
             {
-        String requestPathAndQuery = requestPathAndQuery(request);
-        if(requestPathAndQuery.contains("/featureTree")){
-            logger.info(" Delegating usage of deprecated /featureTree service to /termTree");
-            return doPageByTermType(TermType.Feature, pageIndex, pageSize, orderBy, request, response);
-        }
+
         logger.info("doPage() " + requestPathAndQuery(request));
         PagerParameters pagerParameters = new PagerParameters(pageSize, pageIndex).normalizeAndValidate(response);
 
@@ -137,11 +133,7 @@ public class TermTreeListController extends AbstractIdentifiableListController<T
             )
              throws IOException {
 
-        String requestPathAndQuery = requestPathAndQuery(request);
-        if(requestPathAndQuery.contains("/featureTree")){
-            logger.info(" Delegating usage of deprecated /featureTree service to /termTree");
-            return doFindByTitleByTermType(query, TermType.Feature, pageIndex, pageSize, matchMode, request, response);
-        }
+
         logger.info("doFind : " + request.getRequestURI() + "?" + request.getQueryString() );
 
         PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex);

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeListPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeListPortalController.java
index e4c249b11a904bde5c476d894b69dfac89f1fadf..72118d356844f619745d9fa3bcb4fa9c4fcad171 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeListPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeListPortalController.java
@@ -23,7 +23,7 @@ import io.swagger.annotations.Api;
  */
 @Controller
 @Api("portal_termTree")
-@RequestMapping(value = {"/portal/featureTree", "/portal/termTree"})
+@RequestMapping(value = {"/portal/termTree"})
 public class TermTreeListPortalController extends TermTreeListController {
 
     private static final List<String> TERMTREE_INIT_STRATEGY = Arrays.asList(

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreePortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreePortalController.java
index 4cce6d0ef974edec81f6c7b26363f03c92a54744..6125d1bc84004d80d7a9b31d93194bf46e8c6143 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreePortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreePortalController.java
@@ -33,7 +33,7 @@ import io.swagger.annotations.Api;
  */
 @Controller
 @Api("portal_termTree")
-@RequestMapping(value = {"/portal/featureTree/{uuid}", "/portal/termTree/{uuid}"})
+@RequestMapping(value = {"/portal/termTree/{uuid}"})
 public class TermTreePortalController extends TermTreeController {
 
     public static final Logger logger = Logger.getLogger(TermTreePortalController.class);

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RegistrationDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RegistrationDTO.java
index 690f59c8f3e2d4d7e7406ce6356284903bd270a7..c247b616d39786eb067c34cce0c5eef960fdba2f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RegistrationDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RegistrationDTO.java
@@ -114,7 +114,7 @@ public class RegistrationDTO {
         default:
             try {
                 typeDesignationManager = new TypeDesignationSetManager(reg.getTypeDesignations());
-                summaryTaggedText = new TypeDesignationSetFormatter(true, true, true).toTaggedText(typeDesignationManager);
+                summaryTaggedText = new TypeDesignationSetFormatter(false, true, true).toTaggedText(typeDesignationManager);
                 summary = TaggedCacheHelper.createString(summaryTaggedText);
             } catch (RegistrationValidationException e) {
                 validationProblems.add("Validation errors: " + e.getMessage());