Mercurial > hg > LightPIT / file diff

--- a/src/main/java/de/uapcore/lightpit/modules/ModuleManagerModule.java	Sat May 09 15:19:21 2020 +0200
+++ b/src/main/java/de/uapcore/lightpit/modules/ModuleManagerModule.java	Sat May 09 17:01:29 2020 +0200
@@ -1,8 +1,8 @@
 /*
  * 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:
  *
@@ -24,13 +24,12 @@
  * 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.modules;
 
 import de.uapcore.lightpit.*;
 import de.uapcore.lightpit.LightPITModule.ELProxy;
-import de.uapcore.lightpit.dao.CoreDAOFactory;
 import de.uapcore.lightpit.entities.Module;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,25 +58,26 @@
         urlPatterns = "/modmgmt/*"
 )
 public final class ModuleManagerModule extends AbstractLightPITServlet {
-    
+
     private static final Logger LOG = LoggerFactory.getLogger(ModuleManagerModule.class);
-    
+
     private static final String REQ_ATTR_MODULES = "modules";
-    
-    
+
+
     @RequestMapping(method = HttpMethod.GET)
     public ResponseType handle(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        
-        Optional<DataSource> ds = getDatabaseFacade().getDataSource();
+
+        DatabaseFacade db = getDatabaseFacade();
+        Optional<DataSource> ds = db.getDataSource();
         if (ds.isPresent()) {
             try (Connection conn = ds.get().getConnection()) {
-                final List<Module> modules = CoreDAOFactory.getModuleDao(getDatabaseFacade().getSQLDialect()).listAll(conn);
-                
+                final List<Module> modules = db.getDataAccessObjects().getModuleDao().list(conn);
+
                 final Map<String, LightPITModule> registeredModules = getModuleManager().getRegisteredModules();
                 modules.forEach((mod) -> mod.setAnnotatedInfos(ELProxy.convert(registeredModules.get(mod.getClassname()))));
-                
+
                 req.setAttribute(REQ_ATTR_MODULES, modules);
-                setDynamicFragment(req, "modules");                
+                setDynamicFragment(req, "modules");
                 return ResponseType.HTML_FULL;
             } catch (SQLException ex) {
                 LOG.error("Unexpected SQL Exception", ex);