MODFEE-391: Upgrade to RMB 35.3.0 (#295)

* MODFEE-391 Upgrade to RMB 35.3.0 * MODFEE-391 Upgrade apache commons lang3 to 3.17.0 * MODFEE-391 Add commons-io 2.17.0 * MODFEE-391 Increase wait timeout in tests * MODFEE-391 Do not override parameter constraint configuration * MODFEE-391 Fix typo
folio-org · Oct 24, 2024 · f951b7d · f951b7d
1 parent 3c4fc1a
commit f951b7d
Show file tree

Hide file tree

Showing 34 changed files with 396 additions and 350 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
@@ -18,7 +18,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <vertx.version>4.5.5</vertx.version>
-    <raml-module-builder.version>35.2.0</raml-module-builder.version>
+    <raml-module-builder.version>35.3.0</raml-module-builder.version>
     <ramlfiles_path>${basedir}/ramls</ramlfiles_path>
     <postgresrunner.port>5434</postgresrunner.port>
     <!-- Postgres port for Jenkins CI build environment https://issues.folio.org/browse/METADATA-10 -->
@@ -166,8 +166,14 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.12.0</version>
+      <version>3.17.0</version>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.17.0</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>

diff --git a/ramls/accounts.raml b/ramls/accounts.raml
@@ -23,7 +23,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
   facets: !include raml-util/traits/facets.raml
 

diff --git a/ramls/actual-cost-fee-fine.raml b/ramls/actual-cost-fee-fine.raml
@@ -15,7 +15,6 @@ types:
   errors: !include raml-util/schemas/errors.schema
 
 traits:
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
 
 /actual-cost-fee-fine:

diff --git a/ramls/comments.raml b/ramls/comments.raml
@@ -16,7 +16,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
   facets: !include raml-util/traits/facets.raml
 

diff --git a/ramls/feefine-reports.raml b/ramls/feefine-reports.raml
@@ -28,7 +28,6 @@ types:
 
 traits:
   validate: !include raml-util/traits/validation.raml
-  language: !include raml-util/traits/language.raml
 
 /feefine-reports:
   /refund:

diff --git a/ramls/feefineactions.raml b/ramls/feefineactions.raml
@@ -27,7 +27,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
 
 resourceTypes:

diff --git a/ramls/feefines.raml b/ramls/feefines.raml
@@ -17,7 +17,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
   facets: !include raml-util/traits/facets.raml
 

diff --git a/ramls/lost-item-fee-policy.raml b/ramls/lost-item-fee-policy.raml
@@ -17,7 +17,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
 
 resourceTypes:

diff --git a/ramls/manual-block-templates.raml b/ramls/manual-block-templates.raml
@@ -16,7 +16,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
 
 resourceTypes:

diff --git a/ramls/manualblocks.raml b/ramls/manualblocks.raml
@@ -16,7 +16,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
 
 resourceTypes:

diff --git a/ramls/overdue-fine-policy.raml b/ramls/overdue-fine-policy.raml
@@ -17,7 +17,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
 
 resourceTypes:

diff --git a/ramls/owners.raml b/ramls/owners.raml
@@ -16,7 +16,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
 
 resourceTypes:

diff --git a/ramls/payments.raml b/ramls/payments.raml
@@ -16,7 +16,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
   facets: !include raml-util/traits/facets.raml
 

diff --git a/ramls/raml-util b/ramls/raml-util
diff --git a/ramls/refunds.raml b/ramls/refunds.raml
@@ -16,7 +16,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
   facets: !include raml-util/traits/facets.raml
 

diff --git a/ramls/transfer-criteria.raml b/ramls/transfer-criteria.raml
@@ -16,7 +16,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
 
 resourceTypes:

diff --git a/ramls/transfers.raml b/ramls/transfers.raml
@@ -16,7 +16,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
   facets: !include raml-util/traits/facets.raml
 

diff --git a/ramls/waiver.raml b/ramls/waiver.raml
@@ -16,7 +16,6 @@ traits:
   orderable: !include raml-util/traits/orderable.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
   facets: !include raml-util/traits/facets.raml
 

diff --git a/src/main/java/org/folio/rest/impl/AccountsAPI.java b/src/main/java/org/folio/rest/impl/AccountsAPI.java
@@ -6,6 +6,7 @@
 import static org.folio.rest.domain.Action.REFUND;
 import static org.folio.rest.domain.Action.TRANSFER;
 import static org.folio.rest.domain.Action.WAIVE;
+import static org.folio.rest.tools.messages.Messages.DEFAULT_LANGUAGE;
 
 import java.util.List;
 import java.util.Map;
@@ -126,10 +127,10 @@ private Future<Void> setAdditionalFields(Vertx vertx, Map<String, String> okapiH
 
   @Validate
   @Override
-  public void getAccounts(String query, String orderBy, AccountsGetOrder order, int offset, int limit, List<String> facets,
-    String lang,
-    Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler,
-    Context vertxContext) {
+  public void getAccounts(String query, String orderBy, AccountsGetOrder order, String totalRecords,
+    int offset, int limit, List<String> facets, Map<String, String> okapiHeaders,
+    Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+
     String tenantId = TenantTool.calculateTenantId(okapiHeaders.get(OKAPI_HEADER_TENANT));
     List<FacetField> facetList = FacetManager.convertFacetStrings2FacetFields(facets, "jsonb");
     try {
@@ -176,7 +177,7 @@ public void getAccounts(String query, String orderBy, AccountsGetOrder order, in
           } else {
             asyncResultHandler.handle(succeededFuture(
               GetAccountsResponse.respond500WithTextPlain(
-                messages.getMessage(lang,
+                messages.getMessage(DEFAULT_LANGUAGE,
                   MessageConsts.InternalServerError))));
           }
         }
@@ -190,19 +191,16 @@ public void getAccounts(String query, String orderBy, AccountsGetOrder order, in
       } else {
         asyncResultHandler.handle(succeededFuture(
           GetAccountsResponse.respond500WithTextPlain(
-            messages.getMessage(lang,
+            messages.getMessage(DEFAULT_LANGUAGE,
               MessageConsts.InternalServerError))));
       }
     }
   }
 
   @Validate
   @Override
-  public void postAccounts(String lang,
-    Account entity,
-    Map<String, String> okapiHeaders,
-    Handler<AsyncResult<Response>> asyncResultHandler,
-    Context vertxContext) {
+  public void postAccounts(Account entity, Map<String, String> okapiHeaders,
+    Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
 
     PgUtil.post(ACCOUNTS_TABLE, entity, okapiHeaders, vertxContext,
       PostAccountsResponse.class, post -> {
@@ -216,8 +214,9 @@ public void postAccounts(String lang,
 
   @Validate
   @Override
-  public void getAccountsByAccountId(String accountId, String lang, Map<String, String> okapiHeaders,
+  public void getAccountsByAccountId(String accountId, Map<String, String> okapiHeaders,
     Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+
     try {
       vertxContext.runOnContext(v -> {
         String tenantId = TenantTool.calculateTenantId(okapiHeaders.get(OKAPI_HEADER_TENANT));
@@ -235,19 +234,19 @@ public void getAccountsByAccountId(String accountId, String lang, Map<String, St
                 logger.error(getReply.result());
                 asyncResultHandler.handle(succeededFuture(
                   GetAccountsByAccountIdResponse.respond500WithTextPlain(
-                    messages.getMessage(lang, MessageConsts.InternalServerError))));
+                    messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError))));
               } else {
                 List<Account> accountList = getReply.result().getResults();
                 if (accountList.isEmpty()) {
                   asyncResultHandler.handle(succeededFuture(
                     GetAccountsByAccountIdResponse.respond404WithTextPlain("Account"
-                      + messages.getMessage(lang,
+                      + messages.getMessage(DEFAULT_LANGUAGE,
                       MessageConsts.ObjectDoesNotExist))));
                 } else if (accountList.size() > 1) {
                   logger.error("Multiple accounts found with the same id");
                   asyncResultHandler.handle(succeededFuture(
                     GetAccountsByAccountIdResponse.respond500WithTextPlain(
-                      messages.getMessage(lang,
+                      messages.getMessage(DEFAULT_LANGUAGE,
                         MessageConsts.InternalServerError))));
                 } else {
                   setAdditionalFields(vertxContext.owner(), okapiHeaders, accountList)
@@ -262,20 +261,21 @@ public void getAccountsByAccountId(String accountId, String lang, Map<String, St
           logger.error(e.getMessage());
           asyncResultHandler.handle(succeededFuture(
             GetAccountsResponse.respond500WithTextPlain(messages.getMessage(
-              lang, MessageConsts.InternalServerError))));
+              DEFAULT_LANGUAGE, MessageConsts.InternalServerError))));
         }
       });
     } catch (Exception e) {
       asyncResultHandler.handle(succeededFuture(
         GetAccountsResponse.respond500WithTextPlain(messages.getMessage(
-          lang, MessageConsts.InternalServerError))));
+          DEFAULT_LANGUAGE, MessageConsts.InternalServerError))));
     }
   }
 
   @Validate
   @Override
-  public void deleteAccountsByAccountId(String accountId, String lang, Map<String, String> okapiHeaders,
+  public void deleteAccountsByAccountId(String accountId, Map<String, String> okapiHeaders,
     Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+
     try {
       vertxContext.runOnContext(v -> {
         String tenantId = TenantTool.calculateTenantId(okapiHeaders.get(OKAPI_HEADER_TENANT));
@@ -304,7 +304,7 @@ public void deleteAccountsByAccountId(String accountId, String lang, Map<String,
                 logger.error(error, deleteReply.cause());
                 if (error == null) {
                   asyncResultHandler.handle(succeededFuture(DeleteAccountsByAccountIdResponse.respond500WithTextPlain(
-                    messages.getMessage(lang, MessageConsts.InternalServerError))));
+                    messages.getMessage(DEFAULT_LANGUAGE, MessageConsts.InternalServerError))));
                 } else {
                   asyncResultHandler.handle(succeededFuture(DeleteAccountsByAccountIdResponse.respond400WithTextPlain(error)));
                 }
@@ -315,7 +315,7 @@ public void deleteAccountsByAccountId(String accountId, String lang, Map<String,
           asyncResultHandler.handle(
             succeededFuture(
               DeleteAccountsByAccountIdResponse.respond500WithTextPlain(
-                messages.getMessage(lang,
+                messages.getMessage(DEFAULT_LANGUAGE,
                   MessageConsts.InternalServerError))));
         }
       });
@@ -324,16 +324,16 @@ public void deleteAccountsByAccountId(String accountId, String lang, Map<String,
       asyncResultHandler.handle(
         succeededFuture(
           DeleteAccountsByAccountIdResponse.respond500WithTextPlain(
-            messages.getMessage(lang,
+            messages.getMessage(DEFAULT_LANGUAGE,
               MessageConsts.InternalServerError))));
     }
   }
 
   @Validate
   @Override
-  public void putAccountsByAccountId(String accountId, String lang,
-    Account entity, Map<String, String> okapiHeaders,
-    Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void putAccountsByAccountId(String accountId, Account entity,
+    Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler,
+    Context vertxContext) {
 
     new AccountUpdateService(okapiHeaders, vertxContext)
       .updateAccount(accountId, entity)
+89 −0		.github/workflows/api-doc.yml
+59 −0		.github/workflows/api-lint.yml
+40 −0		.github/workflows/api-schema-lint.yml
+0 −58		Jenkinsfile
+1 −2		README.md
+0 −169		examples/mod-users/userdata.json.sample
+0 −53		examples/mod-users/users.raml.sample
+0 −23		examples/tagged-record-example/user.sample
+0 −3		ramls/codex/codex-instances-sources.raml
+0 −1		ramls/codex/codex-packages.raml
+0 −1		ramls/codex/codex.raml
+1 −2		ramls/jsonSchemas.raml
+1 −2		ramls/ramls.raml
+0 −53		ramls/tagged-record-example/users.raml
+0 −1		rtypes/attachments.raml
+0 −1		rtypes/collection-get-with-json-response.raml
+0 −1		rtypes/collection-get.raml
+1 −2		rtypes/collection-stream.raml
+0 −1		rtypes/collection-with-json-response.raml
+0 −1		rtypes/collection.raml
+0 −1		rtypes/get-delete-with-json-response.raml
+0 −1		rtypes/get-delete.raml
+0 −1		rtypes/get-only-with-json-response.raml
+0 −1		rtypes/get-only.raml
+0 −1		rtypes/item-collection-get-with-json-response.raml
+0 −1		rtypes/item-collection-get.raml
+0 −1		rtypes/item-collection-with-json-response.raml
+0 −1		rtypes/item-collection.raml
+0 −1		rtypes/post-empty-body.raml
+3 −1		schemas/codex/packageType.json
+2 −2		schemas/codex/source.json
+1 −1		schemas/resultInfo.schema
+0 −9		traits/language.raml
+9 −1		traits/pageable.raml