Project

General

Profile

« Previous | Next » 

Revision 567659e8

Added by Andreas Kohlbecker over 2 years ago

fix #8438 removing all featureTree/* web services

View differences:

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeController.java
21 21 

  		




  22
  22
  
    
@Controller


  		




  23
  23
  
    
@Api("termTree")


  		




  24
  
  
    
@RequestMapping(value = {"/featureTree/{uuid}", "/termTree/{uuid}"})


  		




  
  24
  
    
@RequestMapping(value = {"/termTree/{uuid}"})


  		




  25
  25
  
    
public class TermTreeController extends AbstractIdentifiableController<TermTree, ITermTreeService> {


  		




  26
  26
  
    
    @SuppressWarnings("unused")


  		




  27
  27
  
    
    private static final Logger logger = Logger.getLogger(TermTreeController.class);


  		












  

    
      cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeListController.java
    
  





  34
  34
  
    

  		




  35
  35
  
    
@Controller


  		




  36
  36
  
    
@Api("termTree")


  		




  37
  
  
    
@RequestMapping(value = {"/featureTree", "/termTree"})


  		




  
  37
  
    
@RequestMapping(value = {"/termTree"})


  		




  38
  38
  
    
public class TermTreeListController extends AbstractIdentifiableListController<TermTree, ITermTreeService> {


  		




  39
  39
  
    

  		




  40
  40
  
    
    @Override


  		




  ......




  54
  54
  
    
            HttpServletRequest request,


  		




  55
  55
  
    
            HttpServletResponse response) throws IOException


  		




  56
  56
  
    
            {


  		




  57
  
  
    
        String requestPathAndQuery = requestPathAndQuery(request);


  		




  58
  
  
    
        if(requestPathAndQuery.contains("/featureTree")){


  		




  59
  
  
    
            logger.info(" Delegating usage of deprecated /featureTree service to /termTree");


  		




  60
  
  
    
            return doPageByTermType(TermType.Feature, pageIndex, pageSize, orderBy, request, response);


  		




  61
  
  
    
        }


  		




  
  57
  
    

  		




  62
  58
  
    
        logger.info("doPage() " + requestPathAndQuery(request));


  		




  63
  59
  
    
        PagerParameters pagerParameters = new PagerParameters(pageSize, pageIndex).normalizeAndValidate(response);


  		




  64
  60
  
    

  		




  ......




  137
  133
  
    
            )


  		




  138
  134
  
    
             throws IOException {


  		




  139
  135
  
    

  		




  140
  
  
    
        String requestPathAndQuery = requestPathAndQuery(request);


  		




  141
  
  
    
        if(requestPathAndQuery.contains("/featureTree")){


  		




  142
  
  
    
            logger.info(" Delegating usage of deprecated /featureTree service to /termTree");


  		




  143
  
  
    
            return doFindByTitleByTermType(query, TermType.Feature, pageIndex, pageSize, matchMode, request, response);


  		




  144
  
  
    
        }


  		




  
  136
  
    

  		




  145
  137
  
    
        logger.info("doFind : " + request.getRequestURI() + "?" + request.getQueryString() );


  		




  146
  138
  
    

  		




  147
  139
  
    
        PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex);


  		












  

    
      cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreeListPortalController.java
    
  





  23
  23
  
    
 */


  		




  24
  24
  
    
@Controller


  		




  25
  25
  
    
@Api("portal_termTree")


  		




  26
  
  
    
@RequestMapping(value = {"/portal/featureTree", "/portal/termTree"})


  		




  
  26
  
    
@RequestMapping(value = {"/portal/termTree"})


  		




  27
  27
  
    
public class TermTreeListPortalController extends TermTreeListController {


  		




  28
  28
  
    

  		




  29
  29
  
    
    private static final List<String> TERMTREE_INIT_STRATEGY = Arrays.asList(


  		












  

    
      cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermTreePortalController.java
    
  





  33
  33
  
    
 */


  		




  34
  34
  
    
@Controller


  		




  35
  35
  
    
@Api("portal_termTree")


  		




  36
  
  
    
@RequestMapping(value = {"/portal/featureTree/{uuid}", "/portal/termTree/{uuid}"})


  		




  
  36
  
    
@RequestMapping(value = {"/portal/termTree/{uuid}"})


  		




  37
  37
  
    
public class TermTreePortalController extends TermTreeController {


  		




  38
  38
  
    

  		




  39
  39
  
    
    public static final Logger logger = Logger.getLogger(TermTreePortalController.class);


  		












  

    
      cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RegistrationDTO.java
    
  





  114
  114
  
    
        default:


  		




  115
  115
  
    
            try {


  		




  116
  116
  
    
                typeDesignationManager = new TypeDesignationSetManager(reg.getTypeDesignations());


  		




  117
  
  
    
                summaryTaggedText = new TypeDesignationSetFormatter(true, true, true).toTaggedText(typeDesignationManager);


  		




  
  117
  
    
                summaryTaggedText = new TypeDesignationSetFormatter(false, true, true).toTaggedText(typeDesignationManager);


  		




  118
  118
  
    
                summary = TaggedCacheHelper.createString(summaryTaggedText);


  		




  119
  119
  
    
            } catch (RegistrationValidationException e) {


  		




  120
  120
  
    
                validationProblems.add("Validation errors: " + e.getMessage());


  		












Also available in:  Unified diff