Mercurial > hg > LightPIT / changeset

     1.1 --- a/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java	Tue May 12 22:03:00 2020 +0200
     1.2 +++ b/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java	Wed May 13 18:31:52 2020 +0200
     1.3 @@ -168,7 +168,7 @@
     1.4                                  method.getName()
     1.5                          );
     1.6                      } else {
     1.7 -                        LOG.warn("{} is annotated with {} but has the wrong parameters - (HttpServletRequest,HttpServletResponse) required",
     1.8 +                        LOG.warn("{} is annotated with {} but has the wrong parameters - (HttpServletRequest,HttpServletResponse,DataAccessObjects) required",
     1.9                                  method.getName(), RequestMapping.class.getSimpleName()
    1.10                          );
    1.11                      }

     2.1 --- a/src/main/java/de/uapcore/lightpit/dao/AbstractDao.java	Tue May 12 22:03:00 2020 +0200
     2.2 +++ b/src/main/java/de/uapcore/lightpit/dao/AbstractDao.java	Wed May 13 18:31:52 2020 +0200
     2.3 @@ -74,7 +74,7 @@
     2.4          }
     2.5      }
     2.6  
     2.7 -    protected final void setForeignKeyOrNull(PreparedStatement stmt, int index, Object instance, Function<Object, Integer> keyGetter) throws SQLException {
     2.8 +    protected final <T> void setForeignKeyOrNull(PreparedStatement stmt, int index, T instance, Function<? super T, Integer> keyGetter) throws SQLException {
     2.9          Integer key = Optional.ofNullable(instance).map(keyGetter).orElse(null);
    2.10          if (key == null) {
    2.11              stmt.setNull(index, Types.INTEGER);

     3.1 --- a/src/main/java/de/uapcore/lightpit/modules/ErrorModule.java	Tue May 12 22:03:00 2020 +0200
     3.2 +++ b/src/main/java/de/uapcore/lightpit/modules/ErrorModule.java	Wed May 13 18:31:52 2020 +0200
     3.3 @@ -29,6 +29,7 @@
     3.4  package de.uapcore.lightpit.modules;
     3.5  
     3.6  import de.uapcore.lightpit.*;
     3.7 +import de.uapcore.lightpit.dao.DataAccessObjects;
     3.8  
     3.9  import javax.servlet.annotation.WebServlet;
    3.10  import javax.servlet.http.HttpServletRequest;
    3.11 @@ -51,7 +52,7 @@
    3.12  
    3.13      public static final String REQ_ATTR_ERROR_CODE = "errorCode";
    3.14  
    3.15 -    private ResponseType handle(HttpServletRequest req, HttpServletResponse resp, int sc) {
    3.16 +    private ResponseType handle(HttpServletRequest req, int sc) {
    3.17  
    3.18          req.setAttribute(REQ_ATTR_ERROR_CODE, sc);
    3.19          setStylesheet(req, "error");
    3.20 @@ -61,17 +62,17 @@
    3.21      }
    3.22  
    3.23      @RequestMapping(requestPath = "404", method = HttpMethod.GET)
    3.24 -    public ResponseType handle404(HttpServletRequest req, HttpServletResponse resp) {
    3.25 -        return handle(req, resp, 404);
    3.26 +    public ResponseType handle404(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) {
    3.27 +        return handle(req, 404);
    3.28      }
    3.29  
    3.30      @RequestMapping(requestPath = "403", method = HttpMethod.GET)
    3.31 -    public ResponseType handle403(HttpServletRequest req, HttpServletResponse resp) {
    3.32 -        return handle(req, resp, 403);
    3.33 +    public ResponseType handle403(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) {
    3.34 +        return handle(req, 403);
    3.35      }
    3.36  
    3.37      @RequestMapping(requestPath = "500", method = HttpMethod.GET)
    3.38 -    public ResponseType handle500(HttpServletRequest req, HttpServletResponse resp) {
    3.39 -        return handle(req, resp, 500);
    3.40 +    public ResponseType handle500(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) {
    3.41 +        return handle(req, 500);
    3.42      }
    3.43  }

     4.1 --- a/src/main/java/de/uapcore/lightpit/modules/HomeModule.java	Tue May 12 22:03:00 2020 +0200
     4.2 +++ b/src/main/java/de/uapcore/lightpit/modules/HomeModule.java	Wed May 13 18:31:52 2020 +0200
     4.3 @@ -29,6 +29,7 @@
     4.4  package de.uapcore.lightpit.modules;
     4.5  
     4.6  import de.uapcore.lightpit.*;
     4.7 +import de.uapcore.lightpit.dao.DataAccessObjects;
     4.8  
     4.9  import javax.servlet.annotation.WebServlet;
    4.10  import javax.servlet.http.HttpServletRequest;
    4.11 @@ -49,7 +50,7 @@
    4.12  public final class HomeModule extends AbstractLightPITServlet {
    4.13  
    4.14      @RequestMapping(method = HttpMethod.GET)
    4.15 -    public ResponseType handle(HttpServletRequest req, HttpServletResponse resp) {
    4.16 +    public ResponseType handle(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) {
    4.17  
    4.18          return ResponseType.HTML_FULL;
    4.19      }

     5.1 --- a/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java	Tue May 12 22:03:00 2020 +0200
     5.2 +++ b/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java	Wed May 13 18:31:52 2020 +0200
     5.3 @@ -29,6 +29,7 @@
     5.4  package de.uapcore.lightpit.modules;
     5.5  
     5.6  import de.uapcore.lightpit.*;
     5.7 +import de.uapcore.lightpit.dao.DataAccessObjects;
     5.8  import org.slf4j.Logger;
     5.9  import org.slf4j.LoggerFactory;
    5.10  
    5.11 @@ -85,7 +86,7 @@
    5.12      }
    5.13  
    5.14      @RequestMapping(method = HttpMethod.GET)
    5.15 -    public ResponseType handle(HttpServletRequest req, HttpServletResponse resp) {
    5.16 +    public ResponseType handle(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) {
    5.17  
    5.18          req.setAttribute("languages", languages);
    5.19          req.setAttribute("browserLanguage", req.getLocale());
    5.20 @@ -96,7 +97,7 @@
    5.21      }
    5.22  
    5.23      @RequestMapping(method = HttpMethod.POST)
    5.24 -    public ResponseType switchLanguage(HttpServletRequest req, HttpServletResponse resp) {
    5.25 +    public ResponseType switchLanguage(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) {
    5.26  
    5.27          Optional<Locale> chosenLanguage = Optional.ofNullable(req.getParameter("language"))
    5.28                  .map(Locale::forLanguageTag)
    5.29 @@ -105,6 +106,6 @@
    5.30          chosenLanguage.ifPresent((l) -> req.getSession().setAttribute(Constants.SESSION_ATTR_LANGUAGE, l));
    5.31          chosenLanguage.ifPresent(resp::setLocale);
    5.32  
    5.33 -        return handle(req, resp);
    5.34 +        return handle(req, resp, dao);
    5.35      }
    5.36  }

     6.1 --- a/src/main/java/de/uapcore/lightpit/modules/VersionsModule.java	Tue May 12 22:03:00 2020 +0200
     6.2 +++ b/src/main/java/de/uapcore/lightpit/modules/VersionsModule.java	Wed May 13 18:31:52 2020 +0200
     6.3 @@ -29,6 +29,7 @@
     6.4  package de.uapcore.lightpit.modules;
     6.5  
     6.6  import de.uapcore.lightpit.*;
     6.7 +import de.uapcore.lightpit.dao.DataAccessObjects;
     6.8  
     6.9  import javax.servlet.annotation.WebServlet;
    6.10  import javax.servlet.http.HttpServletRequest;
    6.11 @@ -46,7 +47,7 @@
    6.12  )
    6.13  public final class VersionsModule extends AbstractLightPITServlet {
    6.14      @RequestMapping(method = HttpMethod.GET)
    6.15 -    public ResponseType handle(HttpServletRequest req, HttpServletResponse resp) {
    6.16 +    public ResponseType handle(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) {
    6.17  
    6.18          return ResponseType.HTML_FULL;
    6.19      }