Update pebble

Signed-off-by: Paulo Lopes <[email protected]>
cescoffier · Mar 8, 2023 · 9f43f87 · 9f43f87
1 parent 2177b1e
commit 9f43f87
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 25 deletions.
diff --git a/vertx-template-engines/vertx-web-templ-pebble/pom.xml b/vertx-template-engines/vertx-web-templ-pebble/pom.xml
@@ -16,7 +16,7 @@
     <dependency>
 	    <groupId>io.pebbletemplates</groupId>
 	    <artifactId>pebble</artifactId>
-	    <version>3.1.5</version>
+	    <version>3.2.0</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>

diff --git a/...tx-web-templ-pebble/src/main/java/io/vertx/ext/web/templ/pebble/PebbleTemplateEngine.java b/...tx-web-templ-pebble/src/main/java/io/vertx/ext/web/templ/pebble/PebbleTemplateEngine.java
@@ -16,7 +16,7 @@
 
 package io.vertx.ext.web.templ.pebble;
 
-import com.mitchellbosecke.pebble.PebbleEngine;
+import io.pebbletemplates.pebble.PebbleEngine;
 import io.vertx.codegen.annotations.GenIgnore;
 import io.vertx.codegen.annotations.VertxGen;
 import io.vertx.core.Vertx;

diff --git a/...mpl-pebble/src/main/java/io/vertx/ext/web/templ/pebble/impl/PebbleTemplateEngineImpl.java b/...mpl-pebble/src/main/java/io/vertx/ext/web/templ/pebble/impl/PebbleTemplateEngineImpl.java
@@ -16,8 +16,8 @@
 
 package io.vertx.ext.web.templ.pebble.impl;
 
-import com.mitchellbosecke.pebble.PebbleEngine;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.PebbleEngine;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;

diff --git a/...pebble/src/main/java/io/vertx/ext/web/templ/pebble/impl/PebbleVertxAttributeResolver.java b/...pebble/src/main/java/io/vertx/ext/web/templ/pebble/impl/PebbleVertxAttributeResolver.java
@@ -16,24 +16,23 @@
 
 package io.vertx.ext.web.templ.pebble.impl;
 
-import com.mitchellbosecke.pebble.attributes.AttributeResolver;
-import com.mitchellbosecke.pebble.attributes.ResolvedAttribute;
-import com.mitchellbosecke.pebble.error.AttributeNotFoundException;
-import com.mitchellbosecke.pebble.node.ArgumentsNode;
-import com.mitchellbosecke.pebble.template.EvaluationContextImpl;
-
+import io.pebbletemplates.pebble.attributes.AttributeResolver;
+import io.pebbletemplates.pebble.attributes.ResolvedAttribute;
+import io.pebbletemplates.pebble.error.AttributeNotFoundException;
+import io.pebbletemplates.pebble.node.ArgumentsNode;
+import io.pebbletemplates.pebble.template.EvaluationContextImpl;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 
 /**
- * @author Nicola Murino <nicola dot murino at gmail.com> 
+ * @author Nicola Murino <nicola dot murino at gmail.com>
  */
 
 class PebbleVertxAttributeResolver implements AttributeResolver {
 
   @Override
   public ResolvedAttribute resolve(Object instance, Object attributeNameValue, Object[] argumentValues,
-      ArgumentsNode args, EvaluationContextImpl context, String filename, int lineNumber) {
+                                   ArgumentsNode args, EvaluationContextImpl context, String filename, int lineNumber) {
 
     if (instance instanceof JsonObject) {
       ResolvedAttribute resolvedAttribute = new ResolvedAttribute(null);

diff --git a/...b-templ-pebble/src/main/java/io/vertx/ext/web/templ/pebble/impl/PebbleVertxExtension.java b/...b-templ-pebble/src/main/java/io/vertx/ext/web/templ/pebble/impl/PebbleVertxExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Red Hat, Inc. 
+ * Copyright 2019 Red Hat, Inc.
  *
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
@@ -16,14 +16,14 @@
 
 package io.vertx.ext.web.templ.pebble.impl;
 
+import io.pebbletemplates.pebble.attributes.AttributeResolver;
+import io.pebbletemplates.pebble.extension.AbstractExtension;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import com.mitchellbosecke.pebble.attributes.AttributeResolver;
-import com.mitchellbosecke.pebble.extension.AbstractExtension;
-
 /**
- * @author Nicola Murino <nicola dot murino at gmail.com> 
+ * @author Nicola Murino <nicola dot murino at gmail.com>
  */
 
 class PebbleVertxExtension extends AbstractExtension {

diff --git a/...-web-templ-pebble/src/main/java/io/vertx/ext/web/templ/pebble/impl/PebbleVertxLoader.java b/...-web-templ-pebble/src/main/java/io/vertx/ext/web/templ/pebble/impl/PebbleVertxLoader.java
@@ -15,8 +15,8 @@
  */
 package io.vertx.ext.web.templ.pebble.impl;
 
-import com.mitchellbosecke.pebble.error.LoaderException;
-import com.mitchellbosecke.pebble.loader.Loader;
+import io.pebbletemplates.pebble.error.LoaderException;
+import io.pebbletemplates.pebble.loader.Loader;
 import io.vertx.core.Vertx;
 
 import java.io.File;

diff --git a/...gines/vertx-web-templ-pebble/src/test/java/io/vertx/ext/web/templ/PebbleTemplateTest.java b/...gines/vertx-web-templ-pebble/src/test/java/io/vertx/ext/web/templ/PebbleTemplateTest.java
@@ -16,7 +16,7 @@
 
 package io.vertx.ext.web.templ;
 
-import com.mitchellbosecke.pebble.PebbleEngine;
+import io.pebbletemplates.pebble.PebbleEngine;
 import io.vertx.core.Vertx;
 import io.vertx.core.VertxOptions;
 import io.vertx.core.file.FileSystemOptions;

diff --git a/.../vertx-web-templ-pebble/src/test/java/io/vertx/ext/web/templ/extension/TestExtension.java b/.../vertx-web-templ-pebble/src/test/java/io/vertx/ext/web/templ/extension/TestExtension.java
@@ -1,9 +1,9 @@
 package io.vertx.ext.web.templ.extension;
 
-import com.mitchellbosecke.pebble.extension.AbstractExtension;
-import com.mitchellbosecke.pebble.extension.Function;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.extension.AbstractExtension;
+import io.pebbletemplates.pebble.extension.Function;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 import java.util.Collections;
 import java.util.List;
@@ -19,7 +19,7 @@ public Map<String, Function> getFunctions() {
     return Collections.singletonMap("createString", new CreateStringFunction());
   }
 
-  class CreateStringFunction implements Function {
+  static class CreateStringFunction implements Function {
 
     @Override
     public Object execute(Map<String, Object> map, PebbleTemplate pebbleTemplate, EvaluationContext evaluationContext, int i) {