SpringCloud/spring-cloud-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adopt to Spring Boot 2.0 changes.

Browse Source 
Replace RelaxedPropertyResolver with direct Environment lookup.

See gh-128.
This commit is contained in:
Mark Paluch
2017-05-27 22:54:10 +02:00
parent c3f1fe34fa
commit 5fd94effc1
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultGenericBackendProperties.java
View File

@@ -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;

5
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java
View File

@@ -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;