Merge branch 'master' of github.com:folio-org/mod-circulation-storage…

… into ecs-tlr-feature
folio-org · Oct 25, 2024 · b39d10e · b39d10e
2 parents 5591f35 + f9371d6
commit b39d10e
Show file tree

Hide file tree

Showing 33 changed files with 213 additions and 279 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
@@ -29,7 +29,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <ramlfiles_path>${basedir}/ramls</ramlfiles_path>
     <vertx-version>4.5.9</vertx-version>
-    <raml-module-builder-version>35.2.0</raml-module-builder-version>
+    <raml-module-builder-version>35.3.0</raml-module-builder-version>
     <spring.version>6.1.5</spring.version>
     <argLine />
   </properties>
@@ -181,7 +181,12 @@
     <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.logging.log4j</groupId>

diff --git a/ramls/actual-cost-record-storage.raml b/ramls/actual-cost-record-storage.raml
@@ -15,7 +15,6 @@ types:
   parameters: !include raml-util/schemas/parameters.schema
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml
@@ -55,5 +54,3 @@ resourceTypes:
         is: [validate]
       delete:
         description: "Delete actual cost record"
-        is: [language]
-
diff --git a/ramls/cancellation-reason.raml b/ramls/cancellation-reason.raml
@@ -15,7 +15,6 @@ types:
   parameters: !include raml-util/schemas/parameters.schema
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml
@@ -48,7 +47,6 @@ resourceTypes:
         501:
           description: "Not implemented yet"
     delete:
-      is: [language]
       responses:
         204:
           description: "All cancellation reasons deleted"

diff --git a/ramls/check-in-storage.raml b/ramls/check-in-storage.raml
@@ -15,7 +15,6 @@ types:
   check-ins: !include check-ins.json
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml

diff --git a/ramls/circulation-settings-storage.raml b/ramls/circulation-settings-storage.raml
@@ -9,7 +9,6 @@ documentation:
     content: <b>Storage for circulation settings</b>
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml

diff --git a/ramls/fixed-due-date-schedule.raml b/ramls/fixed-due-date-schedule.raml
@@ -16,7 +16,6 @@ types:
   parameters: !include raml-util/schemas/parameters.schema
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml
@@ -49,7 +48,6 @@ resourceTypes:
         501:
           description: "Not implemented yet"
     delete:
-      is: [language]
       responses:
         204:
           description: "All fixed due date schedules deleted"

diff --git a/ramls/loan-policy-storage.raml b/ramls/loan-policy-storage.raml
@@ -14,7 +14,6 @@ types:
   errors: !include raml-util/schemas/errors.schema
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml
@@ -46,7 +45,6 @@ resourceTypes:
         501:
           description: "Not implemented yet"
     delete:
-      is: [language]
       responses:
         204:
           description: "All loans deleted"

diff --git a/ramls/loan-storage.raml b/ramls/loan-storage.raml
@@ -19,7 +19,6 @@ types:
   anonymize-loans-request: !include anonymize-storage-loans-request.json
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml
@@ -49,7 +48,6 @@ resourceTypes:
     post:
       is: [validate]
     delete:
-      is: [language]
       responses:
         204:
           description: "All loans deleted"

diff --git a/ramls/patron-action-session.raml b/ramls/patron-action-session.raml
@@ -17,7 +17,6 @@ types:
 traits:
   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/raml-util b/ramls/raml-util
diff --git a/ramls/request-policy-storage.raml b/ramls/request-policy-storage.raml
@@ -16,7 +16,6 @@ types:
   errors: !include raml-util/schemas/errors.schema
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
 
@@ -62,7 +61,6 @@ resourceTypes:
             text/plain:
               example: "Internal server error, contact administrator"
     delete:
-      is: [language]
       responses:
         204:
           description: "All request policies deleted"

diff --git a/ramls/request-preference-storage.raml b/ramls/request-preference-storage.raml
@@ -14,7 +14,6 @@ types:
   errors: !include raml-util/schemas/errors.schema
 
 traits:
-  language: !include raml-util/traits/language.raml
   validate: !include raml-util/traits/validation.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml

