From 5fd94effc118e0d03c43d8cfa3c24ce4553b8c50 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Sat, 27 May 2017 22:54:10 +0200 Subject: [PATCH] Adopt to Spring Boot 2.0 changes. Replace RelaxedPropertyResolver with direct Environment lookup. See gh-128. --- .../vault/config/VaultGenericBackendProperties.java | 11 +++-------- .../cloud/vault/config/VaultProperties.java | 5 +---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultGenericBackendProperties.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultGenericBackendProperties.java index 7610d12d..e7f2e445 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultGenericBackendProperties.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultGenericBackendProperties.java @@ -18,7 +18,6 @@ package org.springframework.cloud.vault.config; import lombok.Data; import org.hibernate.validator.constraints.NotEmpty; -import org.springframework.boot.bind.RelaxedPropertyResolver; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.EnvironmentAware; import org.springframework.core.env.Environment; @@ -66,18 +65,14 @@ public class VaultGenericBackendProperties implements EnvironmentAware { @Override public void setEnvironment(Environment environment) { - RelaxedPropertyResolver springCloudVaultPropertyResolver = new RelaxedPropertyResolver( - environment, "spring.cloud.vault."); - String springCloudVaultAppName = springCloudVaultPropertyResolver - .getProperty("application-name"); + String springCloudVaultAppName = environment + .getProperty("spring.cloud.vault.application-name"); if (StringUtils.hasText(springCloudVaultAppName)) { this.applicationName = springCloudVaultAppName; } else { - RelaxedPropertyResolver springPropertyResolver = new RelaxedPropertyResolver( - environment, "spring.application."); - String springAppName = springPropertyResolver.getProperty("name"); + String springAppName = environment.getProperty("spring.application.name"); if (StringUtils.hasText(springAppName)) { this.applicationName = springAppName; diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java index 9dbec342..03ec6c7b 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java @@ -20,7 +20,6 @@ import lombok.Getter; import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.Range; -import org.springframework.boot.bind.RelaxedPropertyResolver; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; import org.springframework.context.EnvironmentAware; @@ -105,9 +104,7 @@ public class VaultProperties implements EnvironmentAware { @Override public void setEnvironment(Environment environment) { - RelaxedPropertyResolver springPropertyResolver = new RelaxedPropertyResolver( - environment, "spring.application."); - String springAppName = springPropertyResolver.getProperty("name"); + String springAppName = environment.getProperty("spring.application.name"); if (StringUtils.hasText(springAppName)) { this.applicationName = springAppName;