From 2a9326037f66dcf550a6b3451c05466e0ede8e08 Mon Sep 17 00:00:00 2001 From: Viachaslau Khandramai Date: Wed, 16 Oct 2024 17:46:12 +0200 Subject: [PATCH] FOLIO-4087 - RMB & spring-base upgrades (#382) --- .github/workflows/postgres.yml | 26 +++++++++++++++++++ pom.xml | 2 +- ramls/folio-set-filtering-conditions.raml | 3 +-- ramls/folio-set.raml | 3 +-- ramls/raml-util | 2 +- ramls/request-metadata.raml | 1 - .../org/folio/rest/impl/OaiPmhSetImpl.java | 16 +++++------- .../folio/rest/impl/RequestMetadataAPIs.java | 12 ++++----- 8 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 .github/workflows/postgres.yml diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml new file mode 100644 index 000000000..1d4d0f80f --- /dev/null +++ b/.github/workflows/postgres.yml @@ -0,0 +1,26 @@ +name: postgres +on: + workflow_dispatch: + inputs: + postgres: + description: "List of postgres container images, to be injected as TESTCONTAINERS_POSTGRES_IMAGE" + default: '["postgres:16-alpine", "postgres:18-alpine"]' +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + postgres: ${{ fromJSON(github.event.inputs.postgres) }} + fail-fast: false + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + cache: maven + - run: mvn --batch-mode verify + env: + TESTCONTAINERS_POSTGRES_IMAGE: ${{ matrix.postgres }} diff --git a/pom.xml b/pom.xml index 35703799f..b2886db87 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ 1.9.21.1 - 35.2.0 + 35.3.0 1.7.0 1.10.0 2.1.0 diff --git a/ramls/folio-set-filtering-conditions.raml b/ramls/folio-set-filtering-conditions.raml index 81ec69c6b..652432806 100644 --- a/ramls/folio-set-filtering-conditions.raml +++ b/ramls/folio-set-filtering-conditions.raml @@ -1,7 +1,7 @@ #%RAML 1.0 title: OAI-PMH API baseUri: https://github.com/folio-org/mod-oai-pmh -version: v3 +version: v3.1 protocols: [ HTTP, HTTPS ] documentation: @@ -15,7 +15,6 @@ types: traits: validate: !include raml-util/traits/validation.raml - language: !include raml-util/traits/language.raml pageable: !include raml-util/traits/pageable.raml resourceTypes: diff --git a/ramls/folio-set.raml b/ramls/folio-set.raml index fd2edc6a6..0ce39e274 100644 --- a/ramls/folio-set.raml +++ b/ramls/folio-set.raml @@ -1,7 +1,7 @@ #%RAML 1.0 title: OAI-PMH API baseUri: https://github.com/folio-org/mod-oai-pmh -version: v3 +version: v3.1 protocols: [ HTTP, HTTPS ] documentation: @@ -15,7 +15,6 @@ types: traits: validate: !include raml-util/traits/validation.raml - language: !include raml-util/traits/language.raml pageable: !include raml-util/traits/pageable.raml resourceTypes: diff --git a/ramls/raml-util b/ramls/raml-util index f5b065d6e..f48a63f3e 160000 --- a/ramls/raml-util +++ b/ramls/raml-util @@ -1 +1 @@ -Subproject commit f5b065d6e6b4c1ea8a4ec02a4519a96155e6ab7f +Subproject commit f48a63f3e45b9a3b437d21c3a61ed10b8ceb5f25 diff --git a/ramls/request-metadata.raml b/ramls/request-metadata.raml index 7ca433f1f..00e2f1623 100644 --- a/ramls/request-metadata.raml +++ b/ramls/request-metadata.raml @@ -19,7 +19,6 @@ types: traits: pageable: !include raml-util/traits/pageable.raml - language: !include raml-util/traits/language.raml validate: !include raml-util/traits/validation.raml resourceTypes: diff --git a/src/main/java/org/folio/rest/impl/OaiPmhSetImpl.java b/src/main/java/org/folio/rest/impl/OaiPmhSetImpl.java index e0a81eeca..fdd7e8728 100644 --- a/src/main/java/org/folio/rest/impl/OaiPmhSetImpl.java +++ b/src/main/java/org/folio/rest/impl/OaiPmhSetImpl.java @@ -52,8 +52,7 @@ public OaiPmhSetImpl() { } @Override - public void getOaiPmhSetsById(String id, String lang, Map okapiHeaders, - Handler> asyncResultHandler, Context vertxContext) { + public void getOaiPmhSetsById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { logger.info("Get set by id with id: {}.", id); @@ -70,8 +69,7 @@ public void getOaiPmhSetsById(String id, String lang, Map okapiH } @Override - public void putOaiPmhSetsById(String id, String lang, FolioSet entity, Map okapiHeaders, - Handler> asyncResultHandler, Context vertxContext) { + public void putOaiPmhSetsById(String id, FolioSet entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { logger.info("Put set by id with id: '{}' and body: {}", id, entityToJsonString(entity)); @@ -89,8 +87,7 @@ public void putOaiPmhSetsById(String id, String lang, FolioSet entity, Map okapiHeaders, - Handler> asyncResultHandler, Context vertxContext) { + public void postOaiPmhSets(FolioSet entity, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { logger.info("Post set with body: {}.", entityToJsonString(entity)); @@ -108,8 +105,7 @@ public void postOaiPmhSets(String lang, FolioSet entity, Map oka } @Override - public void deleteOaiPmhSetsById(String id, String lang, Map okapiHeaders, - Handler> asyncResultHandler, Context vertxContext) { + public void deleteOaiPmhSetsById(String id, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { logger.info("Delete set by id '{}'.", id); @@ -126,8 +122,8 @@ public void deleteOaiPmhSetsById(String id, String lang, Map oka } @Override - public void getOaiPmhSets(int offset, int limit, String lang, Map okapiHeaders, - Handler> asyncResultHandler, Context vertxContext) { + public void getOaiPmhSets(String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { + vertxContext.runOnContext(v -> { try { logger.info("Get list of sets, offset: {}, limit: {}.", offset, limit); diff --git a/src/main/java/org/folio/rest/impl/RequestMetadataAPIs.java b/src/main/java/org/folio/rest/impl/RequestMetadataAPIs.java index a792db51c..cf8f8046f 100644 --- a/src/main/java/org/folio/rest/impl/RequestMetadataAPIs.java +++ b/src/main/java/org/folio/rest/impl/RequestMetadataAPIs.java @@ -42,9 +42,7 @@ public RequestMetadataAPIs() { } @Override - public void getOaiRequestMetadata(int offset, int limit, String lang, Map okapiHeaders, - Handler> asyncResultHandler, Context vertxContext) { - + public void getOaiRequestMetadata(String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { vertxContext.runOnContext(v -> { try { var tenantId = TenantTool.tenantId(okapiHeaders); @@ -62,7 +60,7 @@ public void getOaiRequestMetadata(int offset, int limit, String lang, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { + public void getOaiRequestMetadataFailedToSaveInstancesByRequestId(String requestId, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { try { var tenantId = TenantTool.tenantId(okapiHeaders); logger.info("Get failed to save instances UUIDs collection for tenant: {}, requestId: {}", tenantId, requestId); @@ -78,7 +76,7 @@ public void getOaiRequestMetadataFailedToSaveInstancesByRequestId(String request } @Override - public void getOaiRequestMetadataSkippedInstancesByRequestId(String requestId, int offset, int limit, String lang, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { + public void getOaiRequestMetadataSkippedInstancesByRequestId(String requestId, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { try { var tenantId = TenantTool.tenantId(okapiHeaders); logger.info("Get skipped instances UUIDs collection for tenant: {}, requestId: {}", tenantId, requestId); @@ -94,7 +92,7 @@ public void getOaiRequestMetadataSkippedInstancesByRequestId(String requestId, i } @Override - public void getOaiRequestMetadataFailedInstancesByRequestId(String requestId, int offset, int limit, String lang, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { + public void getOaiRequestMetadataFailedInstancesByRequestId(String requestId, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { try { var tenantId = TenantTool.tenantId(okapiHeaders); logger.info("Get failed UUIDs collection for tenant: {}, requestId: {}", tenantId, requestId); @@ -110,7 +108,7 @@ public void getOaiRequestMetadataFailedInstancesByRequestId(String requestId, in } @Override - public void getOaiRequestMetadataSuppressedFromDiscoveryInstancesByRequestId(String requestId, int offset, int limit, String lang, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { + public void getOaiRequestMetadataSuppressedFromDiscoveryInstancesByRequestId(String requestId, String totalRecords, int offset, int limit, Map okapiHeaders, Handler> asyncResultHandler, Context vertxContext) { try { var tenantId = TenantTool.tenantId(okapiHeaders); logger.info("Get suppressed from discovery instances UUIDs collection for tenant: {}, requestId: {}", tenantId, requestId);