From 5479130178071ca752bff18b680f0d11af73d642 Mon Sep 17 00:00:00 2001
From: - <->
Date: Tue, 19 Mar 2019 17:44:53 -0600
Subject: [PATCH] fixed again, thanks Alex for your detailed reviews I have
 learned alot :)

---
 build.gradle                                  |  2 ++
 .../website/{controller => }/Application.java |  8 ++----
 .../controller/TheoremEntryController.java    | 27 ++++++------------
 .../tsp/website/controller/forms/Theorem.java | 21 ++++----------
 src/main/webapp/WEB-INF/jsp/Theorem.jsp       |  6 ++--
 src/main/webapp/WEB-INF/jsp/success.jsp       |  3 +-
 src/main/webapp/WEB-INF/jsp/welcome.jsp       | 11 --------
 .../TheoremEntryControllerTest.java           | 28 +++++++------------
 8 files changed, 35 insertions(+), 71 deletions(-)
 rename src/main/java/edu/msudenver/tsp/website/{controller => }/Application.java (71%)
 delete mode 100644 src/main/webapp/WEB-INF/jsp/welcome.jsp

diff --git a/build.gradle b/build.gradle
index b50c1d6..3231c9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,6 +70,8 @@ subprojects {
         testCompile group: 'junit', name: 'junit', version: '4.11'
         testCompile group: 'junit', name: 'junit', version: '4.12'
         testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')}
+        testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.1.2.RELEASE'
+        testCompile 'javax.el:javax.el-api:3.0.0'
 
     }
 
diff --git a/src/main/java/edu/msudenver/tsp/website/controller/Application.java b/src/main/java/edu/msudenver/tsp/website/Application.java
similarity index 71%
rename from src/main/java/edu/msudenver/tsp/website/controller/Application.java
rename to src/main/java/edu/msudenver/tsp/website/Application.java
index b165a26..12556af 100644
--- a/src/main/java/edu/msudenver/tsp/website/controller/Application.java
+++ b/src/main/java/edu/msudenver/tsp/website/Application.java
@@ -1,16 +1,14 @@
-package edu.msudenver.tsp.website.controller;
-
-
+package edu.msudenver.tsp.website;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 
-
 public class Application {
 
-    public static void main(final String[] args) {
+    public static void main(final String[] args)
+    {
         SpringApplication.run(Application.class, args);
     }
 
diff --git a/src/main/java/edu/msudenver/tsp/website/controller/TheoremEntryController.java b/src/main/java/edu/msudenver/tsp/website/controller/TheoremEntryController.java
index 57d2ef3..4605fa3 100644
--- a/src/main/java/edu/msudenver/tsp/website/controller/TheoremEntryController.java
+++ b/src/main/java/edu/msudenver/tsp/website/controller/TheoremEntryController.java
@@ -6,6 +6,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
@@ -13,31 +15,20 @@ import org.springframework.web.servlet.ModelAndView;
 @Slf4j
 @Controller
 @AllArgsConstructor
+@RequestMapping("/theorem")
 public class TheoremEntryController {
-
-
-
-    @RequestMapping("/theorem")
-    public ModelAndView theoremPage()
+    @GetMapping({"/",""})
+    public ModelAndView enterTheoremPage()
     {
-
-
         return new ModelAndView("Theorem");
     }
 
-
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @PostMapping({"/",""})
     public String saveTheorem(@Validated Theorem theorem, Model model) {
 
-        model.addAttribute("theromName", theorem.getTheoremName());
+        model.addAttribute("theromName1", theorem.getTheoremName1());
+        model.addAttribute("theromName2", theorem.getTheoremName2());
 
         return "success";
     }
-
-
-    public ModelAndView firstPage() {
-        return new ModelAndView("welcome");
-    }
-}
-
-
+}
\ No newline at end of file
diff --git a/src/main/java/edu/msudenver/tsp/website/controller/forms/Theorem.java b/src/main/java/edu/msudenver/tsp/website/controller/forms/Theorem.java
index fc9660c..7b15b36 100644
--- a/src/main/java/edu/msudenver/tsp/website/controller/forms/Theorem.java
+++ b/src/main/java/edu/msudenver/tsp/website/controller/forms/Theorem.java
@@ -3,23 +3,14 @@ package edu.msudenver.tsp.website.controller.forms;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 @Getter
 @Setter
-
 public class Theorem {
-    private String theoremName ;
-
-
-    public String getTheoremName() {
-        return theoremName;
-    }
-
-    public void setTheoremName1(String theoremName) {
-        this.theoremName = theoremName;
-    }
-
-
-
-
+    private String theoremName1 ;
+    private String theoremName2 ;
+    @NotBlank(message = "Theorem name must not be blank") private String theoremName;
+    private String theorem;
 
 }
diff --git a/src/main/webapp/WEB-INF/jsp/Theorem.jsp b/src/main/webapp/WEB-INF/jsp/Theorem.jsp
index ae55b1d..8933e48 100644
--- a/src/main/webapp/WEB-INF/jsp/Theorem.jsp
+++ b/src/main/webapp/WEB-INF/jsp/Theorem.jsp
@@ -7,9 +7,9 @@
 <title>Theroem Page</title>
 </head>
 <body>
-<form action="save" method="post">
-Enter Theorem Name: <input type="text" name="theoremName">
-
+<form action="" method="post">
+Enter Theorem Name : <input type="text" name="theoremName1">
+    <br>Enter Theorem: <input type="text" name="theoremName2"><br>
 <input type="submit" value="save">
 </form>
 </body>
diff --git a/src/main/webapp/WEB-INF/jsp/success.jsp b/src/main/webapp/WEB-INF/jsp/success.jsp
index 5802680..ea5294b 100644
--- a/src/main/webapp/WEB-INF/jsp/success.jsp
+++ b/src/main/webapp/WEB-INF/jsp/success.jsp
@@ -1,6 +1,7 @@
 <html>
 <body>
-<br><b>Name:</b><%= request.getParameter("theoremName")%>
+<br><b>Name:</b><%= request.getParameter("theoremName1")%>
+<br><b>Name:</b><%= request.getParameter("theoremName2")%>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp
deleted file mode 100644
index 1342bc5..0000000
--- a/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title>Guru Success Page</title>
-</head>
-<body>
-<a><b>Welcome User!!!!</b></a>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java b/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java
index 5864497..f71de78 100644
--- a/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java
+++ b/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java
@@ -23,27 +23,19 @@ public class TheoremEntryControllerTest {
     @InjectMocks
     private TheoremEntryController theoremEntryController;
 
-    @Autowired
-    protected MockMvc mockMvc;
-
-    @Test
-    public void contexLoads() throws Exception {
-        assertNotNull(theoremEntryController);
-    }
-
-    @Test
-    public void firstPage(){
-
-        final ModelAndView modelAndView= theoremEntryController.firstPage();
-
-        assertNotNull(modelAndView);
-        assertEquals("welcome",modelAndView.getViewName());
-    }
-
     @Test
     public void theoremPage(){
 
-        final ModelAndView modelAndView= theoremEntryController.theoremPage();
+        final ModelAndView modelAndView= theoremEntryController.enterTheoremPage();
+
+        assertNotNull(modelAndView);
+        assertEquals("Theorem",modelAndView.getViewName());
+    }
+
+    @Test
+    public void saveTheorem(){
+
+        final ModelAndView modelAndView= theoremEntryController.enterTheoremPage();
 
         assertNotNull(modelAndView);
         assertEquals("Theorem",modelAndView.getViewName());