From f53b2f98dc7ee5ae2841269aa840701766b4b3c5 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 29 Jun 2017 20:37:05 +0200 Subject: [PATCH] Polishing. Remove deprecated code usage. --- .../config/EnvironmentVaultConfiguration.java | 14 +++++++------- .../vault/core/VaultSysTemplate.java | 2 +- .../vault/core/VaultTokenTemplate.java | 2 +- ...tCertificateAuthenticationIntegrationTests.java | 9 ++++----- .../org/springframework/vault/util/Settings.java | 9 ++++----- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java b/spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java index b8d2f014..c7c87977 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/config/EnvironmentVaultConfiguration.java @@ -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)); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java index 68e90435..062d1a8b 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultSysTemplate.java @@ -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; } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java index 5db9928b..8118d2d6 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultTokenTemplate.java @@ -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; } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTests.java index 22306cc9..3af2e085 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/ClientCertificateAuthenticationIntegrationTests.java @@ -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()); } } diff --git a/spring-vault-core/src/test/java/org/springframework/vault/util/Settings.java b/spring-vault-core/src/test/java/org/springframework/vault/util/Settings.java index 056d7f1c..0baf7721 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/util/Settings.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/util/Settings.java @@ -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()); } }