Revision a245f810
Added by Andreas Kohlbecker almost 3 years ago
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java | ||
---|---|---|
140 | 140 |
* restrict the search to a set of geographic {@link NamedArea}s. |
141 | 141 |
* The parameter currently takes a list of TDWG area labels. |
142 | 142 |
* - <i>optional parameter</i> |
143 |
* @param pageNumber
|
|
143 |
* @param pageIndex
|
|
144 | 144 |
* the number of the page to be returned, the first page has the |
145 | 145 |
* pageNumber = 1 - <i>optional parameter</i> |
146 | 146 |
* @param pageSize |
... | ... | |
165 | 165 |
@RequestParam(value = "subtree", required = false) UUID subtreeUuid, |
166 | 166 |
@RequestParam(value = "area", required = false) DefinedTermBaseList<NamedArea> areaList, |
167 | 167 |
@RequestParam(value = "status", required = false) PresenceAbsenceTerm[] status, |
168 |
@RequestParam(value = "pageNumber", required = false) Integer pageNumber,
|
|
168 |
@RequestParam(value = "pageIndex", required = false) Integer pageIndex,
|
|
169 | 169 |
@RequestParam(value = "pageSize", required = false) Integer pageSize, |
170 | 170 |
@RequestParam(value = "doTaxa", required = false) Boolean doTaxa, |
171 | 171 |
@RequestParam(value = "doSynonyms", required = false) Boolean doSynonyms, |
... | ... | |
187 | 187 |
TaxonListController.includeAllSubAreas(areaSet, termService); |
188 | 188 |
} |
189 | 189 |
|
190 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);
|
|
190 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex);
|
|
191 | 191 |
pagerParams.normalizeAndValidate(response); |
192 | 192 |
|
193 | 193 |
// TODO change type of do* parameters to TaxaAndNamesSearchMode |
... | ... | |
239 | 239 |
* restrict the search to a set of geographic {@link NamedArea}s. |
240 | 240 |
* The parameter currently takes a list of TDWG area labels. |
241 | 241 |
* - <i>optional parameter</i> |
242 |
* @param pageNumber
|
|
242 |
* @param pageIndex
|
|
243 | 243 |
* the number of the page to be returned, the first page has the |
244 | 244 |
* pageNumber = 1 - <i>optional parameter</i> |
245 | 245 |
* @param pageSize |
... | ... | |
263 | 263 |
@RequestParam(value = "tree", required = false) UUID classificationUuid, |
264 | 264 |
@RequestParam(value = "subtree", required = false) UUID subtreeUuid, |
265 | 265 |
@RequestParam(value = "area", required = false) Set<NamedArea> areas, |
266 |
@RequestParam(value = "pageNumber", required = false) Integer pageNumber,
|
|
266 |
@RequestParam(value = "pageIndex", required = false) Integer pageIndex,
|
|
267 | 267 |
@RequestParam(value = "pageSize", required = false) Integer pageSize, |
268 | 268 |
@RequestParam(value = "doTaxa", required = false) Boolean doTaxa, |
269 | 269 |
@RequestParam(value = "doSynonyms", required = false) Boolean doSynonyms, |
... | ... | |
281 | 281 |
|
282 | 282 |
logger.info("doFind() " + requestPathAndQuery(request)); |
283 | 283 |
|
284 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);
|
|
284 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex);
|
|
285 | 285 |
pagerParams.normalizeAndValidate(response); |
286 | 286 |
|
287 | 287 |
|
... | ... | |
318 | 318 |
* @param queryString |
319 | 319 |
* @param treeUuid TODO unimplemented in TaxonServiceImpl !!!! |
320 | 320 |
* @param languages |
321 |
* @param pageNumber
|
|
321 |
* @param pageIndex
|
|
322 | 322 |
* @param pageSize |
323 | 323 |
* @param request |
324 | 324 |
* @param response |
... | ... | |
335 | 335 |
@RequestParam(value = "features", required = false) UuidList featureUuids, |
336 | 336 |
@RequestParam(value = "languages", required = false) List<Language> languages, |
337 | 337 |
@RequestParam(value = "hl", required = false) Boolean highlighting, |
338 |
@RequestParam(value = "pageNumber", required = false) Integer pageNumber,
|
|
338 |
@RequestParam(value = "pageIndex", required = false) Integer pageIndex,
|
|
339 | 339 |
@RequestParam(value = "pageSize", required = false) Integer pageSize, |
340 | 340 |
HttpServletRequest request, |
341 | 341 |
HttpServletResponse response |
... | ... | |
344 | 344 |
|
345 | 345 |
logger.info("findByDescriptionElementFullText : " + requestPathAndQuery(request) ); |
346 | 346 |
|
347 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);
|
|
347 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex);
|
|
348 | 348 |
pagerParams.normalizeAndValidate(response); |
349 | 349 |
|
350 | 350 |
if(highlighting == null){ |
... | ... | |
379 | 379 |
@RequestParam(value = "subtree", required = false) UUID subtreeUuid, |
380 | 380 |
@RequestParam(value = "languages", required = false) List<Language> languages, |
381 | 381 |
@RequestParam(value = "hl", required = false) Boolean highlighting, |
382 |
@RequestParam(value = "pageNumber", required = false) Integer pageNumber,
|
|
382 |
@RequestParam(value = "pageIndex", required = false) Integer pageIndex,
|
|
383 | 383 |
@RequestParam(value = "pageSize", required = false) Integer pageSize, |
384 | 384 |
HttpServletRequest request, |
385 | 385 |
HttpServletResponse response |
... | ... | |
390 | 390 |
|
391 | 391 |
logger.info("doFindByFullText() " + requestPathAndQuery(request) ); |
392 | 392 |
|
393 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);
|
|
393 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex);
|
|
394 | 394 |
pagerParams.normalizeAndValidate(response); |
395 | 395 |
|
396 | 396 |
if(highlighting == null){ |
... | ... | |
422 | 422 |
@RequestParam(value = "subtree", required = false) UUID subtreeUuid, |
423 | 423 |
@RequestParam(value = "languages", required = false) List<Language> languages, |
424 | 424 |
@RequestParam(value = "hl", required = false) Boolean highlighting, |
425 |
@RequestParam(value = "pageNumber", required = false) Integer pageNumber,
|
|
425 |
@RequestParam(value = "pageIndex", required = false) Integer pageIndex,
|
|
426 | 426 |
@RequestParam(value = "pageSize", required = false) Integer pageSize, |
427 | 427 |
HttpServletRequest request, |
428 | 428 |
HttpServletResponse response |
... | ... | |
433 | 433 |
|
434 | 434 |
boolean includeUnpublished = NO_UNPUBLISHED; |
435 | 435 |
|
436 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);
|
|
436 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex);
|
|
437 | 437 |
pagerParams.normalizeAndValidate(response); |
438 | 438 |
|
439 | 439 |
if(highlighting == null){ |
... | ... | |
490 | 490 |
* @param type |
491 | 491 |
* @param identifierType |
492 | 492 |
* @param identifier |
493 |
* @param pageNumber
|
|
493 |
* @param pageIndex
|
|
494 | 494 |
* @param pageSize |
495 | 495 |
* @param matchMode |
496 | 496 |
* @param request |
... | ... | |
504 | 504 |
@RequestParam(value = "class", required = false) Class<T> type, |
505 | 505 |
@RequestParam(value = "identifierType", required = false) UUID identifierType, |
506 | 506 |
@RequestParam(value = "identifier", required = false) String identifier, |
507 |
@RequestParam(value = "pageNumber", required = false) Integer pageNumber,
|
|
507 |
@RequestParam(value = "pageIndex", required = false) Integer pageIndex,
|
|
508 | 508 |
@RequestParam(value = "pageSize", required = false) Integer pageSize, |
509 | 509 |
@RequestParam(value = "matchMode", required = false) MatchMode matchMode, |
510 | 510 |
@RequestParam(value = "includeEntity", required = false, defaultValue="false") Boolean includeEntity, |
... | ... | |
530 | 530 |
logger.info("doFindByIdentifier [subtreeUuid] : " + request.getRequestURI() + "?" + request.getQueryString() ); |
531 | 531 |
|
532 | 532 |
|
533 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber).normalizeAndValidate(response);
|
|
533 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex).normalizeAndValidate(response);
|
|
534 | 534 |
|
535 | 535 |
matchMode = matchMode != null ? matchMode : MatchMode.EXACT; |
536 | 536 |
return service.findByIdentifier(type, identifier, definedTerm , subTree, matchMode, includeEntity, pagerParams.getPageSize(), pagerParams.getPageIndex(), initializationStrategy); |
... | ... | |
542 | 542 |
* @param type |
543 | 543 |
* @param markerType |
544 | 544 |
* @param value |
545 |
* @param pageNumber
|
|
545 |
* @param pageIndex
|
|
546 | 546 |
* @param pageSize |
547 | 547 |
* @param request |
548 | 548 |
* @param response |
... | ... | |
557 | 557 |
@RequestParam(value = "class", required = false) Class<T> type, |
558 | 558 |
@RequestParam(value = "markerType", required = true) UUID markerTypeUuid, |
559 | 559 |
@RequestParam(value = "value", required = false) Boolean value, |
560 |
@RequestParam(value = "pageNumber", required = false) Integer pageNumber,
|
|
560 |
@RequestParam(value = "pageIndex", required = false) Integer pageIndex,
|
|
561 | 561 |
@RequestParam(value = "pageSize", required = false) Integer pageSize, |
562 | 562 |
@RequestParam(value = "includeEntity", required = false, defaultValue="false") Boolean includeEntity, |
563 | 563 |
@RequestParam(value = "subtree", required = true) UUID subtreeUuid, |
... | ... | |
585 | 585 |
|
586 | 586 |
if (logger.isDebugEnabled()){logger.info("doFindByMarker [subtreeUuid] : " + request.getRequestURI() + "?" + request.getQueryString() );} |
587 | 587 |
|
588 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber).normalizeAndValidate(response);
|
|
588 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex).normalizeAndValidate(response);
|
|
589 | 589 |
return service.findByMarker(type, markerType, value, subTree, includeEntity, titleType, pagerParams.getPageSize(), pagerParams.getPageIndex(), initializationStrategy); |
590 | 590 |
} |
591 | 591 |
|
... | ... | |
597 | 597 |
@RequestParam(value = "infraspecificEpithet", required = false) String infraspecificEpithet, |
598 | 598 |
@RequestParam(value = "authorshipCache", required = false) String authorshipCache, |
599 | 599 |
@RequestParam(value = "rankUuid", required = false) UUID rankUuid, |
600 |
@RequestParam(value = "pageNumber", required = false) Integer pageNumber,
|
|
600 |
@RequestParam(value = "pageIndex", required = false) Integer pageIndex,
|
|
601 | 601 |
@RequestParam(value = "pageSize", required = false) Integer pageSize, |
602 | 602 |
HttpServletRequest request, |
603 | 603 |
HttpServletResponse response)throws IOException { |
... | ... | |
615 | 615 |
} |
616 | 616 |
|
617 | 617 |
Pager<TaxonBase> result = service.findTaxaByName(null, genusOrUninomial, infragenericEpithet, specificEpithet, infraspecificEpithet, |
618 |
authorshipCache, rank, pageSize, pageNumber, initializationStrategy);
|
|
618 |
authorshipCache, rank, pageSize, pageIndex, initializationStrategy);
|
|
619 | 619 |
|
620 | 620 |
return result; |
621 | 621 |
} |
Also available in: Unified diff
ref #9637 renaming pageNumber -> pageIndex in controllers