#459 and #460: Avoid feature version in spring boot starter name and …

…upgrade to latest spring boot version (#461) Signed-off-by: Eric Bussieres <[email protected]>
PebbleTemplates · Aug 19, 2019 · 59b9c28 · 59b9c28
1 parent 9b9217a
commit 59b9c28
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 48 deletions.
diff --git a/...ng4/src/main/java/com/mitchellbosecke/pebble/spring4/extension/function/HrefFunction.java b/...ng4/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<String, Object> 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/...pring/pebble-spring4/src/main/java/com/mitchellbosecke/pebble/spring4/util/ViewUtils.java b/...pring/pebble-spring4/src/main/java/com/mitchellbosecke/pebble/spring4/util/ViewUtils.java
diff --git a/...ing5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/HrefFunction.java b/...ing5/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<String, Object> 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/...spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/util/ViewUtils.java b/...spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/util/ViewUtils.java