Mercurial > hg > LightPIT / file diff

     1.1 --- a/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java	Fri Oct 23 20:34:57 2020 +0200
     1.2 +++ b/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java	Sat Oct 24 12:09:08 2020 +0200
     1.3 @@ -101,11 +101,11 @@
     1.4       * @return a set of data access objects
     1.5       */
     1.6      private DataAccessObjects createDataAccessObjects(Connection connection) throws SQLException {
     1.7 -        final var df = (DatabaseFacade) getServletContext().getAttribute(DatabaseFacade.SC_ATTR_NAME);
     1.8 -        if (df.getSQLDialect() == DatabaseFacade.Dialect.Postgres) {
     1.9 +        final var df = (DataSourceProvider) getServletContext().getAttribute(DataSourceProvider.Companion.getSC_ATTR_NAME());
    1.10 +        if (df.getDialect() == DatabaseDialect.Postgres) {
    1.11              return new PGDataAccessObjects(connection);
    1.12          }
    1.13 -        throw new AssertionError("Non-exhaustive if-else - this is a bug.");
    1.14 +        throw new UnsupportedOperationException("Non-exhaustive if-else - this is a bug.");
    1.15      }
    1.16  
    1.17      private ResponseType invokeMapping(Map.Entry<PathPattern, Method> mapping, HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException {
    1.18 @@ -434,7 +434,7 @@
    1.19          }
    1.20  
    1.21          // obtain a connection and create the data access objects
    1.22 -        final var db = (DatabaseFacade) req.getServletContext().getAttribute(DatabaseFacade.SC_ATTR_NAME);
    1.23 +        final var db = (DataSourceProvider) req.getServletContext().getAttribute(DataSourceProvider.Companion.getSC_ATTR_NAME());
    1.24          final var ds = db.getDataSource();
    1.25          if (ds == null) {
    1.26              resp.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, "JNDI DataSource lookup failed. See log for details.");