From 2771f53fae01beb1c4cea7536a73fe6eae9d32cf Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Tue, 4 Mar 2025 13:06:23 +0100
Subject: [PATCH] OZG-4097 Delay validation of api client configuration
---
.../postfach/osiv2/config/ApiClientConfiguration.java | 4 ++--
.../postfach/osiv2/config/ApiClientConfigurationTest.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/ApiClientConfiguration.java b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/ApiClientConfiguration.java
index af114b9..b0b34b0 100644
--- a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/ApiClientConfiguration.java
+++ b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/ApiClientConfiguration.java
@@ -71,10 +71,10 @@ public class ApiClientConfiguration {
@Bean
@SneakyThrows
ApiClient apiClient() {
- getErrorMessageOfViolations();
var apiClient = new ApiClient(restClient());
LOG.debug("Setting api client base path to {}", apiConfiguration.getUrl());
apiClient.setBasePath(apiConfiguration.getUrl());
+ validateConfiguration();
return apiClient;
}
@@ -182,7 +182,7 @@ public class ApiClientConfiguration {
});
}
- void getErrorMessageOfViolations() {
+ void validateConfiguration() {
String violationMessage = Stream.<Optional<String>>of(getErrorMessageOfViolations(authConfiguration),
getErrorMessageOfViolations(apiConfiguration),
proxyConfiguration.isEnabled() ? getErrorMessageOfViolations(proxyConfiguration) : Optional.empty()
diff --git a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/config/ApiClientConfigurationTest.java b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/config/ApiClientConfigurationTest.java
index 95bbcef..0917893 100644
--- a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/config/ApiClientConfigurationTest.java
+++ b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/config/ApiClientConfigurationTest.java
@@ -41,7 +41,7 @@ class ApiClientConfigurationTest {
VALIDATOR
);
- assertThatCode(validator::getErrorMessageOfViolations).doesNotThrowAnyException();
+ assertThatCode(validator::validateConfiguration).doesNotThrowAnyException();
}
@DisplayName("should return if is valid with disabled proxy")
@@ -54,7 +54,7 @@ class ApiClientConfigurationTest {
VALIDATOR
);
- assertThatCode(validator::getErrorMessageOfViolations).doesNotThrowAnyException();
+ assertThatCode(validator::validateConfiguration).doesNotThrowAnyException();
}
static Stream<Arguments> invalidValidatorConfigurations() {
@@ -92,7 +92,7 @@ class ApiClientConfigurationTest {
VALIDATOR
);
- assertThatThrownBy(validator::getErrorMessageOfViolations)
+ assertThatThrownBy(validator::validateConfiguration)
.isInstanceOf(TechnicalException.class)
.hasMessageContaining("is invalid");
}
--
GitLab