@@ -127,22 +127,30 @@ public List<Map<String, String>> fetchTableRecords(
127127 int offset ,
128128 int limit )
129129 throws ServiceNowAPIException {
130- ServiceNowTableAPIRequestBuilder requestBuilder = new ServiceNowTableAPIRequestBuilder (
131- this .conf .getRestApiEndpoint (), tableName , false )
132- .setExcludeReferenceLink (true )
133- .setDisplayValue (valueType )
134- .setLimit (limit );
130+ List <Map <String , String >> combinedResults = new ArrayList <>();
131+ String accessToken = getAccessToken ();
132+ int pageSize = limit / 5 ;
133+ LOG .info ("pageSize:::: " + pageSize );
134+ LOG .info ("offset:::: " + offset );
135+ for (int i = 0 ; i < 5 ; i ++) {
136+ int currentOffset = offset + (i * pageSize );
137+ ServiceNowTableAPIRequestBuilder requestBuilder = new ServiceNowTableAPIRequestBuilder (
138+ this .conf .getRestApiEndpoint (), tableName , false )
139+ .setExcludeReferenceLink (true )
140+ .setDisplayValue (valueType )
141+ .setLimit (pageSize )
142+ .setOffset (currentOffset );
143+ LOG .info ("currentOffset:::: " + currentOffset );
144+
145+ applyDateRangeToRequest (requestBuilder , startDate , endDate );
135146
136- if (offset > 0 ) {
137- requestBuilder .setOffset (offset );
147+ requestBuilder .setAuthHeader (accessToken );
148+ RestAPIResponse apiResponse = executeGetWithRetries (requestBuilder .build ());
149+ List <Map <String , String >> batch = parseResponseToResultListOfMap (apiResponse .getResponseBody ());
150+ combinedResults .addAll (batch );
138151 }
139-
140- applyDateRangeToRequest (requestBuilder , startDate , endDate );
141-
142- String accessToken = getAccessToken ();
143- requestBuilder .setAuthHeader (accessToken );
144- RestAPIResponse apiResponse = executeGetWithRetries (requestBuilder .build ());
145- return parseResponseToResultListOfMap (apiResponse .getResponseBody ());
152+ LOG .info ("combinedResults size:::: " + combinedResults .size ());
153+ return combinedResults ;
146154 }
147155
148156 private void applyDateRangeToRequest (ServiceNowTableAPIRequestBuilder requestBuilder , String startDate ,
0 commit comments