From 483f4a69fe723f68e6dcb35f961de2b93e217711 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 15 Mar 2021 15:56:06 -0400 Subject: [PATCH] Sets defaults of StoreTypes in getters of TlsProperties. Deprecates TlsProperties.postConstruct --- .../cloud/configuration/TlsProperties.java | 16 +++++++--------- .../configuration/SSHContextFactoryTests.java | 2 -- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/TlsProperties.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/TlsProperties.java index 43aba0e3..1b641955 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/TlsProperties.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/TlsProperties.java @@ -20,8 +20,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.annotation.PostConstruct; - import org.springframework.core.io.Resource; /** @@ -76,6 +74,9 @@ public class TlsProperties { } public String getKeyStoreType() { + if (keyStore != null && keyStoreType == null) { + keyStoreType = storeTypeOf(keyStore); + } return keyStoreType; } @@ -116,6 +117,9 @@ public class TlsProperties { } public String getTrustStoreType() { + if (trustStore != null && trustStoreType == null) { + trustStoreType = storeTypeOf(trustStore); + } return trustStoreType; } @@ -135,14 +139,8 @@ public class TlsProperties { return trustStorePassword.toCharArray(); } - @PostConstruct + @Deprecated public void postConstruct() { - if (keyStore != null && keyStoreType == null) { - keyStoreType = storeTypeOf(keyStore); - } - if (trustStore != null && trustStoreType == null) { - trustStoreType = storeTypeOf(trustStore); - } } private String storeTypeOf(Resource resource) { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SSHContextFactoryTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SSHContextFactoryTests.java index 9868e844..f831f168 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SSHContextFactoryTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SSHContextFactoryTests.java @@ -92,8 +92,6 @@ public class SSHContextFactoryTests { properties.setKeyPassword(KEY_PASSWORD); properties.setTrustStore(resourceOf(trustStore)); properties.setTrustStorePassword(KEY_STORE_PASSWORD); - - properties.postConstruct(); } private Resource resourceOf(File file) {