Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update folio-query-tool-metadata to 1.2.0-SNAPSHOT #22

Merged
merged 2 commits into from
Feb 23, 2024
Merged

Update folio-query-tool-metadata to 1.2.0-SNAPSHOT #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41a96e3
Update folio-query-tool-metadata to 1.2.0-SNAPSHOT
ncovercash Feb 23, 2024
ef50cb1
Replicate multiple IDs per record changes (MODFQMMGR-137)
ncovercash Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

<!-- runtime dependencies -->
<folio-spring-base.version>7.2.1</folio-spring-base.version>
<folio-query-tool-metadata.version>1.1.0-SNAPSHOT</folio-query-tool-metadata.version>
<folio-query-tool-metadata.version>1.2.0-SNAPSHOT</folio-query-tool-metadata.version>
<edge-common-spring.version>2.3.0</edge-common-spring.version>
<openapi-generator.version>6.2.1</openapi-generator.version>
<mapstruct.version>1.5.2.Final</mapstruct.version>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/folio/fqm/edge/client/QueryClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public interface QueryClient {
ResultsetPage runFqlQuery(@RequestParam @NotNull String query,
@RequestParam @NotNull UUID entityTypeId,
@RequestParam List<String> fields,
@RequestParam UUID afterId,
@RequestParam List<String> afterId,
@RequestParam Integer limit);

@DeleteMapping(path = "/{queryId}")
Expand All @@ -40,7 +40,7 @@ QueryDetails getQuery(@PathVariable UUID queryId,
List<Map<String, Object>> getContents(ContentsRequest contentsRequest);

@GetMapping(path = "/{queryId}/sortedIds")
List<UUID> getSortedIds(@PathVariable UUID queryId,
List<List<String>> getSortedIds(@PathVariable UUID queryId,
@RequestParam Integer offset,
@RequestParam Integer limit);
}
4 changes: 2 additions & 2 deletions src/main/java/org/folio/fqm/edge/controller/QueryController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class QueryController implements FqlQueryApi {
private final QueryService queryService;

@Override
public ResponseEntity<ResultsetPage> runFqlQuery(String query, UUID entityTypeId, List<String> fields, UUID afterId, Integer limit) {
public ResponseEntity<ResultsetPage> runFqlQuery(String query, UUID entityTypeId, List<String> fields, List<String> afterId, Integer limit) {
return ResponseEntity.ok(queryService.runFqlQuery(query, entityTypeId, fields, afterId, limit));
}

Expand All @@ -53,7 +53,7 @@ public ResponseEntity<List<Map<String, Object>>> getContents(ContentsRequest con
}

@Override
public ResponseEntity<List<UUID>> getSortedIds(UUID queryId, Integer offset, Integer limit) {
public ResponseEntity<List<List<String>>> getSortedIds(UUID queryId, Integer offset, Integer limit) {
return ResponseEntity.ok(queryService.getSortedIds(queryId, offset, limit));
}
}
4 changes: 2 additions & 2 deletions src/main/java/org/folio/fqm/edge/service/QueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class QueryService {

private final QueryClient queryClient;

public ResultsetPage runFqlQuery(@NotNull String query, @NotNull UUID entityTypeId, List<String> fields, UUID afterId, Integer limit) {
public ResultsetPage runFqlQuery(@NotNull String query, @NotNull UUID entityTypeId, List<String> fields, List<String> afterId, Integer limit) {
return queryClient.runFqlQuery(query, entityTypeId, fields, afterId, limit);
}

Expand All @@ -40,7 +40,7 @@ public List<Map<String, Object>> getContents(ContentsRequest contentsRequest) {
return queryClient.getContents(contentsRequest);
}

public List<UUID> getSortedIds(UUID queryId, Integer offset, Integer limit) {
public List<List<String>> getSortedIds(UUID queryId, Integer offset, Integer limit) {
return queryClient.getSortedIds(queryId, offset, limit);
}
}