From 9c2940e2652a02540b03242bffcca3dc2c1422ef Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 27 Jul 2018 13:41:05 +0200 Subject: [PATCH] Allow Spring Vault usage with Spring Framework 4.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PrefixAwareUriTemplateHandler now overrides expand(…) methods of DefaultUriTemplateHandler instead of expandInternal(…). expandInternal was added with Spring 4.3. Usage of Spring Framework 4.2 does not process the URI template which leaves the basepath and relative path untouched. This code path also does not add missing slashes which resulted in invalid context paths. See gh-265. --- .../org/springframework/vault/client/VaultClients.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java index 5bc5497e..ade1d85c 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java @@ -152,13 +152,13 @@ public class VaultClients { } @Override - protected URI expandInternal(String uriTemplate, Map uriVariables) { - return super.expandInternal(prepareUriTemplate(uriTemplate), uriVariables); + public URI expand(String uriTemplate, Map uriVariables) { + return super.expand(prepareUriTemplate(uriTemplate), uriVariables); } @Override - protected URI expandInternal(String uriTemplate, Object... uriVariables) { - return super.expandInternal(prepareUriTemplate(uriTemplate), uriVariables); + public URI expand(String uriTemplate, Object... uriVariableValues) { + return super.expand(prepareUriTemplate(uriTemplate), uriVariableValues); } @Override