Merge pull request #23 from indexdata/master

Master

Author: nielserik

NEWS.md

@@ -2,7 +2,10 @@
 * Replace deprecated mod-configuration with mod-settings for fetching tenant's locale settings ([CIRC-2295](https://folio-org.atlassian.net/browse/CIRC-2295))
 * Fix sending notifications specified to be sent to proxy ([CIRC-2295](https://folio-org.atlassian.net/browse/CIRC-2385))
 * Handling of patron notices for closed loans ([CIRC-1891](https://folio-org.atlassian.net/browse/CIRC-1891))
-* Render item's loan type in requests responses ([CIRC-2441])(https://folio-org.atlassian.net/browse/CIRC-2441))
+* Render item's loan type in requests responses ([CIRC-2441](https://folio-org.atlassian.net/browse/CIRC-2441))
+* Switch DCB user check from lastName to the user type ([CIRC-2482](https://folio-org.atlassian.net/browse/CIRC-2482))
+* Upgrade wiremock from 2.35.0 to 3.13.2 fixing CVE-2023-41329 ([CIRC-2543](https://folio-org.atlassian.net/browse/CIRC-2543))
+* Fix request losing retrieval service point name upon check-in ([CIRC-2535](https://folio-org.atlassian.net/browse/CIRC-2535))
 
 ## 24.4.0 2025-03-12
 * Patron notices for the trigger “Item recalled” not sent if the item is not 1st in the title request queue (CIRC-2168)

descriptors/ModuleDescriptor-template.json

@@ -25,8 +25,9 @@
   <properties>
     <antlr4.version>4.11.1</antlr4.version>
     <drools.version>10.0.0</drools.version>
-    <rmb.version>35.4.0</rmb.version>
-    <vertx.version>4.5.13</vertx.version>
+    <rmb.version>36.0.0-SNAPSHOT</rmb.version>
+    <vertx.version>5.0.6</vertx.version>
+    <folio.kafka.wrapper.version>4.0.0-SNAPSHOT</folio.kafka.wrapper.version>
     <log4j2.version>2.24.3</log4j2.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -64,7 +65,7 @@
       <dependency>
         <groupId>org.testcontainers</groupId>
         <artifactId>testcontainers-bom</artifactId>
-        <version>1.21.0</version>
+        <version>1.21.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -124,12 +125,17 @@
     <dependency>
       <groupId>org.folio</groupId>
       <artifactId>mod-pubsub-client</artifactId>
-      <version>2.16.0</version>
+      <version>2.17.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>
-      <version>1.10.0</version>
+      <version>1.14.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.21.0</version>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
@@ -206,9 +212,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8</artifactId>
-      <version>2.35.0</version>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock</artifactId>
+      <version>3.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -248,7 +254,7 @@
     <dependency>
       <groupId>org.folio</groupId>
       <artifactId>folio-kafka-wrapper</artifactId>
-      <version>3.0.0</version>
+      <version>${folio.kafka.wrapper.version}</version>
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
@@ -461,6 +467,7 @@
                   <!-- otherwise Drools KieServices.Factory.get() returns null: CIRC-309, CIRC-1147 -->
                   <resource>META-INF/kie.conf</resource>
                 </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
               </transformers>
               <artifactSet />
               <outputFile>${project.build.directory}/${project.artifactId}.jar</outputFile>
@@ -493,6 +500,11 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.0.0-M5</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>3.5.4</version>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>

pom.xml

@@ -0,0 +1,66 @@
+#%RAML 1.0
+title: Circulation
+version: v0.1
+protocols: [ HTTP, HTTPS ]
+baseUri: http://localhost:9130
+
+documentation:
+  - title: Request Anonymization API
+    content: <b>Request Anonymization API</b>
+
+types:
+  anonymize-request-response: !include schema/anonymize-single-request-response.json
+  errors: !include raml-util/schemas/errors.schema
+
+traits:
+  validate: !include raml-util/traits/validation.raml
+
+/request-anonymization:
+  /{requestId}:
+    uriParameters:
+      requestId:
+        type: string
+        description: Request UUID to anonymize
+        example: 9fd9b9d8-1b1a-4a7a-9f54-5e7c5f5e0b2e
+        pattern: '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'
+    post:
+      is: [ validate ]
+      description: Anonymize a single closed request by its requestId.
+      responses:
+        200:
+          description: The request has been successfully anonymized.
+          body:
+            application/json:
+              type: anonymize-request-response
+              example:
+                requestId: 9fd9b9d8-1b1a-4a7a-9f54-5e7c5f5e0b2e
+                anonymized: true
+
+        404:
+          description: Request with the given requestId was not found.
+          body:
+            application/json:
+              type: errors
+              example:
+                errors:
+                  - message: Request not found
+
+        422:
+          description: Validation error — request is not closed or another rule prevents anonymization.
+          body:
+            application/json:
+              type: errors
+              example:
+                errors:
+                  - message: requestNotClosed
+
+        500:
+          description: Internal server error.
+          body:
+            application/json:
+              type: errors
+              example:
+                errors:
+                  - message: Internal server error
+
+

ramls/request-anonymization.raml

@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Single Request Anonymization Response",
+  "type": "object",
+  "properties": {
+    "requestId": {
+      "type": "string",
+      "format": "UUID",
+      "description": "UUID of the request that was processed."
+    },
+    "anonymized": {
+      "type": "boolean",
+      "description": "True if the request is anonymized after this call (PII removed or already absent)."
+    }
+  },
+  "required": ["requestId", "anonymized"],
+  "additionalProperties": false
+}

ramls/schema/anonymize-single-request-response.json

@@ -36,32 +36,34 @@
 import org.folio.circulation.resources.OverdueFineScheduledNoticeProcessingResource;
 import org.folio.circulation.resources.PickSlipsResource;
 import org.folio.circulation.resources.PrintEventsResource;
+import org.folio.circulation.resources.RequestAnonymizationResource;
 import org.folio.circulation.resources.RequestByInstanceIdResource;
 import org.folio.circulation.resources.RequestCirculationRulesEngineResource;
 import org.folio.circulation.resources.RequestCollectionResource;
 import org.folio.circulation.resources.RequestHoldShelfClearanceResource;
 import org.folio.circulation.resources.RequestQueueResource;
 import org.folio.circulation.resources.RequestScheduledNoticeProcessingResource;
 import org.folio.circulation.resources.ScheduledAnonymizationProcessingResource;
+import org.folio.circulation.resources.ScheduledRequestAnonymizationProcessingResource;
 import org.folio.circulation.resources.ScheduledDigitalRemindersProcessingResource;
 import org.folio.circulation.resources.SearchSlipsResource;
 import org.folio.circulation.resources.TenantActivationResource;
 import org.folio.circulation.resources.agedtolost.ScheduledAgeToLostFeeChargingResource;
 import org.folio.circulation.resources.agedtolost.ScheduledAgeToLostResource;
+import org.folio.circulation.resources.foruseatlocation.HoldByBarcodeResource;
+import org.folio.circulation.resources.foruseatlocation.PickupByBarcodeResource;
 import org.folio.circulation.resources.handlers.FeeFineBalanceChangedHandlerResource;
 import org.folio.circulation.resources.handlers.LoanRelatedFeeFineClosedHandlerResource;
 import org.folio.circulation.resources.renewal.RenewByBarcodeResource;
 import org.folio.circulation.resources.renewal.RenewByIdResource;
-import org.folio.circulation.resources.foruseatlocation.HoldByBarcodeResource;
-import org.folio.circulation.resources.foruseatlocation.PickupByBarcodeResource;
 import org.folio.circulation.support.logging.LogHelper;
 import org.folio.circulation.support.logging.Logging;
 
 import io.vertx.core.AbstractVerticle;
 import io.vertx.core.Promise;
 import io.vertx.core.http.HttpClient;
-import io.vertx.core.http.HttpClientOptions;
 import io.vertx.core.http.HttpServer;
+import io.vertx.core.http.PoolOptions;
 import io.vertx.ext.web.Router;
 
 public class CirculationVerticle extends AbstractVerticle {
@@ -78,8 +80,10 @@ public void start(Promise<Void> startFuture) {
     Router router = Router.router(vertx);
 
     // bump up the connection pool size from the default value of 5
-    final HttpClient client = vertx.createHttpClient(new HttpClientOptions().setMaxPoolSize(
-      getHttpMaxPoolSize()));
+    int httpMaxPoolSize = getHttpMaxPoolSize();
+    final HttpClient client = vertx.createHttpClient(new PoolOptions()
+      .setHttp1MaxSize(httpMaxPoolSize)
+      .setHttp2MaxSize(httpMaxPoolSize));
 
     this.server = vertx.createHttpServer();
 
@@ -145,6 +149,7 @@ public void start(Promise<Void> startFuture) {
     new ScheduledDigitalRemindersProcessingResource(client).register(router);
     new DueDateNotRealTimeScheduledNoticeProcessingResource(client).register(router);
     new RequestScheduledNoticeProcessingResource(client).register(router);
+    new RequestAnonymizationResource(client).register(router);
     new FeeFineScheduledNoticeProcessingResource(client).register(router);
     new FeeFineNotRealTimeScheduledNoticeProcessingResource(client).register(router);
     new OverdueFineScheduledNoticeProcessingResource(client).register(router);
@@ -153,6 +158,7 @@ public void start(Promise<Void> startFuture) {
     new LoanAnonymizationResource(client).register(router);
     new DeclareLostResource(client).register(router);
     new ScheduledAnonymizationProcessingResource(client).register(router);
+    new ScheduledRequestAnonymizationProcessingResource(client).register(router);
     new EndPatronActionSessionResource(client).register(router);
     new ClaimItemReturnedResource(client).register(router);
     new ChangeDueDateResource(client).register(router);
@@ -169,13 +175,11 @@ public void start(Promise<Void> startFuture) {
     new PrintEventsResource(client).register(router);
 
     server.requestHandler(router)
-      .listen(config().getInteger("port"), result -> {
-        if (result.succeeded()) {
-          log.info("Listening on {}", server.actualPort());
-          startFuture.complete();
-        } else {
-          startFuture.fail(result.cause());
-        }
+      .listen(config().getInteger("port"))
+      .onFailure(startFuture::fail)
+      .onSuccess(httpServer -> {
+        log.info("Listening on {}", server.actualPort());
+        startFuture.complete();
       });
   }
 
@@ -184,15 +188,13 @@ public void stop(Promise<Void> stopFuture) {
     final Logger log = LogManager.getLogger(MethodHandles.lookup().lookupClass());
     log.info("Stopping circulation module");
 
-    if(server != null) {
-      server.close(result -> {
-        if (result.succeeded()) {
+    if (server != null) {
+      server.close()
+        .onFailure(stopFuture::fail)
+        .onSuccess(v -> {
           log.info("Stopped listening on {}", server.actualPort());
           stopFuture.complete();
-        } else {
-          stopFuture.fail(result.cause());
-        }
-      });
+        });
     }
   }
 }