From 26a820deb1d566c42c901ba48c8295ede8b59a77 Mon Sep 17 00:00:00 2001
From: Julian Ladisch <julianladisch@users.noreply.github.com>
Date: Thu, 20 Nov 2025 14:12:28 +0100
Subject: [PATCH 1/2] OKAPI-1228: Add javadoc about ServicesResourceTransformer
 requirement

If some other dependency also ships with io.vertx.core.spi.VertxServiceProvider
we need to execute maven-shade-plugin with ServicesResourceTransformer that concatenated
both files.

Otherwise we may get an excpetion in org.folio.okapi.common.logging.FolioLoggingContext.put,
see https://github.com/folio-org/mod-copycat/pull/123
---
 .../java/org/folio/okapi/common/logging/FolioLocal.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/okapi-common/src/main/java/org/folio/okapi/common/logging/FolioLocal.java b/okapi-common/src/main/java/org/folio/okapi/common/logging/FolioLocal.java
index 860963ea7..eb301fdf2 100644
--- a/okapi-common/src/main/java/org/folio/okapi/common/logging/FolioLocal.java
+++ b/okapi-common/src/main/java/org/folio/okapi/common/logging/FolioLocal.java
@@ -16,6 +16,13 @@ public class FolioLocal implements VertxServiceProvider {
    * {@code src/main/resources/META-INF/services/io.vertx.core.spi.VertxServiceProvider}
    * to prevent a timing (race condition) issue:
    * <a href="https://folio-org.atlassian.net/browse/OKAPI-1228">OKAPI-1228</a>.
+   * <p>
+   * If some other dependency also ships with io.vertx.core.spi.VertxServiceProvider
+   * add the {@code ServicesResourceTransformer} transformer to {@code maven-shade-plugin}
+   * so that both files get concatenated, see
+   * <pre><a href="https://maven.apache.org/plugins/maven-shade-plugin/examples/resource-transformers.html
+     #ServicesResourceTransformer">manual</a></pre>
+   * and <a href="https://github.com/folio-org/mod-copycat/pull/123/files">example</a>.
    */
   @Override
   @SuppressWarnings("java:S2696")  // Suppress "Make method static", cannot change supertype

From 50249849d8921758204e1c6d19ac8e79422a6ed8 Mon Sep 17 00:00:00 2001
From: Julian Ladisch <julianladisch@users.noreply.github.com>
Date: Tue, 25 Nov 2025 11:07:09 +0100
Subject: [PATCH 2/2] Fix javadoc smells

---
 .../org/folio/okapi/common/logging/FolioLocal.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/okapi-common/src/main/java/org/folio/okapi/common/logging/FolioLocal.java b/okapi-common/src/main/java/org/folio/okapi/common/logging/FolioLocal.java
index eb301fdf2..8f63da98b 100644
--- a/okapi-common/src/main/java/org/folio/okapi/common/logging/FolioLocal.java
+++ b/okapi-common/src/main/java/org/folio/okapi/common/logging/FolioLocal.java
@@ -16,16 +16,17 @@ public class FolioLocal implements VertxServiceProvider {
    * {@code src/main/resources/META-INF/services/io.vertx.core.spi.VertxServiceProvider}
    * to prevent a timing (race condition) issue:
    * <a href="https://folio-org.atlassian.net/browse/OKAPI-1228">OKAPI-1228</a>.
-   * <p>
-   * If some other dependency also ships with io.vertx.core.spi.VertxServiceProvider
+   *
+   * <p>If some other dependency also ships with io.vertx.core.spi.VertxServiceProvider
    * add the {@code ServicesResourceTransformer} transformer to {@code maven-shade-plugin}
    * so that both files get concatenated, see
-   * <pre><a href="https://maven.apache.org/plugins/maven-shade-plugin/examples/resource-transformers.html
-     #ServicesResourceTransformer">manual</a></pre>
+   * <a href="https://maven.apache.org/plugins/maven-shade-plugin/examples/resource-transformers.html#ServicesResourceTransformer">manual</a>
    * and <a href="https://github.com/folio-org/mod-copycat/pull/123/files">example</a>.
    */
   @Override
-  @SuppressWarnings("java:S2696")  // Suppress "Make method static", cannot change supertype
+  @SuppressWarnings({"java:S2696",  // Suppress "Make method static", cannot change supertype
+      "java:S103",  // Suppress "Line too long" to keep the URL in the javadoc without breaking it
+  })
   public void init(VertxBootstrap builder) {
     initialized = true;
   }