1.1 --- a/src/main/java/de/uapcore/lightpit/modules/UsersModule.java Tue May 19 16:50:05 2020 +0200 1.2 +++ b/src/main/java/de/uapcore/lightpit/modules/UsersModule.java Tue May 19 16:51:08 2020 +0200 1.3 @@ -39,7 +39,6 @@ 1.4 import javax.servlet.http.HttpServletRequest; 1.5 import java.sql.SQLException; 1.6 import java.util.NoSuchElementException; 1.7 -import java.util.Optional; 1.8 1.9 @LightPITModule( 1.10 bundleBaseName = "localization.users", 1.11 @@ -66,14 +65,9 @@ 1.12 1.13 @RequestMapping(requestPath = "edit", method = HttpMethod.GET) 1.14 public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException { 1.15 - final var userDao = dao.getUserDao(); 1.16 1.17 - Optional<Integer> id = getParameter(req, Integer.class, "id"); 1.18 - if (id.isPresent()) { 1.19 - req.setAttribute("user", Optional.ofNullable(userDao.find(id.get())).orElse(new User(-1))); 1.20 - } else { 1.21 - req.setAttribute("user", new User(-1)); 1.22 - } 1.23 + req.setAttribute("user", findByParameter(req, Integer.class, "id", 1.24 + dao.getUserDao()::find).orElse(new User(-1))); 1.25 1.26 setDynamicFragment(req, "user-form"); 1.27