Skip to content
Snippets Groups Projects
Commit 2771f53f authored by Jan Zickermann's avatar Jan Zickermann
Browse files

OZG-4097 Delay validation of api client configuration

parent 9e35e7c2
No related branches found
Tags
No related merge requests found
...@@ -71,10 +71,10 @@ public class ApiClientConfiguration { ...@@ -71,10 +71,10 @@ public class ApiClientConfiguration {
@Bean @Bean
@SneakyThrows @SneakyThrows
ApiClient apiClient() { ApiClient apiClient() {
getErrorMessageOfViolations();
var apiClient = new ApiClient(restClient()); var apiClient = new ApiClient(restClient());
LOG.debug("Setting api client base path to {}", apiConfiguration.getUrl()); LOG.debug("Setting api client base path to {}", apiConfiguration.getUrl());
apiClient.setBasePath(apiConfiguration.getUrl()); apiClient.setBasePath(apiConfiguration.getUrl());
validateConfiguration();
return apiClient; return apiClient;
} }
...@@ -182,7 +182,7 @@ public class ApiClientConfiguration { ...@@ -182,7 +182,7 @@ public class ApiClientConfiguration {
}); });
} }
void getErrorMessageOfViolations() { void validateConfiguration() {
String violationMessage = Stream.<Optional<String>>of(getErrorMessageOfViolations(authConfiguration), String violationMessage = Stream.<Optional<String>>of(getErrorMessageOfViolations(authConfiguration),
getErrorMessageOfViolations(apiConfiguration), getErrorMessageOfViolations(apiConfiguration),
proxyConfiguration.isEnabled() ? getErrorMessageOfViolations(proxyConfiguration) : Optional.empty() proxyConfiguration.isEnabled() ? getErrorMessageOfViolations(proxyConfiguration) : Optional.empty()
......
...@@ -41,7 +41,7 @@ class ApiClientConfigurationTest { ...@@ -41,7 +41,7 @@ class ApiClientConfigurationTest {
VALIDATOR VALIDATOR
); );
assertThatCode(validator::getErrorMessageOfViolations).doesNotThrowAnyException(); assertThatCode(validator::validateConfiguration).doesNotThrowAnyException();
} }
@DisplayName("should return if is valid with disabled proxy") @DisplayName("should return if is valid with disabled proxy")
...@@ -54,7 +54,7 @@ class ApiClientConfigurationTest { ...@@ -54,7 +54,7 @@ class ApiClientConfigurationTest {
VALIDATOR VALIDATOR
); );
assertThatCode(validator::getErrorMessageOfViolations).doesNotThrowAnyException(); assertThatCode(validator::validateConfiguration).doesNotThrowAnyException();
} }
static Stream<Arguments> invalidValidatorConfigurations() { static Stream<Arguments> invalidValidatorConfigurations() {
...@@ -92,7 +92,7 @@ class ApiClientConfigurationTest { ...@@ -92,7 +92,7 @@ class ApiClientConfigurationTest {
VALIDATOR VALIDATOR
); );
assertThatThrownBy(validator::getErrorMessageOfViolations) assertThatThrownBy(validator::validateConfiguration)
.isInstanceOf(TechnicalException.class) .isInstanceOf(TechnicalException.class)
.hasMessageContaining("is invalid"); .hasMessageContaining("is invalid");
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment