refactoring

core/modules/core/src/com/haulmont/yarg/loaders/factory/DefaultLoaderFactory.java

@@ -21,12 +21,9 @@
  */
 package com.haulmont.yarg.loaders.factory;
 
-import com.haulmont.yarg.exception.InitializationException;
 import com.haulmont.yarg.exception.UnsupportedLoaderException;
 import com.haulmont.yarg.loaders.ReportDataLoader;
-import org.apache.commons.dbcp.*;
 
-import javax.sql.DataSource;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -72,40 +69,4 @@ public ReportDataLoader createDataLoader(String loaderType) {
  return dataLoader;
  }
  }
-
- public static DataSource setupDataSource(String driver, String connectURI,
- String username,
- String password,
- Integer maxActive,
- Integer maxIdle,
- Integer maxWait) {
- try {
- Class.forName(driver);
- final AbandonedConfig config = new AbandonedConfig();
- config.setLogAbandoned(true);
-
- AbandonedObjectPool connectionPool = new AbandonedObjectPool(null, config);
-
- connectionPool.setMaxIdle(maxIdle);
- connectionPool.setMaxActive(maxActive);
- if (maxWait != null) {
- connectionPool.setMaxWait(maxWait);
- }
-
- ConnectionFactory connectionFactory =
- new DriverManagerConnectionFactory(connectURI, username, password);
-
- PoolableConnectionFactory poolableConnectionFactory =
- new PoolableConnectionFactory(
- connectionFactory, connectionPool, null, null, false, true);
-
- connectionPool.setFactory(poolableConnectionFactory);
- PoolingDataSource dataSource =
- new PoolingDataSource(connectionPool);
-
- return dataSource;
- } catch (ClassNotFoundException e) {
- throw new InitializationException("An error occurred during creation of new datasource object", e);
- }
- }
 }

core/modules/core/src/com/haulmont/yarg/loaders/factory/PropertiesSqlLoaderFactory.java

@@ -23,6 +23,7 @@
 
 import com.haulmont.yarg.exception.InitializationException;
 import com.haulmont.yarg.loaders.impl.SqlDataLoader;
+import com.haulmont.yarg.util.db.DatasourceCreator;
 import com.haulmont.yarg.util.properties.PropertiesLoader;
 import org.apache.commons.lang.StringUtils;
 
@@ -47,9 +48,9 @@ public SqlDataLoader create() {
 
  if (StringUtils.isBlank(driver) || StringUtils.isBlank(dbUrl)) {
  return null;
- }
+  }
 
- DataSource dataSource = DefaultLoaderFactory.setupDataSource(driver, dbUrl, user, password, 3, 2, 1);
+ DataSource dataSource = DatasourceCreator.setupDataSource(driver, dbUrl, user, password, 3, 2, 1);
  SqlDataLoader sqlDataLoader = new SqlDataLoader(dataSource);
  return sqlDataLoader;
  } catch (IOException e) {

core/modules/core/src/com/haulmont/yarg/util/db/DatasourceCreator.java

@@ -0,0 +1,51 @@
+package com.haulmont.yarg.util.db;
+
+import com.haulmont.yarg.exception.InitializationException;
+import org.apache.commons.dbcp.*;
+
+import javax.sql.DataSource;
+
+/**
+ * @author degtyarjov
+ * @version $Id$
+ */
+public final class DatasourceCreator {
+ private DatasourceCreator() {
+ }
+
+ public static DataSource setupDataSource(String driver, String connectURI,
+ String username,
+ String password,
+ Integer maxActive,
+ Integer maxIdle,
+ Integer maxWait) {
+ try {
+ Class.forName(driver);
+ final AbandonedConfig config = new AbandonedConfig();
+ config.setLogAbandoned(true);
+
+ AbandonedObjectPool connectionPool = new AbandonedObjectPool(null, config);
+
+ connectionPool.setMaxIdle(maxIdle);
+ connectionPool.setMaxActive(maxActive);
+ if (maxWait != null) {
+ connectionPool.setMaxWait(maxWait);
+ }
+
+ ConnectionFactory connectionFactory =
+ new DriverManagerConnectionFactory(connectURI, username, password);
+
+ PoolableConnectionFactory poolableConnectionFactory =
+ new PoolableConnectionFactory(
+ connectionFactory, connectionPool, null, null, false, true);
+
+ connectionPool.setFactory(poolableConnectionFactory);
+ PoolingDataSource dataSource =
+ new PoolingDataSource(connectionPool);
+
+ return dataSource;
+ } catch (ClassNotFoundException e) {
+ throw new InitializationException("An error occurred during creation of new datasource object", e);
+ }
+ }
+}

core/modules/core/test/utils/TestDatabase.java

@@ -1,6 +1,6 @@
 package utils;
 
-import com.haulmont.yarg.loaders.factory.DefaultLoaderFactory;
+import com.haulmont.yarg.util.db.DatasourceCreator;
 import org.hsqldb.Server;
 
 import javax.sql.DataSource;
@@ -21,7 +21,7 @@ public void setUpDatabase() throws Exception {
  hsqlServer.setDatabasePath(0, "file:./db/testdb");
 
  hsqlServer.start();
- ds = DefaultLoaderFactory.setupDataSource("org.hsqldb.jdbcDriver", "jdbc:hsqldb:hsql:https://localhost/reportingDb", "sa", "", 10, 10, 0);
+ ds = DatasourceCreator.setupDataSource("org.hsqldb.jdbcDriver", "jdbc:hsqldb:hsql:https://localhost/reportingDb", "sa", "", 10, 10, 0);
 
  Connection connection = ds.getConnection();
  try {