Repository: cayenne Updated Branches: refs/heads/master 19e42c1b1 -> 4116471c1
CAY-2009 Non-blocking connection pool * no need for special formatting of logs in DriverDataSource, so using JCL logger instead of JdbcEventLogger Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4116471c Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4116471c Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4116471c Branch: refs/heads/master Commit: 4116471c1990df2829eaf0db9fce2a634a9c3e73 Parents: 19e42c1 Author: aadamchik <[email protected]> Authored: Tue May 19 10:57:01 2015 +0300 Committer: aadamchik <[email protected]> Committed: Tue May 19 11:08:03 2015 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/access/DbGenerator.java | 2 +- .../server/PropertyDataSourceFactory.java | 8 +- .../server/XMLPoolingDataSourceFactory.java | 6 +- .../cayenne/datasource/DataSourceBuilder.java | 12 +-- .../cayenne/datasource/DriverDataSource.java | 86 ++++++-------------- .../cayenne/log/CommonsJdbcEventLogger.java | 5 ++ .../org/apache/cayenne/log/JdbcEventLogger.java | 23 +++++- .../apache/cayenne/log/NoopJdbcEventLogger.java | 5 ++ .../datasource/BasePoolingDataSourceIT.java | 6 +- ...lingDataSource_FailingValidationQueryIT.java | 6 +- .../di/server/ServerCaseDataSourceFactory.java | 8 +- .../apache/cayenne/tools/DbGeneratorTask.java | 2 +- .../configuration/DriverDataSourceFactory.java | 7 +- .../dialog/pref/DataSourcePreferences.java | 3 +- .../cayenne/modeler/pref/DBConnectionInfo.java | 3 +- .../apache/cayenne/tools/DbGeneratorMojo.java | 2 +- 16 files changed, 73 insertions(+), 111 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java index fa340e0..f9558ca 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java @@ -256,7 +256,7 @@ public class DbGenerator { Driver driver = (Driver) Class.forName(dsi.getJdbcDriver()).newInstance(); DataSource dataSource = new DriverDataSource(driver, dsi.getDataSourceUrl(), dsi.getUserName(), - dsi.getPassword(), jdbcEventLogger); + dsi.getPassword()); runGenerator(dataSource); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java index 0826d7c..d8dd229 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java @@ -28,7 +28,6 @@ import org.apache.cayenne.datasource.DataSourceBuilder; import org.apache.cayenne.datasource.PoolingDataSource; import org.apache.cayenne.di.AdhocObjectFactory; import org.apache.cayenne.di.Inject; -import org.apache.cayenne.log.JdbcEventLogger; /** * A DataSourceFactrory that creates a DataSource based on system properties. @@ -53,9 +52,6 @@ public class PropertyDataSourceFactory implements DataSourceFactory { protected RuntimeProperties properties; @Inject - protected JdbcEventLogger jdbcEventLogger; - - @Inject private AdhocObjectFactory objectFactory; @Override @@ -73,8 +69,8 @@ public class PropertyDataSourceFactory implements DataSourceFactory { PoolingDataSource.MAX_QUEUE_WAIT_DEFAULT); String validationQuery = properties.get(Constants.JDBC_VALIDATION_QUERY_PROPERTY); - return DataSourceBuilder.builder(objectFactory, jdbcEventLogger).driver(driverClass).url(url) - .userName(username).password(password).minConnections(minConnections).maxConnections(maxConnections) + return DataSourceBuilder.builder(objectFactory).driver(driverClass).url(url).userName(username) + .password(password).minConnections(minConnections).maxConnections(maxConnections) .maxQueueWaitTime(maxQueueWaitTime).validationQuery(validationQuery).build(); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java index c333325..5df5f2a 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java @@ -29,7 +29,6 @@ import org.apache.cayenne.datasource.DataSourceBuilder; import org.apache.cayenne.datasource.PoolingDataSource; import org.apache.cayenne.di.AdhocObjectFactory; import org.apache.cayenne.di.Inject; -import org.apache.cayenne.log.JdbcEventLogger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,9 +46,6 @@ public class XMLPoolingDataSourceFactory implements DataSourceFactory { private static final Log logger = LogFactory.getLog(XMLPoolingDataSourceFactory.class); @Inject - protected JdbcEventLogger jdbcEventLogger; - - @Inject private RuntimeProperties properties; @Inject @@ -69,7 +65,7 @@ public class XMLPoolingDataSourceFactory implements DataSourceFactory { long maxQueueWaitTime = properties.getLong(Constants.SERVER_MAX_QUEUE_WAIT_TIME, PoolingDataSource.MAX_QUEUE_WAIT_DEFAULT); - return DataSourceBuilder.builder(objectFactory, jdbcEventLogger).driver(descriptor.getJdbcDriver()) + return DataSourceBuilder.builder(objectFactory).driver(descriptor.getJdbcDriver()) .url(descriptor.getDataSourceUrl()).userName(descriptor.getUserName()) .password(descriptor.getPassword()).minConnections(descriptor.getMinConnections()) .maxConnections(descriptor.getMaxConnections()).maxQueueWaitTime(maxQueueWaitTime).build(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-server/src/main/java/org/apache/cayenne/datasource/DataSourceBuilder.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/datasource/DataSourceBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/datasource/DataSourceBuilder.java index ee281ba..1e959b1 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/datasource/DataSourceBuilder.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/datasource/DataSourceBuilder.java @@ -24,8 +24,6 @@ import javax.sql.DataSource; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.di.AdhocObjectFactory; -import org.apache.cayenne.log.JdbcEventLogger; -import org.apache.cayenne.log.NoopJdbcEventLogger; /** * A builder class that allows to build a {@link DataSource} with optional @@ -36,20 +34,18 @@ import org.apache.cayenne.log.NoopJdbcEventLogger; public class DataSourceBuilder { private AdhocObjectFactory objectFactory; - private JdbcEventLogger logger; private String userName; private String password; private String driver; private String url; private PoolingDataSourceParameters poolParameters; - public static DataSourceBuilder builder(AdhocObjectFactory objectFactory, JdbcEventLogger logger) { - return new DataSourceBuilder(objectFactory, logger); + public static DataSourceBuilder builder(AdhocObjectFactory objectFactory) { + return new DataSourceBuilder(objectFactory); } - private DataSourceBuilder(AdhocObjectFactory objectFactory, JdbcEventLogger logger) { + private DataSourceBuilder(AdhocObjectFactory objectFactory) { this.objectFactory = objectFactory; - this.logger = logger != null ? logger : NoopJdbcEventLogger.getInstance(); this.poolParameters = new PoolingDataSourceParameters(); poolParameters.setMinConnections(1); @@ -120,7 +116,7 @@ public class DataSourceBuilder { private DataSource buildNonPooling() { Driver driver = objectFactory.newInstance(Driver.class, this.driver); - return new DriverDataSource(driver, url, userName, password, logger); + return new DriverDataSource(driver, url, userName, password); } private PoolingDataSource buildPooling(DataSource nonPoolingDataSource) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java b/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java index 2f9ba1c..92cdad1 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java @@ -31,22 +31,22 @@ import java.util.logging.Logger; import javax.sql.DataSource; import org.apache.cayenne.CayenneRuntimeException; -import org.apache.cayenne.log.JdbcEventLogger; -import org.apache.cayenne.log.NoopJdbcEventLogger; import org.apache.cayenne.util.Util; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * A non-pooling DataSource implementation wrapping a JDBC driver. */ public class DriverDataSource implements DataSource { + private static final Log LOGGER = LogFactory.getLog(DriverDataSource.class); + protected Driver driver; protected String connectionUrl; protected String userName; protected String password; - protected JdbcEventLogger logger; - /** * Loads JDBC driver using current thread class loader. * @@ -80,8 +80,7 @@ public class DriverDataSource implements DataSource { * null. * * @deprecated since 4.0 as class loading should not happen here. Use { - * {@link #DriverDataSource(Driver, String, String, String, JdbcEventLogger)} - * . + * {@link #DriverDataSource(Driver, String, String, String)}. */ @Deprecated public DriverDataSource(String driverClassName, String connectionUrl) { @@ -96,8 +95,7 @@ public class DriverDataSource implements DataSource { * null. * * @deprecated since 4.0 as class loading should not happen here. Use - * {@link #DriverDataSource(Driver, String, String, String, JdbcEventLogger)} - * . + * {@link #DriverDataSource(Driver, String, String, String)}. */ @Deprecated public DriverDataSource(String driverClassName, String connectionUrl, String userName, String password) { @@ -112,40 +110,17 @@ public class DriverDataSource implements DataSource { * null. * * @since 1.1 - * @deprecated since 4.0 as class loading should not happen here. Use - * {@link #DriverDataSource(Driver, String, String, String, JdbcEventLogger)} - * . */ - @Deprecated public DriverDataSource(Driver driver, String connectionUrl, String userName, String password) { - this(driver, connectionUrl, userName, password, NoopJdbcEventLogger.getInstance()); - } - - /** - * Creates a new DriverDataSource wrapping a given Driver. If "driver" is - * null, DriverDataSource will consult DriverManager for a registered driver - * for the given URL. So when specifying null, a user must take care of - * registering the driver. "connectionUrl" on the other hand must NOT be - * null. - * - * @since 4.0 - */ - public DriverDataSource(Driver driver, String connectionUrl, String userName, String password, - JdbcEventLogger logger) { if (connectionUrl == null) { throw new NullPointerException("Null 'connectionUrl'"); } - if (logger == null) { - throw new NullPointerException("Null 'logger'"); - } - this.driver = driver; this.connectionUrl = connectionUrl; this.userName = userName; this.password = password; - this.logger = logger; } /** @@ -163,10 +138,8 @@ public class DriverDataSource implements DataSource { */ public Connection getConnection(String userName, String password) throws SQLException { try { - if (logger != null) { - logger.logConnect(connectionUrl, userName, password); - } + logConnect(connectionUrl, userName, password); Connection c = null; if (driver == null) { @@ -191,17 +164,25 @@ public class DriverDataSource implements DataSource { throw new SQLException("Can't establish connection: " + connectionUrl); } - if (logger != null) { - logger.logConnectSuccess(); - } + LOGGER.info("+++ Connecting: SUCCESS."); return c; - } catch (SQLException sqlex) { - if (logger != null) { - logger.logConnectFailure(sqlex); - } + } catch (SQLException ex) { + LOGGER.info("*** Connecting: FAILURE.", ex); + throw ex; + } + } + + private void logConnect(String url, String userName, String password) { + if (LOGGER.isInfoEnabled()) { + StringBuilder buf = new StringBuilder("Opening connection: "); + + // append URL on the same line to make log somewhat grep-friendly + buf.append(url); + buf.append("\n\tLogin: ").append(userName); + buf.append("\n\tPassword: *******"); - throw sqlex; + LOGGER.info(buf.toString()); } } @@ -222,27 +203,6 @@ public class DriverDataSource implements DataSource { } /** - * @deprecated since 4.0. Connection parameters are immutable and not - * readable. - */ - @Deprecated - public JdbcEventLogger getLogger() { - return logger; - } - - /** - * @deprecated since 4.0. Logger is immutable. - */ - @Deprecated - public void setLogger(JdbcEventLogger logger) { - if (logger == null) { - throw new NullPointerException("Null 'logger'"); - } - - this.logger = logger; - } - - /** * @since 3.0 * @deprecated since 4.0. Connection parameters are immutable and not * readable. http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java index d31f89f..6908fcc 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java @@ -149,6 +149,7 @@ public class CommonsJdbcEventLogger implements JdbcEventLogger { } } + @Deprecated @Override public void logConnect(String dataSource) { if (isLoggable()) { @@ -156,6 +157,7 @@ public class CommonsJdbcEventLogger implements JdbcEventLogger { } } + @Deprecated @Override public void logConnect(String url, String userName, String password) { if (isLoggable()) { @@ -170,6 +172,7 @@ public class CommonsJdbcEventLogger implements JdbcEventLogger { } } + @Deprecated @Override public void logPoolCreated(DataSourceInfo dsi) { if (isLoggable()) { @@ -200,11 +203,13 @@ public class CommonsJdbcEventLogger implements JdbcEventLogger { } } + @Deprecated @Override public void logConnectSuccess() { logger.info("+++ Connecting: SUCCESS."); } + @Deprecated @Override public void logConnectFailure(Throwable th) { logger.info("*** Connecting: FAILURE.", th); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java index 7e89611..49ad655 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java @@ -38,18 +38,39 @@ public interface JdbcEventLogger { /** * Logs database connection event using container data source. + * + * @deprecated since 4.0 connection events are logged by the DataSources + * using their own logger. */ + @Deprecated void logConnect(String dataSource); + /** + * @deprecated since 4.0 connection events are logged by the DataSources + * using their own logger. + */ + @Deprecated void logConnect(String url, String userName, String password); /** - * Logs database connection event. + * @deprecated since 4.0 connection events are logged by the DataSources + * using their own logger. */ + @Deprecated void logPoolCreated(DataSourceInfo dsi); + /** + * @deprecated since 4.0 connection events are logged by the DataSources + * using their own logger. + */ + @Deprecated void logConnectSuccess(); + /** + * @deprecated since 4.0 connection events are logged by the DataSources + * using their own logger. + */ + @Deprecated void logConnectFailure(Throwable th); void logGeneratedKey(DbAttribute attribute, Object value); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-server/src/main/java/org/apache/cayenne/log/NoopJdbcEventLogger.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/NoopJdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/NoopJdbcEventLogger.java index 03f29ab..8a56d94 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/log/NoopJdbcEventLogger.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/log/NoopJdbcEventLogger.java @@ -43,22 +43,27 @@ public class NoopJdbcEventLogger implements JdbcEventLogger { public void log(String message) { } + @Deprecated @Override public void logConnect(String dataSource) { } + @Deprecated @Override public void logConnect(String url, String userName, String password) { } + @Deprecated @Override public void logPoolCreated(DataSourceInfo dsi) { } + @Deprecated @Override public void logConnectSuccess() { } + @Deprecated @Override public void logConnectFailure(Throwable th) { } http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-server/src/test/java/org/apache/cayenne/datasource/BasePoolingDataSourceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/datasource/BasePoolingDataSourceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/datasource/BasePoolingDataSourceIT.java index 4e54aa1..ab7a196 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/datasource/BasePoolingDataSourceIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/datasource/BasePoolingDataSourceIT.java @@ -24,7 +24,6 @@ import java.sql.SQLException; import org.apache.cayenne.conn.DataSourceInfo; import org.apache.cayenne.di.AdhocObjectFactory; import org.apache.cayenne.di.Inject; -import org.apache.cayenne.log.JdbcEventLogger; import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; @@ -42,9 +41,6 @@ public class BasePoolingDataSourceIT extends ServerCase { @Inject private AdhocObjectFactory objectFactory; - @Inject - private JdbcEventLogger logger; - protected PoolingDataSource dataSource; @Before @@ -52,7 +48,7 @@ public class BasePoolingDataSourceIT extends ServerCase { Driver driver = objectFactory.newInstance(Driver.class, dataSourceInfo.getJdbcDriver()); DriverDataSource nonPooling = new DriverDataSource(driver, dataSourceInfo.getDataSourceUrl(), - dataSourceInfo.getUserName(), dataSourceInfo.getPassword(), logger); + dataSourceInfo.getUserName(), dataSourceInfo.getPassword()); PoolingDataSourceParameters poolParameters = createParameters(); this.dataSource = new PoolingDataSource(nonPooling, poolParameters); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-server/src/test/java/org/apache/cayenne/datasource/PoolingDataSource_FailingValidationQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/datasource/PoolingDataSource_FailingValidationQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/datasource/PoolingDataSource_FailingValidationQueryIT.java index c7e666e..a88942f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/datasource/PoolingDataSource_FailingValidationQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/datasource/PoolingDataSource_FailingValidationQueryIT.java @@ -24,7 +24,6 @@ import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.conn.DataSourceInfo; import org.apache.cayenne.di.AdhocObjectFactory; import org.apache.cayenne.di.Inject; -import org.apache.cayenne.log.JdbcEventLogger; import org.apache.cayenne.unit.di.server.CayenneProjects; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; @@ -39,9 +38,6 @@ public class PoolingDataSource_FailingValidationQueryIT extends ServerCase { @Inject private AdhocObjectFactory objectFactory; - @Inject - private JdbcEventLogger logger; - protected PoolingDataSourceParameters createParameters() { PoolingDataSourceParameters poolParameters = new PoolingDataSourceParameters(); poolParameters.setMinConnections(2); @@ -55,7 +51,7 @@ public class PoolingDataSource_FailingValidationQueryIT extends ServerCase { public void testConstructor() throws Exception { Driver driver = objectFactory.newInstance(Driver.class, dataSourceInfo.getJdbcDriver()); DriverDataSource nonPooling = new DriverDataSource(driver, dataSourceInfo.getDataSourceUrl(), - dataSourceInfo.getUserName(), dataSourceInfo.getPassword(), logger); + dataSourceInfo.getUserName(), dataSourceInfo.getPassword()); PoolingDataSourceParameters poolParameters = createParameters(); new PoolingDataSource(nonPooling, poolParameters); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceFactory.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceFactory.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceFactory.java index be4df2f..4946403 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceFactory.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceFactory.java @@ -30,7 +30,6 @@ import org.apache.cayenne.conn.DataSourceInfo; import org.apache.cayenne.datasource.DataSourceBuilder; import org.apache.cayenne.di.AdhocObjectFactory; import org.apache.cayenne.di.Inject; -import org.apache.cayenne.log.JdbcEventLogger; public class ServerCaseDataSourceFactory { @@ -39,12 +38,9 @@ public class ServerCaseDataSourceFactory { private Map<String, DataSource> dataSources; private Set<String> mapsWithDedicatedDataSource; private AdhocObjectFactory objectFactory; - private JdbcEventLogger logger; - public ServerCaseDataSourceFactory(@Inject DataSourceInfo dataSourceInfo, @Inject AdhocObjectFactory objectFactory, - @Inject JdbcEventLogger logger) { + public ServerCaseDataSourceFactory(@Inject DataSourceInfo dataSourceInfo, @Inject AdhocObjectFactory objectFactory) { - this.logger = logger; this.objectFactory = objectFactory; this.dataSourceInfo = dataSourceInfo; this.dataSources = new HashMap<String, DataSource>(); @@ -70,7 +66,7 @@ public class ServerCaseDataSourceFactory { } private DataSource createDataSource() { - return DataSourceBuilder.builder(objectFactory, logger).driver(dataSourceInfo.getJdbcDriver()) + return DataSourceBuilder.builder(objectFactory).driver(dataSourceInfo.getJdbcDriver()) .url(dataSourceInfo.getDataSourceUrl()).userName(dataSourceInfo.getUserName()) .password(dataSourceInfo.getPassword()).minConnections(dataSourceInfo.getMinConnections()) .maxConnections(dataSourceInfo.getMaxConnections()).build(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java index c02b811..5e0ab99 100644 --- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java +++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java @@ -78,7 +78,7 @@ public class DbGeneratorTask extends CayenneTask { // load driver taking custom CLASSPATH into account... DriverDataSource dataSource = new DriverDataSource((Driver) Class.forName(driver).newInstance(), url, - userName, password, NoopJdbcEventLogger.getInstance()); + userName, password); DbAdapter adapter = getAdapter(injector, dataSource); http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/DriverDataSourceFactory.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/DriverDataSourceFactory.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/DriverDataSourceFactory.java index e80159d..c5425d5 100644 --- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/DriverDataSourceFactory.java +++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/configuration/DriverDataSourceFactory.java @@ -28,7 +28,6 @@ import org.apache.cayenne.conn.DataSourceInfo; import org.apache.cayenne.datasource.DriverDataSource; import org.apache.cayenne.di.AdhocObjectFactory; import org.apache.cayenne.di.Inject; -import org.apache.cayenne.log.JdbcEventLogger; /** * @since 4.0 @@ -36,11 +35,9 @@ import org.apache.cayenne.log.JdbcEventLogger; public class DriverDataSourceFactory implements DataSourceFactory { private AdhocObjectFactory objectFactory; - private JdbcEventLogger logger; - public DriverDataSourceFactory(@Inject AdhocObjectFactory objectFactory, @Inject JdbcEventLogger logger) { + public DriverDataSourceFactory(@Inject AdhocObjectFactory objectFactory) { this.objectFactory = objectFactory; - this.logger = logger; } public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception { @@ -51,6 +48,6 @@ public class DriverDataSourceFactory implements DataSourceFactory { Driver driver = objectFactory.newInstance(Driver.class, properties.getJdbcDriver()); return new DriverDataSource(driver, properties.getDataSourceUrl(), properties.getUserName(), - properties.getPassword(), logger); + properties.getPassword()); } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java index 712f13a..e10d373 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferences.java @@ -37,7 +37,6 @@ import javax.swing.DefaultComboBoxModel; import javax.swing.JOptionPane; import org.apache.cayenne.datasource.DriverDataSource; -import org.apache.cayenne.log.NoopJdbcEventLogger; import org.apache.cayenne.modeler.FileClassLoadingService; import org.apache.cayenne.modeler.pref.DBConnectionInfo; import org.apache.cayenne.modeler.util.CayenneController; @@ -273,7 +272,7 @@ public class DataSourcePreferences extends CayenneController { // connect via Cayenne DriverDataSource - it addresses some driver // issues... Connection c = new DriverDataSource(driver, currentDataSource.getUrl(), currentDataSource.getUserName(), - currentDataSource.getPassword(), NoopJdbcEventLogger.getInstance()).getConnection(); + currentDataSource.getPassword()).getConnection(); try { c.close(); } catch (SQLException e) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectionInfo.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectionInfo.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectionInfo.java index 921d451..28ccc97 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectionInfo.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectionInfo.java @@ -31,7 +31,6 @@ import org.apache.cayenne.datasource.DriverDataSource; import org.apache.cayenne.dba.AutoAdapter; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.di.AdhocObjectFactory; -import org.apache.cayenne.log.NoopJdbcEventLogger; import org.apache.cayenne.modeler.Application; import org.apache.cayenne.modeler.ClassLoadingService; import org.apache.cayenne.pref.CayennePreference; @@ -225,7 +224,7 @@ public class DBConnectionInfo extends CayennePreference { throw new SQLException("Driver load error: " + th.getLocalizedMessage()); } - return new DriverDataSource(driver, getUrl(), getUserName(), getPassword(), NoopJdbcEventLogger.getInstance()); + return new DriverDataSource(driver, getUrl(), getUserName(), getPassword()); } /** http://git-wip-us.apache.org/repos/asf/cayenne/blob/4116471c/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java ---------------------------------------------------------------------- diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java index e61aa95..e15c65e 100644 --- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java +++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java @@ -165,7 +165,7 @@ public class DbGeneratorMojo extends AbstractMojo { // load driver taking custom CLASSPATH into account... DriverDataSource dataSource = new DriverDataSource((Driver) Class.forName(driver).newInstance(), url, - username, password, NoopJdbcEventLogger.getInstance()); + username, password); generator.runGenerator(dataSource); } catch (Exception ex) {
