From 453a2f96da15e3917fcf1feabba1dcb04ddf3678 Mon Sep 17 00:00:00 2001 From: Flawz Date: Fri, 13 Feb 2026 00:07:10 +0100 Subject: [PATCH 1/2] Fix version mismatch Signed-off-by: Flawz --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71e9529..960590c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,6 +4,7 @@ UTF-8 4.5.10 + 3.4.1 jp.co.sony.csl.dcoes.apis @@ -17,7 +18,7 @@ jp.co.sony.csl.dcoes.apis apis-bom - ${project.version} + ${apis.bom.version} pom import From ce4f835131e6255c885b04ef1a029814dd3c6584 Mon Sep 17 00:00:00 2001 From: Flawz Date: Sat, 14 Feb 2026 01:34:27 +0100 Subject: [PATCH 2/2] Rewrote unit tests for apis-common --- .../apis/common/util/vertx/ApisLoggerFormatterTest.java | 5 +++++ .../util/vertx/FileSystemExclusiveLockUtilTest.java | 4 +++- .../apis/common/util/vertx/LocalExclusiveLockTest.java | 8 +++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/ApisLoggerFormatterTest.java b/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/ApisLoggerFormatterTest.java index 93572c6..b371cca 100755 --- a/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/ApisLoggerFormatterTest.java +++ b/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/ApisLoggerFormatterTest.java @@ -3,6 +3,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; +import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; @@ -17,6 +18,10 @@ public ApisLoggerFormatterTest() { super(); } + @After public void after() { + VertxConfig.config.setJsonObject(null); + } + @Test public void nullProgramId(TestContext context) { VertxConfig.config.setJsonObject(null); LogRecord record = new LogRecord(Level.INFO, "test message"); diff --git a/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/FileSystemExclusiveLockUtilTest.java b/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/FileSystemExclusiveLockUtilTest.java index 86a14f4..2c411f6 100755 --- a/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/FileSystemExclusiveLockUtilTest.java +++ b/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/FileSystemExclusiveLockUtilTest.java @@ -22,7 +22,9 @@ public FileSystemExclusiveLockUtilTest() { vertx = Vertx.vertx(); } @After public void after(TestContext context) { - vertx.close(); + if (vertx != null) { + vertx.close(context.asyncAssertSuccess()); + } } @Test public void once(TestContext context) { diff --git a/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/LocalExclusiveLockTest.java b/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/LocalExclusiveLockTest.java index d1c524f..e670833 100755 --- a/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/LocalExclusiveLockTest.java +++ b/src/test/java/jp/co/sony/csl/dcoes/apis/common/util/vertx/LocalExclusiveLockTest.java @@ -25,7 +25,9 @@ public LocalExclusiveLockTest() { vertx = Vertx.vertx(); } @After public void after(TestContext context) { - vertx.close(); + if (vertx != null) { + vertx.close(context.asyncAssertSuccess()); + } } @Test public void releaseTwice(TestContext context) { @@ -116,10 +118,10 @@ public LocalExclusiveLockTest() { if (res.succeeded()) { LocalExclusiveLock.Lock result = res.result(); System.out.println("lock acquired"); - vertx.setTimer(13000L, v -> { + vertx.setTimer(200L, v -> { result.release(); System.out.println("lock released"); - vertx.setTimer(5000L, vv -> { + vertx.setTimer(100L, vv -> { System.out.println("done"); async.complete(); });