From 96d043eb678a7acd7bd783c89b50b52d3f943c14 Mon Sep 17 00:00:00 2001 From: Jeff Maxwell Date: Wed, 20 May 2020 18:05:06 -0500 Subject: [PATCH] Reorder & simplify isKeyVaultEnabled Reorder & simplify isKeyVaultEnabled to fix microsoft#867 ## Summary Reorder and simplify isKeyVaultEnabled's conditionals. ## Issue Type - Bug fixing ## Starter Names - key vault spring boot starter --- .../spring/KeyVaultEnvironmentPostProcessor.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/azure-spring-boot/src/main/java/com/microsoft/azure/keyvault/spring/KeyVaultEnvironmentPostProcessor.java b/azure-spring-boot/src/main/java/com/microsoft/azure/keyvault/spring/KeyVaultEnvironmentPostProcessor.java index 37512e9ed..701f3814b 100644 --- a/azure-spring-boot/src/main/java/com/microsoft/azure/keyvault/spring/KeyVaultEnvironmentPostProcessor.java +++ b/azure-spring-boot/src/main/java/com/microsoft/azure/keyvault/spring/KeyVaultEnvironmentPostProcessor.java @@ -76,13 +76,12 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp * @return true if the key vault is enabled, false otherwise. */ private boolean isKeyVaultEnabled(ConfigurableEnvironment environment, String normalizedName) { - if (environment.getProperty(AZURE_KEYVAULT_PREFIX + normalizedName + AZURE_KEYVAULT_VAULT_URI) == null) { - return false; - } - return environment.getProperty(AZURE_KEYVAULT_PREFIX + normalizedName + AZURE_KEYVAULT_ENABLED, - Boolean.class, true) && isKeyVaultClientAvailable(); + final String normalizedPrefix = AZURE_KEYVAULT_PREFIX + normalizedName; + return environment.getProperty(normalizedPrefix + AZURE_KEYVAULT_ENABLED, + Boolean.class, true) && environment.getProperty(normalizedPrefix + AZURE_KEYVAULT_VAULT_URI) != null + && isKeyVaultClientAvailable(); } - + /** * Determine whether or not multiple key vaults are enabled. *