Mercurial > hg > LightPIT / changeset

--- a/src/main/java/de/uapcore/lightpit/ModuleManager.java	Sat May 09 14:26:31 2020 +0200
+++ b/src/main/java/de/uapcore/lightpit/ModuleManager.java	Sat May 09 14:37:15 2020 +0200
@@ -28,25 +28,22 @@
  */
 package de.uapcore.lightpit;
 
-import de.uapcore.lightpit.entities.CoreDAOFactory;
+import de.uapcore.lightpit.dao.CoreDAOFactory;
+import de.uapcore.lightpit.dao.ModuleDao;
 import de.uapcore.lightpit.entities.Module;
-import de.uapcore.lightpit.entities.ModuleDao;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javax.servlet.Registration;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.servlet.annotation.WebListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
 
 /**
  * Scans registered servlets for LightPIT modules.
@@ -144,17 +141,17 @@
         dirty.set(true);
         LOG.info("Modules loaded.");
     }
-    
+
     /**
      * Synchronizes module information with the database.
-     * 
+     * <p>
      * This must be called from the {@link AbstractLightPITServlet}.
      * Admittedly the call will perform the synchronization once after reload
      * and be a no-op, afterwards.
-     * However, we since the DatabaseFacade might be loaded after the module
+     * However, since the DatabaseFacade might be loaded after the module
      * manager, we must defer the synchronization to the first request
      * handled by the Servlet.
-     * 
+     *
      * @param db interface to the database
      */
     public void syncWithDatabase(DatabaseFacade db) {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/de/uapcore/lightpit/dao/CoreDAOFactory.java	Sat May 09 14:37:15 2020 +0200
@@ -0,0 +1,50 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * 
+ * Copyright 2018 Mike Becker. All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+package de.uapcore.lightpit.dao;
+
+import de.uapcore.lightpit.DatabaseFacade;
+
+public final class CoreDAOFactory {
+
+    private static final ModuleDao moduleDao = new ModuleDao();
+
+    private CoreDAOFactory() {
+    }
+
+    public static ModuleDao getModuleDao(DatabaseFacade.Dialect dialect) {
+        // TODO: this is idiotic, we would not change the dialect while the app is running
+        switch (dialect) {
+            case Postgres:
+                return moduleDao;
+            default:
+                assert (false);
+                return null;
+        }
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/de/uapcore/lightpit/dao/ModuleDao.java	Sat May 09 14:37:15 2020 +0200
@@ -0,0 +1,140 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * 
+ * Copyright 2018 Mike Becker. All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+package de.uapcore.lightpit.dao;
+
+import de.uapcore.lightpit.LightPITModule;
+import de.uapcore.lightpit.entities.Module;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class ModuleDao {
+
+    /**
+     * Maps database columns to POJO fields.
+     *
+     * @param result the database result set
+     * @param mod    the POJO
+     * @throws SQLException
+     */
+    protected void mapColumns(ResultSet result, Module mod) throws SQLException {
+        mod.setModID(result.getInt("modid"));
+        mod.setClassname(result.getString("classname"));
+        mod.setVisible(result.getBoolean("visible"));
+    }
+            
+    
+    /**
+     * Must return a prepared statement for a single object query with the specified properties.
+     * 
+     * <ul>
+     * <li>Parameter 1: classname</li>
+     * <li>Result field 1: visible</li>
+     * </ul>
+     * 
+     * @param conn the connection to use
+     * @return the prepared statement
+     * @throws SQLException 
+     */
+    protected PreparedStatement moduleCheckStatement(Connection conn) throws SQLException {
+        return conn.prepareStatement("SELECT visible FROM lpitcore_module WHERE classname = ?");
+    }
+    
+    /**
+     * Must return a prepared statement for insertion with the specified properties.
+     * 
+     * <ul>
+     * <li>Parameter 1: classname</li>
+     * <li>Parameter 2: visible</li>
+     * </ul>
+     * 
+     * @param conn the connection to use
+     * @return the prepared statement
+     * @throws SQLException 
+     */
+    protected PreparedStatement moduleInsertStatement(Connection conn) throws SQLException {
+        return conn.prepareStatement("INSERT INTO lpitcore_module (classname, visible) VALUES (?, ?)");
+    }
+    
+    /**
+     * Synchronizes a set of registered module classes with the database.
+     * 
+     * Inserts module classes which are not known to the database and sets them to be visible by default.
+     * Module classes known to the database, which are not in the given set, are ignored.
+     * 
+     * @param conn the connection to use
+     * @param moduleSet the module set to synchronize
+     * @throws SQLException
+     */
+    public final void syncRegisteredModuleClasses(Connection conn, Set<Map.Entry<String, LightPITModule>> moduleSet) throws SQLException {
+                
+        PreparedStatement
+                check = moduleCheckStatement(conn),
+                insert = moduleInsertStatement(conn);
+        insert.setBoolean(2, true);
+        // update/delete not required, we do this in the module management UI
+
+        for (Map.Entry<String, LightPITModule> modEntry : moduleSet) {
+            if (modEntry.getValue().systemModule()) continue;
+
+            check.setString(1, modEntry.getKey());
+            try (ResultSet r = check.executeQuery()) {
+                if (!r.next()) {
+                    insert.setString(1, modEntry.getKey());
+                    insert.executeUpdate();
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns a list of all modules known by the database.
+     * 
+     * Keep in mind, that system modules are never known to the database.
+     * 
+     * @param conn the connection to use
+     * @return a list of all modules known by the database
+     * @throws SQLException 
+     */
+    public List<Module> listAll(Connection conn) throws SQLException {
+        List<Module> list = new ArrayList<>();
+        try (Statement stmt = conn.createStatement();
+                ResultSet result = stmt.executeQuery("SELECT * FROM lpitcore_module")) {
+            while (result.next()) {
+                final Module mod = new Module();
+                mapColumns(result, mod);
+                list.add(mod);
+            }
+        }
+        return list;
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/de/uapcore/lightpit/dao/UserDao.java	Sat May 09 14:37:15 2020 +0200
@@ -0,0 +1,80 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * 
+ * Copyright 2018 Mike Becker. All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+package de.uapcore.lightpit.dao;
+
+import de.uapcore.lightpit.entities.User;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class UserDao {
+
+    /**
+     * Maps SQL columns to POJO fields.
+     *
+     * @param result the database result set
+     * @param user   the POJO
+     * @throws SQLException
+     */
+    protected void mapColumns(ResultSet result, User user) throws SQLException {
+        user.setUserID(result.getInt("userid"));
+        user.setUsername(result.getString("username"));
+        user.setGivenname(Optional.ofNullable(result.getString("givenname")));
+        user.setLastname(Optional.ofNullable(result.getString("lastname"))); 
+    }
+
+    /**
+     * Returns a list of all users ordered by their username.
+     * 
+     * Does not return reserved system users with negative user IDs.
+     * 
+     * @param conn the connection to use
+     * @return a list of all users
+     * @throws SQLException 
+     */
+    public List<User> listAll(Connection conn) throws SQLException {
+        List<User> list = new ArrayList<>();
+        try (
+                Statement stmt = conn.createStatement();
+                ResultSet result = stmt.executeQuery(
+                        "SELECT * FROM lpitcore_user WHERE userid >= 0 ORDER BY username")) {
+            while (result.next()) {
+                final User user = new User();
+                mapColumns(result, user);
+                list.add(user);
+            }
+        }
+        return list;
+    }
+}

--- a/src/main/java/de/uapcore/lightpit/entities/CoreDAOFactory.java	Sat May 09 14:26:31 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 2018 Mike Becker. All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-package de.uapcore.lightpit.entities;
-
-import de.uapcore.lightpit.DatabaseFacade;
-
-public final class CoreDAOFactory {
-    
-    private CoreDAOFactory() {}
-    
-    private static class PostgresDaos {
-        static final ModuleDao MODULE_DAO = new PostgresModuleDao();
-    }
-    
-    public static ModuleDao getModuleDao(DatabaseFacade.Dialect dialect) {
-        switch (dialect) {
-            case Postgres: return PostgresDaos.MODULE_DAO;
-            default: assert(false); return null;
-        }
-    }
-}

--- a/src/main/java/de/uapcore/lightpit/entities/ModuleDao.java	Sat May 09 14:26:31 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 2018 Mike Becker. All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-package de.uapcore.lightpit.entities;
-
-import de.uapcore.lightpit.LightPITModule;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public abstract class ModuleDao {
-    
-    /**
-     * Maps database columns to POJO fields.
-     * @param result the database result set
-     * @param mod the POJO
-     * @throws SQLException 
-     */
-    protected void mapColumns(ResultSet result, Module mod) throws SQLException {
-        mod.setModID(result.getInt("modid"));
-        mod.setClassname(result.getString("classname"));
-        mod.setVisible(result.getBoolean("visible"));
-    }
-            
-    
-    /**
-     * Must return a prepared statement for a single object query with the specified properties.
-     * 
-     * <ul>
-     * <li>Parameter 1: classname</li>
-     * <li>Result field 1: visible</li>
-     * </ul>
-     * 
-     * @param conn the connection to use
-     * @return the prepared statement
-     * @throws SQLException 
-     */
-    protected PreparedStatement moduleCheckStatement(Connection conn) throws SQLException {
-        return conn.prepareStatement("SELECT visible FROM lpitcore_module WHERE classname = ?");
-    }
-    
-    /**
-     * Must return a prepared statement for insertion with the specified properties.
-     * 
-     * <ul>
-     * <li>Parameter 1: classname</li>
-     * <li>Parameter 2: visible</li>
-     * </ul>
-     * 
-     * @param conn the connection to use
-     * @return the prepared statement
-     * @throws SQLException 
-     */
-    protected PreparedStatement moduleInsertStatement(Connection conn) throws SQLException {
-        return conn.prepareStatement("INSERT INTO lpitcore_module (classname, visible) VALUES (?, ?)");
-    }
-    
-    /**
-     * Synchronizes a set of registered module classes with the database.
-     * 
-     * Inserts module classes which are not known to the database and sets them to be visible by default.
-     * Module classes known to the database, which are not in the given set, are ignored.
-     * 
-     * @param conn the connection to use
-     * @param moduleSet the module set to synchronize
-     * @throws SQLException
-     */
-    public final void syncRegisteredModuleClasses(Connection conn, Set<Map.Entry<String, LightPITModule>> moduleSet) throws SQLException {
-                
-        PreparedStatement
-                check = moduleCheckStatement(conn),
-                insert = moduleInsertStatement(conn);
-        insert.setBoolean(2, true);
-        // update/delete not required, we do this in the module management UI
-
-        for (Map.Entry<String, LightPITModule> modEntry : moduleSet) {
-            if (modEntry.getValue().systemModule()) continue;
-
-            check.setString(1, modEntry.getKey());
-            try (ResultSet r = check.executeQuery()) {
-                if (!r.next()) {
-                    insert.setString(1, modEntry.getKey());
-                    insert.executeUpdate();
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a list of all modules known by the database.
-     * 
-     * Keep in mind, that system modules are never known to the database.
-     * 
-     * @param conn the connection to use
-     * @return a list of all modules known by the database
-     * @throws SQLException 
-     */
-    public List<Module> listAll(Connection conn) throws SQLException {
-        List<Module> list = new ArrayList<>();
-        try (Statement stmt = conn.createStatement();
-                ResultSet result = stmt.executeQuery("SELECT * FROM lpitcore_module")) {
-            while (result.next()) {
-                final Module mod = new Module();
-                mapColumns(result, mod);
-                list.add(mod);
-            }
-        }
-        return list;
-    }
-}

--- a/src/main/java/de/uapcore/lightpit/entities/PostgresModuleDao.java	Sat May 09 14:26:31 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 2018 Mike Becker. All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-package de.uapcore.lightpit.entities;
-
-public class PostgresModuleDao extends ModuleDao {
-    // No overrides needed.
-}

--- a/src/main/java/de/uapcore/lightpit/entities/UserDao.java	Sat May 09 14:26:31 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 2018 Mike Becker. All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- */
-package de.uapcore.lightpit.entities;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-public abstract class UserDao {
-    
-    /**
-     * Maps SQL columns to POJO fields.
-     * @param result the database result set
-     * @param user the POJO
-     * @throws SQLException 
-     */
-    protected void mapColumns(ResultSet result, User user) throws SQLException {
-        user.setUserID(result.getInt("userid"));
-        user.setUsername(result.getString("username"));
-        user.setGivenname(Optional.ofNullable(result.getString("givenname")));
-        user.setLastname(Optional.ofNullable(result.getString("lastname"))); 
-    }
-
-    /**
-     * Returns a list of all users ordered by their username.
-     * 
-     * Does not return reserved system users with negative user IDs.
-     * 
-     * @param conn the connection to use
-     * @return a list of all users
-     * @throws SQLException 
-     */
-    public List<User> listAll(Connection conn) throws SQLException {
-        List<User> list = new ArrayList<>();
-        try (
-                Statement stmt = conn.createStatement();
-                ResultSet result = stmt.executeQuery(
-                        "SELECT * FROM lpitcore_user WHERE userid >= 0 ORDER BY username")) {
-            while (result.next()) {
-                final User user = new User();
-                mapColumns(result, user);
-                list.add(user);
-            }
-        }
-        return list;
-    }
-}

--- a/src/main/java/de/uapcore/lightpit/modules/ModuleManagerModule.java	Sat May 09 14:26:31 2020 +0200
+++ b/src/main/java/de/uapcore/lightpit/modules/ModuleManagerModule.java	Sat May 09 14:37:15 2020 +0200
@@ -28,26 +28,23 @@
  */
 package de.uapcore.lightpit.modules;
 
-import de.uapcore.lightpit.LightPITModule;
-import de.uapcore.lightpit.AbstractLightPITServlet;
-import de.uapcore.lightpit.HttpMethod;
+import de.uapcore.lightpit.*;
 import de.uapcore.lightpit.LightPITModule.ELProxy;
-import de.uapcore.lightpit.RequestMapping;
-import de.uapcore.lightpit.ResponseType;
-import de.uapcore.lightpit.entities.CoreDAOFactory;
+import de.uapcore.lightpit.dao.CoreDAOFactory;
 import de.uapcore.lightpit.entities.Module;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.sql.DataSource;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.sql.DataSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Entry point for the application.