From c7f47e4d4dfbf6a25b377bedb35a10820781cac9 Mon Sep 17 00:00:00 2001 From: hbina Date: Mon, 27 Aug 2018 11:21:24 -0400 Subject: [PATCH 1/3] changed the type of {id} in the greeting form to match its expected type; a number --- complete/src/main/resources/templates/greeting.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/complete/src/main/resources/templates/greeting.html b/complete/src/main/resources/templates/greeting.html index 8a8ff78..80c7792 100644 --- a/complete/src/main/resources/templates/greeting.html +++ b/complete/src/main/resources/templates/greeting.html @@ -7,7 +7,7 @@

Form

-

Id:

+

Id:

Message:

From 76f20089005c98aaf68a8c353481a25294a49fd7 Mon Sep 17 00:00:00 2001 From: hbina Date: Tue, 28 Aug 2018 08:35:37 -0400 Subject: [PATCH 2/3] as per Issue ##9 of origin repo, this commit hopes to resolve the confusion surrounding the naming scheme used. --- .../hello/{Greeting.java => GreetingClass.java} | 2 +- .../src/main/java/hello/GreetingController.java | 7 +++---- .../src/main/resources/templates/greeting.html | 15 --------------- .../resources/templates/greeting_template.html | 15 +++++++++++++++ complete/src/main/resources/templates/result.html | 12 ++++++------ 5 files changed, 25 insertions(+), 26 deletions(-) rename complete/src/main/java/hello/{Greeting.java => GreetingClass.java} (91%) delete mode 100644 complete/src/main/resources/templates/greeting.html create mode 100644 complete/src/main/resources/templates/greeting_template.html diff --git a/complete/src/main/java/hello/Greeting.java b/complete/src/main/java/hello/GreetingClass.java similarity index 91% rename from complete/src/main/java/hello/Greeting.java rename to complete/src/main/java/hello/GreetingClass.java index a92576c..377b7a1 100644 --- a/complete/src/main/java/hello/Greeting.java +++ b/complete/src/main/java/hello/GreetingClass.java @@ -1,6 +1,6 @@ package hello; -public class Greeting { +public class GreetingClass { private long id; private String content; diff --git a/complete/src/main/java/hello/GreetingController.java b/complete/src/main/java/hello/GreetingController.java index b335d8f..29464da 100644 --- a/complete/src/main/java/hello/GreetingController.java +++ b/complete/src/main/java/hello/GreetingController.java @@ -11,13 +11,12 @@ public class GreetingController { @GetMapping("/greeting") public String greetingForm(Model model) { - model.addAttribute("greeting", new Greeting()); - return "greeting"; + model.addAttribute("greeting_attribute", new GreetingClass()); + return "greeting_template"; } @PostMapping("/greeting") - public String greetingSubmit(@ModelAttribute Greeting greeting) { + public String greetingSubmit(@ModelAttribute GreetingClass greetingClass) { return "result"; } - } diff --git a/complete/src/main/resources/templates/greeting.html b/complete/src/main/resources/templates/greeting.html deleted file mode 100644 index 80c7792..0000000 --- a/complete/src/main/resources/templates/greeting.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - Getting Started: Handling Form Submission - - - -

Form

-
-

Id:

-

Message:

-

-
- - diff --git a/complete/src/main/resources/templates/greeting_template.html b/complete/src/main/resources/templates/greeting_template.html new file mode 100644 index 0000000..b59c281 --- /dev/null +++ b/complete/src/main/resources/templates/greeting_template.html @@ -0,0 +1,15 @@ + + + + Getting Started: Handling Form Submission + + + +

Form

+
+

Id:

+

Message:

+

+
+ + diff --git a/complete/src/main/resources/templates/result.html b/complete/src/main/resources/templates/result.html index 05131f6..e247032 100644 --- a/complete/src/main/resources/templates/result.html +++ b/complete/src/main/resources/templates/result.html @@ -1,13 +1,13 @@ - + Getting Started: Handling Form Submission - + -

Result

-

-

- Submit another message +

Result

+

+

+Submit another message From 7403b7fa0ee2868d50fc68be56195276fbeb9a00 Mon Sep 17 00:00:00 2001 From: hbina Date: Tue, 28 Aug 2018 08:46:59 -0400 Subject: [PATCH 3/3] fixed a problem caused by previous commit because of naming conflict --- complete/src/main/java/hello/GreetingController.java | 2 +- complete/src/main/resources/templates/greeting_template.html | 2 +- complete/src/main/resources/templates/result.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/complete/src/main/java/hello/GreetingController.java b/complete/src/main/java/hello/GreetingController.java index 29464da..fa1d56c 100644 --- a/complete/src/main/java/hello/GreetingController.java +++ b/complete/src/main/java/hello/GreetingController.java @@ -16,7 +16,7 @@ public String greetingForm(Model model) { } @PostMapping("/greeting") - public String greetingSubmit(@ModelAttribute GreetingClass greetingClass) { + public String greetingSubmit(@ModelAttribute GreetingClass result) { return "result"; } } diff --git a/complete/src/main/resources/templates/greeting_template.html b/complete/src/main/resources/templates/greeting_template.html index b59c281..2d05378 100644 --- a/complete/src/main/resources/templates/greeting_template.html +++ b/complete/src/main/resources/templates/greeting_template.html @@ -6,7 +6,7 @@

Form

-
+

Id:

Message:

diff --git a/complete/src/main/resources/templates/result.html b/complete/src/main/resources/templates/result.html index e247032..308bd14 100644 --- a/complete/src/main/resources/templates/result.html +++ b/complete/src/main/resources/templates/result.html @@ -8,6 +8,6 @@

Result

-Submit another message +Submit another message