FOLIO-4087 - RMB & spring-base upgrades (#382)

folio-org · Oct 16, 2024 · 2a93260 · 2a93260
1 parent 4e881de
commit 2a93260
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 24 deletions.
diff --git a/.github/workflows/postgres.yml 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
@@ -142,7 +142,7 @@
     </sonar.coverage.exclusions>
     <!-- Plugin versions -->
     <aspectj.version>1.9.21.1</aspectj.version>
-    <raml-module-builder.version>35.2.0</raml-module-builder.version>
+    <raml-module-builder.version>35.3.0</raml-module-builder.version>
     <folio-liquibase-util.version>1.7.0</folio-liquibase-util.version>
     <data-import-utils.version>1.10.0</data-import-utils.version>
     <folio-di-support.version>2.1.0</folio-di-support.version>

diff --git 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
@@ -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
diff --git 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
@@ -52,8 +52,7 @@ public OaiPmhSetImpl() {
   }
 
   @Override
-  public void getOaiPmhSetsById(String id, String lang, Map<String, String> okapiHeaders,
-      Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void getOaiPmhSetsById(String id, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> 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<String, String> okapiH
   }
 
   @Override
-  public void putOaiPmhSetsById(String id, String lang, FolioSet entity, Map<String, String> okapiHeaders,
-      Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void putOaiPmhSetsById(String id, FolioSet entity, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> 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<Strin
   }
 
   @Override
-  public void postOaiPmhSets(String lang, FolioSet entity, Map<String, String> okapiHeaders,
-      Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void postOaiPmhSets(FolioSet entity, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> 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<String, String> oka
   }
 
   @Override
-  public void deleteOaiPmhSetsById(String id, String lang, Map<String, String> okapiHeaders,
-      Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void deleteOaiPmhSetsById(String id, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> 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<String, String> oka
   }
 
   @Override
-  public void getOaiPmhSets(int offset, int limit, String lang, Map<String, String> okapiHeaders,
-      Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void getOaiPmhSets(String totalRecords, int offset, int limit, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> 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
@@ -42,9 +42,7 @@ public RequestMetadataAPIs() {
   }
 
   @Override
-  public void getOaiRequestMetadata(int offset, int limit, String lang, Map<String, String> okapiHeaders,
-      Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
-
+  public void getOaiRequestMetadata(String totalRecords, int offset, int limit, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> 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<String
   }
 
   @Override
-  public void getOaiRequestMetadataFailedToSaveInstancesByRequestId(String requestId, int offset, int limit, String lang, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void getOaiRequestMetadataFailedToSaveInstancesByRequestId(String requestId, String totalRecords, int offset, int limit, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> 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<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void getOaiRequestMetadataSkippedInstancesByRequestId(String requestId, String totalRecords, int offset, int limit, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> 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<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void getOaiRequestMetadataFailedInstancesByRequestId(String requestId, String totalRecords, int offset, int limit, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> 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<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void getOaiRequestMetadataSuppressedFromDiscoveryInstancesByRequestId(String requestId, String totalRecords, int offset, int limit, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
     try {
       var tenantId = TenantTool.tenantId(okapiHeaders);
       logger.info("Get suppressed from discovery instances UUIDs collection for tenant: {}, requestId: {}", tenantId, requestId);
+89 −0		.github/workflows/api-doc.yml
+59 −0		.github/workflows/api-lint.yml
+40 −0		.github/workflows/api-schema-lint.yml
+2 −3		README.md
+15 −0		examples/codex/package.sample
+58 −0		examples/codex/packageCollection.sample
+12 −0		examples/codex/sourceCollection.sample
+0 −4		examples/moduleInfo.sample
+0 −23		examples/tagged-record-example/user.sample
+7 −0		examples/tenantAttributes.sample
+17 −0		examples/tenantJob.sample
+14 −0		library/ramltojaxrs.raml
+27 −0		ramls/codex/codex-instances-sources.raml
+62 −0		ramls/codex/codex-packages.raml
+11 −5		ramls/codex/codex.raml
+52 −0		ramls/jsonSchemas.raml
+0 −399		ramls/mod-permissions/permissions.raml
+0 −52		ramls/mod-permissions/tenantPermissions.raml
+48 −0		ramls/ramls.raml
+0 −53		ramls/tagged-record-example/users.raml
+62 −42		ramls/tenant.raml
+0 −1		rtypes/attachments.raml
+55 −0		rtypes/collection-get-with-json-response.raml
+0 −1		rtypes/collection-get.raml
+35 −0		rtypes/collection-stream.raml
+93 −0		rtypes/collection-with-json-response.raml
+0 −1		rtypes/collection.raml
+80 −0		rtypes/get-delete-with-json-response.raml
+0 −1		rtypes/get-delete.raml
+31 −0		rtypes/get-only-with-json-response.raml
+0 −1		rtypes/get-only.raml
+43 −0		rtypes/item-collection-get-with-json-response.raml
+0 −1		rtypes/item-collection-get.raml
+118 −0		rtypes/item-collection-with-json-response.raml
+5 −2		rtypes/item-collection.raml
+0 −1		rtypes/post-empty-body.raml
+96 −21		schemas/CQLSchema.schema
+1 −0		schemas/codex/codex_instance_cqlschema-ext.json
+1 −0		schemas/codex/codex_instance_cqlschema.json
+19 −0		schemas/codex/codex_package_cqlschema-ext.json
+56 −0		schemas/codex/codex_package_cqlschema.json
+23 −0		schemas/codex/coverage.json
+20 −0		schemas/codex/instance.json
+1 −0		schemas/codex/instanceCollection.json
+68 −0		schemas/codex/package.json
+24 −0		schemas/codex/packageCollection.json
+18 −0		schemas/codex/packageType.json
+12 −0		schemas/codex/selectionStatus.json
+21 −0		schemas/codex/source.json
+6 −8		schemas/codex/sourceCollection.json
+9 −4		schemas/error.schema
+4 −0		schemas/errors.schema
+5 −4		schemas/metadata.schema
+0 −26		schemas/mod-permissions/okapiPermission.json
+0 −17		schemas/mod-permissions/okapiPermissionSet.json
+0 −47		schemas/mod-permissions/permission.json
+0 −17		schemas/mod-permissions/permissionNameListObject.json
+0 −9		schemas/mod-permissions/permissionNameObject.json
+0 −41		schemas/mod-permissions/permissionUpload.json
+0 −19		schemas/mod-permissions/permissionUser.json
+0 −21		schemas/mod-permissions/permissionUserListObject.json
+0 −15		schemas/moduleInfo.schema
+2 −0		schemas/parameters.schema
+39 −11		schemas/resultInfo.schema
+7 −5		schemas/tags.schema
+24 −0		schemas/tenantAttributes.schema
+36 −0		schemas/tenantJob.schema
+7 −0		schemas/uuid.schema
+8 −0		traits/internal-error.raml
+0 −9		traits/language.raml
+9 −1		traits/pageable.raml