diff --git a/pom.xml b/pom.xml index 5b5aa8e..21f78e5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.puppet.sample java-webapp jar - 1.0 + 1.1 java-webapp http://maven.apache.org diff --git a/src/main/java/com/puppet/sample/App.java b/src/main/java/com/puppet/sample/App.java index 673c845..5f1c775 100644 --- a/src/main/java/com/puppet/sample/App.java +++ b/src/main/java/com/puppet/sample/App.java @@ -4,6 +4,7 @@ import spark.Request; import spark.Response; import spark.Spark; +import spark.template.thymeleaf.ThymeleafTemplateEngine; import java.util.HashMap; import java.util.Map; @@ -41,8 +42,20 @@ public static void main(String[] args) { System.out.println(requestInfoToString(request)); }); - get("/", (request,response) -> "Hello World!"); + get("/", App::helloWorld, new ThymeleafTemplateEngine()); } + public static ModelAndView helloWorld(Request req, Response res) { + Map params = new HashMap<>(); + + App t = new App(); + params.put("version", t.getClass().getPackage().getImplementationVersion() ); + + App test = new App(); + params.put("lang", test.enMsg()); + + return new ModelAndView(params, "index"); + } + } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000..9ef0ad5 --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,15 @@ + + + + Hello world + + + +
+
+

[[${lang}]]

+
+

Version: [[${version}]]

+
+ + diff --git a/src/test/java/com/puppet/sample/AppTest.java b/src/test/java/com/puppet/sample/AppTest.java new file mode 100644 index 0000000..faeb822 --- /dev/null +++ b/src/test/java/com/puppet/sample/AppTest.java @@ -0,0 +1,16 @@ +package com.puppet.sample; + +import org.junit.Test; +import org.junit.Rule; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import spark.servlet.SparkApplication; + +public class AppTest +{ + @Test + public void testMsg() { + assertEquals("Hello World!", new App().enMsg()); + } +}