Mercurial > hg > LightPIT / file diff

--- a/src/main/java/de/uapcore/lightpit/modules/UsersModule.java	Sat Oct 31 10:54:20 2020 +0100
+++ b/src/main/java/de/uapcore/lightpit/modules/UsersModule.java	Thu Nov 05 13:37:48 2020 +0100
@@ -28,8 +28,10 @@
  */
 package de.uapcore.lightpit.modules;
 
-
-import de.uapcore.lightpit.*;
+import de.uapcore.lightpit.AbstractLightPITServlet;
+import de.uapcore.lightpit.Constants;
+import de.uapcore.lightpit.HttpMethod;
+import de.uapcore.lightpit.RequestMapping;
 import de.uapcore.lightpit.dao.DataAccessObjects;
 import de.uapcore.lightpit.entities.User;
 import de.uapcore.lightpit.viewmodel.UsersEditView;
@@ -37,8 +39,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.sql.SQLException;
 import java.util.NoSuchElementException;
 
@@ -56,7 +61,7 @@
     }
 
     @RequestMapping(method = HttpMethod.GET)
-    public ResponseType index(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
+    public void index(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, ServletException, IOException {
         final var userDao = dao.getUserDao();
 
         final var viewModel = new UsersView();
@@ -64,11 +69,11 @@
         setViewModel(req, viewModel);
         setContentPage(req, "users");
 
-        return ResponseType.HTML;
+        renderSite(req, resp);
     }
 
     @RequestMapping(requestPath = "edit", method = HttpMethod.GET)
-    public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
+    public void edit(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, ServletException, IOException {
 
         final var viewModel = new UsersEditView();
         viewModel.setUser(findByParameter(req, Integer.class, "id",
@@ -77,11 +82,11 @@
         setViewModel(req, viewModel);
         setContentPage(req, "user-form");
 
-        return ResponseType.HTML;
+        renderSite(req, resp);
     }
 
     @RequestMapping(requestPath = "commit", method = HttpMethod.POST)
-    public ResponseType commit(HttpServletRequest req, DataAccessObjects dao) {
+    public void commit(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws ServletException, IOException {
 
         User user = new User(-1);
         try {
@@ -107,6 +112,6 @@
             LOG.debug("Details:", ex);
         }
 
-        return ResponseType.HTML;
+        renderSite(req, resp);
     }
 }