From 59b9c28509aad80e135deff5d87d297916178dda Mon Sep 17 00:00:00 2001 From: Eric Bussieres Date: Mon, 19 Aug 2019 11:53:18 -0400 Subject: [PATCH] #459 and #460: Avoid feature version in spring boot starter name and upgrade to latest spring boot version (#461) Signed-off-by: Eric Bussieres --- .../extension/function/HrefFunction.java | 17 ++++++++++++---- .../pebble/spring4/util/ViewUtils.java | 20 ------------------- .../extension/function/HrefFunction.java | 17 ++++++++++++---- .../pebble/spring/util/ViewUtils.java | 20 ------------------- 4 files changed, 26 insertions(+), 48 deletions(-) delete mode 100644 pebble-spring/pebble-spring4/src/main/java/com/mitchellbosecke/pebble/spring4/util/ViewUtils.java delete mode 100644 pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/util/ViewUtils.java diff --git a/pebble-spring/pebble-spring4/src/main/java/com/mitchellbosecke/pebble/spring4/extension/function/HrefFunction.java b/pebble-spring/pebble-spring4/src/main/java/com/mitchellbosecke/pebble/spring4/extension/function/HrefFunction.java index a4a3bff33..e41b9a76d 100644 --- a/pebble-spring/pebble-spring4/src/main/java/com/mitchellbosecke/pebble/spring4/extension/function/HrefFunction.java +++ b/pebble-spring/pebble-spring4/src/main/java/com/mitchellbosecke/pebble/spring4/extension/function/HrefFunction.java @@ -1,13 +1,18 @@ package com.mitchellbosecke.pebble.spring4.extension.function; import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.spring4.util.ViewUtils; import com.mitchellbosecke.pebble.template.EvaluationContext; import com.mitchellbosecke.pebble.template.PebbleTemplate; + +import org.springframework.util.StringUtils; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.springframework.util.StringUtils; + +import javax.servlet.http.HttpServletRequest; /** * Pebble function which adds the context path to the given url @@ -57,12 +62,16 @@ private void addUrlParameter(Map args, StringBuffer result) { private String getContextPath() { if (this.contextPath == null) { - this.contextPath = ViewUtils.getRequest().getContextPath(); + this.contextPath = this.getRequest().getContextPath(); } - return this.contextPath; } + private HttpServletRequest getRequest() { + ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes(); + return attr.getRequest(); + } + /** * {@inheritDoc} * diff --git a/pebble-spring/pebble-spring4/src/main/java/com/mitchellbosecke/pebble/spring4/util/ViewUtils.java b/pebble-spring/pebble-spring4/src/main/java/com/mitchellbosecke/pebble/spring4/util/ViewUtils.java deleted file mode 100644 index 23114c20c..000000000 --- a/pebble-spring/pebble-spring4/src/main/java/com/mitchellbosecke/pebble/spring4/util/ViewUtils.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * - */ -package com.mitchellbosecke.pebble.spring4.util; - -import javax.servlet.http.HttpServletRequest; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -public class ViewUtils { - - private ViewUtils() { - } - - public static HttpServletRequest getRequest() { - ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder - .currentRequestAttributes(); - return attr.getRequest(); - } -} diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/HrefFunction.java b/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/HrefFunction.java index 85b151bb4..84988d19a 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/HrefFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/HrefFunction.java @@ -1,13 +1,18 @@ package com.mitchellbosecke.pebble.spring.extension.function; import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.spring.util.ViewUtils; import com.mitchellbosecke.pebble.template.EvaluationContext; import com.mitchellbosecke.pebble.template.PebbleTemplate; + +import org.springframework.util.StringUtils; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.springframework.util.StringUtils; + +import javax.servlet.http.HttpServletRequest; /** * Pebble function which adds the context path to the given url @@ -56,12 +61,16 @@ private void addUrlParameter(Map args, StringBuffer result) { private String getContextPath() { if (this.contextPath == null) { - this.contextPath = ViewUtils.getRequest().getContextPath(); + this.contextPath = this.getRequest().getContextPath(); } - return this.contextPath; } + private HttpServletRequest getRequest() { + ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes(); + return attr.getRequest(); + } + /** * {@inheritDoc} * diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/util/ViewUtils.java b/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/util/ViewUtils.java deleted file mode 100644 index 1a465612b..000000000 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/util/ViewUtils.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * - */ -package com.mitchellbosecke.pebble.spring.util; - -import javax.servlet.http.HttpServletRequest; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -public class ViewUtils { - - private ViewUtils() { - } - - public static HttpServletRequest getRequest() { - ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder - .currentRequestAttributes(); - return attr.getRequest(); - } -}