From 990115fc852efb2e0cdab309ea0a98b330bb7746 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Mon, 31 Mar 2025 16:35:57 +0200
Subject: [PATCH 1/2] KOP-3126 logging: Cleanup
---
.../java/de/ozgcloud/xta/client/config/XtaClientConfig.java | 2 +-
src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java b/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java
index b51cb00..9b49c07 100644
--- a/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java
+++ b/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java
@@ -136,7 +136,7 @@ public class XtaClientConfig {
@RequiredArgsConstructor
@Getter
@Builder
- @ToString
+ @ToString(exclude = {"content", "password"})
public static class KeyStore {
/**
* File content of the keystore file.
diff --git a/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java b/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java
index 536ff5a..254a3f6 100644
--- a/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java
+++ b/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java
@@ -55,7 +55,7 @@ public class XtaClientService {
try {
return Optional.of(service.getMessage(messageId, readerClientIdentifier));
} catch (XTAWSTechnicalProblemException | PermissionDeniedException | InvalidMessageIDException | RuntimeException e) {
- logError("Failed to get message by id ! '%s' (reader: %s)".formatted(messageId, readerClientIdentifier.value()), e);
+ logError("Failed to get message by id! '%s' (reader: %s)".formatted(messageId, readerClientIdentifier.value()), e);
return Optional.empty();
}
}
--
GitLab
From 48483720280d1d26b9cf9ead99a89ecd044603e6 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Mon, 31 Mar 2025 16:58:21 +0200
Subject: [PATCH 2/2] KOP-3126 itcase: Use latest xta-test-server
---
.../xta/client/extension/XtaTestServerSetupExtension.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java b/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java
index ef4eefb..ca8e5d8 100644
--- a/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java
+++ b/src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java
@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
public class XtaTestServerSetupExtension implements BeforeAllCallback, AfterAllCallback {
private static final DockerImageName XTA_TEST_SERVER_IMAGE = DockerImageName.parse("docker.ozg-sh.de/xta-test-server")
- .withTag("release-1.7.0");
+ .withTag("latest");
private static final String XTA_TEST_CLIENT_KEYSTORE_PATH = "store/xta-test-client-john-smith_keystore.p12";
private static final String XTA_TEST_CLIENT_KEYSTORE_PASSWORD = "password";
--
GitLab