diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6787a6b6..ac56c730 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,10 +11,10 @@ jobs: with: ref: ${{github.event.pull_request.head.ref}} repository: ${{github.event.pull_request.head.repo.full_name}} - - name: Set up JDK 17 + - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: '17' + java-version: '11' distribution: 'adopt' cache: maven - name: Build with Maven diff --git a/pom.xml b/pom.xml index 24b4c2e6..1adc380a 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,7 @@ org.apache.maven.plugins maven-war-plugin + 3.3.1 src/main/webapp/web.xml diff --git a/src/main/java/mate/controller/IndexController.java b/src/main/java/mate/controller/IndexController.java index 6c284d42..f60cf04b 100644 --- a/src/main/java/mate/controller/IndexController.java +++ b/src/main/java/mate/controller/IndexController.java @@ -1,9 +1,34 @@ package mate.controller; +import java.io.IOException; +import java.time.LocalDate; +import java.time.LocalTime; +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 + + @Override + public void init() throws ServletException { + super.init(); + myResource = MyCoolResource.openResource(); + } + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + myResource.write(LocalDate.now().toString()); + myResource.write(LocalTime.now().toString()); + req.getRequestDispatcher("/WEB-INF/views/index.jsp").forward(req, resp); + } + + @Override + public void destroy() { + myResource.close(); + super.destroy(); + } } 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..7c6f14be --- /dev/null +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -0,0 +1,9 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Servlet lifecycle + + +

Information written to our resource

+ +