- call Freemarker/Velocity templates directly for importing in other templates

Author: rawdog71

clownfish/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.clownfish</groupId>
     <artifactId>clownfish</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <scm>
         <connection>scm:git:https://github.com/rawdog71/Clownfish</connection>

clownfish/src/main/java/io/clownfish/clownfish/Clownfish.java

@@ -660,6 +660,42 @@ public void universalGetTemplate(@PathVariable("name") String name, @Context Htt
         }
     }
 
+    @GetMapping(path = "/{name}.ftl")
+    public void universalGetFreemarkerTemplate(@PathVariable("name") String name, @Context HttpServletRequest request, @Context HttpServletResponse response) {
+        CfTemplate cftemplate = null;
+        try {
+            cftemplate = cftemplateService.findByName(name);
+            if (0 == cftemplate.getScriptlanguage()) {
+                response.setContentType("text/html");
+                response.setCharacterEncoding("UTF-8");
+                PrintWriter outwriter = response.getWriter();
+                outwriter.println(cftemplate.getContent());
+            } else {
+                LOGGER.warn("ONLY Freemarker Templates");
+            }
+        } catch (Exception ex) {
+            LOGGER.warn("Template NOT FOUND");
+        }
+    }
+    
+    @GetMapping(path = "/{name}.vm")
+    public void universalGetVelocityTemplate(@PathVariable("name") String name, @Context HttpServletRequest request, @Context HttpServletResponse response) {
+        CfTemplate cftemplate = null;
+        try {
+            cftemplate = cftemplateService.findByName(name);
+            if (1 == cftemplate.getScriptlanguage()) {
+                response.setContentType("text/html");
+                response.setCharacterEncoding("UTF-8");
+                PrintWriter outwriter = response.getWriter();
+                outwriter.println(cftemplate.getContent());
+            } else {
+                LOGGER.warn("ONLY Velocity Templates");
+            }
+        } catch (Exception ex) {
+            LOGGER.warn("Template NOT FOUND");
+        }
+    }
+    
     @GetMapping(path = "/{name}.js")
     public void universalGetJS(@PathVariable("name") String name, @Context HttpServletRequest request, @Context HttpServletResponse response) {
         CfJavascript cfjavascript = null;

clownfish/src/main/java/io/clownfish/clownfish/serviceimpl/CfTemplateLoaderImpl.java

@@ -33,6 +33,9 @@ public CfTemplateLoaderImpl() {
     @Override
     public Object findTemplateSource(String name) throws IOException {
         try {
+            if ((name.endsWith(".ftl")) || (name.endsWith(".vm"))) {
+                name = name.substring(0, name.lastIndexOf("."));
+            }
             CfTemplate cftemplate = cftemplateService.findByName(name);
             return cftemplate;
         } catch (Exception ex) {