Merge pull request #175 from folio-org/MODLOGSAML-198-limit-1000

MODLOGSAML-198: limit=1000 for GET /configurations/entries
folio-org · Sep 13, 2024 · a85c4a9 · a85c4a9
2 parents cae8e2f + a110423
commit a85c4a9
Show file tree

Hide file tree

Showing 24 changed files with 73 additions and 73 deletions.
diff --git a/src/main/java/org/folio/config/ConfigurationsClient.java b/src/main/java/org/folio/config/ConfigurationsClient.java
@@ -122,7 +122,7 @@ public static Future<JsonArray> checkConfig(Vertx vertx, OkapiHeaders okapiHeade
     CharSequence encodedQuery = PercentCodec.encode(query);
 
     return WebClientFactory.getWebClient(vertx)
-      .getAbs(okapiHeaders.getUrl() + CONFIGURATIONS_ENTRIES_ENDPOINT_URL + "?query=" + encodedQuery)
+      .getAbs(okapiHeaders.getUrl() + CONFIGURATIONS_ENTRIES_ENDPOINT_URL + "?limit=1000&query=" + encodedQuery)
       .putHeader(XOkapiHeaders.TOKEN, okapiHeaders.getToken())
       .putHeader(XOkapiHeaders.URL, okapiHeaders.getUrl())
       .putHeader(XOkapiHeaders.TENANT, okapiHeaders.getTenant())

diff --git a/src/main/java/org/folio/util/OkapiHelper.java b/src/main/java/org/folio/util/OkapiHelper.java
@@ -51,7 +51,7 @@ public static OkapiHeaders okapiHeaders(Map<String, String> parsedHeaders) {
   * For example in the class ConfigurationsClient:
   * public static Future<JsonArray> ConfigurationsClient.checkConfig(Vertx vertx, OkapiHeaders okapiHeaders,String query)
   * return WebClientFactory.getWebClient(vertx)
-  *   .getAbs(okapiHeaders.getUrl() + CONFIGURATIONS_ENTRIES_ENDPOINT_URL + "?query=" + encodedQuery) ....
+  *   .getAbs(okapiHeaders.getUrl() + CONFIGURATIONS_ENTRIES_ENDPOINT_URL + "?limit=1000&query=" + encodedQuery) ....
   */
   public static OkapiHeaders okapiHeadersWithUrlTo(Map<String, String> parsedHeaders ) {
     OkapiHeaders headers = okapiHeaders(parsedHeaders);

diff --git a/src/test/java/org/folio/util/MockJsonExtended.java b/src/test/java/org/folio/util/MockJsonExtended.java
@@ -17,7 +17,7 @@
 
 public class MockJsonExtended extends MockJson {
   private static final Logger log = LogManager.getLogger(MockJsonExtended.class);
-  private static final String PARTIAL_URL = "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29";
+  private static final String PARTIAL_URL = "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29";
   private static final String RECEIVED_DATA_CONSTANT = "receivedData";
   private static final String CONFIGS_CONSTANT = "configs";
   private static final String URL_CONSTANT = "url";

diff --git a/src/test/resources/after_regenerate.json b/src/test/resources/after_regenerate.json
@@ -1,7 +1,7 @@
 {
   "mocks": [
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -62,7 +62,7 @@
       "sendData": {}
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20saml.attribute%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20saml.attribute%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -71,7 +71,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20idp.url%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20idp.url%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -88,7 +88,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20metadata.invalidated%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20metadata.invalidated%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -105,7 +105,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20user.property%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20user.property%29",
       "method": "get",
       "status": 200,
       "receivedData": {

diff --git a/src/test/resources/mock_200_empty.json b/src/test/resources/mock_200_empty.json
@@ -1,7 +1,7 @@
 {
   "mocks": [
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
       "method": "get",
       "status": 200,
         "receivedData": {

diff --git a/src/test/resources/mock_200_null.json b/src/test/resources/mock_200_null.json
@@ -1,7 +1,7 @@
 {
   "mocks": [
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
       "method": "get",
       "status": 200,
         "receivedData": {}

diff --git a/src/test/resources/mock_400.json b/src/test/resources/mock_400.json
@@ -1,7 +1,7 @@
 {
   "mocks": [
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
       "method": "get",
       "status": 400,
       "receivedData": { }

diff --git a/src/test/resources/mock_content.json b/src/test/resources/mock_content.json
@@ -1,7 +1,7 @@
 {
   "mocks": [
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -62,7 +62,7 @@
       "sendData": {}
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20saml.attribute%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20saml.attribute%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -71,7 +71,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20idp.metadata%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20idp.metadata%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -88,7 +88,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20idp.url%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20idp.url%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -105,7 +105,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20metadata.invalidated%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20metadata.invalidated%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -122,7 +122,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20user.property%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20user.property%29",
       "method": "get",
       "status": 200,
       "receivedData": {

diff --git a/src/test/resources/mock_content_legacy.json b/src/test/resources/mock_content_legacy.json
@@ -1,7 +1,7 @@
 {
   "mocks": [
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -69,7 +69,7 @@
       "sendData": {}
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20saml.attribute%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20saml.attribute%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -78,7 +78,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20idp.metadata%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20idp.metadata%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -95,7 +95,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20idp.url%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20idp.url%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -112,7 +112,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20saml.callback%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20saml.callback%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -129,7 +129,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20metadata.invalidated%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20metadata.invalidated%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -146,7 +146,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20user.property%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20user.property%29",
       "method": "get",
       "status": 200,
       "receivedData": {

diff --git a/src/test/resources/mock_content_no_keystore.json b/src/test/resources/mock_content_no_keystore.json
@@ -1,7 +1,7 @@
 {
   "mocks": [
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -55,7 +55,7 @@
       "sendData": {}
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20saml.attribute%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%20saml.attribute%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -64,7 +64,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML+AND+configName%3D%3Dsaml+AND+code%3D%3D+idp.metadata%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML+AND+configName%3D%3Dsaml+AND+code%3D%3D+idp.metadata%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -73,7 +73,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML+AND+configName%3D%3Dsaml+AND+code%3D%3D+idp.url%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML+AND+configName%3D%3Dsaml+AND+code%3D%3D+idp.url%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -90,7 +90,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML+AND+configName%3D%3Dsaml+AND+code%3D%3D+metadata.invalidated%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML+AND+configName%3D%3Dsaml+AND+code%3D%3D+metadata.invalidated%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -107,7 +107,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML+AND+configName%3D%3Dsaml+AND+code%3D%3D+user.property%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML+AND+configName%3D%3Dsaml+AND+code%3D%3D+user.property%29",
       "method": "get",
       "status": 200,
       "receivedData": {

diff --git a/src/test/resources/mock_content_with_delete.json b/src/test/resources/mock_content_with_delete.json
@@ -1,7 +1,7 @@
 {
     "mocks": [
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -98,7 +98,7 @@
       "status": 204
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%idp.metadata%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3D%idp.metadata%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -115,7 +115,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Didp.url%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Didp.url%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -132,7 +132,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dmetadata.invalidated%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dmetadata.invalidated%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -149,7 +149,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Duser.property%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Duser.property%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -158,7 +158,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dsaml.attribute%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dsaml.attribute%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -167,7 +167,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dkeystore.file%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dkeystore.file%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -184,7 +184,7 @@
        }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dkeystore.password%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dkeystore.password%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -201,7 +201,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dkeystore.privatekey.password%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dkeystore.privatekey.password%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -218,7 +218,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dsaml.binding%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dsaml.binding%29",
       "method": "get",
       "status": 200,
       "receivedData": {
@@ -235,7 +235,7 @@
       }
     },
     {
-      "url": "/configurations/entries?query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dokapi.url%29",
+      "url": "/configurations/entries?limit=1000&query=%28module%3D%3DLOGIN-SAML%20AND%20configName%3D%3Dsaml%20AND%20code%3D%3Dokapi.url%29",
       "method": "get",
       "status": 200,
       "receivedData": {