From 41a96e34bf242a625773b794890834e6bec3c0b5 Mon Sep 17 00:00:00 2001 From: Noah Overcash Date: Fri, 23 Feb 2024 09:35:03 -0500 Subject: [PATCH 1/2] Update folio-query-tool-metadata to 1.2.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1f3b27..543ca8e 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 7.2.1 - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT 2.3.0 6.2.1 1.5.2.Final From ef50cb102434b5db76d50278612ba12a39e74da9 Mon Sep 17 00:00:00 2001 From: Noah Overcash Date: Fri, 23 Feb 2024 09:58:13 -0500 Subject: [PATCH 2/2] Replicate multiple IDs per record changes (MODFQMMGR-137) --- src/main/java/org/folio/fqm/edge/client/QueryClient.java | 4 ++-- .../java/org/folio/fqm/edge/controller/QueryController.java | 4 ++-- src/main/java/org/folio/fqm/edge/service/QueryService.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/folio/fqm/edge/client/QueryClient.java b/src/main/java/org/folio/fqm/edge/client/QueryClient.java index 6d96a8d..a6e1463 100644 --- a/src/main/java/org/folio/fqm/edge/client/QueryClient.java +++ b/src/main/java/org/folio/fqm/edge/client/QueryClient.java @@ -21,7 +21,7 @@ public interface QueryClient { ResultsetPage runFqlQuery(@RequestParam @NotNull String query, @RequestParam @NotNull UUID entityTypeId, @RequestParam List fields, - @RequestParam UUID afterId, + @RequestParam List afterId, @RequestParam Integer limit); @DeleteMapping(path = "/{queryId}") @@ -40,7 +40,7 @@ QueryDetails getQuery(@PathVariable UUID queryId, List> getContents(ContentsRequest contentsRequest); @GetMapping(path = "/{queryId}/sortedIds") - List getSortedIds(@PathVariable UUID queryId, + List> getSortedIds(@PathVariable UUID queryId, @RequestParam Integer offset, @RequestParam Integer limit); } diff --git a/src/main/java/org/folio/fqm/edge/controller/QueryController.java b/src/main/java/org/folio/fqm/edge/controller/QueryController.java index 77b9a31..89ce433 100644 --- a/src/main/java/org/folio/fqm/edge/controller/QueryController.java +++ b/src/main/java/org/folio/fqm/edge/controller/QueryController.java @@ -27,7 +27,7 @@ public class QueryController implements FqlQueryApi { private final QueryService queryService; @Override - public ResponseEntity runFqlQuery(String query, UUID entityTypeId, List fields, UUID afterId, Integer limit) { + public ResponseEntity runFqlQuery(String query, UUID entityTypeId, List fields, List afterId, Integer limit) { return ResponseEntity.ok(queryService.runFqlQuery(query, entityTypeId, fields, afterId, limit)); } @@ -53,7 +53,7 @@ public ResponseEntity>> getContents(ContentsRequest con } @Override - public ResponseEntity> getSortedIds(UUID queryId, Integer offset, Integer limit) { + public ResponseEntity>> getSortedIds(UUID queryId, Integer offset, Integer limit) { return ResponseEntity.ok(queryService.getSortedIds(queryId, offset, limit)); } } diff --git a/src/main/java/org/folio/fqm/edge/service/QueryService.java b/src/main/java/org/folio/fqm/edge/service/QueryService.java index 2455efb..ca180c5 100644 --- a/src/main/java/org/folio/fqm/edge/service/QueryService.java +++ b/src/main/java/org/folio/fqm/edge/service/QueryService.java @@ -20,7 +20,7 @@ public class QueryService { private final QueryClient queryClient; - public ResultsetPage runFqlQuery(@NotNull String query, @NotNull UUID entityTypeId, List fields, UUID afterId, Integer limit) { + public ResultsetPage runFqlQuery(@NotNull String query, @NotNull UUID entityTypeId, List fields, List afterId, Integer limit) { return queryClient.runFqlQuery(query, entityTypeId, fields, afterId, limit); } @@ -40,7 +40,7 @@ public List> getContents(ContentsRequest contentsRequest) { return queryClient.getContents(contentsRequest); } - public List getSortedIds(UUID queryId, Integer offset, Integer limit) { + public List> getSortedIds(UUID queryId, Integer offset, Integer limit) { return queryClient.getSortedIds(queryId, offset, limit); } }