diff --git a/ramls/request-storage.raml b/ramls/request-storage.raml
@@ -15,7 +15,6 @@ types:
   parameters: !include raml-util/schemas/parameters.schema
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml
@@ -47,7 +46,6 @@ resourceTypes:
         501:
           description: "Not implemented yet"
     delete:
-      is: [language]
       responses:
         204:
           description: "All requests deleted"

diff --git a/ramls/scheduled-notice-storage.raml b/ramls/scheduled-notice-storage.raml
@@ -15,7 +15,6 @@ types:
   parameters: !include raml-util/schemas/parameters.schema
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml

diff --git a/ramls/staff-slips.raml b/ramls/staff-slips.raml
@@ -15,7 +15,6 @@ types:
   parameters: !include raml-util/schemas/parameters.schema
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml
@@ -46,7 +45,6 @@ resourceTypes:
         501:
           description: "Not implemented yet"
     delete:
-      is: [language]
       responses:
         500:
           description: "Internal server error, e.g. due to misconfiguration"

diff --git a/ramls/tlr-feature-toggle-job.raml b/ramls/tlr-feature-toggle-job.raml
@@ -17,7 +17,6 @@ types:
   kvConfiguration: !include kv-configuration.json
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml
@@ -57,7 +56,6 @@ resourceTypes:
         is: [validate]
       delete:
         description: "Removes TLR feature toggle job"
-        is: [language]
 /tlr-feature-toggle-job/start:
   post:
     responses:

