From a372ca5b81edf2aef6aa43b57c8b1c2b16bfb34f Mon Sep 17 00:00:00 2001
From: axbg <bisagalexstefan@gmail.com>
Date: Thu, 7 Oct 2021 13:17:28 +0300
Subject: [PATCH] Added usage of spring.cloud.vault.reactive.enabled property
 in VaultConfigDataLoader

Closes gh-619
Original pull request: gh-618.
---
 .../vault/config/VaultConfigDataLoader.java   |  4 +--
 .../cloud/vault/config/VaultProperties.java   | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultConfigDataLoader.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultConfigDataLoader.java
index 4369d4d3..c3f92c17 100644
--- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultConfigDataLoader.java
+++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultConfigDataLoader.java
@@ -127,7 +127,7 @@ public class VaultConfigDataLoader implements ConfigDataLoader<VaultConfigLocati
 
 		registerImperativeInfrastructure(bootstrap, vaultProperties);
 
-		if (REGISTER_REACTIVE_INFRASTRUCTURE) {
+		if (REGISTER_REACTIVE_INFRASTRUCTURE && vaultProperties.getReactive().isEnabled()) {
 			registerReactiveInfrastructure(bootstrap, vaultProperties);
 		}
 
@@ -191,7 +191,7 @@ public class VaultConfigDataLoader implements ConfigDataLoader<VaultConfigLocati
 
 			infra.registerClientAuthentication();
 
-			if (!REGISTER_REACTIVE_INFRASTRUCTURE) {
+			if (!REGISTER_REACTIVE_INFRASTRUCTURE || !vaultProperties.getReactive().isEnabled()) {
 				infra.registerVaultSessionManager();
 			}
 
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 cb588483..e1af3f2e 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
@@ -82,6 +82,11 @@ public class VaultProperties implements EnvironmentAware {
 	@Nullable
 	private String namespace;
 
+    /**
+     * Reactive properties
+     */
+    private Reactive reactive = new Reactive();
+
 	/**
 	 * Discovery properties.
 	 */
@@ -199,6 +204,14 @@ public class VaultProperties implements EnvironmentAware {
 		this.namespace = namespace;
 	}
 
+    public Reactive getReactive() {
+        return this.reactive;
+    }
+
+    public void setReactive(Reactive reactive) {
+        this.reactive = reactive;
+    }
+
 	public Discovery getDiscovery() {
 		return this.discovery;
 	}
@@ -361,6 +374,24 @@ public class VaultProperties implements EnvironmentAware {
 
 	}
 
+    /**
+     * Reactive properties.
+     */
+    public static class Reactive {
+        /**
+         * Flag to indicate that reactive discovery is enabled
+         */
+        private boolean enabled = true;
+
+        public boolean isEnabled() {
+            return this.enabled;
+        }
+
+        public void setEnabled(boolean enabled) {
+            this.enabled = enabled;
+        }
+    }
+
 	/**
 	 * Discovery properties.
 	 */