Reduce need for bean method proxying and disable where not needed.

Closes gh-360.
spring-cloud · Oct 21, 2019 · b89e7d2 · b89e7d2
1 parent 62f8be6
commit b89e7d2
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 27 deletions.
diff --git a/...java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfiguration.java b/...java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfiguration.java
@@ -35,7 +35,7 @@
  *
  * @author Mark Paluch
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(VaultAwsProperties.class)
 public class VaultConfigAwsBootstrapConfiguration {
 
@@ -65,7 +65,7 @@ static SecretBackendMetadata forAws(final VaultAwsProperties properties) {
 
 			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/...org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java b/...org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java
@@ -59,7 +59,7 @@ public void shouldApplyCustomConfiguration() {
 		assertThat(metadata.getPath()).isEqualTo(this.properties.getRole());
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class CustomBootstrapConfiguration {
 
 		@Bean

diff --git a/...rg/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java b/...rg/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java
@@ -35,7 +35,7 @@
  *
  * @author Mark Paluch
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(VaultConsulProperties.class)
 public class VaultConfigConsulBootstrapConfiguration {
 
@@ -63,7 +63,7 @@ static SecretBackendMetadata forConsul(final VaultConsulProperties properties) {
 
 			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/...ringframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java b/...ringframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java
@@ -61,7 +61,7 @@ public void shouldApplyCustomConfiguration() {
 		assertThat(metadata.getPath()).isEqualTo(this.properties.getRole());
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class CustomBootstrapConfiguration {
 
 		@Bean

diff --git a/...ringframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfiguration.java b/...ringframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfiguration.java
@@ -38,7 +38,7 @@
  * @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 @@ static SecretBackendMetadata forDatabase(
 
 			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/...ramework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java b/...ramework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java
@@ -61,7 +61,7 @@ public void shouldApplyCustomConfiguration() {
 		assertThat(metadata.getPath()).isEqualTo(this.properties.getRole());
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class CustomBootstrapConfiguration {
 
 		@Bean

diff --git a/...pringframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfiguration.java b/...pringframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfiguration.java
@@ -35,7 +35,7 @@
  *
  * @author Mark Paluch
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 public class VaultConfigRabbitMqBootstrapConfiguration {
 
@@ -71,7 +71,7 @@ static SecretBackendMetadata forRabbitMq(
 
 			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/...framework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java b/...framework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java
@@ -61,7 +61,7 @@ public void shouldApplyCustomConfiguration() {
 		assertThat(metadata.getPath()).isEqualTo(this.properties.getRole());
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class CustomBootstrapConfiguration {
 
 		@Bean

diff --git a/...va/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfiguration.java b/...va/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfiguration.java
@@ -41,7 +41,7 @@
  * @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 VaultServiceInstanceProvider vaultServerInstanceProvider(
 	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 VaultEndpointProvider vaultEndpointProvider(
 
 		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/...fig/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapConfiguration.java b/...fig/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapConfiguration.java
@@ -66,7 +66,7 @@
  * @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/...ava/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java b/...ava/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java
@@ -47,7 +47,7 @@
  * @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/...in/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java b/...in/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfiguration.java
@@ -33,7 +33,7 @@
  * @author Mark Paluch
  * @since 2.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnEnabledHealthIndicator("vault")
 @ConditionalOnBean(VaultBootstrapConfiguration.class)
 @ConditionalOnClass(HealthIndicator.class)

diff --git a/...c/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java b/...c/main/java/org/springframework/cloud/vault/config/VaultHealthIndicatorConfiguration.java
@@ -33,7 +33,7 @@
  * @author Mark Paluch
  * @since 1.1
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(VaultOperations.class)
 class VaultHealthIndicatorConfiguration extends
 		CompositeHealthIndicatorConfiguration<VaultHealthIndicator, VaultOperations> {

diff --git a/...main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java b/...main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java
@@ -76,7 +76,7 @@
  * @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/...ava/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java b/...ava/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorConfiguration.java
@@ -35,7 +35,7 @@
  * @author Mark Paluch
  * @since 2.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(Flux.class)
 @ConditionalOnBean(ReactiveVaultOperations.class)
 class VaultReactiveHealthIndicatorConfiguration extends

diff --git a/...g/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java b/...g/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java
@@ -97,7 +97,7 @@ public void shouldNotRegisterBeansIfVaultDisabled() {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class DiscoveryConfiguration {
 
 		@Bean

diff --git a/...est/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java b/...est/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java
@@ -118,7 +118,7 @@ public static void main(String[] args) {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	public static class BootstrapConfiguration {
 
 		@ConditionalOnProperty("VaultConfigAppIdCustomMechanismTests.custom.config")

diff --git a/...java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java b/...java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java
@@ -109,7 +109,7 @@ public void shouldNotConfigureReactiveSupport() {
 				});
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class AuthenticationFactoryConfiguration {
 
 		@Bean
@@ -119,7 +119,7 @@ AuthenticationStepsFactory authenticationStepsFactory() {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class TokenSupplierConfiguration {
 
 		@Bean
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,7 +97,7 @@ public void shouldNotRegisterBeansIfVaultDisabled() { @@
     	}
-    	@Configuration
+    	@Configuration(proxyBeanMethods = false)
     	static class DiscoveryConfiguration {
     		@Bean
@@ Expand Down @@