Project

General

Profile

« Previous | Next » 

Revision a245f810

Added by Andreas Kohlbecker almost 3 years ago

ref #9637 renaming pageNumber -> pageIndex in controllers

View differences:

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AbstractIdentifiableListController.java
60 60
     * <p>
61 61
     *
62 62
     * @param query
63
     *            the string to query for. Since the wildcard character '*'
63
     *            the string to query for. Since the wild-card character '*'
64 64
     *            internally always is appended to the query string, a search
65 65
     *            always compares the query string with the beginning of a name.
66 66
     *            - <i>required parameter</i>
67
     * @param pageNumber
67
     * @param pageIndex
68 68
     *            the number of the page to be returned, the first page has the
69 69
     *            pageNumber = 1 - <i>optional parameter</i>
70 70
     * @param pageSize
......
78 78
    @RequestMapping(method = RequestMethod.GET, value={"findByTitle"})
79 79
    public Pager<T> doFindByTitle(
80 80
            @RequestParam(value = "query", required = true) String query,
81
            @RequestParam(value = "pageNumber", required = false) Integer pageNumber,
81
            @RequestParam(value = "pageIndex", required = false) Integer pageIndex,
82 82
            @RequestParam(value = "pageSize", required = false) Integer pageSize,
83 83
            @RequestParam(value = "matchMode", required = false) MatchMode matchMode,
84 84
            HttpServletRequest request,
......
88 88

  
89 89
        logger.info("doFind() : " + requestPathAndQuery(request) );
90 90

  
91
        PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);
91
        PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex);
92 92
        pagerParams.normalizeAndValidate(response);
93 93

  
94 94
        matchMode = matchMode != null ? matchMode : MatchMode.BEGINNING;
......
102 102
     * @param type
103 103
     * @param identifierType
104 104
     * @param identifier
105
     * @param pageNumber
105
     * @param pageIndex
106 106
     * @param pageSize
107 107
     * @param matchMode
108 108
     * @param request
......
116 116
    		@RequestParam(value = "class", required = false) Class<T> type,
117 117
    		@RequestParam(value = "identifierType", required = false) String identifierType,
118 118
            @RequestParam(value = "identifier", required = false) String identifier,
119
            @RequestParam(value = "pageNumber", required = false) Integer pageNumber,
119
            @RequestParam(value = "pageIndex", required = false) Integer pageIndex,
120 120
            @RequestParam(value = "pageSize", required = false) Integer pageSize,
121 121
            @RequestParam(value = "matchMode", required = false) MatchMode matchMode,
122 122
            @RequestParam(value = "includeEntity", required = false) Boolean includeEntity,
......
134 134

  
135 135
        logger.info("doFindByIdentifier() : " + requestPathAndQuery(request) );
136 136

  
137
        PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber).normalizeAndValidate(response);
137
        PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex).normalizeAndValidate(response);
138 138

  
139 139
        matchMode = matchMode != null ? matchMode : MatchMode.EXACT;
140 140
        boolean includeCdmEntity = includeEntity == null ||  includeEntity == true ? true : false;
......
147 147
     * @param type
148 148
     * @param markerType
149 149
     * @param value
150
     * @param pageNumber
150
     * @param pageIndex
151 151
     * @param pageSize
152 152
     * @param request
153 153
     * @param response
......
160 160
            @RequestParam(value = "class", required = false) Class<T> type,
161 161
            @RequestParam(value = "markerType", required = true) UUID markerTypeUuid,
162 162
            @RequestParam(value = "value", required = false) Boolean value,
163
            @RequestParam(value = "pageNumber", required = false) Integer pageNumber,
163
            @RequestParam(value = "pageIndex", required = false) Integer pageIndex,
164 164
            @RequestParam(value = "pageSize", required = false) Integer pageSize,
165 165
            @RequestParam(value = "includeEntity", required = false, defaultValue="false") Boolean includeEntity,
166 166
            HttpServletRequest request,
......
178 178

  
179 179
        logger.info("doFindByMarker() " + requestPathAndQuery(request));
180 180

  
181
        PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber).normalizeAndValidate(response);
181
        PagerParameters pagerParams = new PagerParameters(pageSize, pageIndex).normalizeAndValidate(response);
182 182

  
183 183
        Pager<MarkedEntityDTO<T>> result = service.findByMarker(type, markerType, value, includeEntity, pagerParams.getPageSize(), pagerParams.getPageIndex(), initializationStrategy);
184 184
        return result;

Also available in: Unified diff