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

Polishing.

Browse Source 
Remove deprecated code usage.
This commit is contained in:
Mark Paluch
2017-06-29 20:37:05 +02:00
parent af47439da9
commit f53b2f98dc
5 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java
View File

@@ -31,7 +31,6 @@ import org.springframework.vault.authentication.AppRoleAuthentication;
import org.springframework.vault.authentication.AppRoleAuthenticationOptions;
import org.springframework.vault.authentication.AwsEc2Authentication;
import org.springframework.vault.authentication.AwsEc2AuthenticationOptions;
import org.springframework.vault.authentication.AwsEc2AuthenticationOptions.AwsEc2AuthenticationOptionsBuilder;
import org.springframework.vault.authentication.ClientAuthentication;
import org.springframework.vault.authentication.ClientCertificateAuthentication;
import org.springframework.vault.authentication.CubbyholeAuthentication;
@@ -40,6 +39,7 @@ import org.springframework.vault.authentication.IpAddressUserId;
import org.springframework.vault.authentication.MacAddressUserId;
import org.springframework.vault.authentication.StaticUserId;
import org.springframework.vault.authentication.TokenAuthentication;
import org.springframework.vault.authentication.AwsEc2AuthenticationOptions.AwsEc2AuthenticationOptionsBuilder;
import org.springframework.vault.client.VaultEndpoint;
import org.springframework.vault.support.SslConfiguration;
import org.springframework.vault.support.VaultToken;
@@ -133,8 +133,8 @@ import org.springframework.web.client.RestOperations;
* @see CubbyholeAuthentication
*/
@Configuration
public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration
implements ApplicationContextAware {
public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration implements
ApplicationContextAware {
private RestOperations cachedRestOperations;
private ApplicationContext applicationContext;
@@ -175,8 +175,8 @@ public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration
Resource keyStore = getResource("vault.ssl.key-store");
String keyStorePassword = getProperty("vault.ssl.key-store-password");
Resource trustStore = getResource("vault.ssl.trust-store");
String trustStorePassword = getEnvironment()
.getProperty("vault.ssl.trust-store-password");
String trustStorePassword = getEnvironment().getProperty(
"vault.ssl.trust-store-password");
return new SslConfiguration(keyStore, keyStorePassword, trustStore,
trustStorePassword);
@@ -282,8 +282,8 @@ public class EnvironmentVaultConfiguration extends AbstractVaultConfiguration
Assert.hasText(roleId,
"Vault AWS EC2 authentication: RoleId (vault.aws-ec2.role-id) must not be empty");
AwsEc2AuthenticationOptionsBuilder builder = AwsEc2AuthenticationOptions.builder()
.role(roleId);
AwsEc2AuthenticationOptionsBuilder builder = AwsEc2AuthenticationOptions
.builder().role(roleId);
if (StringUtils.hasText(identityDocument)) {
builder.identityDocumentUri(URI.create(identityDocument));

2
spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java
View File

@@ -71,7 +71,7 @@ public class VaultSysTemplate implements VaultSysOperations {
*/
public VaultSysTemplate(VaultOperations vaultOperations) {
Assert.notNull(vaultOperations);
Assert.notNull(vaultOperations, "VaultOperations must not be null");
this.vaultOperations = vaultOperations;
}

2
spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java
View File

@@ -43,7 +43,7 @@ public class VaultTokenTemplate implements VaultTokenOperations {
*/
public VaultTokenTemplate(VaultOperations vaultOperations) {
Assert.notNull(vaultOperations);
Assert.notNull(vaultOperations, "VaultOperations must not be null");
this.vaultOperations = vaultOperations;
}

9
spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTests.java
View File

@@ -33,6 +33,7 @@ import org.springframework.vault.core.RestOperationsCallback;
import org.springframework.vault.support.ClientOptions;
import org.springframework.vault.support.SslConfiguration;
import org.springframework.vault.support.VaultToken;
import org.springframework.vault.support.SslConfiguration.KeyStoreConfiguration;
import org.springframework.vault.util.IntegrationTestSupport;
import org.springframework.vault.util.Settings;
import org.springframework.vault.util.TestRestTemplateFactory;
@@ -106,10 +107,8 @@ public class ClientCertificateAuthenticationIntegrationTests extends
SslConfiguration original = createSslConfiguration();
SslConfiguration sslConfiguration = new SslConfiguration(new FileSystemResource(
new File(findWorkDir(), "client-cert.jks")), "changeit",
original.getTrustStore(), original.getTrustStorePassword());
return sslConfiguration;
return new SslConfiguration(new KeyStoreConfiguration(new FileSystemResource(
new File(findWorkDir(), "client-cert.jks")), "changeit".toCharArray(),
null), original.getTrustStoreConfiguration());
}
}

9
spring-vault-core/src/test/java/org/springframework/vault/util/Settings.java
View File

@@ -35,8 +35,8 @@ public class Settings {
File workDir = findWorkDir();
return SslConfiguration.forTrustStore(
new FileSystemResource(new File(workDir, "keystore.jks")), "changeit");
return SslConfiguration.forTrustStore(new FileSystemResource(new File(workDir,
"keystore.jks")), "changeit".toCharArray());
}
/**
@@ -78,8 +78,7 @@ public class Settings {
* @return the token to use during tests.
*/
public static VaultToken token() {
return VaultToken.of(
System.getProperty("vault.token", "00000000-0000-0000-0000-000000000000")
.toCharArray());
return VaultToken.of(System.getProperty("vault.token",
"00000000-0000-0000-0000-000000000000").toCharArray());
}
}