From aeaf571d2d352f315b1cd8591f17787dc35ca025 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 17 Mar 2023 10:26:00 +0100 Subject: [PATCH] Consistently attach cause to exceptions. Closes gh-713 --- .../springframework/vault/authentication/LoginTokenAdapter.java | 2 +- .../vault/authentication/VaultLoginException.java | 2 +- .../java/org/springframework/vault/support/AbstractResult.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java index 3a564dde..6f7a7607 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LoginTokenAdapter.java @@ -90,7 +90,7 @@ public class LoginTokenAdapter implements ClientAuthentication { } catch (HttpStatusCodeException e) { throw new VaultTokenLookupException(String.format("Token self-lookup failed: %s %s", e.getRawStatusCode(), - VaultResponses.getError(e.getResponseBodyAsString()))); + VaultResponses.getError(e.getResponseBodyAsString())), e); } catch (RestClientException e) { throw new VaultTokenLookupException("Token self-lookup failed", e); diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/VaultLoginException.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/VaultLoginException.java index 852c6de4..b2054c09 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/VaultLoginException.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/VaultLoginException.java @@ -61,7 +61,7 @@ public class VaultLoginException extends VaultException { String.format("Cannot login using %s: %s", authMethod, VaultResponses.getError(response)), cause); } - return new VaultLoginException(String.format("Cannot login using %s", cause)); + return new VaultLoginException(String.format("Cannot login using %s", cause), cause); } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/AbstractResult.java b/spring-vault-core/src/main/java/org/springframework/vault/support/AbstractResult.java index 35845a64..709830d2 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/support/AbstractResult.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/support/AbstractResult.java @@ -82,7 +82,7 @@ public abstract class AbstractResult { return get0(); } - throw new VaultException(this.exception.getMessage()); + throw new VaultException(this.exception.getMessage(), this.exception); } /**