Revision a245f810
Added by Andreas Kohlbecker almost 3 years ago
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java | ||
---|---|---|
276 | 276 |
* |
277 | 277 |
* @param uuid |
278 | 278 |
* @param classificationUuid |
279 |
* @param pageNumber
|
|
279 |
* @param pageIndex
|
|
280 | 280 |
* @param pageSize |
281 | 281 |
* @param request |
282 | 282 |
* @param response |
... | ... | |
289 | 289 |
@PathVariable("uuid") UUID uuid, |
290 | 290 |
@PathVariable("classification_uuid") UUID classificationUuid, |
291 | 291 |
@RequestParam(value = "relType_uuid" , required = false) UUID relTypeUuid, |
292 |
@RequestParam(value = "pageNumber", required = false) Integer pageNumber,
|
|
292 |
@RequestParam(value = "pageIndex", required = false) Integer pageIndex,
|
|
293 | 293 |
@RequestParam(value = "pageSize", required = false) Integer pageSize, |
294 | 294 |
HttpServletRequest request, |
295 | 295 |
HttpServletResponse response) throws IOException { |
296 | 296 |
|
297 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);
|
|
297 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex);
|
|
298 | 298 |
pagerParams.normalizeAndValidate(response); |
299 | 299 |
|
300 | 300 |
Pager<TaxonNodeAgentRelation> pager = nodeService.pageTaxonNodeAgentRelations(uuid, classificationUuid, |
... | ... | |
369 | 369 |
public Pager<SpecimenOrObservationBase> doGetAssociatedRootUnits( |
370 | 370 |
@PathVariable("uuid") UUID uuid, |
371 | 371 |
@RequestParam(value = "maxDepth", required = false) Integer maxDepth, |
372 |
@RequestParam(value = "pageNumber", required = false) Integer pageNumber,
|
|
372 |
@RequestParam(value = "pageIndex", required = false) Integer pageIndex,
|
|
373 | 373 |
@RequestParam(value = "pageSize", required = false) Integer pageSize, |
374 | 374 |
HttpServletRequest request, |
375 | 375 |
HttpServletResponse response) throws IOException { |
... | ... | |
382 | 382 |
orderHints.add(new OrderHint("titleCache", SortOrder.ASCENDING)); |
383 | 383 |
|
384 | 384 |
if(taxonBase instanceof Taxon){ |
385 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);
|
|
385 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex);
|
|
386 | 386 |
pagerParams.normalizeAndValidate(response); |
387 | 387 |
|
388 | 388 |
return occurrenceService.pageRootUnitsByAssociatedTaxon(null, null, (Taxon) taxonBase, maxDepth, pagerParams.getPageSize(), pagerParams.getPageIndex(), orderHints, null); |
Also available in: Unified diff
ref #9637 renaming pageNumber -> pageIndex in controllers