From c300196e194d3097e9d8f38b16bf910860f41b71 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 17:57:00 +0100 Subject: [PATCH 01/14] Create .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..dff5f3a --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ +language: java From d5334567d1874a1197f2744e79327570786f84c2 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:07:00 +0100 Subject: [PATCH 02/14] Update GreetingController.java --- src/main/java/hello/GreetingController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/hello/GreetingController.java b/src/main/java/hello/GreetingController.java index 2a1631c..8d9217c 100644 --- a/src/main/java/hello/GreetingController.java +++ b/src/main/java/hello/GreetingController.java @@ -5,14 +5,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -@Controller -public class GreetingController { @RequestMapping("/greeting") public String greeting(@RequestParam(value="name", required=false, defaultValue="World") String name, + @RequestParam(value="lang", required=false, defaultValue="en") String lang, Model model) { + model.addAttribute("hello", greetingTranslator.sayHelloIn(lang)); model.addAttribute("name", name); return "greeting"; } -} \ No newline at end of file +} From 2a2f17e1398be4d0bdd7d30c17d2aad2df4cc020 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:09:02 +0100 Subject: [PATCH 03/14] Create TreetingTranslator.java --- src/main/java/hello/TreetingTranslator.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/main/java/hello/TreetingTranslator.java diff --git a/src/main/java/hello/TreetingTranslator.java b/src/main/java/hello/TreetingTranslator.java new file mode 100644 index 0000000..66eadda --- /dev/null +++ b/src/main/java/hello/TreetingTranslator.java @@ -0,0 +1,16 @@ +package hello; + +public class GreetingTranslator { + + public String sayHelloIn(String lang) { + String hello; + if ("en".equals(lang)) { + hello = "hello"; + } else if ("es".equals(lang)) { + hello = "hola"; + } else { + hello = "no hablo tu idioma"; + } + } + +} From 6a0d9bf00cc30ced6857814051b6b7831d8399b0 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:09:40 +0100 Subject: [PATCH 04/14] Update greeting.html --- src/main/resources/templates/greeting.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/greeting.html b/src/main/resources/templates/greeting.html index aaeba56..12d7712 100644 --- a/src/main/resources/templates/greeting.html +++ b/src/main/resources/templates/greeting.html @@ -5,6 +5,6 @@ -

+

