LightPIT: comparison src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java

-:1e6f16fad3a5
+:4f912cd42876
 */
 public abstract class AbstractLightPITServlet extends HttpServlet {
 private static final Logger LOG = LoggerFactory.getLogger(AbstractLightPITServlet.class);
-private static final String SITE_JSP = Functions.jspPath("site");
+private static final String SITE_JSP = jspPath("site");
 @FunctionalInterface
 protected interface SQLFindFunction<K, T> {
 T apply(K key) throws SQLException;
 * @param connection the SQL connection
 * @return a set of data access objects
 */
 private DataAccessObjects createDataAccessObjects(Connection connection) throws SQLException {
 final var df = (DataSourceProvider) getServletContext().getAttribute(DataSourceProvider.Companion.getSC_ATTR_NAME());
-if (df.getDialect() == DatabaseDialect.Postgres) {
+if (df.getDialect() == DataSourceProvider.Dialect.Postgres) {
 return new PGDataAccessObjects(connection);
 }
 throw new UnsupportedOperationException("Non-exhaustive if-else - this is a bug.");
 }
 * @param req      the servlet request object
 * @param pageName the name of the content page
 * @see Constants#REQ_ATTR_CONTENT_PAGE
 */
 protected void setContentPage(HttpServletRequest req, String pageName) {
-req.setAttribute(Constants.REQ_ATTR_CONTENT_PAGE, Functions.jspPath(pageName));
+req.setAttribute(Constants.REQ_ATTR_CONTENT_PAGE, jspPath(pageName));
 }
 /**
 * Sets the navigation menu.
 *
 * @param req     the servlet request object
 * @param jspName the name of the menu's jsp file
 * @see Constants#REQ_ATTR_NAVIGATION
 */
 protected void setNavigationMenu(HttpServletRequest req, String jspName) {
-req.setAttribute(Constants.REQ_ATTR_NAVIGATION, Functions.jspPath(jspName));
+req.setAttribute(Constants.REQ_ATTR_NAVIGATION, jspPath(jspName));
 }
 /**
 * @param req      the servlet request object
 * @param location the location where to redirect
 * @see Constants#REQ_ATTR_REDIRECT_LOCATION
 */
 protected void setRedirectLocation(HttpServletRequest req, String location) {
 if (location.startsWith("./")) {
-location = location.replaceFirst("\\./", Functions.baseHref(req));
+location = location.replaceFirst("\\./", baseHref(req));
 }
 req.setAttribute(Constants.REQ_ATTR_REDIRECT_LOCATION, location);
 }
 /**
 *
 * @param req        the servlet request object
 * @param stylesheet the name of the stylesheet
 */
 public void setStylesheet(HttpServletRequest req, String stylesheet) {
-req.setAttribute(Constants.REQ_ATTR_STYLESHEET, Functions.enforceExt(stylesheet, ".css"));
+req.setAttribute(Constants.REQ_ATTR_STYLESHEET, enforceExt(stylesheet, ".css"));
 }
 /**
 * Sets the view model object.
 * The type must match the expected type in the JSP file.
 protected void renderSite(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 req.getRequestDispatcher(SITE_JSP).forward(req, resp);
 }
+protected Optional<String[]> availableLanguages() {
+return Optional.ofNullable(getServletContext().getInitParameter(Constants.CTX_ATTR_LANGUAGES)).map((x) -> x.split("\\s*,\\s*"));
+}
+private static String baseHref(HttpServletRequest req) {
+return String.format("%s://%s:%d%s/",
+req.getScheme(),
+req.getServerName(),
+req.getServerPort(),
+req.getContextPath());
+}
+private static String enforceExt(String filename, String ext) {
+return filename.endsWith(ext) ? filename : filename + ext;
+}
+private static String jspPath(String filename) {
+return enforceExt(Constants.JSP_PATH_PREFIX + filename, ".jsp");
+}
 private void doProcess(HttpMethod method, HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 // choose the requested language as session language (if available) or fall back to english, otherwise
 HttpSession session = req.getSession();
 if (session.getAttribute(Constants.SESSION_ATTR_LANGUAGE) == null) {
-Optional<List<String>> availableLanguages = Functions.availableLanguages(getServletContext()).map(Arrays::asList);
+Optional<List<String>> availableLanguages = availableLanguages().map(Arrays::asList);
 Optional<Locale> reqLocale = Optional.of(req.getLocale());
 Locale sessionLocale = reqLocale.filter((rl) -> availableLanguages.map((al) -> al.contains(rl.getLanguage())).orElse(false)).orElse(Locale.ENGLISH);
 session.setAttribute(Constants.SESSION_ATTR_LANGUAGE, sessionLocale);
 LOG.debug("Setting language for new session {}: {}", session.getId(), sessionLocale.getDisplayLanguage());
 } else {
 resp.setLocale(sessionLocale);
 LOG.trace("Continuing session {} with language {}", session.getId(), sessionLocale);
 }
 // set some internal request attributes
-final String fullPath = Functions.fullPath(req);
+final String fullPath = req.getServletPath() + Optional.ofNullable(req.getPathInfo()).orElse("");
-req.setAttribute(Constants.REQ_ATTR_BASE_HREF, Functions.baseHref(req));
+req.setAttribute(Constants.REQ_ATTR_BASE_HREF, baseHref(req));
 req.setAttribute(Constants.REQ_ATTR_PATH, fullPath);
 req.setAttribute(Constants.REQ_ATTR_RESOURCE_BUNDLE, getResourceBundleName());
 // if this is an error path, bypass the normal flow
 if (fullPath.startsWith("/error/")) {

Mercurial > hg > LightPIT / file comparison

comparison: src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java

src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java