Revision 3ac9988f
Added by Andreas Müller 9 months ago
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java | ||
---|---|---|
270 | 270 |
return TAXONNODE_INIT_STRATEGY; |
271 | 271 |
} |
272 | 272 |
|
273 |
/** |
|
274 |
* |
|
273 |
/** |
|
275 | 274 |
* See also {@link AgentController#doGetTaxonNodeAgentRelations(UUID, UUID, Integer, Integer, HttpServletRequest, HttpServletResponse)} |
276 |
* |
|
277 |
* @param uuid |
|
278 |
* @param classificationUuid |
|
279 |
* @param pageIndex |
|
280 |
* @param pageSize |
|
281 |
* @param request |
|
282 |
* @param response |
|
283 |
* @return |
|
284 |
* @throws IOException |
|
285 |
* |
|
286 | 275 |
*/ |
287 | 276 |
@RequestMapping(value = "taxonNodeAgentRelations/{classification_uuid}", method = RequestMethod.GET) |
288 | 277 |
public Pager<TaxonNodeAgentRelation> doGetTaxonNodeAgentRelations( |
... | ... | |
307 | 296 |
public StringResultDTO doCountSpecimensOrObservations( |
308 | 297 |
@PathVariable("uuid") UUID uuid, |
309 | 298 |
HttpServletRequest request, |
310 |
HttpServletResponse response) throws IOException {
|
|
299 |
HttpServletResponse response) { |
|
311 | 300 |
logger.info("doListSpecimensOrObservations() - " + request.getRequestURI()); |
312 | 301 |
|
313 | 302 |
List<OrderHint> orderHints = new ArrayList<>(); |
... | ... | |
319 | 308 |
} |
320 | 309 |
|
321 | 310 |
/** |
322 |
* |
|
323 | 311 |
* @deprecated replaced by rootUnitDTOs |
324 | 312 |
*/ |
325 | 313 |
@Deprecated |
... | ... | |
327 | 315 |
public List<SpecimenOrObservationBaseDTO> doListFieldUnitDTOs( |
328 | 316 |
@PathVariable("uuid") UUID uuid, |
329 | 317 |
HttpServletRequest request, |
330 |
HttpServletResponse response) throws IOException {
|
|
318 |
HttpServletResponse response) { |
|
331 | 319 |
logger.info("doListFieldUnitDTOs() - " + request.getRequestURI()); |
332 | 320 |
|
333 | 321 |
List<SpecimenOrObservationBaseDTO> rootUnitDtos = occurrenceService.listRootUnitDTOsByAssociatedTaxon(null, uuid, OccurrenceController.DERIVED_UNIT_INIT_STRATEGY); |
... | ... | |
338 | 326 |
public List<SpecimenOrObservationBaseDTO> doListRooUnitDTOs( |
339 | 327 |
@PathVariable("uuid") UUID uuid, |
340 | 328 |
HttpServletRequest request, |
341 |
HttpServletResponse response) throws IOException {
|
|
329 |
HttpServletResponse response) { |
|
342 | 330 |
logger.info("rootUnitDTOs() - " + request.getRequestURI()); |
343 | 331 |
|
344 | 332 |
List<SpecimenOrObservationBaseDTO> rootUnitDtos = occurrenceService.listRootUnitDTOsByAssociatedTaxon(null, uuid, OccurrenceController.DERIVED_UNIT_INIT_STRATEGY); |
... | ... | |
410 | 398 |
* The result also returns the path to these taxa represented by the uuids of the taxon relationships types and doubtful information. |
411 | 399 |
* If classificationUuids is set only taxa of classifications are returned which are included in the given classifications. |
412 | 400 |
* Also the path to these taxa may not include taxa from other classifications. |
413 |
* |
|
414 |
* @param taxonUUIDString |
|
415 |
* @param classificationStringList |
|
416 |
* @param includeDoubtful |
|
417 |
* @param onlyCongruent |
|
418 |
* @param response |
|
419 |
* @param request |
|
420 |
* @return |
|
421 |
* @throws IOException |
|
422 | 401 |
*/ |
423 | 402 |
@RequestMapping(value = { "includedTaxa" }, method = { RequestMethod.GET }) |
424 | 403 |
public IncludedTaxaDTO doGetIncludedTaxa( |
... | ... | |
427 | 406 |
@RequestParam(value="includeDoubtful", required=false) final boolean includeDoubtful, |
428 | 407 |
@RequestParam(value="onlyCongruent", required=false) final boolean onlyCongruent, |
429 | 408 |
HttpServletResponse response, |
430 |
HttpServletRequest request) throws IOException {
|
|
409 |
HttpServletRequest request) { |
|
431 | 410 |
|
432 | 411 |
|
433 | 412 |
if(request != null){ |
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java | ||
---|---|---|
85 | 85 |
* |
86 | 86 |
* @author a.kohlbecker |
87 | 87 |
* @since 20.07.2009 |
88 |
* |
|
89 | 88 |
*/ |
90 | 89 |
@Controller |
91 | 90 |
@Api("portal_taxon") |
... | ... | |
561 | 560 |
} |
562 | 561 |
|
563 | 562 |
/** |
564 |
* @param uuid |
|
565 |
* @param type |
|
566 |
* @param mimeTypes |
|
567 |
* @param relationshipUuids |
|
568 |
* @param relationshipInversUuids |
|
569 |
* @param includeTaxonDescriptions |
|
570 |
* @param includeOccurrences |
|
571 |
* @param includeTaxonNameDescriptions |
|
572 |
* @param widthOrDuration |
|
573 |
* @param height |
|
574 |
* @param size |
|
575 |
* @param response |
|
576 |
* @param initStrategy |
|
577 |
* @return |
|
578 |
* @throws IOException |
|
579 | 563 |
* @Deprecated To be replaced by other loadMediaForTaxonAndRelated method |
580 | 564 |
*/ |
581 | 565 |
@Deprecated |
... | ... | |
588 | 572 |
includeTaxonDescriptions, includeOccurrences, includeTaxonNameDescriptions, response, taxonInitStrategy, null); |
589 | 573 |
} |
590 | 574 |
|
591 |
/** |
|
592 |
* @param uuid |
|
593 |
* @param type |
|
594 |
* @param mimeTypes |
|
595 |
* @param relationshipUuids |
|
596 |
* @param relationshipInversUuids |
|
597 |
* @param includeTaxonDescriptions |
|
598 |
* @param includeOccurrences |
|
599 |
* @param includeTaxonNameDescriptions |
|
600 |
* @param widthOrDuration |
|
601 |
* @param height |
|
602 |
* @param size |
|
603 |
* @param response |
|
604 |
* @param initStrategy |
|
605 |
* @return |
|
606 |
* @throws IOException |
|
607 |
*/ |
|
608 | 575 |
public EntityMediaContext<Taxon> loadMediaForTaxonAndRelated(UUID uuid, |
609 | 576 |
UuidList relationshipUuids, UuidList relationshipInversUuids, |
610 | 577 |
Boolean includeTaxonDescriptions, Boolean includeOccurrences, Boolean includeTaxonNameDescriptions, |
... | ... | |
613 | 580 |
|
614 | 581 |
boolean includeUnpublished = NO_UNPUBLISHED; |
615 | 582 |
|
616 |
|
|
617 | 583 |
Taxon taxon = getCdmBaseInstance(Taxon.class, uuid, response, taxonInitStrategy); |
618 | 584 |
taxon = checkExistsAndAccess(taxon, includeUnpublished, response); |
619 | 585 |
|
... | ... | |
622 | 588 |
List<Media> media = listMediaForTaxon(taxon, includeRelationships, |
623 | 589 |
includeTaxonDescriptions, includeOccurrences, includeTaxonNameDescriptions, mediaInitStrategy); |
624 | 590 |
|
625 |
EntityMediaContext<Taxon> entityMediaContext = new EntityMediaContext<Taxon>(taxon, media);
|
|
591 |
EntityMediaContext<Taxon> entityMediaContext = new EntityMediaContext<>(taxon, media); |
|
626 | 592 |
|
627 | 593 |
return entityMediaContext; |
628 | 594 |
} |
Also available in: Unified diff
cleanup