From bcda3eeb85065c4d030f14e5a1d65873fbac68e9 Mon Sep 17 00:00:00 2001 From: Domingo Date: Mon, 11 Dec 2017 08:59:51 +0100 Subject: [PATCH 01/10] added travis.yml file --- .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 4bf5e75fb6d647fce5d8faf8b5f72b2470c041ec Mon Sep 17 00:00:00 2001 From: Domingo Date: Mon, 11 Dec 2017 09:07:36 +0100 Subject: [PATCH 02/10] removed ; to test error handling --- src/main/java/hello/Application.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/hello/Application.java b/src/main/java/hello/Application.java index 8cf206d..c589697 100644 --- a/src/main/java/hello/Application.java +++ b/src/main/java/hello/Application.java @@ -14,7 +14,7 @@ protected SpringApplicationBuilder configure(SpringApplicationBuilder applicatio } public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringApplication.run(Application.class, args) } -} \ No newline at end of file +} From 01751caf4ac85b68fd64bac9a53c2c44e8909849 Mon Sep 17 00:00:00 2001 From: Domingo Date: Mon, 11 Dec 2017 09:11:24 +0100 Subject: [PATCH 03/10] fixed ; error --- src/main/java/hello/Application.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/hello/Application.java b/src/main/java/hello/Application.java index c589697..5be2676 100644 --- a/src/main/java/hello/Application.java +++ b/src/main/java/hello/Application.java @@ -14,7 +14,7 @@ protected SpringApplicationBuilder configure(SpringApplicationBuilder applicatio } public static void main(String[] args) { - SpringApplication.run(Application.class, args) + SpringApplication.run(Application.class, args); } } From 8ba5d7b881fc8ee55e6ca901669bbbb3d9ee5c43 Mon Sep 17 00:00:00 2001 From: Domingo Date: Mon, 11 Dec 2017 09:23:11 +0100 Subject: [PATCH 04/10] adding different language greeting --- src/main/java/hello/GreetingController.java | 6 +++--- src/main/java/hello/GreetingTranslator.java | 16 ++++++++++++++++ src/main/resources/templates/greeting.html | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 src/main/java/hello/GreetingTranslator.java diff --git a/src/main/java/hello/GreetingController.java b/src/main/java/hello/GreetingController.java index 2a1631c..2ef8957 100644 --- a/src/main/java/hello/GreetingController.java +++ b/src/main/java/hello/GreetingController.java @@ -9,10 +9,10 @@ public class GreetingController { @RequestMapping("/greeting") - public String greeting(@RequestParam(value="name", required=false, defaultValue="World") String name, - Model model) { + 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 +} diff --git a/src/main/java/hello/GreetingTranslator.java b/src/main/java/hello/GreetingTranslator.java new file mode 100644 index 0000000..66eadda --- /dev/null +++ b/src/main/java/hello/GreetingTranslator.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"; + } + } + +} diff --git a/src/main/resources/templates/greeting.html b/src/main/resources/templates/greeting.html index aaeba56..0488fc9 100644 --- a/src/main/resources/templates/greeting.html +++ b/src/main/resources/templates/greeting.html @@ -7,4 +7,4 @@

- \ No newline at end of file + From fd9fc22afc17b3d37ff647846dbc5cc012bb20dc Mon Sep 17 00:00:00 2001 From: Domingo Date: Mon, 11 Dec 2017 09:30:48 +0100 Subject: [PATCH 05/10] fixing language greeting --- src/main/java/hello/GreetingController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/hello/GreetingController.java b/src/main/java/hello/GreetingController.java index 2ef8957..30edde6 100644 --- a/src/main/java/hello/GreetingController.java +++ b/src/main/java/hello/GreetingController.java @@ -8,6 +8,9 @@ @Controller public class GreetingController { + @Autowired + private GreetingTranslator 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)); From b11748dd2bdd35c91a9dce727944c6d0566bbd0e Mon Sep 17 00:00:00 2001 From: Domingo Date: Mon, 11 Dec 2017 09:34:04 +0100 Subject: [PATCH 06/10] removing @autowired symbol --- src/main/java/hello/GreetingController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/hello/GreetingController.java b/src/main/java/hello/GreetingController.java index 30edde6..5d4fd7f 100644 --- a/src/main/java/hello/GreetingController.java +++ b/src/main/java/hello/GreetingController.java @@ -8,7 +8,6 @@ @Controller public class GreetingController { - @Autowired private GreetingTranslator greetingTranslator; @RequestMapping("/greeting") From 470305e100498207c094bfbf52435cf8ceb2bb5f Mon Sep 17 00:00:00 2001 From: Domingo Date: Mon, 11 Dec 2017 09:36:58 +0100 Subject: [PATCH 07/10] adding return statmenet to grettingcontroller --- 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 66eadda..c1ac86d 100644 --- a/src/main/java/hello/GreetingTranslator.java +++ b/src/main/java/hello/GreetingTranslator.java @@ -11,6 +11,7 @@ public String sayHelloIn(String lang) { } else { hello = "no hablo tu idioma"; } + return hello; } } From 1def38a958cc5fc591c3fc867f9f20cf17ff42fa Mon Sep 17 00:00:00 2001 From: DominMuda Date: Mon, 11 Dec 2017 09:57:15 +0100 Subject: [PATCH 08/10] Adding Travis status [![Build Status](https://travis-ci.org/DominMuda/hello-java.svg?branch=add-languages)](https://travis-ci.org/DominMuda/hello-java) --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..52b078f --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# hello-java +This is just a hello world example for the students of EGC course From 1dab479564c84b9da7d862aea191ab7d78a43c23 Mon Sep 17 00:00:00 2001 From: DominMuda Date: Mon, 11 Dec 2017 09:58:58 +0100 Subject: [PATCH 09/10] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 52b078f..7cf2ff5 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # hello-java This is just a hello world example for the students of EGC course + +[![Build Status](https://travis-ci.org/DominMuda/hello-java.svg?branch=add-languages)](https://travis-ci.org/DominMuda/hello-java) From 06685d32fb9e4838be7f0be75d932357c29718fc Mon Sep 17 00:00:00 2001 From: Domingo Date: Mon, 11 Dec 2017 09:59:28 +0100 Subject: [PATCH 10/10] configured travis notifications --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index dff5f3a..5e29d40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,9 @@ language: java + +notifications: + email: + recipients: + - dmunnoz96@gmail.com + on_success: always # default: change + on_failure: always # default: always +