diff --git a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java index 53792ea1..320ca77d 100644 --- a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java @@ -39,9 +39,9 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = CustomBootstrapConfiguration.class, properties = { - "VaultConfigAwsBootstrapConfigurationTests.custom.config=true", - "spring.cloud.vault.aws.role=foo" }) +@SpringBootTest(classes = CustomBootstrapConfiguration.class, + properties = { "VaultConfigAwsBootstrapConfigurationTests.custom.config=true", + "spring.cloud.vault.aws.role=foo" }) public class VaultConfigAwsBootstrapConfigurationTests extends IntegrationTestSupport { @Autowired diff --git a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java index c9cbdc13..b9d56889 100644 --- a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java +++ b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java @@ -50,9 +50,10 @@ import static org.junit.Assume.assumeTrue; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigAwsTests.TestApplication.class, properties = { - "spring.cloud.vault.aws.enabled=true", "spring.cloud.vault.aws.role=readonly", - "cloud.aws.region.auto=false", "cloud.aws.region.static=eu-west-1" }) +@SpringBootTest(classes = VaultConfigAwsTests.TestApplication.class, + properties = { "spring.cloud.vault.aws.enabled=true", + "spring.cloud.vault.aws.role=readonly", "cloud.aws.region.auto=false", + "cloud.aws.region.static=eu-west-1" }) public class VaultConfigAwsTests { private static final String AWS_REGION = "eu-west-1"; diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java index e20e5254..ce2a8e10 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java @@ -39,10 +39,11 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = CustomBootstrapConfiguration.class, properties = { - "VaultConfigConsulBootstrapConfigurationTests.custom.config=true", - "spring.cloud.vault.consul.role=foo", "spring.cloud.vault.consul.enabled=true", - "spring.cloud.consul.config.enabled=false" }) +@SpringBootTest(classes = CustomBootstrapConfiguration.class, + properties = { "VaultConfigConsulBootstrapConfigurationTests.custom.config=true", + "spring.cloud.vault.consul.role=foo", + "spring.cloud.vault.consul.enabled=true", + "spring.cloud.consul.config.enabled=false" }) public class VaultConfigConsulBootstrapConfigurationTests extends IntegrationTestSupport { @Autowired diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java index 3b14eae2..8e343f67 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java @@ -55,9 +55,9 @@ import static org.junit.Assume.assumeTrue; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigConsulTests.TestApplication.class, properties = { - "spring.cloud.vault.consul.enabled=true", - "spring.cloud.vault.consul.role=readonly" }) +@SpringBootTest(classes = VaultConfigConsulTests.TestApplication.class, + properties = { "spring.cloud.vault.consul.enabled=true", + "spring.cloud.vault.consul.role=readonly" }) public class VaultConfigConsulTests { private static final String CONSUL_HOST = "localhost"; diff --git a/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultMySqlProperties.java b/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultMySqlProperties.java index 48f481ea..0fd6747d 100644 --- a/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultMySqlProperties.java +++ b/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultMySqlProperties.java @@ -42,15 +42,15 @@ public class VaultMySqlProperties /** * Enable mysql backend usage. */ - @Getter(onMethod_ = { - @DeprecatedConfigurationProperty(reason = "Use spring.cloud.vault.database") }) + @Getter(onMethod_ = { @DeprecatedConfigurationProperty( + reason = "Use spring.cloud.vault.database") }) private boolean enabled = false; /** * Role name for credentials. */ - @Getter(onMethod_ = { - @DeprecatedConfigurationProperty(reason = "Use spring.cloud.vault.database") }) + @Getter(onMethod_ = { @DeprecatedConfigurationProperty( + reason = "Use spring.cloud.vault.database") }) private String role; /** diff --git a/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultPostgreSqlProperties.java b/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultPostgreSqlProperties.java index 99a65f40..834e6510 100644 --- a/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultPostgreSqlProperties.java +++ b/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultPostgreSqlProperties.java @@ -41,15 +41,15 @@ public class VaultPostgreSqlProperties implements DatabaseSecretProperties { * Enable postgresql backend usage. */ @Deprecated - @Getter(onMethod_ = { - @DeprecatedConfigurationProperty(reason = "Use spring.cloud.vault.database") }) + @Getter(onMethod_ = { @DeprecatedConfigurationProperty( + reason = "Use spring.cloud.vault.database") }) private boolean enabled = false; /** * Role name for credentials. */ - @Getter(onMethod_ = { - @DeprecatedConfigurationProperty(reason = "Use spring.cloud.vault.database") }) + @Getter(onMethod_ = { @DeprecatedConfigurationProperty( + reason = "Use spring.cloud.vault.database") }) private String role; /** diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java index 3b905e6d..ddff5996 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java @@ -49,10 +49,10 @@ import static org.junit.Assume.assumeTrue; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigCassandraTests.TestApplication.class, properties = { - "spring.cloud.vault.cassandra.enabled=true", - "spring.cloud.vault.cassandra.role=readonly", - "spring.data.cassandra.jmx-enabled=false" }) +@SpringBootTest(classes = VaultConfigCassandraTests.TestApplication.class, + properties = { "spring.cloud.vault.cassandra.enabled=true", + "spring.cloud.vault.cassandra.role=readonly", + "spring.data.cassandra.jmx-enabled=false" }) public class VaultConfigCassandraTests { private static final String CASSANDRA_HOST = "localhost"; diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java index 917516bd..e5a98af4 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java @@ -52,11 +52,11 @@ import static org.junit.Assume.assumeTrue; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigMongoTests.TestApplication.class, properties = { - "spring.cloud.vault.mongodb.enabled=true", - "spring.cloud.vault.mongodb.role=readonly", - "spring.data.mongodb.url=mongodb://localhost", - "spring.data.mongodb.database=admin" }) +@SpringBootTest(classes = VaultConfigMongoTests.TestApplication.class, + properties = { "spring.cloud.vault.mongodb.enabled=true", + "spring.cloud.vault.mongodb.role=readonly", + "spring.data.mongodb.url=mongodb://localhost", + "spring.data.mongodb.database=admin" }) public class VaultConfigMongoTests { private static final int MONGODB_PORT = 27017; diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java index 92623d04..96642aba 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java @@ -50,11 +50,11 @@ import static org.junit.Assume.assumeTrue; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigMySqlDatabaseTests.TestApplication.class, properties = { - "spring.cloud.vault.database.enabled=true", - "spring.cloud.vault.database.role=readonly", - "spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=UTC", - "spring.main.allow-bean-definition-overriding=true" }) +@SpringBootTest(classes = VaultConfigMySqlDatabaseTests.TestApplication.class, + properties = { "spring.cloud.vault.database.enabled=true", + "spring.cloud.vault.database.role=readonly", + "spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=UTC", + "spring.main.allow-bean-definition-overriding=true" }) public class VaultConfigMySqlDatabaseTests { private static final int MYSQL_PORT = 3306; diff --git a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java index f03a7785..6d92f1db 100644 --- a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java @@ -39,9 +39,10 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = CustomBootstrapConfiguration.class, properties = { - "VaultConfigRabbitMqBootstrapConfigurationTests.custom.config=true", - "spring.cloud.vault.rabbitmq.role=foo" }) +@SpringBootTest(classes = CustomBootstrapConfiguration.class, + properties = { + "VaultConfigRabbitMqBootstrapConfigurationTests.custom.config=true", + "spring.cloud.vault.rabbitmq.role=foo" }) public class VaultConfigRabbitMqBootstrapConfigurationTests extends IntegrationTestSupport { diff --git a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java index a86c6218..a02f7caa 100644 --- a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java +++ b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java @@ -49,10 +49,10 @@ import static org.junit.Assume.assumeTrue; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = VaultConfigRabbitMqTests.TestApplication.class, properties = { - "spring.cloud.vault.rabbitmq.enabled=true", - "spring.cloud.vault.rabbitmq.role=readonly", - "spring.rabbitmq.address=localhost" }) +@SpringBootTest(classes = VaultConfigRabbitMqTests.TestApplication.class, + properties = { "spring.cloud.vault.rabbitmq.enabled=true", + "spring.cloud.vault.rabbitmq.role=readonly", + "spring.rabbitmq.address=localhost" }) public class VaultConfigRabbitMqTests { private static final int RABBITMQ_HTTP_MANAGEMENT_PORT = 15672; diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java index e592cf89..2574cb63 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java @@ -44,6 +44,7 @@ import org.springframework.vault.core.lease.SecretLeaseContainer; * * @author Mark Paluch * @author Grenville Wilson + * @author Mårten Svantesson * @since 1.1 */ @Configuration 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 0fe12ae1..a336ea62 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 @@ -32,11 +32,14 @@ import org.springframework.validation.annotation.Validated; import org.springframework.vault.core.lease.LeaseEndpoints; /** + * Properties to configure Vault support. + * * @author Spencer Gibb * @author Mark Paluch * @author Kevin Holditch * @author Michal Budzyn * @author Grenville Wilson + * @author Mårten Svantesson */ @ConfigurationProperties("spring.cloud.vault") @Data @@ -502,15 +505,16 @@ public class VaultProperties implements EnvironmentAware { /** * Set the {@link LeaseEndpoints} to delegate renewal/revocation calls to. - * {@link LeaseEndpoints} encapsulates differences between Vault versions that affect - * the location of renewal/revocation endpoints. + * {@link LeaseEndpoints} encapsulates differences between Vault versions that + * affect the location of renewal/revocation endpoints. * - * Can be SysLeases for version 0.8 or above of vault or Legacy for older versions (the default) + * Can be {@link LeaseEndpoints#SysLeases} for version 0.8 or above of Vault or + * {@link LeaseEndpoints#Legacy} for older versions (the default). * - * @since 2.3 + * @since 2.2 */ - private LeaseEndpoints leaseEndpoints; + } } diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java index eb9b98a5..5826b943 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java @@ -16,7 +16,10 @@ package org.springframework.cloud.vault.config; +import java.time.Duration; + import org.junit.Test; + import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -26,8 +29,6 @@ import org.springframework.vault.core.VaultOperations; import org.springframework.vault.core.lease.LeaseEndpoints; import org.springframework.vault.core.lease.SecretLeaseContainer; -import java.time.Duration; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -35,6 +36,7 @@ import static org.mockito.Mockito.verify; * Unit tests for {@link VaultBootstrapPropertySourceConfiguration}. * * @author Mark Paluch + * @author Mårten Svantesson */ public class VaultBootstrapPropertySourceConfigurationTests { @@ -78,6 +80,7 @@ public class VaultBootstrapPropertySourceConfigurationTests { SecretLeaseContainer secretLeaseContainer() { return mock(SecretLeaseContainer.class); } + } }