Project

General

Profile

« Previous | Next » 

Revision 1c376cd7

Added by Andreas Müller over 4 years ago

cleanup classification controller

View differences:

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationPortalListController.java
145 145
            value = {"{treeUuid}/siblingsOf/{taxonUuid}"},
146 146
            method = RequestMethod.GET)
147 147
    public List<TaxonNode> getSiblingsOfTaxon(
148
            @PathVariable("treeUuid") UUID treeUuid,
148
            @PathVariable("treeUuid") UUID classificationUuid,
149 149
            @PathVariable("taxonUuid") UUID taxonUuid,
150 150
            HttpServletRequest request,
151
            HttpServletResponse response) throws IOException {
151
            @SuppressWarnings("unused") HttpServletResponse response) {
152 152
        logger.info("getSiblingsOfTaxon() " + request.getRequestURI());
153 153

  
154 154
        boolean includeUnpublished = NO_UNPUBLISHED;
155 155
        //FIXME return pager
156
        List<TaxonNode> childs = service.listSiblingsOfTaxon(taxonUuid, treeUuid, includeUnpublished, null, null, NODE_INIT_STRATEGY);
156
        List<TaxonNode> childs = service.listSiblingsOfTaxon(taxonUuid, classificationUuid, includeUnpublished, null, null, NODE_INIT_STRATEGY);
157 157
        return childs;
158 158

  
159 159
    }
......
180 180
            value = {"{treeUuid}/pathFrom/{taxonUuid}/toRank/{rankUuid}"},
181 181
            method = RequestMethod.GET)
182 182
    public List<TaxonNode> getPathFromTaxonToRank(
183
            @PathVariable("treeUuid") UUID treeUuid,
183
            @PathVariable("treeUuid") UUID classificationUuid,
184 184
            @PathVariable("taxonUuid") UUID taxonUuid,
185 185
            @PathVariable("rankUuid") UUID rankUuid,
186 186
            @RequestParam(value = "subtree", required = false) UUID subtreeUuid,
......
190 190

  
191 191
        boolean includeUnpublished = NO_UNPUBLISHED;
192 192

  
193
        Classification classification = service.find(treeUuid);
193
        Classification classification = service.find(classificationUuid);
194 194
        TaxonNode subtree = getSubtreeOrError(subtreeUuid, taxonNodeService, response);
195 195
        Rank rank = findRank(rankUuid);
196 196
        Taxon taxon = (Taxon) taxonService.load(taxonUuid);

Also available in: Unified diff