From 10ba9a46f14d2c4b8786e529fea4130da637faca Mon Sep 17 00:00:00 2001
From: vbillard91 <vincent.billard@edifice.io>
Date: Mon, 6 Oct 2025 10:00:34 +0200
Subject: [PATCH 1/5] fix(rights): #COCO-4531 add constructor override for
 backward compatibility (#38)

---
 .../java/fr/wseduc/webutils/security/SecuredAction.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/fr/wseduc/webutils/security/SecuredAction.java b/src/main/java/fr/wseduc/webutils/security/SecuredAction.java
index a7ecedb..ca13383 100644
--- a/src/main/java/fr/wseduc/webutils/security/SecuredAction.java
+++ b/src/main/java/fr/wseduc/webutils/security/SecuredAction.java
@@ -30,6 +30,14 @@ public SecuredAction(String qualifiedName, String displayName, String type, Stri
         this.right = right;
     }
 
+	public SecuredAction(String qualifiedName, String displayName, String type) {
+		this.name = qualifiedName;
+		this.displayName = displayName;
+		this.type = type;
+		this.right = qualifiedName;
+	}
+
+
 	public String getName() {
 		return name;
 	}

From 952124bfdeb38d565247516e6bb23ab164df01fd Mon Sep 17 00:00:00 2001
From: jenkinsEdificePublic <sre@edifice.io>
Date: Tue, 14 Oct 2025 11:48:59 +0200
Subject: [PATCH 2/5] chore: prepare next development iteration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 825a5b2..12afd42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>fr.wseduc</groupId>
     <artifactId>web-utils</artifactId>
-    <version>3.2-SNAPSHOT</version>
+    <version>3.2-develop-b2school-SNAPSHOT</version>
 
     <repositories>
         <repository>

From 773b4378ec53ca62227dd4f735f18bde550676f7 Mon Sep 17 00:00:00 2001
From: Vincent Billard <vincent.billard@edifice.io>
Date: Thu, 18 Sep 2025 10:23:30 +0200
Subject: [PATCH 3/5] fix-(communication): add missing import due to rebase

---
 .../java/fr/wseduc/webutils/http/Renders.java | 24 +++++--
 .../webutils/template/TemplateProcessor.java  | 70 ++++++++++++++-----
 2 files changed, 72 insertions(+), 22 deletions(-)

diff --git a/src/main/java/fr/wseduc/webutils/http/Renders.java b/src/main/java/fr/wseduc/webutils/http/Renders.java
index 520f973..87dbaba 100644
--- a/src/main/java/fr/wseduc/webutils/http/Renders.java
+++ b/src/main/java/fr/wseduc/webutils/http/Renders.java
@@ -20,8 +20,11 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import com.samskivert.mustache.Mustache;
 import fr.wseduc.webutils.template.TemplateProcessor;
 import fr.wseduc.webutils.template.FileTemplateProcessor;
 import fr.wseduc.webutils.template.lambdas.FormatBirthDateLambda;
@@ -57,6 +60,7 @@ public class Renders {
 	protected String staticHost;
 	protected FileTemplateProcessor templateProcessor;
 	protected static final List<String> allowedHosts = new ArrayList<>();
+	private final Map<String, Mustache.Lambda> staticLambdas = new HashMap<>();
 
 	public Renders(Vertx vertx, JsonObject config) {
 		this.config = config;
@@ -66,8 +70,10 @@ public Renders(Vertx vertx, JsonObject config) {
 		this.vertx = vertx;
 		if (vertx != null) {
 			this.templateProcessor = new FileTemplateProcessor(vertx, "view/", false);
-			this.templateProcessor.setLambda("formatBirthDate", new FormatBirthDateLambda());
-			this.templateProcessor.setLambda("modVersion", new ModsLambda(vertx));
+			staticLambdas.put("formatBirthDate", new FormatBirthDateLambda());
+			staticLambdas.put("modVersion", new ModsLambda(vertx));
+
+			staticLambdas.forEach(templateProcessor::setLambda);
 		}
 	}
 
@@ -84,13 +90,15 @@ protected void init(Vertx vertx, JsonObject config)
 
 		if (templateProcessor == null && vertx != null) {
 			this.templateProcessor = new FileTemplateProcessor(vertx, "view/", false);
-			this.templateProcessor.setLambda("formatBirthDate", new FormatBirthDateLambda());
-			this.templateProcessor.setLambda("modVersion", new ModsLambda(vertx));
+			staticLambdas.put("formatBirthDate", new FormatBirthDateLambda());
+			staticLambdas.put("modVersion", new ModsLambda(vertx));
+
+			staticLambdas.forEach(templateProcessor::setLambda);
 		}
 	}
 
-	protected void setLambdaTemplateRequest(final HttpServerRequest request)
-	{
+	@Deprecated
+	protected void setLambdaTemplateRequest(final HttpServerRequest request) {
 		String host = Renders.getHost(request);
 		if(host == null) // This can happen for forged requests
 			host = "";
@@ -104,6 +112,10 @@ protected void setLambdaTemplateRequest(final HttpServerRequest request)
 		this.templateProcessor.setLambda("datetime", new LocaleDateLambda(I18n.acceptLanguage(request)));
 	}
 
+	protected Map<String, Mustache.Lambda> getLambdasFromRequest() {
+		return null;
+	}
+
 	public void renderView(HttpServerRequest request) {
 		renderView(request, new JsonObject());
 	}
diff --git a/src/main/java/fr/wseduc/webutils/template/TemplateProcessor.java b/src/main/java/fr/wseduc/webutils/template/TemplateProcessor.java
index 8f5176f..2f34f2f 100644
--- a/src/main/java/fr/wseduc/webutils/template/TemplateProcessor.java
+++ b/src/main/java/fr/wseduc/webutils/template/TemplateProcessor.java
@@ -52,12 +52,14 @@ public TemplateProcessor()
 
   // =========================================== COMPILER CONFIGURATION ===========================================
 
+  @Deprecated
   public TemplateProcessor setLambda(String identifier, Mustache.Lambda lambda)
   {
     this.templateLambdas.put(identifier, lambda);
     return this;
   }
 
+  @Deprecated
   public TemplateProcessor clearLambda(String identifier)
   {
     this.templateLambdas.remove(identifier);
@@ -79,6 +81,7 @@ public TemplateProcessor escapeHTML(boolean enableHTMLEscaping)
   // ============================================= TEMPLATE PROCESSING ============================================
 
 
+  @Deprecated
   public void processTemplate(String templateString, JsonObject params, final Handler<String> handler)
   {
     this.processTemplateToWriter(templateString, params, new Handler<Writer>()
@@ -91,6 +94,20 @@ public void handle(Writer w)
     });
   }
 
+  public void processTemplate(String templateString, JsonObject params, Map<String, Mustache.Lambda> lambdas,
+                              final Handler<String> handler)
+  {
+    this.processTemplateToWriter(templateString, params, lambdas, new Handler<Writer>()
+    {
+      @Override
+      public void handle(Writer w)
+      {
+        handler.handle(w == null ? null : w.toString());
+      }
+    });
+  }
+
+  @Deprecated
   public void processTemplateToWriter(String templateString, JsonObject params, final Handler<Writer> handler)
   {
     this.getTemplate(templateString, new Handler<Template>()
@@ -103,37 +120,58 @@ public void handle(Template t)
     });
   }
 
+  public void processTemplateToWriter(String templateString, JsonObject params,  Map<String, Mustache.Lambda> lambdas,
+                                      final Handler<Writer> handler)
+  {
+    this.getTemplate(templateString, new Handler<Template>()
+    {
+      @Override
+      public void handle(Template t)
+      {
+        processTemplate(t, params, lambdas, handler);
+      }
+    });
+  }
+
+  protected void processTemplate(Template t, JsonObject params, Map<String, Mustache.Lambda> lambdas, final Handler<Writer> handler) {
+    final JsonObject ctxParams = (params == null) ? new JsonObject() : params.copy();
+    final Map<String, Object> ctx = JsonUtils.convertMap(ctxParams);
+    ctx.putAll(lambdas);
+    applyTemplate(t, ctx, handler);
+  }
+
+  @Deprecated
   protected void processTemplate(Template t, JsonObject params, final Handler<Writer> handler)
   {
     final JsonObject ctxParams = (params == null) ? new JsonObject() : params.copy();
     final Map<String, Object> ctx = JsonUtils.convertMap(ctxParams);
     this.applyLambdas(ctx);
+    applyTemplate(t, ctx, handler);
+  }
 
-    if (t != null)
-    {
-      try
-      {
+  protected void getTemplate(String templateString, final Handler<Template> handler)
+  {
+    handler.handle(compiler.compile(templateString));
+  }
+
+
+  // ================================================ PRIVATE UTILS ===============================================
+
+  private void applyTemplate(Template t, Map<String, Object> ctx, Handler<Writer> handler) {
+    if (t != null) {
+      try {
         Writer writer = new StringWriter();
         t.execute(ctx, writer);
         handler.handle(writer);
-      }
-      catch (Exception e)
-      {
+      } catch (Exception e) {
         log.error(e.getMessage(), e);
         handler.handle(null);
       }
-    }
-    else
+    } else {
       handler.handle(null);
+    }
   }
 
-  protected void getTemplate(String templateString, final Handler<Template> handler)
-  {
-    handler.handle(compiler.compile(templateString));
-  }
-
-  // ================================================ PRIVATE UTILS ===============================================
-
   private void applyLambdas(Map<String, Object> context)
   {
     for(Map.Entry<String, Mustache.Lambda> entry : this.templateLambdas.entrySet())

From f5da945b7d79b032f30d3c238bc0435113035de3 Mon Sep 17 00:00:00 2001
From: Vincent Billard <vincent.billard@edifice.io>
Date: Fri, 19 Sep 2025 10:28:54 +0200
Subject: [PATCH 4/5] fix(template): #COCO-4672 refactor template processing to
 avoid race condition on lambda

---
 .../webutils/http/ProcessTemplateContext.java |  86 +++++++++++++
 .../java/fr/wseduc/webutils/http/Renders.java | 114 ++++++++++++++++--
 .../template/FileTemplateProcessor.java       |  52 +++++---
 .../webutils/template/TemplateProcessor.java  | 110 +++++++----------
 4 files changed, 262 insertions(+), 100 deletions(-)
 create mode 100644 src/main/java/fr/wseduc/webutils/http/ProcessTemplateContext.java

diff --git a/src/main/java/fr/wseduc/webutils/http/ProcessTemplateContext.java b/src/main/java/fr/wseduc/webutils/http/ProcessTemplateContext.java
new file mode 100644
index 0000000..9849b2d
--- /dev/null
+++ b/src/main/java/fr/wseduc/webutils/http/ProcessTemplateContext.java
@@ -0,0 +1,86 @@
+package fr.wseduc.webutils.http;
+
+import com.samskivert.mustache.Mustache;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.json.JsonObject;
+
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Container for all parameters needed for the template processinf
+ */
+public class ProcessTemplateContext {
+
+    private HttpServerRequest request;
+    private JsonObject params;
+    private String templateString;
+    private Reader reader;
+    private boolean escapeHtml;
+    private String defaultValue;
+    private final Map<String, Mustache.Lambda> lambdas = new HashMap<>();
+
+    public ProcessTemplateContext request(HttpServerRequest request) {
+        this.request = request;
+        return this;
+    }
+
+    public ProcessTemplateContext escapeHtml(boolean escapeHtml) {
+        this.escapeHtml = escapeHtml;
+        return this;
+    }
+
+    public ProcessTemplateContext setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+        return this;
+    }
+
+    public ProcessTemplateContext params(JsonObject params) {
+        this.params = params;
+        return this;
+    }
+
+    public ProcessTemplateContext templateString(String templateString) {
+        this.templateString = templateString;
+        return this;
+    }
+
+    public ProcessTemplateContext reader(Reader reader) {
+        this.reader = reader;
+        return this;
+    }
+
+    public ProcessTemplateContext lambdas(Map<String, Mustache.Lambda> lambdas) {
+        this.lambdas.putAll(lambdas);
+        return this;
+    }
+
+    public HttpServerRequest request() {
+        return request;
+    }
+
+    public JsonObject params() {
+        return params;
+    }
+
+    public String templateString() {
+        return templateString;
+    }
+
+    public Reader reader() {
+        return reader;
+    }
+
+    public Map<String, Mustache.Lambda> lambdas() {
+        return lambdas;
+    }
+
+    public boolean escapeHtml() {
+        return escapeHtml;
+    }
+
+    public String defaultValue() {
+        return defaultValue;
+    }
+}
diff --git a/src/main/java/fr/wseduc/webutils/http/Renders.java b/src/main/java/fr/wseduc/webutils/http/Renders.java
index 87dbaba..dee3185 100644
--- a/src/main/java/fr/wseduc/webutils/http/Renders.java
+++ b/src/main/java/fr/wseduc/webutils/http/Renders.java
@@ -33,6 +33,7 @@
 import fr.wseduc.webutils.template.lambdas.LocaleDateLambda;
 import fr.wseduc.webutils.template.lambdas.ModsLambda;
 import fr.wseduc.webutils.template.lambdas.StaticLambda;
+import io.micrometer.common.util.StringUtils;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
@@ -50,6 +51,12 @@
 
 import static fr.wseduc.webutils.Utils.isNotEmpty;
 
+/**
+ * Method with @deprecated, relative to template processing are NOT thread safe and should not be used. Alternative method not deprecated was developed.
+ * Lambda for template processing dependent of the user context (request, host, etc..) must not be shared and are local variable.
+ * Static lambda that doesn't change with the context can be used
+ * Parameter for the template are either NOT thread safe. EscapeHTML, defaultValue, should be passed as local variable
+ */
 public class Renders {
 
 	protected static final Logger log = LoggerFactory.getLogger(Renders.class);
@@ -112,10 +119,79 @@ protected void setLambdaTemplateRequest(final HttpServerRequest request) {
 		this.templateProcessor.setLambda("datetime", new LocaleDateLambda(I18n.acceptLanguage(request)));
 	}
 
-	protected Map<String, Mustache.Lambda> getLambdasFromRequest() {
-		return null;
+	protected Map<String, Mustache.Lambda> getLambdasFromRequest(final HttpServerRequest request) {
+		Map<String, Mustache.Lambda> lambdas = new HashMap<>();
+
+		String host = Renders.getHost(request);
+		if(host == null) // This can happen for forged requests
+			host = "";
+		String sttcHost = this.staticHost != null ? this.staticHost : host;
+
+
+		lambdas.put("i18n",
+				new I18nLambda(I18n.acceptLanguage(request), host, I18n.getTheme(request)));
+		lambdas.put("static",
+				new StaticLambda(config.getBoolean("ssl", sttcHost.startsWith("https")), sttcHost, this.pathPrefix + "/public"));
+		lambdas.put("infra",
+				new InfraLambda(config.getBoolean("ssl", sttcHost.startsWith("https")), sttcHost, "/infra/public", request.headers().get("X-Forwarded-For") == null));
+		lambdas.put("datetime", new LocaleDateLambda(I18n.acceptLanguage(request)));
+		return lambdas;
+	}
+
+	public void renderTemplateView(HttpServerRequest request) {
+		renderTemplateView(request, new JsonObject(), new HashMap<>());
+	}
+
+	public void renderTemplateView(HttpServerRequest request, Map<String, Mustache.Lambda> lambdas) {
+		renderTemplateView(request, new JsonObject(), lambdas);
+	}
+
+	public void renderTemplateView(HttpServerRequest request, JsonObject params) {
+		renderTemplateView(request, params, new HashMap<>());
+	}
+
+	public void renderTemplateView(HttpServerRequest request, JsonObject params, Map<String, Mustache.Lambda> lambdas) {
+		renderTemplateView(request, params, null, null, 200, lambdas);
+	}
+
+	public void renderTemplateView(HttpServerRequest request, JsonObject params,  String resourceName,
+								   Reader r, Map<String, Mustache.Lambda> lambdas) {
+		renderTemplateView(request, params, resourceName, r, 200, lambdas);
+	}
+
+	public void renderTemplateView(final HttpServerRequest request, JsonObject params,
+								   String resourceName, Reader r, final int status, Map<String, Mustache.Lambda> lambdas) {
+
+		Map<String, Mustache.Lambda> mergeLambdas = getLambdasFromRequest(request);
+		mergeLambdas.putAll(lambdas);
+		mergeLambdas.putAll(staticLambdas);
+
+		ProcessTemplateContext context = new ProcessTemplateContext()
+												.escapeHtml(true)
+												.reader(r)
+												.lambdas( mergeLambdas)
+												.request(request);
+		processTemplateWithLambdas(context,  resourceName,writer -> {
+			if (writer != null) {
+				request.response().putHeader("content-type", "text/html; charset=utf-8");
+				request.response().setStatusCode(status);
+				if (hookRenderProcess != null) {
+					executeHandlersHookRender(request, new Handler<Void>() {
+						@Override
+						public void handle(Void v) {
+							request.response().end(writer.toString());
+						}
+					});
+				} else {
+					request.response().end(writer.toString());
+				}
+			} else {
+				renderError(request);
+			}
+		});
 	}
 
+	@Deprecated
 	public void renderView(HttpServerRequest request) {
 		renderView(request, new JsonObject());
 	}
@@ -124,14 +200,17 @@ public void renderView(HttpServerRequest request) {
 	 * Render a Mustache template : see http://mustache.github.com/mustache.5.html
 	 * TODO : isolate scope management
 	 */
+	@Deprecated
 	public void renderView(HttpServerRequest request, JsonObject params) {
 		renderView(request, params, null, null, 200);
 	}
 
+	@Deprecated
 	public void renderView(HttpServerRequest request, JsonObject params, String resourceName, Reader r) {
 		renderView(request, params, resourceName, r, 200);
 	}
 
+	@Deprecated
 	public void renderView(final HttpServerRequest request, JsonObject params,
 			String resourceName, Reader r, final int status) {
 		processTemplate(request, params, resourceName, r, new Handler<Writer>() {
@@ -173,12 +252,14 @@ public void handle(Void v) {
 		handlers[0].handle(null);
 	}
 
+	@Deprecated
 	public void processTemplate(HttpServerRequest request, String template, JsonObject params, final Handler<String> handler)
 	{
 		this.setLambdaTemplateRequest(request);
 		this.templateProcessor.escapeHTML(true).processTemplate(this.genTemplateName(template, request), params, handler);
 	}
 
+	@Deprecated
 	public void processTemplate(final HttpServerRequest request, JsonObject p, String resourceName, Reader r, final Handler<Writer> handler)
 	{
 		this.setLambdaTemplateRequest(request);
@@ -186,24 +267,33 @@ public void processTemplate(final HttpServerRequest request, JsonObject p, Strin
 		this.templateProcessor.processTemplate(this.genTemplateName(resourceName, request), p, r, handler);
 	}
 
+	@Deprecated
 	public void processTemplate(final HttpServerRequest request, JsonObject p, String resourceName, boolean escapeHTML, final Handler<String> handler)
 	{
 		this.setLambdaTemplateRequest(request);
 		this.templateProcessor.escapeHTML(escapeHTML).processTemplate(this.genTemplateName(resourceName, request), p, handler);
 	}
 
-	private String genTemplateName(final String resourceName, final HttpServerRequest request)
-	{
-		if (resourceName != null && !resourceName.trim().isEmpty())
+	public void processTemplateWithLambdas(ProcessTemplateContext context, Handler<Writer> handler) {
+		context.lambdas(getLambdasFromRequest(context.request()));
+		this.templateProcessor.processTemplate(context, handler);
+	}
+
+	public void processTemplateWithLambdas(ProcessTemplateContext context, String resourceName, Handler<Writer> handler) {
+		context.lambdas(getLambdasFromRequest(context.request()));
+		context.templateString(genTemplateName(resourceName, context.request()));
+		this.templateProcessor.processTemplate(context, handler);
+	}
+
+	private String genTemplateName(final String resourceName, final HttpServerRequest request) {
+		if (!StringUtils.isEmpty(resourceName)) {
 			return resourceName;
-		else
-		{
-			String template = request.path().substring(pathPrefix.length());
-			if (template.trim().isEmpty()) {
-				template = pathPrefix.substring(1);
-			}
-			return template + ".html";
 		}
+		String template = request.path().substring(pathPrefix.length());
+		if (template.trim().isEmpty()) {
+			template = pathPrefix.substring(1);
+		}
+		return template + ".html";
 	}
 
 	public static void ok(HttpServerRequest request) {
diff --git a/src/main/java/fr/wseduc/webutils/template/FileTemplateProcessor.java b/src/main/java/fr/wseduc/webutils/template/FileTemplateProcessor.java
index 9bd2d87..b953a67 100644
--- a/src/main/java/fr/wseduc/webutils/template/FileTemplateProcessor.java
+++ b/src/main/java/fr/wseduc/webutils/template/FileTemplateProcessor.java
@@ -29,6 +29,7 @@
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
 import fr.wseduc.webutils.collections.JsonUtils;
+import fr.wseduc.webutils.http.ProcessTemplateContext;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
@@ -74,6 +75,7 @@ public void clearCache()
 
   // ============================================= TEMPLATE PROCESSING ============================================
 
+  @Deprecated
   public void processTemplate(String resourceName, JsonObject params, Reader r, final Handler<Writer> handler)
   {
     if(r != null)
@@ -83,38 +85,50 @@ public void processTemplate(String resourceName, JsonObject params, Reader r, fi
   }
 
   @Override
+  @Deprecated
   protected void getTemplate(String resourceName, final Handler<Template> handler)
   {
     String path = this.templateFolder + resourceName;
+    final String p = absolutePath(path);
+    handleGetTemplate(p,  handler);
+  }
+
+  @Override
+  public void processTemplate(ProcessTemplateContext context, final Handler<Writer> handler) {
+    if(context.reader() != null) {
+      super.getTemplate(context, t -> processTemplate(context,  t , handler));
+    } else {
+      super.processTemplate(context, handler);
+    }
+  }
+
 
+  @Override
+  protected void getTemplate(ProcessTemplateContext context, final Handler<Template> handler) {
+    String path = this.templateFolder + context.templateString();
     final String p = absolutePath(path);
-    if (this.useCache == true)
-    {
+    handleGetTemplate(p,  handler);
+  }
+
+  private void handleGetTemplate(String p, Handler<Template> handler) {
+    if (this.useCache) {
       Template cacheEntry = cache.get(p);
-      if(cacheEntry != null)
-      {
+      if(cacheEntry != null) {
         handler.handle(cacheEntry);
         return;
       }
     }
 
-    this.vertx.fileSystem().readFile(p, new Handler<AsyncResult<Buffer>>()
-    {
-      @Override
-      public void handle(AsyncResult<Buffer> ar)
-      {
-        if (ar.succeeded())
-        {
-          Template template = compiler.compile(ar.result().toString("UTF-8"));
-
-          if(useCache == true)
-            cache.put(p, template);
-
-          handler.handle(template);
+    this.vertx.fileSystem().readFile(p, ar -> {
+      if (ar.succeeded()) {
+        Template template = compiler.compile(ar.result().toString("UTF-8"));
+        if(useCache) {
+          cache.put(p, template);
         }
-        else
-          handler.handle(null);
+        handler.handle(template);
+        return;
       }
+      handler.handle(null);
     });
   }
 }
\ No newline at end of file
diff --git a/src/main/java/fr/wseduc/webutils/template/TemplateProcessor.java b/src/main/java/fr/wseduc/webutils/template/TemplateProcessor.java
index 2f34f2f..36fd97d 100644
--- a/src/main/java/fr/wseduc/webutils/template/TemplateProcessor.java
+++ b/src/main/java/fr/wseduc/webutils/template/TemplateProcessor.java
@@ -21,34 +21,24 @@
 
 import java.io.Writer;
 import java.io.StringWriter;
-import java.io.Reader;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
 import fr.wseduc.webutils.collections.JsonUtils;
-import io.vertx.core.AsyncResult;
+import fr.wseduc.webutils.http.ProcessTemplateContext;
 import io.vertx.core.Handler;
-import io.vertx.core.Vertx;
-import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.logging.Logger;
 import io.vertx.core.logging.LoggerFactory;
 
-import static fr.wseduc.webutils.data.FileResolver.absolutePath;
-
 public class TemplateProcessor
 {
   protected static final Logger log = LoggerFactory.getLogger(TemplateProcessor.class);
 
   protected Mustache.Compiler compiler = Mustache.compiler().defaultValue("");
-  private Map<String, Mustache.Lambda> templateLambdas = new ConcurrentHashMap<String, Mustache.Lambda>();
-
-  public TemplateProcessor()
-  {
-  }
+  private Map<String, Mustache.Lambda> templateLambdas = new ConcurrentHashMap<>();
 
   // =========================================== COMPILER CONFIGURATION ===========================================
 
@@ -66,12 +56,14 @@ public TemplateProcessor clearLambda(String identifier)
     return this;
   }
 
+  @Deprecated
   public TemplateProcessor defaultValue(String defaultValue)
   {
     this.compiler = this.compiler.defaultValue(defaultValue);
     return this;
   }
 
+  @Deprecated
   public TemplateProcessor escapeHTML(boolean enableHTMLEscaping)
   {
     this.compiler = this.compiler.escapeHTML(enableHTMLEscaping);
@@ -84,60 +76,13 @@ public TemplateProcessor escapeHTML(boolean enableHTMLEscaping)
   @Deprecated
   public void processTemplate(String templateString, JsonObject params, final Handler<String> handler)
   {
-    this.processTemplateToWriter(templateString, params, new Handler<Writer>()
-    {
-      @Override
-      public void handle(Writer w)
-      {
-        handler.handle(w == null ? null : w.toString());
-      }
-    });
-  }
-
-  public void processTemplate(String templateString, JsonObject params, Map<String, Mustache.Lambda> lambdas,
-                              final Handler<String> handler)
-  {
-    this.processTemplateToWriter(templateString, params, lambdas, new Handler<Writer>()
-    {
-      @Override
-      public void handle(Writer w)
-      {
-        handler.handle(w == null ? null : w.toString());
-      }
-    });
+    this.processTemplateToWriter(templateString, params, w -> handler.handle(w == null ? null : w.toString()));
   }
 
   @Deprecated
   public void processTemplateToWriter(String templateString, JsonObject params, final Handler<Writer> handler)
   {
-    this.getTemplate(templateString, new Handler<Template>()
-    {
-      @Override
-      public void handle(Template t)
-      {
-        processTemplate(t, params, handler);
-      }
-    });
-  }
-
-  public void processTemplateToWriter(String templateString, JsonObject params,  Map<String, Mustache.Lambda> lambdas,
-                                      final Handler<Writer> handler)
-  {
-    this.getTemplate(templateString, new Handler<Template>()
-    {
-      @Override
-      public void handle(Template t)
-      {
-        processTemplate(t, params, lambdas, handler);
-      }
-    });
-  }
-
-  protected void processTemplate(Template t, JsonObject params, Map<String, Mustache.Lambda> lambdas, final Handler<Writer> handler) {
-    final JsonObject ctxParams = (params == null) ? new JsonObject() : params.copy();
-    final Map<String, Object> ctx = JsonUtils.convertMap(ctxParams);
-    ctx.putAll(lambdas);
-    applyTemplate(t, ctx, handler);
+    this.getTemplate(templateString, t -> processTemplate(t, params, handler));
   }
 
   @Deprecated
@@ -149,14 +94,39 @@ protected void processTemplate(Template t, JsonObject params, final Handler<Writ
     applyTemplate(t, ctx, handler);
   }
 
-  protected void getTemplate(String templateString, final Handler<Template> handler)
-  {
+  @Deprecated
+  protected void getTemplate(String templateString, final Handler<Template> handler) {
     handler.handle(compiler.compile(templateString));
   }
 
+  protected void getTemplate(ProcessTemplateContext context, final Handler<Template> handler) {
+    if(context.reader() == null) {
+      handler.handle(compiler.defaultValue(context.defaultValue())
+              .escapeHTML(context.escapeHtml())
+              .compile(context.templateString()));
+    } else {
+      handler.handle(compiler.defaultValue(context.defaultValue())
+              .escapeHTML(context.escapeHtml())
+              .compile(context.reader()));
+    }
+  }
+
+
+  public void processTemplate(ProcessTemplateContext templateContext, Template template, Handler<Writer> handler) {
+    final JsonObject ctxParams = (templateContext.params() == null) ? new JsonObject() : templateContext.params().copy();
+    final Map<String, Object> ctx = JsonUtils.convertMap(ctxParams);
+    applyLambdas(templateContext, ctx);
+    applyTemplate(template, ctx, handler);
+  }
+
+  public void processTemplate(ProcessTemplateContext templateContext, Handler<Writer> handler) {
+      getTemplate(templateContext, h -> processTemplate(templateContext, h, handler));
+  }
+
 
   // ================================================ PRIVATE UTILS ===============================================
 
+
   private void applyTemplate(Template t, Map<String, Object> ctx, Handler<Writer> handler) {
     if (t != null) {
       try {
@@ -172,11 +142,13 @@ private void applyTemplate(Template t, Map<String, Object> ctx, Handler<Writer>
     }
   }
 
-  private void applyLambdas(Map<String, Object> context)
-  {
-    for(Map.Entry<String, Mustache.Lambda> entry : this.templateLambdas.entrySet())
-    {
-      context.put(entry.getKey(), entry.getValue());
-    }
+  private void applyLambdas(ProcessTemplateContext templateContext, Map<String, Object> ctx) {
+      ctx.putAll(templateContext.lambdas());
   }
+
+  @Deprecated
+  private void applyLambdas(Map<String, Object> context) {
+      context.putAll(this.templateLambdas);
+  }
+
 }
\ No newline at end of file

From 203bc65e941b9e10cfbf667609a3932a7fdb2f65 Mon Sep 17 00:00:00 2001
From: Vincent Billard <vincent.billard@edifice.io>
Date: Mon, 13 Oct 2025 10:41:57 +0200
Subject: [PATCH 5/5] PR review

---
 .../webutils/http/ProcessTemplateContext.java | 107 +++++++++++-------
 .../java/fr/wseduc/webutils/http/Renders.java |  21 +++-
 2 files changed, 84 insertions(+), 44 deletions(-)

diff --git a/src/main/java/fr/wseduc/webutils/http/ProcessTemplateContext.java b/src/main/java/fr/wseduc/webutils/http/ProcessTemplateContext.java
index 9849b2d..2ce1b3e 100644
--- a/src/main/java/fr/wseduc/webutils/http/ProcessTemplateContext.java
+++ b/src/main/java/fr/wseduc/webutils/http/ProcessTemplateContext.java
@@ -9,51 +9,82 @@
 import java.util.Map;
 
 /**
- * Container for all parameters needed for the template processinf
+ * Container for all parameters needed for the template processing
  */
-public class ProcessTemplateContext {
-
-    private HttpServerRequest request;
-    private JsonObject params;
-    private String templateString;
-    private Reader reader;
-    private boolean escapeHtml;
-    private String defaultValue;
-    private final Map<String, Mustache.Lambda> lambdas = new HashMap<>();
-
-    public ProcessTemplateContext request(HttpServerRequest request) {
+public final class ProcessTemplateContext {
+
+    private final HttpServerRequest request;
+    private final JsonObject params;
+    private final String templateString;
+    private final Reader reader;
+    private final boolean escapeHtml;
+    private final String defaultValue;
+    private final Map<String, Mustache.Lambda> lambdas;
+
+    private ProcessTemplateContext(HttpServerRequest request, JsonObject params, String templateString, Reader reader,
+                                  boolean escapeHtml, String defaultValue, Map<String, Mustache.Lambda> lambdas) {
         this.request = request;
-        return this;
-    }
-
-    public ProcessTemplateContext escapeHtml(boolean escapeHtml) {
-        this.escapeHtml = escapeHtml;
-        return this;
-    }
-
-    public ProcessTemplateContext setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-        return this;
-    }
-
-    public ProcessTemplateContext params(JsonObject params) {
         this.params = params;
-        return this;
-    }
-
-    public ProcessTemplateContext templateString(String templateString) {
         this.templateString = templateString;
-        return this;
-    }
-
-    public ProcessTemplateContext reader(Reader reader) {
         this.reader = reader;
-        return this;
+        this.escapeHtml = escapeHtml;
+        this.defaultValue = defaultValue;
+        this.lambdas = new HashMap<>(lambdas);
     }
 
-    public ProcessTemplateContext lambdas(Map<String, Mustache.Lambda> lambdas) {
-        this.lambdas.putAll(lambdas);
-        return this;
+    public static class Builder {
+
+        private HttpServerRequest request;
+        private JsonObject params;
+        private String templateString;
+        private Reader reader;
+        private boolean escapeHtml;
+        private String defaultValue;
+        private final Map<String, Mustache.Lambda> lambdas = new HashMap<>();
+
+        public Builder request(HttpServerRequest request) {
+            this.request = request;
+            return this;
+        }
+
+        public Builder escapeHtml(boolean escapeHtml) {
+            this.escapeHtml = escapeHtml;
+            return this;
+        }
+
+        public Builder setDefaultValue(String defaultValue) {
+            this.defaultValue = defaultValue;
+            return this;
+        }
+
+        public Builder params(JsonObject params) {
+            this.params = params;
+            return this;
+        }
+
+        public Builder templateString(String templateString) {
+            this.templateString = templateString;
+            return this;
+        }
+
+        public Builder reader(Reader reader) {
+            this.reader = reader;
+            return this;
+        }
+
+        public Builder lambdas(Map<String, Mustache.Lambda> lambdas) {
+            this.lambdas.putAll(lambdas);
+            return this;
+        }
+
+        public HttpServerRequest request() {
+            return request;
+        }
+
+        public ProcessTemplateContext build() {
+            return new ProcessTemplateContext(request, params, templateString, reader, escapeHtml, defaultValue, lambdas);
+        }
+
     }
 
     public HttpServerRequest request() {
diff --git a/src/main/java/fr/wseduc/webutils/http/Renders.java b/src/main/java/fr/wseduc/webutils/http/Renders.java
index dee3185..1ef598f 100644
--- a/src/main/java/fr/wseduc/webutils/http/Renders.java
+++ b/src/main/java/fr/wseduc/webutils/http/Renders.java
@@ -119,6 +119,12 @@ protected void setLambdaTemplateRequest(final HttpServerRequest request) {
 		this.templateProcessor.setLambda("datetime", new LocaleDateLambda(I18n.acceptLanguage(request)));
 	}
 
+	/**
+	 * Create lambda from request for mustache. These lambdas should be used with TemplateProcessorContext and method
+	 * that use it in order to avoid race condition on template processing
+	 * @param request HttpRequest of the user to set various dependent request lambda (host, domain, language, etc..)
+	 * @return Map with request dependent lambda
+	 */
 	protected Map<String, Mustache.Lambda> getLambdasFromRequest(final HttpServerRequest request) {
 		Map<String, Mustache.Lambda> lambdas = new HashMap<>();
 
@@ -166,12 +172,15 @@ public void renderTemplateView(final HttpServerRequest request, JsonObject param
 		mergeLambdas.putAll(lambdas);
 		mergeLambdas.putAll(staticLambdas);
 
-		ProcessTemplateContext context = new ProcessTemplateContext()
+		ProcessTemplateContext.Builder context = new ProcessTemplateContext.Builder()
 												.escapeHtml(true)
 												.reader(r)
 												.lambdas( mergeLambdas)
 												.request(request);
-		processTemplateWithLambdas(context,  resourceName,writer -> {
+
+		context.templateString(genTemplateName(resourceName, request));
+
+		templateProcessor.processTemplate(context.build(),  writer -> {
 			if (writer != null) {
 				request.response().putHeader("content-type", "text/html; charset=utf-8");
 				request.response().setStatusCode(status);
@@ -274,15 +283,15 @@ public void processTemplate(final HttpServerRequest request, JsonObject p, Strin
 		this.templateProcessor.escapeHTML(escapeHTML).processTemplate(this.genTemplateName(resourceName, request), p, handler);
 	}
 
-	public void processTemplateWithLambdas(ProcessTemplateContext context, Handler<Writer> handler) {
+	public void processTemplateWithLambdas(ProcessTemplateContext.Builder context, Handler<Writer> handler) {
 		context.lambdas(getLambdasFromRequest(context.request()));
-		this.templateProcessor.processTemplate(context, handler);
+		this.templateProcessor.processTemplate(context.build(), handler);
 	}
 
-	public void processTemplateWithLambdas(ProcessTemplateContext context, String resourceName, Handler<Writer> handler) {
+	public void processTemplateWithLambdas(ProcessTemplateContext.Builder context, String resourceName, Handler<Writer> handler) {
 		context.lambdas(getLambdasFromRequest(context.request()));
 		context.templateString(genTemplateName(resourceName, context.request()));
-		this.templateProcessor.processTemplate(context, handler);
+		this.templateProcessor.processTemplate(context.build(), handler);
 	}
 
 	private String genTemplateName(final String resourceName, final HttpServerRequest request) {