From 9f5d9e24f5641bf7f676e55432a51ddce5d88868 Mon Sep 17 00:00:00 2001 From: - <-> Date: Mon, 18 Mar 2019 13:52:01 -0600 Subject: [PATCH] made few changes also adding test method --- build.gradle | 4 ++++ .../msudenver/tsp/website/Application.java | 14 ++++++++++++++ .../msudenver/tsp/website/ProofsDriver.java | 5 ----- .../tsp/website/TheoremEntryController.java | 15 ++++++++------- .../msudenver/tsp/website/forms/Theorem.java | 19 +++++++++++++------ .../tsp/website/service/ProofDriver.java | 16 ---------------- src/main/webapp/WEB-INF/jsp/Theorem.jsp | 3 ++- src/main/webapp/WEB-INF/jsp/success.jsp | 3 ++- .../tsp/website/ProofsDriverTest.java | 5 ----- 9 files changed, 43 insertions(+), 41 deletions(-) delete mode 100644 src/main/java/edu/msudenver/tsp/website/ProofsDriver.java delete mode 100644 src/main/java/edu/msudenver/tsp/website/service/ProofDriver.java delete mode 100644 src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java diff --git a/build.gradle b/build.gradle index 6690226..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' } @@ -107,6 +109,8 @@ dependencies { compile 'org.slf4j:slf4j-api:1.7.22' compile "joda-time:joda-time:2.2" compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.0.5.RELEASE' + compile('org.springframework.boot:spring-boot-starter-web','org.apache.tomcat.embed:tomcat-embed-jasper' + ,'javax.servlet:jstl') testCompile group: 'junit', name: 'junit', version: '4.12' testCompile "org.springframework:spring-test:5.0.9.RELEASE" diff --git a/src/main/java/edu/msudenver/tsp/website/Application.java b/src/main/java/edu/msudenver/tsp/website/Application.java index 17154e8..b700c5a 100644 --- a/src/main/java/edu/msudenver/tsp/website/Application.java +++ b/src/main/java/edu/msudenver/tsp/website/Application.java @@ -1,16 +1,30 @@ package edu.msudenver.tsp.website; +import lombok.extern.java.Log; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; + +import java.util.Arrays; @SpringBootApplication +@Slf4j + public class Application { public static void main(final String[] args) { SpringApplication.run(Application.class, args); } + } + + + diff --git a/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java b/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java deleted file mode 100644 index a8a5de0..0000000 --- a/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java +++ /dev/null @@ -1,5 +0,0 @@ -package edu.msudenver.tsp.website; - -public class ProofsDriver { - //Business Logic will go here -} diff --git a/src/main/java/edu/msudenver/tsp/website/TheoremEntryController.java b/src/main/java/edu/msudenver/tsp/website/TheoremEntryController.java index c62f84a..53db791 100644 --- a/src/main/java/edu/msudenver/tsp/website/TheoremEntryController.java +++ b/src/main/java/edu/msudenver/tsp/website/TheoremEntryController.java @@ -1,7 +1,8 @@ package edu.msudenver.tsp.website; import edu.msudenver.tsp.website.forms.Theorem; -import edu.msudenver.tsp.website.service.ProofDriver; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,12 +11,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; - +@Slf4j @Controller +@AllArgsConstructor public class TheoremEntryController { - @Autowired - ProofDriver proofDriver; @RequestMapping("/welcome") public ModelAndView firstPage() @@ -26,14 +26,15 @@ public class TheoremEntryController { @RequestMapping("/theorem") public ModelAndView theoremPage() { + //System.out.println("Inside controller"); return new ModelAndView("Theorem"); } - @RequestMapping(value = "/save", method = RequestMethod.POST) public String saveTheorem(@Validated Theorem theorem, Model model) { - proofDriver.processProof(theorem.getTheoremName()); - model.addAttribute("theromName", theorem.getTheoremName()); + + model.addAttribute("theromName1", theorem.getTheoremName1()); + model.addAttribute("theromName2", theorem.getTheoremName2()); return "success"; } diff --git a/src/main/java/edu/msudenver/tsp/website/forms/Theorem.java b/src/main/java/edu/msudenver/tsp/website/forms/Theorem.java index 07524df..935f762 100644 --- a/src/main/java/edu/msudenver/tsp/website/forms/Theorem.java +++ b/src/main/java/edu/msudenver/tsp/website/forms/Theorem.java @@ -1,17 +1,24 @@ package edu.msudenver.tsp.website.forms; public class Theorem { - private String theoremName ; + private String theoremName1 ; + private String theoremName2 ; - - public String getTheoremName() { - return theoremName; + public String getTheoremName1() { + return theoremName1; } - public void setTheoremName(String theoremName) { - this.theoremName = theoremName; + public void setTheoremName1(String theoremName) { + this.theoremName1 = theoremName; } + public String getTheoremName2() { + return theoremName2; + } + + public void setTheoremName2(String theoremName) { + this.theoremName2 = theoremName; + } diff --git a/src/main/java/edu/msudenver/tsp/website/service/ProofDriver.java b/src/main/java/edu/msudenver/tsp/website/service/ProofDriver.java deleted file mode 100644 index b95c206..0000000 --- a/src/main/java/edu/msudenver/tsp/website/service/ProofDriver.java +++ /dev/null @@ -1,16 +0,0 @@ -package edu.msudenver.tsp.website.service; - -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -@Service -public class ProofDriver { - List theromList = new ArrayList(); - public String processProof(String theoremName){ - //Business Logic - return theoremName + "Accepted"; - } - -} diff --git a/src/main/webapp/WEB-INF/jsp/Theorem.jsp b/src/main/webapp/WEB-INF/jsp/Theorem.jsp index d9f580b..183b974 100644 --- a/src/main/webapp/WEB-INF/jsp/Theorem.jsp +++ b/src/main/webapp/WEB-INF/jsp/Theorem.jsp @@ -8,7 +8,8 @@
-Enter Theroem Name
+Enter Theorem 1: +
Enter Theorem 2:
diff --git a/src/main/webapp/WEB-INF/jsp/success.jsp b/src/main/webapp/WEB-INF/jsp/success.jsp index 6919cde..0ed9148 100644 --- a/src/main/webapp/WEB-INF/jsp/success.jsp +++ b/src/main/webapp/WEB-INF/jsp/success.jsp @@ -1,6 +1,7 @@ -Name:<%= request.getParameter("theoremName")%> +
Name1:<%= request.getParameter("theoremName1")%> +
Name2:<%= request.getParameter("theoremName2")%> \ No newline at end of file diff --git a/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java b/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java deleted file mode 100644 index 04a68e1..0000000 --- a/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java +++ /dev/null @@ -1,5 +0,0 @@ -package edu.msudenver.tsp.website; - -public class ProofsDriverTest { - -} \ No newline at end of file