From 7b3151d227e70948e3a18ea1db84e0252502cd29 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <volkmer_p@ukw.de>
Date: Tue, 23 Apr 2024 15:52:40 +0200
Subject: [PATCH] fix: custom rest template generation after ssl context
 creation

---
 .../pseudonym/GpasPseudonymGenerator.java         | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 a432281..c7c07f2 100644
--- a/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java
+++ b/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java
@@ -72,13 +72,6 @@ public class GpasPseudonymGenerator implements Generator {
 
     public GpasPseudonymGenerator(GPasConfigProperties gpasCfg, RetryTemplate retryTemplate, RestTemplate restTemplate) {
         this.retryTemplate = retryTemplate;
-
-        if (customSslContext == null) {
-            this.restTemplate = restTemplate;
-        } else {
-            this.restTemplate = getCustomRestTemplate();
-        }
-
         this.gPasUrl = gpasCfg.getUri();
         this.psnTargetDomain = gpasCfg.getTarget();
         httpHeader = getHttpHeaders(gpasCfg.getUsername(), gpasCfg.getPassword());
@@ -88,6 +81,14 @@ public class GpasPseudonymGenerator implements Generator {
                 customSslContext = getSslContext(gpasCfg.getSslCaLocation());
                 log.warn(String.format("%s has been initialized with SSL certificate %s. This is deprecated in favor of including Root CA.",
                     this.getClass().getName(), gpasCfg.getSslCaLocation()));
+
+                if (customSslContext == null) {
+                    this.restTemplate = restTemplate;
+                } else {
+                    this.restTemplate = getCustomRestTemplate();
+                }
+            } else {
+                this.restTemplate = restTemplate;
             }
         } catch (IOException | KeyManagementException | KeyStoreException | CertificateException |
                  NoSuchAlgorithmException e) {