From 44f3c10b9b9802ad91eb5fafc8c9e4bd424c2b05 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Wed, 5 Apr 2017 19:39:17 +0200
Subject: [PATCH] Use unique bean names for SecretBackendMetadataFactory beans.

We now use unique bean names for SecretBackendMetadataFactory beans for bean definition. Previously, we used the same bean name (secretBackendMetadataFactory) across all bean definitions which causes definition overrides. The overrides erased previously defined beans so only a single instance of SecretBackendMetadataFactory was defined and using multiple Spring Cloud Vault modules at the same time was not possible.

Closes gh-94.
---
 .../vault/config/aws/VaultConfigAwsBootstrapConfiguration.java  | 2 +-
 .../config/consul/VaultConfigConsulBootstrapConfiguration.java  | 2 +-
 .../databases/VaultConfigDatabaseBootstrapConfiguration.java    | 2 +-
 .../rabbitmq/VaultConfigRabbitMqBootstrapConfiguration.java     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 301632cb..0d99d97d 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
@@ -38,7 +38,7 @@ import org.springframework.vault.core.util.PropertyTransformer;
 public class VaultConfigAwsBootstrapConfiguration {
 
 	@Bean
-	public SecretBackendMetadataFactory<VaultAwsProperties> secretBackendMetadataFactory() {
+	public SecretBackendMetadataFactory<VaultAwsProperties> awsSecretBackendMetadataFactory() {
 		return new AwsSecretBackendMetadataFactory();
 	}
 
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 5e9376eb..04d5abd1 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
@@ -38,7 +38,7 @@ import org.springframework.vault.core.util.PropertyTransformer;
 public class VaultConfigConsulBootstrapConfiguration {
 
 	@Bean
-	public SecretBackendMetadataFactory<VaultConsulProperties> secretBackendAccessorFactory() {
+	public SecretBackendMetadataFactory<VaultConsulProperties> consulSecretBackendAccessorFactory() {
 		return new ConsulSecretBackendMetadataFactory();
 	}
 
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 52e7ce13..911f6b17 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
@@ -41,7 +41,7 @@ import org.springframework.vault.core.util.PropertyTransformer;
 public class VaultConfigDatabaseBootstrapConfiguration {
 
 	@Bean
-	public SecretBackendMetadataFactory<DatabaseSecretProperties> secretBackendMetadataFactory() {
+	public SecretBackendMetadataFactory<DatabaseSecretProperties> databaseSecretBackendMetadataFactory() {
 		return new DatabaseSecretBackendMetadataFactory();
 	}
 
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 0a7f496f..27bc40a6 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
@@ -38,7 +38,7 @@ import org.springframework.vault.core.util.PropertyTransformer;
 public class VaultConfigRabbitMqBootstrapConfiguration {
 
 	@Bean
-	public SecretBackendMetadataFactory<VaultRabbitMqProperties> secureBackendAccessorFactory() {
+	public SecretBackendMetadataFactory<VaultRabbitMqProperties> rabbitMqSecureBackendAccessorFactory() {
 		return new RabbitMqSecretBackendMetadataFactory();
 	}