Mercurial > hg > LightPIT / file diff

     1.1 --- a/src/main/java/de/uapcore/lightpit/modules/UsersModule.java	Sat Oct 31 10:54:20 2020 +0100
     1.2 +++ b/src/main/java/de/uapcore/lightpit/modules/UsersModule.java	Thu Nov 05 13:37:48 2020 +0100
     1.3 @@ -28,8 +28,10 @@
     1.4   */
     1.5  package de.uapcore.lightpit.modules;
     1.6  
     1.7 -
     1.8 -import de.uapcore.lightpit.*;
     1.9 +import de.uapcore.lightpit.AbstractLightPITServlet;
    1.10 +import de.uapcore.lightpit.Constants;
    1.11 +import de.uapcore.lightpit.HttpMethod;
    1.12 +import de.uapcore.lightpit.RequestMapping;
    1.13  import de.uapcore.lightpit.dao.DataAccessObjects;
    1.14  import de.uapcore.lightpit.entities.User;
    1.15  import de.uapcore.lightpit.viewmodel.UsersEditView;
    1.16 @@ -37,8 +39,11 @@
    1.17  import org.slf4j.Logger;
    1.18  import org.slf4j.LoggerFactory;
    1.19  
    1.20 +import javax.servlet.ServletException;
    1.21  import javax.servlet.annotation.WebServlet;
    1.22  import javax.servlet.http.HttpServletRequest;
    1.23 +import javax.servlet.http.HttpServletResponse;
    1.24 +import java.io.IOException;
    1.25  import java.sql.SQLException;
    1.26  import java.util.NoSuchElementException;
    1.27  
    1.28 @@ -56,7 +61,7 @@
    1.29      }
    1.30  
    1.31      @RequestMapping(method = HttpMethod.GET)
    1.32 -    public ResponseType index(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
    1.33 +    public void index(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, ServletException, IOException {
    1.34          final var userDao = dao.getUserDao();
    1.35  
    1.36          final var viewModel = new UsersView();
    1.37 @@ -64,11 +69,11 @@
    1.38          setViewModel(req, viewModel);
    1.39          setContentPage(req, "users");
    1.40  
    1.41 -        return ResponseType.HTML;
    1.42 +        renderSite(req, resp);
    1.43      }
    1.44  
    1.45      @RequestMapping(requestPath = "edit", method = HttpMethod.GET)
    1.46 -    public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
    1.47 +    public void edit(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, ServletException, IOException {
    1.48  
    1.49          final var viewModel = new UsersEditView();
    1.50          viewModel.setUser(findByParameter(req, Integer.class, "id",
    1.51 @@ -77,11 +82,11 @@
    1.52          setViewModel(req, viewModel);
    1.53          setContentPage(req, "user-form");
    1.54  
    1.55 -        return ResponseType.HTML;
    1.56 +        renderSite(req, resp);
    1.57      }
    1.58  
    1.59      @RequestMapping(requestPath = "commit", method = HttpMethod.POST)
    1.60 -    public ResponseType commit(HttpServletRequest req, DataAccessObjects dao) {
    1.61 +    public void commit(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws ServletException, IOException {
    1.62  
    1.63          User user = new User(-1);
    1.64          try {
    1.65 @@ -107,6 +112,6 @@
    1.66              LOG.debug("Details:", ex);
    1.67          }
    1.68  
    1.69 -        return ResponseType.HTML;
    1.70 +        renderSite(req, resp);
    1.71      }
    1.72  }