1.1 --- a/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java Fri Nov 06 10:50:32 2020 +0100
1.2 +++ b/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java Thu Nov 19 13:58:54 2020 +0100
1.3 @@ -28,8 +28,8 @@
1.4 */
1.5 package de.uapcore.lightpit;
1.6
1.7 -import de.uapcore.lightpit.dao.DataAccessObjects;
1.8 -import de.uapcore.lightpit.dao.postgres.PGDataAccessObjects;
1.9 +import de.uapcore.lightpit.dao.DaoProvider;
1.10 +import de.uapcore.lightpit.dao.postgres.PGDaoProvider;
1.11 import org.slf4j.Logger;
1.12 import org.slf4j.LoggerFactory;
1.13
1.14 @@ -100,15 +100,15 @@
1.15 * @param connection the SQL connection
1.16 * @return a set of data access objects
1.17 */
1.18 - private DataAccessObjects createDataAccessObjects(Connection connection) throws SQLException {
1.19 + private DaoProvider createDataAccessObjects(Connection connection) throws SQLException {
1.20 final var df = (DataSourceProvider) getServletContext().getAttribute(DataSourceProvider.Companion.getSC_ATTR_NAME());
1.21 if (df.getDialect() == DataSourceProvider.Dialect.Postgres) {
1.22 - return new PGDataAccessObjects(connection);
1.23 + return new PGDaoProvider(connection);
1.24 }
1.25 throw new UnsupportedOperationException("Non-exhaustive if-else - this is a bug.");
1.26 }
1.27
1.28 - private void invokeMapping(Map.Entry<PathPattern, Method> mapping, HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException {
1.29 + private void invokeMapping(Map.Entry<PathPattern, Method> mapping, HttpServletRequest req, HttpServletResponse resp, DaoProvider dao) throws IOException {
1.30 final var pathPattern = mapping.getKey();
1.31 final var method = mapping.getValue();
1.32 try {
1.33 @@ -121,7 +121,7 @@
1.34 } else if (paramTypes[i].isAssignableFrom(HttpServletResponse.class)) {
1.35 paramValues[i] = resp;
1.36 }
1.37 - if (paramTypes[i].isAssignableFrom(DataAccessObjects.class)) {
1.38 + if (paramTypes[i].isAssignableFrom(DaoProvider.class)) {
1.39 paramValues[i] = dao;
1.40 }
1.41 if (paramTypes[i].isAssignableFrom(PathParameters.class)) {
1.42 @@ -180,7 +180,7 @@
1.43 paramsInjectible &= HttpServletRequest.class.isAssignableFrom(param)
1.44 || HttpServletResponse.class.isAssignableFrom(param)
1.45 || PathParameters.class.isAssignableFrom(param)
1.46 - || DataAccessObjects.class.isAssignableFrom(param);
1.47 + || DaoProvider.class.isAssignableFrom(param);
1.48 }
1.49 if (paramsInjectible) {
1.50 try {
