From 4c42c429be583347d5e7b1da88efb9a0ab9a7496 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 9 Nov 2018 09:17:32 +0100 Subject: [PATCH] Polishing. Rearrange authentication method switch. See gh-250. --- .../vault/config/ClientAuthenticationFactory.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java index 81e5e2be..2740a069 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java @@ -60,11 +60,6 @@ class ClientAuthenticationFactory { switch (vaultProperties.getAuthentication()) { - case TOKEN: - Assert.hasText(vaultProperties.getToken(), - "Token (spring.cloud.vault.token) must not be empty"); - return new TokenAuthentication(vaultProperties.getToken()); - case APPID: return appIdAuthentication(vaultProperties); @@ -85,6 +80,11 @@ class ClientAuthenticationFactory { case KUBERNETES: return kubernetesAuthentication(vaultProperties); + + case TOKEN: + Assert.hasText(vaultProperties.getToken(), + "Token (spring.cloud.vault.token) must not be empty"); + return new TokenAuthentication(vaultProperties.getToken()); } throw new UnsupportedOperationException(String.format(