diff --git a/src/main/java/org/folio/rest/impl/ActualCostRecordAPI.java b/src/main/java/org/folio/rest/impl/ActualCostRecordAPI.java
@@ -17,24 +17,24 @@
 
 public class ActualCostRecordAPI implements ActualCostRecordStorage {
 
-  public void getActualCostRecordStorageActualCostRecords(int offset, int limit, String query,
-    String lang, Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler,
-    Context vertxContext) {
+  public void getActualCostRecordStorageActualCostRecords(String totalRecords, int offset,
+    int limit, String query, Map<String, String> okapiHeaders,
+    Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
 
     PgUtil.get(ACTUAL_COST_RECORD_TABLE, ACTUAL_COST_RECORD_CLASS, ActualCostRecords.class,
       query, offset, limit, okapiHeaders, vertxContext,
       GetActualCostRecordStorageActualCostRecordsResponse.class, asyncResultHandler);
   }
 
-  public void postActualCostRecordStorageActualCostRecords(String lang, ActualCostRecord entity,
+  public void postActualCostRecordStorageActualCostRecords(ActualCostRecord entity,
     Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler,
     Context vertxContext) {
 
     PgUtil.post(ACTUAL_COST_RECORD_TABLE, entity, okapiHeaders, vertxContext,
       PostActualCostRecordStorageActualCostRecordsResponse.class, asyncResultHandler);
   }
 
-  public void getActualCostRecordStorageActualCostRecordsById(String id, String lang,
+  public void getActualCostRecordStorageActualCostRecordsById(String id,
     Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler,
     Context vertxContext) {
 
@@ -43,16 +43,16 @@ public void getActualCostRecordStorageActualCostRecordsById(String id, String la
       asyncResultHandler);
   }
 
-  public void putActualCostRecordStorageActualCostRecordsById(String id, String lang,
-    ActualCostRecord entity, Map<String, String> okapiHeaders,
-    Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void putActualCostRecordStorageActualCostRecordsById(String id, ActualCostRecord entity,
+    Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler,
+    Context vertxContext) {
 
     PgUtil.put(ACTUAL_COST_RECORD_TABLE, entity, id, okapiHeaders,
       vertxContext, PutActualCostRecordStorageActualCostRecordsByIdResponse.class,
       asyncResultHandler);
   }
 
-  public void deleteActualCostRecordStorageActualCostRecordsById(String id, String lang,
+  public void deleteActualCostRecordStorageActualCostRecordsById(String id,
     Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler,
     Context vertxContext) {
 

diff --git a/src/main/java/org/folio/rest/impl/CancellationReasonsAPI.java b/src/main/java/org/folio/rest/impl/CancellationReasonsAPI.java
@@ -43,10 +43,8 @@ private String getErrorResponse(String response) {
 
   @Override
   @Validate
-  public void deleteCancellationReasonStorageCancellationReasons(String lang,
-      Map<String, String> okapiHeaders,
-      Handler<AsyncResult<Response>> asyncResultHandler,
-      Context vertxContext) {
+  public void deleteCancellationReasonStorageCancellationReasons(Map<String, String> okapiHeaders,
+      Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
     try {
       String tenantId = okapiHeaders.get(TENANT_HEADER);
       String deleteAllQuery = String.format("DELETE FROM %s_%s.%s", tenantId,
@@ -74,48 +72,51 @@ public void deleteCancellationReasonStorageCancellationReasons(String lang,
 
   @Override
   @Validate
-  public void getCancellationReasonStorageCancellationReasons(int offset,
-      int limit, String query, String lang, Map<String, String> okapiHeaders,
-      Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void getCancellationReasonStorageCancellationReasons(String totalRecords, int offset,
+    int limit, String query, Map<String, String> okapiHeaders,
+    Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+
     PgUtil.get(TABLE_NAME, CancellationReason.class, CancellationReasons.class,
         query, offset, limit, okapiHeaders, vertxContext,
         GetCancellationReasonStorageCancellationReasonsResponse.class, asyncResultHandler);
   }
 
   @Override
   @Validate
-  public void postCancellationReasonStorageCancellationReasons(String lang,
-      CancellationReason entity, Map<String, String> okapiHeaders,
-      Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+  public void postCancellationReasonStorageCancellationReasons(CancellationReason entity,
+    Map<String, String> okapiHeaders, Handler<AsyncResult<Response>> asyncResultHandler,
+    Context vertxContext) {
+
     PgUtil.post(TABLE_NAME, entity, okapiHeaders, vertxContext,
         PostCancellationReasonStorageCancellationReasonsResponse.class, asyncResultHandler);
   }
 
   @Override
   @Validate
   public void getCancellationReasonStorageCancellationReasonsByCancellationReasonId(
-      String cancellationReasonId, String lang, Map<String, String> okapiHeaders,
+      String cancellationReasonId, Map<String, String> okapiHeaders,
       Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+
     PgUtil.getById(TABLE_NAME, CancellationReason.class, cancellationReasonId, okapiHeaders, vertxContext,
         GetCancellationReasonStorageCancellationReasonsByCancellationReasonIdResponse.class, asyncResultHandler);
   }
 
   @Override
   @Validate
   public void deleteCancellationReasonStorageCancellationReasonsByCancellationReasonId(
-      String cancellationReasonId, String lang, Map<String, String> okapiHeaders,
-      Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+    String cancellationReasonId, Map<String, String> okapiHeaders,
+    Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+
     PgUtil.deleteById(TABLE_NAME, cancellationReasonId, okapiHeaders, vertxContext,
         DeleteCancellationReasonStorageCancellationReasonsByCancellationReasonIdResponse.class, asyncResultHandler);
   }
 
   @Override
   @Validate
   public void putCancellationReasonStorageCancellationReasonsByCancellationReasonId(
-      String cancellationReasonId, String lang, CancellationReason entity,
-      Map<String, String> okapiHeaders,
-      Handler<AsyncResult<Response>> asyncResultHandler,
-      Context vertxContext) {
+      String cancellationReasonId, CancellationReason entity, Map<String, String> okapiHeaders,
+      Handler<AsyncResult<Response>> asyncResultHandler, Context vertxContext) {
+
     PgUtil.put(TABLE_NAME, entity, cancellationReasonId, okapiHeaders, vertxContext,
         PutCancellationReasonStorageCancellationReasonsByCancellationReasonIdResponse.class, asyncResultHandler);
   }
+89 −0		.github/workflows/api-doc.yml
+59 −0		.github/workflows/api-lint.yml
+40 −0		.github/workflows/api-schema-lint.yml
+0 −65		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
+5 −1		rtypes/item-collection-with-json-response.raml
+0 −1		rtypes/item-collection.raml
+0 −1		rtypes/post-empty-body.raml
+1 −0		schemas/codex/codex_instance_cqlschema-ext.json
+1 −0		schemas/codex/codex_instance_cqlschema.json
+1 −0		schemas/codex/codex_package_cqlschema-ext.json
+1 −0		schemas/codex/codex_package_cqlschema.json
+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