From bda3c30a740a82d23f86e8ccba4fab6f488122ab Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Tue, 23 Apr 2024 14:48:24 +0200 Subject: [PATCH] refactor: use default RestTemplate bean if no custom one required --- .../processor/pseudonym/GpasPseudonymGenerator.java | 12 +++++++----- .../dnpm/etl/processor/config/AppConfiguration.kt | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java b/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java index eac6837..a432281 100644 --- a/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java +++ b/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java @@ -70,9 +70,14 @@ public class GpasPseudonymGenerator implements Generator { private SSLContext customSslContext; - public GpasPseudonymGenerator(GPasConfigProperties gpasCfg, RetryTemplate retryTemplate) { + public GpasPseudonymGenerator(GPasConfigProperties gpasCfg, RetryTemplate retryTemplate, RestTemplate restTemplate) { this.retryTemplate = retryTemplate; - this.restTemplate = getCustomRestTemplate(); + + if (customSslContext == null) { + this.restTemplate = restTemplate; + } else { + this.restTemplate = getCustomRestTemplate(); + } this.gPasUrl = gpasCfg.getUri(); this.psnTargetDomain = gpasCfg.getTarget(); @@ -218,9 +223,6 @@ public class GpasPseudonymGenerator implements Generator { } protected RestTemplate getCustomRestTemplate() { - if (customSslContext == null) { - return new RestTemplate(); - } final var sslsf = new SSLConnectionSocketFactory(customSslContext); final Registry socketFactoryRegistry = RegistryBuilder.create() .register("https", sslsf).register("http", new PlainConnectionSocketFactory()).build(); diff --git a/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt b/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt index 0ae2c2f..4fa3bf0 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt @@ -70,8 +70,8 @@ class AppConfiguration { @ConditionalOnProperty(value = ["app.pseudonymize.generator"], havingValue = "GPAS") @Bean - fun gpasPseudonymGenerator(configProperties: GPasConfigProperties, retryTemplate: RetryTemplate): Generator { - return GpasPseudonymGenerator(configProperties, retryTemplate) + fun gpasPseudonymGenerator(configProperties: GPasConfigProperties, retryTemplate: RetryTemplate, restTemplate: RestTemplate): Generator { + return GpasPseudonymGenerator(configProperties, retryTemplate, restTemplate) } @ConditionalOnProperty(value = ["app.pseudonymize.generator"], havingValue = "BUILDIN", matchIfMissing = true) @@ -83,8 +83,8 @@ class AppConfiguration { @ConditionalOnProperty(value = ["app.pseudonymizer"], havingValue = "GPAS") @ConditionalOnMissingBean @Bean - fun gpasPseudonymGeneratorOnDeprecatedProperty(configProperties: GPasConfigProperties, retryTemplate: RetryTemplate): Generator { - return GpasPseudonymGenerator(configProperties, retryTemplate) + fun gpasPseudonymGeneratorOnDeprecatedProperty(configProperties: GPasConfigProperties, retryTemplate: RetryTemplate, restTemplate: RestTemplate): Generator { + return GpasPseudonymGenerator(configProperties, retryTemplate, restTemplate) } @ConditionalOnProperty(value = ["app.pseudonymizer"], havingValue = "BUILDIN")