PR review

Author: vbillard91

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() {

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) {