diff --git a/spring-cloud-vault-config-aws/src/main/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfiguration.java b/spring-cloud-vault-config-aws/src/main/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfiguration.java index c1c15ccf..31e97547 100644 --- a/spring-cloud-vault-config-aws/src/main/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfiguration.java +++ b/spring-cloud-vault-config-aws/src/main/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.vault.core.util.PropertyTransformer; * * @author Mark Paluch */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(VaultAwsProperties.class) public class VaultConfigAwsBootstrapConfiguration { @@ -65,7 +65,7 @@ public class VaultConfigAwsBootstrapConfiguration { Assert.notNull(properties, "VaultAwsProperties must not be null"); - final PropertyNameTransformer transformer = new PropertyNameTransformer(); + PropertyNameTransformer transformer = new PropertyNameTransformer(); transformer.addKeyTransformation("access_key", properties.getAccessKeyProperty()); transformer.addKeyTransformation("secret_key", 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 320ca77d..444c7a77 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 @@ -59,7 +59,7 @@ public class VaultConfigAwsBootstrapConfigurationTests extends IntegrationTestSu assertThat(metadata.getPath()).isEqualTo(this.properties.getRole()); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class CustomBootstrapConfiguration { @Bean diff --git a/spring-cloud-vault-config-consul/src/main/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java b/spring-cloud-vault-config-consul/src/main/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java index e301fa95..ce7d3802 100644 --- a/spring-cloud-vault-config-consul/src/main/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java +++ b/spring-cloud-vault-config-consul/src/main/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.vault.core.util.PropertyTransformer; * * @author Mark Paluch */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(VaultConsulProperties.class) public class VaultConfigConsulBootstrapConfiguration { @@ -63,7 +63,7 @@ public class VaultConfigConsulBootstrapConfiguration { Assert.notNull(properties, "VaultConsulProperties must not be null"); - final PropertyNameTransformer transformer = new PropertyNameTransformer(); + PropertyNameTransformer transformer = new PropertyNameTransformer(); transformer.addKeyTransformation("token", properties.getTokenProperty()); return new SecretBackendMetadata() { 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 ce2a8e10..861cd476 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 @@ -61,7 +61,7 @@ public class VaultConfigConsulBootstrapConfigurationTests extends IntegrationTes assertThat(metadata.getPath()).isEqualTo(this.properties.getRole()); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class CustomBootstrapConfiguration { @Bean diff --git a/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfiguration.java b/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfiguration.java index bc3c5f40..f7b5df9e 100644 --- a/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfiguration.java +++ b/spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfiguration.java @@ -38,7 +38,7 @@ import org.springframework.vault.core.util.PropertyTransformer; * @author Per Abich * @author Sebastien Nahelou */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ VaultMySqlProperties.class, VaultPostgreSqlProperties.class, VaultCassandraProperties.class, VaultMongoProperties.class, VaultDatabaseProperties.class }) @@ -71,7 +71,7 @@ public class VaultConfigDatabaseBootstrapConfiguration { Assert.notNull(properties, "DatabaseSecretProperties must not be null"); - final PropertyNameTransformer transformer = new PropertyNameTransformer(); + PropertyNameTransformer transformer = new PropertyNameTransformer(); transformer.addKeyTransformation("username", properties.getUsernameProperty()); transformer.addKeyTransformation("password", diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java index 778757ad..5e86463a 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java @@ -61,7 +61,7 @@ public class VaultConfigDatabaseBootstrapConfigurationTests assertThat(metadata.getPath()).isEqualTo(this.properties.getRole()); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class CustomBootstrapConfiguration { @Bean diff --git a/spring-cloud-vault-config-rabbitmq/src/main/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfiguration.java b/spring-cloud-vault-config-rabbitmq/src/main/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfiguration.java index 33de8abf..fc87adcb 100644 --- a/spring-cloud-vault-config-rabbitmq/src/main/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfiguration.java +++ b/spring-cloud-vault-config-rabbitmq/src/main/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.vault.core.util.PropertyTransformer; * * @author Mark Paluch */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties public class VaultConfigRabbitMqBootstrapConfiguration { @@ -71,7 +71,7 @@ public class VaultConfigRabbitMqBootstrapConfiguration { Assert.notNull(properties, "VaultRabbitMqProperties must not be null"); - final PropertyNameTransformer transformer = new PropertyNameTransformer(); + PropertyNameTransformer transformer = new PropertyNameTransformer(); transformer.addKeyTransformation("username", properties.getUsernameProperty()); transformer.addKeyTransformation("password", 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 6d92f1db..50d0c65f 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 @@ -61,7 +61,7 @@ public class VaultConfigRabbitMqBootstrapConfigurationTests assertThat(metadata.getPath()).isEqualTo(this.properties.getRole()); } - @Configuration + @Configuration(proxyBeanMethods = false) public static class CustomBootstrapConfiguration { @Bean diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfiguration.java index e4f57391..482d61bc 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.vault.client.VaultEndpointProvider; * @author Mark Paluch * @since 1.1 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty("spring.cloud.vault.discovery.enabled") @EnableConfigurationProperties(VaultProperties.class) @Order(Ordered.LOWEST_PRECEDENCE - 2) @@ -69,9 +69,8 @@ public class DiscoveryClientVaultBootstrapConfiguration { public VaultEndpointProvider vaultEndpointProvider( VaultServiceInstanceProvider instanceProvider) { - final String serviceId = this.vaultProperties.getDiscovery().getServiceId(); - - final String fallbackScheme; + String serviceId = this.vaultProperties.getDiscovery().getServiceId(); + String fallbackScheme; if (StringUtils.hasText(this.vaultProperties.getUri())) { fallbackScheme = URI.create(this.vaultProperties.getUri()).getScheme(); @@ -82,7 +81,7 @@ public class DiscoveryClientVaultBootstrapConfiguration { ServiceInstance server = instanceProvider.getVaultServerInstance(serviceId); - final VaultEndpoint vaultEndpoint = VaultEndpoint.create(server.getHost(), + VaultEndpoint vaultEndpoint = VaultEndpoint.create(server.getHost(), server.getPort()); if (server.getMetadata().containsKey("scheme")) { diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapConfiguration.java index 82cee401..4ce62625 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapConfiguration.java @@ -66,7 +66,7 @@ import org.springframework.web.client.RestTemplate; * @author Spencer Gibb * @author Mark Paluch */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true) @EnableConfigurationProperties(VaultProperties.class) @Order(Ordered.LOWEST_PRECEDENCE - 5) 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 5fe63a6e..5486de48 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 @@ -47,7 +47,7 @@ import org.springframework.vault.core.lease.SecretLeaseContainer; * @author Mårten Svantesson * @since 1.1 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true) @EnableConfigurationProperties({ VaultGenericBackendProperties.class, VaultKeyValueBackendProperties.class }) diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java index 814c5e76..2cb44685 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Import; * @author Mark Paluch * @since 2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnEnabledHealthIndicator("vault") @ConditionalOnBean(VaultBootstrapConfiguration.class) @ConditionalOnClass(HealthIndicator.class) diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java index 0d77f4d3..41d43a8f 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.vault.core.VaultOperations; * @author Mark Paluch * @since 1.1 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnBean(VaultOperations.class) class VaultHealthIndicatorConfiguration extends CompositeHealthIndicatorConfiguration { diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java index bff63ab5..e43e08da 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java @@ -76,7 +76,7 @@ import org.springframework.web.reactive.function.client.WebClient; * @author Mark Paluch * @since 2.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true) @ConditionalOnExpression("${spring.cloud.vault.reactive.enabled:true}") @ConditionalOnClass({ Flux.class, WebClient.class, ReactiveVaultOperations.class, diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java index 7580e767..4fcb9354 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.vault.core.ReactiveVaultOperations; * @author Mark Paluch * @since 2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(Flux.class) @ConditionalOnBean(ReactiveVaultOperations.class) class VaultReactiveHealthIndicatorConfiguration extends diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java index cff9e627..6ac64f53 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java @@ -97,7 +97,7 @@ public class DiscoveryClientVaultBootstrapConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class DiscoveryConfiguration { @Bean diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java index 1c887df2..92f39b4a 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java @@ -118,7 +118,7 @@ public class VaultConfigAppIdCustomMechanismTests { } - @Configuration + @Configuration(proxyBeanMethods = false) public static class BootstrapConfiguration { @ConditionalOnProperty("VaultConfigAppIdCustomMechanismTests.custom.config") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java index 2d4ffd47..d5b411f6 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java @@ -109,7 +109,7 @@ public class VaultReactiveBootstrapConfigurationTests { }); } - @Configuration + @Configuration(proxyBeanMethods = false) static class AuthenticationFactoryConfiguration { @Bean @@ -119,7 +119,7 @@ public class VaultReactiveBootstrapConfigurationTests { } - @Configuration + @Configuration(proxyBeanMethods = false) static class TokenSupplierConfiguration { @Bean