# HG changeset patch # User Mike Becker # Date 1589899868 -7200 # Node ID 635ae67e73b5be464d4f336171c1b087f007ed4c # Parent 9861a68a461234107e5f21f15a318d48926b680b use findByParameter() in UsersModule diff -r 9861a68a4612 -r 635ae67e73b5 src/main/java/de/uapcore/lightpit/modules/UsersModule.java --- a/src/main/java/de/uapcore/lightpit/modules/UsersModule.java Tue May 19 16:50:05 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/modules/UsersModule.java Tue May 19 16:51:08 2020 +0200 @@ -39,7 +39,6 @@ import javax.servlet.http.HttpServletRequest; import java.sql.SQLException; import java.util.NoSuchElementException; -import java.util.Optional; @LightPITModule( bundleBaseName = "localization.users", @@ -66,14 +65,9 @@ @RequestMapping(requestPath = "edit", method = HttpMethod.GET) public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException { - final var userDao = dao.getUserDao(); - Optional id = getParameter(req, Integer.class, "id"); - if (id.isPresent()) { - req.setAttribute("user", Optional.ofNullable(userDao.find(id.get())).orElse(new User(-1))); - } else { - req.setAttribute("user", new User(-1)); - } + req.setAttribute("user", findByParameter(req, Integer.class, "id", + dao.getUserDao()::find).orElse(new User(-1))); setDynamicFragment(req, "user-form");