OO-1615,OO-1616: remove misleading factories methods of the DBFactory

src/main/java/org/olat/admin/quota/QuotaManagerImpl.java

@@ -96,7 +96,7 @@ public class QuotaManagerImpl extends QuotaManager {
 	public void init() {
 		quotaResource = resourceManager.findOrPersistResourceable(OresHelper.lookupType(Quota.class));
 		initDefaultQuotas(); // initialize default quotas
-		DBFactory.getInstance(false).intermediateCommit();
+		DBFactory.getInstance().intermediateCommit();
 		log.info("Successfully initialized Quota Manager");
 	}
 

src/main/java/org/olat/admin/sysinfo/HibernateStatisticsController.java

@@ -19,7 +19,8 @@
  */
 package org.olat.admin.sysinfo;
 
-import org.olat.core.commons.persistence.DBFactory;
+import org.hibernate.stat.Statistics;
+import org.olat.core.commons.persistence.DB;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.link.Link;
@@ -28,6 +29,7 @@ import org.olat.core.gui.components.velocity.VelocityContainer;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.gui.control.controller.BasicController;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 
@@ -40,6 +42,9 @@ public class HibernateStatisticsController extends BasicController {
 	private Link disableLink;
 	private Link clearLink;
 	private VelocityContainer mainVC;
+	
+	@Autowired
+	private DB dbInstance;
 
 	public HibernateStatisticsController(UserRequest ureq, WindowControl wControl) {
 		super(ureq, wControl);
@@ -54,8 +59,9 @@ public class HibernateStatisticsController extends BasicController {
 	}
 	
 	public void loadModel() {
-		mainVC.contextPut("isStatisticsEnabled", DBFactory.getInstance(false).getStatistics().isStatisticsEnabled());
-		mainVC.contextPut("hibernateStatistics", DBFactory.getInstance(false).getStatistics());
+		Statistics statistics = dbInstance.getStatistics();
+		mainVC.contextPut("isStatisticsEnabled", statistics.isStatisticsEnabled());
+		mainVC.contextPut("hibernateStatistics", statistics);
 	}
 	
 	@Override
@@ -65,18 +71,19 @@ public class HibernateStatisticsController extends BasicController {
 
 	@Override
 	protected void event(UserRequest ureq, Component source, Event event) {
+		Statistics statistics = dbInstance.getStatistics();
 		if (source == enableLink){
-			DBFactory.getInstance(false).getStatistics().setStatisticsEnabled(true);
-			mainVC.contextPut("isStatisticsEnabled", DBFactory.getInstance(false).getStatistics().isStatisticsEnabled());
+			statistics.setStatisticsEnabled(true);
+			mainVC.contextPut("isStatisticsEnabled",statistics.isStatisticsEnabled());
 			getWindowControl().setInfo("Hibernate statistics enabled.");
 			loadModel();
 		} else if (source == disableLink){
-			DBFactory.getInstance(false).getStatistics().setStatisticsEnabled(false);
-			mainVC.contextPut("isStatisticsEnabled", DBFactory.getInstance(false).getStatistics().isStatisticsEnabled());
+			statistics.setStatisticsEnabled(false);
+			mainVC.contextPut("isStatisticsEnabled", statistics.isStatisticsEnabled());
 			getWindowControl().setInfo("Hibernate statistics disabled.");
 			loadModel();
 		} else if (source == clearLink){
-			DBFactory.getInstance(false).getStatistics().clear();
+			statistics.clear();
 			getWindowControl().setInfo("Hibernate statistics clear done.");
 			loadModel();
 		}

src/main/java/org/olat/commons/servlets/RSSServlet.java

@@ -150,7 +150,7 @@ public class RSSServlet extends HttpServlet {
 			DispatcherModule.sendNotFound("none", response);
 		} finally {
 			IOUtils.closeQuietly(writer);
-			DBFactory.getInstance(false).commitAndCloseSession();
+			DBFactory.getInstance().commitAndCloseSession();
 		}
 	}
 

src/main/java/org/olat/core/commons/persistence/DBFactory.java

@@ -39,14 +39,4 @@ public class DBFactory {
 	public static DB getInstance() {
 		return DBImpl.getInstance();
 	}
-
-    public static DB getInstance(boolean initialize) {
-        return DBImpl.getInstance();
-    }
-
-    public static DB getInstanceForClosing() {
-      return DBImpl.getInstance();
-  }
-
-
 }

src/main/java/org/olat/core/logging/activity/UserActivityLoggerImpl.java

@@ -833,7 +833,7 @@ public class UserActivityLoggerImpl implements IUserActivityLogger {
 		logObj.setUserProperties(tmpUserProperties);
 		
 		// and store it
-		DB db = DBFactory.getInstanceForClosing();
+		DB db = DBFactory.getInstance();
 		if (db!=null && db.isError()) {
 			// then we would run into an ERROR when we'd do more with this DB
 			// hence we just issue a log.info here with the details

src/main/java/org/olat/course/CourseFactory.java

@@ -442,7 +442,7 @@ public class CourseFactory extends BasicManager {
 		File fTargetCourseBasePath = targetCourse.getCourseBaseContainer().getBasefile();
 		
 		//close connection before file copy
-		DBFactory.getInstance(false).commitAndCloseSession();
+		DBFactory.getInstance().commitAndCloseSession();
 		
 		synchronized (sourceCourse) { // o_clusterNOK - cannot be solved with doInSync since could take too long (leads to error: "Lock wait timeout exceeded")
 			// copy configuration
@@ -474,7 +474,7 @@ public class CourseFactory extends BasicManager {
 			for (Reference ref: refs) {
 				referenceManager.addReference(targetCourse, ref.getTarget(), ref.getUserdata());
 				if(count % 20 == 0) {
-					DBFactory.getInstance(false).intermediateCommit();
+					DBFactory.getInstance().intermediateCommit();
 				}
 			}
 			
@@ -723,7 +723,7 @@ public class CourseFactory extends BasicManager {
 		// cause db connection timeout to be triggered
 		//@TODO transactions/backgroundjob:
 		// rework when backgroundjob infrastructure exists
-		DBFactory.getInstance(false).intermediateCommit();
+		DBFactory.getInstance().intermediateCommit();
 		AsyncExportManager.getInstance().asyncArchiveCourseLogFiles(archiveOnBehalfOf, new Runnable() {
 			public void run() {
 				// that's fine, I dont need to do anything here

src/main/java/org/olat/course/CourseModule.java

@@ -109,7 +109,7 @@ public class CourseModule extends AbstractOLATModule {
 			deployCoursesFromCourseExportFiles();
 		}
 		//also in startup event processing intermediateCommit
-		DBFactory.getInstance(false).intermediateCommit();
+		DBFactory.getInstance().intermediateCommit();
 	}
 
 	
@@ -140,14 +140,7 @@ public class CourseModule extends AbstractOLATModule {
 	 */
 	@Override
 	public void init() {
-		// skip all the expensive course demo setup and deployment when we are in junit mode.
-		if (Settings.isJUnitTest()) return;
-		
-		logInfo("Initializing the OpenOLAT course system");		
-		
-		// Cleanup, otherwise this subjects will have problems in normal OLAT
-		// operation
-		DBFactory.getInstance(false).intermediateCommit();		
+		//
 	}
 
 	private void deployCoursesFromCourseExportFiles( ) {

src/main/java/org/olat/course/assessment/AssessmentMainController.java

@@ -1408,11 +1408,11 @@ public class AssessmentMainController extends MainLayoutBasicController implemen
 							+ "ms");
 				}
 				// finished in this thread, close database session of this thread!
-				DBFactory.getInstance(false).commitAndCloseSession();
+				DBFactory.getInstance().commitAndCloseSession();
 				success = true;
 			} finally {
 				if (!success) {
-					DBFactory.getInstance(false).rollbackAndCloseSession();
+					DBFactory.getInstance().rollbackAndCloseSession();
 				}
 			}
 		}

src/main/java/org/olat/course/assessment/UpdateEfficiencyStatementsWorker.java

@@ -66,7 +66,7 @@ public class UpdateEfficiencyStatementsWorker implements Runnable {
 			List<Identity> identities = EfficiencyStatementManager.getInstance().findIdentitiesWithEfficiencyStatements(re.getKey());
 			esm.updateEfficiencyStatements(ores, identities);
 			// close db session in this thread
-			DBFactory.getInstance(false).commitAndCloseSession();
+			DBFactory.getInstance().commitAndCloseSession();
 			success = true;
 			
 			EfficiencyStatementEvent finishedEvent = new EfficiencyStatementEvent(EfficiencyStatementEvent.CMD_FINISHED, ores.getResourceableId());
@@ -76,7 +76,7 @@ public class UpdateEfficiencyStatementsWorker implements Runnable {
 		} finally {
 			// close db session in this thread
 			if (!success) {
-				DBFactory.getInstance(false).rollbackAndCloseSession();
+				DBFactory.getInstance().rollbackAndCloseSession();
 			}
 		}
 	}

src/main/java/org/olat/modules/dialog/DialogElement.java

@@ -78,10 +78,10 @@ public class DialogElement {
 		} catch (NumberFormatException nEx) {
 			return author;
 		} catch (ObjectNotFoundException oEx) {
-			DBFactory.getInstanceForClosing().rollbackAndCloseSession();
+			DBFactory.getInstance().rollbackAndCloseSession();
 			return author;
 		} catch (Throwable th) {
-			DBFactory.getInstanceForClosing().rollbackAndCloseSession();
+			DBFactory.getInstance().rollbackAndCloseSession();
 			return author;
 		}
 	}

src/main/java/org/olat/resource/accesscontrol/provider/paypal/PaypalIPNFilter.java

@@ -75,7 +75,7 @@ public class PaypalIPNFilter implements Filter {
 			//we must log all errors, it's critical for this part of the payment
 			log.error("Paypal IPN unexpected error", t);
 		} finally {
-			DBFactory.getInstanceForClosing().closeSession();
+			DBFactory.getInstance().closeSession();
 		}
 	}
 

src/main/java/org/olat/search/service/indexer/group/GroupIndexer.java

@@ -89,10 +89,10 @@ public class GroupIndexer extends AbstractHierarchicalIndexer {
 			  super.doIndex(searchResourceContext, businessGroup, indexWriter);
 			} catch(Exception ex) {
 				logError("Exception indexing group=" + businessGroup, ex);
-				DBFactory.getInstance(false).rollbackAndCloseSession();
+				DBFactory.getInstance().rollbackAndCloseSession();
 			} catch (Error err) {
 				logError("Error indexing group=" + businessGroup, err);
-				DBFactory.getInstance(false).rollbackAndCloseSession();
+				DBFactory.getInstance().rollbackAndCloseSession();
 			}
 	  }
 		long indexTime = System.currentTimeMillis() - startTime;

src/main/java/org/olat/search/service/indexer/identity/IdentityIndexer.java

@@ -85,7 +85,7 @@ public class IdentityIndexer extends AbstractHierarchicalIndexer {
 				counter++;
 			} catch (Exception ex) {
 				logWarn("Exception while indexing identity::" + identityKey + ". Skipping this user, try next one.", ex);
-				DBFactory.getInstance(false).rollbackAndCloseSession();
+				DBFactory.getInstance().rollbackAndCloseSession();
 			}
 		}
 		if (isLogDebugEnabled()) logDebug("IdentityIndexer finished with counter::" + counter);

src/main/java/org/olat/upgrade/UpgradeManagerImpl.java

@@ -78,10 +78,10 @@ public class UpgradeManagerImpl extends UpgradeManager {
 				if (upgrade.doPostSystemInitUpgrade(this))
 					logAudit("Successfully installed PostSystemInitUpgrade::" + upgrade.getVersion());
 				//just in case a doPostSystemInitUpgrade did forget it.
-				DBFactory.getInstance(false).commitAndCloseSession();
+				DBFactory.getInstance().commitAndCloseSession();
 			}
 		} catch (Throwable e) {
-			DBFactory.getInstance(false).rollbackAndCloseSession();
+			DBFactory.getInstance().rollbackAndCloseSession();
 			logWarn("Error upgrading PostSystemInitUpgrade::" + upgrade.getVersion(), e);
 			abort(e);
 		}