Cover optional case

Author: wied03

src/test/java/org/primeframework/mvc/test/BodyToolsTest.java

@@ -17,6 +17,7 @@
 
 import java.nio.file.Paths;
 import java.util.Map;
+import java.util.Optional;
 
 import org.testng.annotations.Test;
 import static org.testng.Assert.assertEquals;
@@ -55,6 +56,36 @@ public void processTemplateWithMap_functions() throws Exception {
     assertEquals(result, "missing");
   }
 
+  @Test
+  public void processTemplateWithMap_optional_variable_unused() throws Exception {
+    // arrange
+    DetectionMap values = new DetectionMap();
+    values.putAll(Map.of("message", "howdy", "othervariable", Optional.of("value")));
+
+    // act
+    String result = BodyTools.processTemplateWithMap(Paths.get("src/test/web/templates/echo.ftl"),
+                                                     values,
+                                                     false);
+
+    // assert
+    assertEquals(result, "howdy");
+  }
+
+  @Test
+  public void processTemplateWithMap_optional_variable_used() throws Exception {
+    // arrange
+    DetectionMap values = new DetectionMap();
+    values.put("message", Optional.of("howdy"));
+
+    // act
+    String result = BodyTools.processTemplateWithMap(Paths.get("src/test/web/templates/echo.ftl"),
+                                                     values,
+                                                     false);
+
+    // assert
+    assertEquals(result, "howdy");
+  }
+
   @Test
   public void processTemplateWithMap_unused_variables() throws Exception {
     // arrange

src/test/java/org/primeframework/mvc/test/DetectionMap.java

@@ -17,6 +17,7 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -50,6 +51,17 @@ public Set<Object> getUnusedVariables(String excludePrefix,
     Set<String> excludeKeySet = Set.of(excludeKeys);
     return keySet().stream()
                    .filter(key -> !variablesAccessed.contains(key) && !key.startsWith(excludePrefix) && !excludeKeySet.contains(key))
+                   // optional variables do not have to be used in the template
+                   .filter(key -> !(super.get(key) instanceof Optional<?>))
                    .collect(Collectors.toSet());
   }
+
+  @Override
+  public Object put(String key, Object value) {
+    // go ahead and evaluate optional values for FreeMarker
+    if (value instanceof Optional<?> opt && opt.isPresent()) {
+      value = opt.get();
+    }
+    return super.put(key, value);
+  }
 }