- \ No newline at end of file + From d2bcc563641a427e88247ecfec5aa7d93c4c7aa6 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:20:06 +0100 Subject: [PATCH 05/14] Update pom.xml --- pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 947f7c7..eeb193e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,6 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + + org.springframework hello-java 0.1.0 @@ -71,4 +74,4 @@ - \ No newline at end of file + From 223fd38652c04f1b0be93c146b2036168fbc6529 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:26:23 +0100 Subject: [PATCH 06/14] Rename TreetingTranslator.java to GreetingTranslator.java --- .../hello/{TreetingTranslator.java => GreetingTranslator.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/java/hello/{TreetingTranslator.java => GreetingTranslator.java} (100%) diff --git a/src/main/java/hello/TreetingTranslator.java b/src/main/java/hello/GreetingTranslator.java similarity index 100% rename from src/main/java/hello/TreetingTranslator.java rename to src/main/java/hello/GreetingTranslator.java From 0a19ceb6bb3dc47f720a88cc2d9d10e74f27d96a Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:30:18 +0100 Subject: [PATCH 07/14] Update GreetingController.java --- src/main/java/hello/GreetingController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/hello/GreetingController.java b/src/main/java/hello/GreetingController.java index 8d9217c..4c60fdb 100644 --- a/src/main/java/hello/GreetingController.java +++ b/src/main/java/hello/GreetingController.java @@ -4,13 +4,14 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import hello.GreetingTranslator @RequestMapping("/greeting") public String greeting(@RequestParam(value="name", required=false, defaultValue="World") String name, @RequestParam(value="lang", required=false, defaultValue="en") String lang, Model model) { - model.addAttribute("hello", greetingTranslator.sayHelloIn(lang)); + model.addAttribute("hello", GreetingTranslator.sayHelloIn(lang)); model.addAttribute("name", name); return "greeting"; } From 2708ee1c61b3de6be87ccddc86ab9bc284180bc0 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:30:31 +0100 Subject: [PATCH 08/14] Update GreetingTranslator.java --- src/main/java/hello/GreetingTranslator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/hello/GreetingTranslator.java b/src/main/java/hello/GreetingTranslator.java index 66eadda..4e45dcb 100644 --- a/src/main/java/hello/GreetingTranslator.java +++ b/src/main/java/hello/GreetingTranslator.java @@ -2,7 +2,7 @@ public class GreetingTranslator { - public String sayHelloIn(String lang) { + public static String sayHelloIn(String lang) { String hello; if ("en".equals(lang)) { hello = "hello"; From 1036e89543901128e6a1bddb5d272d6466ad0959 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:32:52 +0100 Subject: [PATCH 09/14] Update GreetingController.java --- src/main/java/hello/GreetingController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/hello/GreetingController.java b/src/main/java/hello/GreetingController.java index 4c60fdb..24c3462 100644 --- a/src/main/java/hello/GreetingController.java +++ b/src/main/java/hello/GreetingController.java @@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.RequestParam; import hello.GreetingTranslator +public class GreetingController{ @RequestMapping("/greeting") public String greeting(@RequestParam(value="name", required=false, defaultValue="World") String name, From ad669be2b0725241e771439c23b80daceb72c201 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:34:44 +0100 Subject: [PATCH 10/14] Update GreetingTranslator.java --- src/main/java/hello/GreetingTranslator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/hello/GreetingTranslator.java b/src/main/java/hello/GreetingTranslator.java index 4e45dcb..d6921de 100644 --- a/src/main/java/hello/GreetingTranslator.java +++ b/src/main/java/hello/GreetingTranslator.java @@ -11,6 +11,7 @@ public static String sayHelloIn(String lang) { } else { hello = "no hablo tu idioma"; } + return hello ; } } From b2785cca4704ecfe3a26cf3b630e6a6611c20d74 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:35:02 +0100 Subject: [PATCH 11/14] Update GreetingController.java --- src/main/java/hello/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/hello/GreetingController.java b/src/main/java/hello/GreetingController.java index 24c3462..82a66a1 100644 --- a/src/main/java/hello/GreetingController.java +++ b/src/main/java/hello/GreetingController.java @@ -4,7 +4,7 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import hello.GreetingTranslator +import hello.GreetingTranslator ; public class GreetingController{ From 82cb087fcc4f551016d2b306dcb6c7bcb19bfc40 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:46:37 +0100 Subject: [PATCH 12/14] Update GreetingController.java --- src/main/java/hello/GreetingController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/hello/GreetingController.java b/src/main/java/hello/GreetingController.java index 82a66a1..029e3c5 100644 --- a/src/main/java/hello/GreetingController.java +++ b/src/main/java/hello/GreetingController.java @@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.RequestParam; import hello.GreetingTranslator ; +@Controller public class GreetingController{ @RequestMapping("/greeting") From 57f908480b05f8712b91d11cb2b89bf270f26c20 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:50:56 +0100 Subject: [PATCH 13/14] Update .travis.yml --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index dff5f3a..e32f2e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,7 @@ language: java +services: + - mysql + +before_install: + - mysql -e 'CREATE DATABASE IF NOT EXISTS hello_test;' + From d6b788193d112c2af62364819757717128b66b78 Mon Sep 17 00:00:00 2001 From: ilFreddo48 Date: Thu, 14 Dec 2017 18:52:33 +0100 Subject: [PATCH 14/14] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e32f2e1..708b5f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,5 @@ services: before_install: - mysql -e 'CREATE DATABASE IF NOT EXISTS hello_test;' +env: + - DATABASE=jdbc:mysql://localhost:3306/hello_test DB_USERNAME=travis DB_PASSWORD=""