From 8271da1fe2c079dd81f8c8a2daf9bca66f5091a6 Mon Sep 17 00:00:00 2001 From: Yura Khilko Date: Fri, 14 Jul 2023 16:12:24 +0300 Subject: [PATCH 1/5] added solution --- .../java/mate/controller/IndexController.java | 23 ++++++++++++++++++- src/main/webapp/WEB-INF/views/index.jsp | 8 +++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/main/webapp/WEB-INF/views/index.jsp diff --git a/src/main/java/mate/controller/IndexController.java b/src/main/java/mate/controller/IndexController.java index 6c284d42..6a586ae3 100644 --- a/src/main/java/mate/controller/IndexController.java +++ b/src/main/java/mate/controller/IndexController.java @@ -1,9 +1,30 @@ package mate.controller; +import java.io.IOException; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import mate.dao.MyCoolResource; public class IndexController extends HttpServlet { private MyCoolResource myResource; - //TODO: implement + private int counter = 0; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + req.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(req, resp); + myResource.write("counter " + ++counter); + } + + @Override + public void destroy() { + myResource.close(); + } + + @Override + public void init() throws ServletException { + myResource = MyCoolResource.openResource(); + } } diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp new file mode 100644 index 00000000..e72e585b --- /dev/null +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -0,0 +1,8 @@ + + + index page + + +

Information written to our resource

+ + \ No newline at end of file From 9df4f7d25bc6d605e2649798330a0d1cec0996ea Mon Sep 17 00:00:00 2001 From: Yura Khilko Date: Fri, 14 Jul 2023 16:20:15 +0300 Subject: [PATCH 2/5] added fixes. --- src/main/java/mate/controller/IndexController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mate/controller/IndexController.java b/src/main/java/mate/controller/IndexController.java index 6a586ae3..8b13d8e8 100644 --- a/src/main/java/mate/controller/IndexController.java +++ b/src/main/java/mate/controller/IndexController.java @@ -1,6 +1,7 @@ package mate.controller; import java.io.IOException; +import java.time.LocalDateTime; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -9,13 +10,12 @@ public class IndexController extends HttpServlet { private MyCoolResource myResource; - private int counter = 0; @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { req.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(req, resp); - myResource.write("counter " + ++counter); + myResource.write(LocalDateTime.now().toString()); } @Override From 716c0c5766b1feb074fd18a8b7db98641eccc12d Mon Sep 17 00:00:00 2001 From: Yura Khilko Date: Fri, 14 Jul 2023 16:26:12 +0300 Subject: [PATCH 3/5] added fixes2. --- src/main/java/mate/controller/IndexController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mate/controller/IndexController.java b/src/main/java/mate/controller/IndexController.java index 8b13d8e8..6737e861 100644 --- a/src/main/java/mate/controller/IndexController.java +++ b/src/main/java/mate/controller/IndexController.java @@ -14,8 +14,8 @@ public class IndexController extends HttpServlet { @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - req.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(req, resp); myResource.write(LocalDateTime.now().toString()); + req.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(req, resp); } @Override From fca9ff920a558e876fc75cdf654c712b2cdc1132 Mon Sep 17 00:00:00 2001 From: Yura Khilko Date: Fri, 14 Jul 2023 16:43:47 +0300 Subject: [PATCH 4/5] added fixes3. --- src/main/java/mate/controller/IndexController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mate/controller/IndexController.java b/src/main/java/mate/controller/IndexController.java index 6737e861..cff5318e 100644 --- a/src/main/java/mate/controller/IndexController.java +++ b/src/main/java/mate/controller/IndexController.java @@ -24,7 +24,7 @@ public void destroy() { } @Override - public void init() throws ServletException { + public void init() { myResource = MyCoolResource.openResource(); } } From 3ba76d0dc3f285c019558e5a86902fd1a088cb90 Mon Sep 17 00:00:00 2001 From: Yura Khilko Date: Fri, 14 Jul 2023 17:20:21 +0300 Subject: [PATCH 5/5] added fixes4. --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 24b4c2e6..0391913d 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,14 @@ + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + + src/main/webapp/web.xml + + org.apache.maven.plugins maven-compiler-plugin