This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 3660f381b CAY-2912 Compact SQL logger
3660f381b is described below
commit 3660f381bacd41f77de6d96cfd874df5917aa3b2
Author: Andrus Adamchik <[email protected]>
AuthorDate: Fri Jul 3 18:07:55 2026 -0400
CAY-2912 Compact SQL logger
cleanup
---
.../cayenne/crypto/map/CryptoDataMapLoader.java | 8 +-
.../java/org/apache/cayenne/access/DataDomain.java | 69 +-------
.../org/apache/cayenne/access/DbGenerator.java | 6 +-
.../access/flush/DefaultDataDomainFlushAction.java | 8 +-
.../flush/DefaultDataDomainFlushActionFactory.java | 4 +-
.../runtime/DefaultDbAdapterFactory.java | 192 ++++++++++-----------
.../java/org/apache/cayenne/dba/AutoAdapter.java | 9 +-
.../org/apache/cayenne/tx/CayenneTransaction.java | 18 +-
.../cayenne/tx/DefaultTransactionFactory.java | 10 +-
.../org/apache/cayenne/tx/ExternalTransaction.java | 14 +-
.../java/org/apache/cayenne/dba/AutoAdapterIT.java | 5 +-
11 files changed, 139 insertions(+), 204 deletions(-)
diff --git
a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/CryptoDataMapLoader.java
b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/CryptoDataMapLoader.java
index 59cbc23f2..cda2f3927 100644
---
a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/CryptoDataMapLoader.java
+++
b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/map/CryptoDataMapLoader.java
@@ -41,16 +41,16 @@ public class CryptoDataMapLoader implements DataMapLoader {
protected final DataMapLoader delegate;
protected final ColumnMapper columnMapper;
- protected final SqlLogger jdbcEventLogger;
+ protected final SqlLogger sqlLogger;
public CryptoDataMapLoader(
@Inject DataMapLoader delegate,
@Inject ColumnMapper columnMapper,
- @Inject SqlLogger jdbcEventLogger) {
+ @Inject SqlLogger sqlLogger) {
this.delegate = delegate;
this.columnMapper = columnMapper;
- this.jdbcEventLogger = jdbcEventLogger;
+ this.sqlLogger = sqlLogger;
}
@Override
@@ -65,7 +65,7 @@ public class CryptoDataMapLoader implements DataMapLoader {
columnMapper.isEncrypted(attr.getDbAttribute())) {
String attrName =
entity.getName() + "." + attr.getName();
-
jdbcEventLogger.logMessage("WARN: Encrypted attributes like '" + attrName + "'
cannot be used for " +
+ sqlLogger.logMessage("WARN:
Encrypted attributes like '" + attrName + "' cannot be used for " +
"optimistic
locking. Locking will be disabled for this attribute.");
attr.setUsedForLocking(false);
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java
b/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java
index 3b6864377..6bba60781 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java
@@ -37,7 +37,6 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.event.EventManager;
import org.apache.cayenne.graph.CompoundDiff;
import org.apache.cayenne.graph.GraphDiff;
-import org.apache.cayenne.log.SqlLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.EntitySorter;
@@ -69,81 +68,34 @@ public class DataDomain implements DataChannel {
public static final String VALIDATING_OBJECTS_ON_COMMIT_PROPERTY =
"cayenne.DataDomain.validatingObjectsOnCommit";
public static final boolean VALIDATING_OBJECTS_ON_COMMIT_DEFAULT = true;
- /**
- * @since 3.1
- */
- @Inject
- protected SqlLogger jdbcEventLogger;
-
- /**
- * @since 4.0
- */
@Inject
protected TransactionManager transactionManager;
-
- /**
- * @since 5.0
- */
@Inject
protected TransactionFactory transactionFactory;
-
- /**
- * @since 4.0
- */
- protected DataRowStoreFactory dataRowStoreFactory;
-
- /**
- * @since 3.1
- */
- protected int maxIdQualifierSize;
-
- /**
- * @since 4.1
- */
- protected List<DataChannelQueryFilter> queryFilters;
-
- /**
- * @since 4.1
- */
- protected List<DataChannelSyncFilter> syncFilters;
-
- /**
- * @since 4.2
- */
@Inject
protected DataDomainFlushActionFactory flushActionFactory;
-
- /**
- * @since 4.2
- */
@Inject
protected AdhocObjectFactory objectFactory;
+ protected DataRowStoreFactory dataRowStoreFactory;
+ protected int maxIdQualifierSize;
+ protected List<DataChannelQueryFilter> queryFilters;
+ protected List<DataChannelSyncFilter> syncFilters;
protected Map<String, DataNode> nodes;
protected Map<String, DataNode> nodesByDataMapName;
protected DataNode defaultNode;
-
protected EntityResolver entityResolver;
protected DataRowStore sharedSnapshotCache;
protected String name;
protected QueryCache queryCache;
+ protected EventManager eventManager;
+ protected EntitySorter entitySorter;
+ protected boolean stopped;
// these are initialized from properties...
protected boolean sharedCacheEnabled;
protected boolean validatingObjectsOnCommit;
- /**
- * @since 1.2
- */
- protected EventManager eventManager;
-
- /**
- * @since 1.2
- */
- protected EntitySorter entitySorter;
-
- protected boolean stopped;
-
/**
* Creates a DataDomain and assigns it a name.
*/
@@ -600,13 +552,6 @@ public class DataDomain implements DataChannel {
this.dataRowStoreFactory = dataRowStoreFactory;
}
- /**
- * @since 3.1
- */
- SqlLogger getSqlLogger() {
- return jdbcEventLogger;
- }
-
void refreshEntitySorter() {
if (entitySorter != null) {
entitySorter.setEntityResolver(getEntityResolver());
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DbGenerator.java
b/cayenne/src/main/java/org/apache/cayenne/access/DbGenerator.java
index 660a8071f..5d3ad6056 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DbGenerator.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DbGenerator.java
@@ -64,7 +64,7 @@ public class DbGenerator {
// situations
protected DataDomain domain;
- protected SqlLogger jdbcEventLogger;
+ protected SqlLogger sqlLogger;
// stores generated SQL statements
protected Map<String, Collection<String>> dropTables;
@@ -130,7 +130,7 @@ public class DbGenerator {
this.domain = domain;
this.map = map;
this.adapter = adapter;
- this.jdbcEventLogger = logger;
+ this.sqlLogger = logger;
prepareDbEntities(excludedEntities);
resetToDefaults();
@@ -321,7 +321,7 @@ public class DbGenerator {
protected boolean safeExecute(Connection connection, String sql) {
try (Statement statement = connection.createStatement()) {
- jdbcEventLogger.logMessage(sql);
+ sqlLogger.logMessage(sql);
statement.execute(sql);
return true;
} catch (SQLException ex) {
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushAction.java
b/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushAction.java
index e04d229db..86f419178 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushAction.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushAction.java
@@ -61,16 +61,16 @@ public class DefaultDataDomainFlushAction implements
DataDomainFlushAction {
protected final DataDomain dataDomain;
protected final DbRowOpSorter dbRowOpSorter;
- protected final SqlLogger jdbcEventLogger;
+ protected final SqlLogger sqlLogger;
protected final OperationObserver observer;
protected final DeleteDbRowOpFactory deleteDbRowOpFactory;
protected DefaultDataDomainFlushAction(DataDomain dataDomain,
DbRowOpSorter dbRowOpSorter,
- SqlLogger jdbcEventLogger,
DeleteDbRowOpFactory deleteDbRowOpFactory) {
+ SqlLogger sqlLogger,
DeleteDbRowOpFactory deleteDbRowOpFactory) {
this.dataDomain = dataDomain;
this.dbRowOpSorter = dbRowOpSorter;
- this.jdbcEventLogger = jdbcEventLogger;
- this.observer = new FlushObserver(jdbcEventLogger);
+ this.sqlLogger = sqlLogger;
+ this.observer = new FlushObserver(sqlLogger);
this.deleteDbRowOpFactory = deleteDbRowOpFactory;
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionFactory.java
b/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionFactory.java
index 2ed532031..c837426a6 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionFactory.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionFactory.java
@@ -36,13 +36,13 @@ public class DefaultDataDomainFlushActionFactory implements
DataDomainFlushActio
private DbRowOpSorter operationSorter;
@Inject
- private SqlLogger jdbcEventLogger;
+ private SqlLogger sqlLogger;
@Inject
private DeleteDbRowOpFactory deleteDbRowOpFactory;
@Override
public DataDomainFlushAction createFlushAction(DataDomain dataDomain) {
- return new DefaultDataDomainFlushAction(dataDomain, operationSorter,
jdbcEventLogger, deleteDbRowOpFactory);
+ return new DefaultDataDomainFlushAction(dataDomain, operationSorter,
sqlLogger, deleteDbRowOpFactory);
}
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactory.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactory.java
index 8e3216a72..b8099ff5f 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactory.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactory.java
@@ -28,7 +28,8 @@ import org.apache.cayenne.dba.PkGenerator;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Injector;
-import org.apache.cayenne.log.SqlLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -45,102 +46,95 @@ import java.util.Objects;
*/
public class DefaultDbAdapterFactory implements DbAdapterFactory {
- @Inject
- protected Injector injector;
-
- @Inject
- protected SqlLogger jdbcEventLogger;
-
- @Inject
- protected AdhocObjectFactory objectFactory;
-
- @Inject
- protected PkGeneratorFactoryProvider pkGeneratorProvider;
-
- protected List<DbAdapterDetector> detectors;
-
- public
DefaultDbAdapterFactory(@Inject(Constants.ADAPTER_DETECTORS_LIST)
List<DbAdapterDetector> detectors) {
- if (detectors == null) {
- throw new NullPointerException("Null detectors list");
- }
- this.detectors = detectors;
- }
-
- @Override
- public DbAdapter createAdapter(DataNodeDescriptor nodeDescriptor,
DataSource dataSource) {
-
- String adapterType = null;
-
- if (nodeDescriptor != null) {
- adapterType = nodeDescriptor.getAdapterType();
- }
-
- // must not create AutoAdapter via objectFactory, so treat
explicit
- // AutoAdapter as null and let it fall through to the default.
(explicit
- // AutoAdapter is often passed from the cdbimport pligin).
- if (adapterType != null &&
adapterType.equals(AutoAdapter.class.getName())) {
- adapterType = null;
- }
-
- if (adapterType != null) {
- DbAdapter dbAdapter =
objectFactory.newInstance(DbAdapter.class, adapterType);
- return setupPkGenerator(dbAdapter);
- } else {
- return new AutoAdapter(() -> detectAdapter(dataSource),
jdbcEventLogger);
- }
- }
-
- protected DbAdapter detectAdapter(DataSource dataSource) {
-
- if (detectors.isEmpty()) {
- return defaultAdapter();
- }
-
- try (Connection c = dataSource.getConnection()) {
- return detectAdapter(c.getMetaData());
- } catch (SQLException e) {
- throw new CayenneRuntimeException("Error detecting
database type: " + e.getLocalizedMessage(), e);
- }
- }
-
- protected DbAdapter detectAdapter(DatabaseMetaData metaData) throws
SQLException {
- // iterate in reverse order to allow custom factories to take
precedence
- // over the
- // default ones configured in constructor
- for (int i = detectors.size() - 1; i >= 0; i--) {
- DbAdapterDetector detector = detectors.get(i);
- DbAdapter adapter = detector.createAdapter(metaData);
-
- if (adapter != null) {
- jdbcEventLogger.logMessage("Detected and
installed adapter: " + adapter.getClass().getName());
-
- // TODO: should detector do this??
- injector.injectMembers(adapter);
-
- return setupPkGenerator(adapter);
- }
- }
-
- return defaultAdapter();
- }
-
- protected DbAdapter defaultAdapter() {
- jdbcEventLogger.logMessage("Failed to detect database type,
using generic adapter");
- return objectFactory.newInstance(DbAdapter.class,
JdbcAdapter.class.getName());
- }
-
- /**
- * Setup PK generator for the adapter
- * @param dbAdapter to process
- * @return db adapter
- * @since 4.1
- */
- protected DbAdapter setupPkGenerator(DbAdapter dbAdapter) {
- PkGenerator pkGenerator =
pkGeneratorProvider.get(Objects.requireNonNull(dbAdapter));
- if(pkGenerator != null) {
- pkGenerator.setAdapter(dbAdapter);
- dbAdapter.setPkGenerator(pkGenerator);
- }
- return dbAdapter;
- }
+ private static final Logger LOGGER =
LoggerFactory.getLogger(DefaultDbAdapterFactory.class);
+
+ @Inject
+ protected Injector injector;
+
+ @Inject
+ protected AdhocObjectFactory objectFactory;
+
+ @Inject
+ protected PkGeneratorFactoryProvider pkGeneratorProvider;
+
+ protected List<DbAdapterDetector> detectors;
+
+ public DefaultDbAdapterFactory(@Inject(Constants.ADAPTER_DETECTORS_LIST)
List<DbAdapterDetector> detectors) {
+ if (detectors == null) {
+ throw new NullPointerException("Null detectors list");
+ }
+ this.detectors = detectors;
+ }
+
+ @Override
+ public DbAdapter createAdapter(DataNodeDescriptor nodeDescriptor,
DataSource dataSource) {
+
+ String adapterType = null;
+
+ if (nodeDescriptor != null) {
+ adapterType = nodeDescriptor.getAdapterType();
+ }
+
+ // must not create AutoAdapter via objectFactory, so treat explicit
+ // AutoAdapter as null and let it fall through to the default.
(explicit
+ // AutoAdapter is often passed from the cdbimport pligin).
+ if (adapterType != null &&
adapterType.equals(AutoAdapter.class.getName())) {
+ adapterType = null;
+ }
+
+ if (adapterType != null) {
+ DbAdapter dbAdapter = objectFactory.newInstance(DbAdapter.class,
adapterType);
+ return setupPkGenerator(dbAdapter);
+ } else {
+ return new AutoAdapter(() -> detectAdapter(dataSource));
+ }
+ }
+
+ protected DbAdapter detectAdapter(DataSource dataSource) {
+
+ if (detectors.isEmpty()) {
+ return defaultAdapter();
+ }
+
+ try (Connection c = dataSource.getConnection()) {
+ return detectAdapter(c.getMetaData());
+ } catch (SQLException e) {
+ throw new CayenneRuntimeException("Error detecting database type:
" + e.getLocalizedMessage(), e);
+ }
+ }
+
+ protected DbAdapter detectAdapter(DatabaseMetaData metaData) throws
SQLException {
+ // iterate in reverse order to allow custom factories to take
precedence
+ // over the
+ // default ones configured in constructor
+ for (int i = detectors.size() - 1; i >= 0; i--) {
+ DbAdapterDetector detector = detectors.get(i);
+ DbAdapter adapter = detector.createAdapter(metaData);
+
+ if (adapter != null) {
+ LOGGER.info("Detected and installed adapter: {}",
adapter.getClass().getName());
+
+ // TODO: should detector do this??
+ injector.injectMembers(adapter);
+
+ return setupPkGenerator(adapter);
+ }
+ }
+
+ return defaultAdapter();
+ }
+
+ protected DbAdapter defaultAdapter() {
+ LOGGER.warn("Failed to detect database type, using generic adapter");
+ return objectFactory.newInstance(DbAdapter.class,
JdbcAdapter.class.getName());
+ }
+
+ protected DbAdapter setupPkGenerator(DbAdapter dbAdapter) {
+ PkGenerator pkGenerator =
pkGeneratorProvider.get(Objects.requireNonNull(dbAdapter));
+ if (pkGenerator != null) {
+ pkGenerator.setAdapter(dbAdapter);
+ dbAdapter.setPkGenerator(pkGenerator);
+ }
+ return dbAdapter;
+ }
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
index 144b68bfb..8f3680578 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
@@ -21,23 +21,22 @@ package org.apache.cayenne.dba;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor;
import org.apache.cayenne.access.jdbc.CSParameter;
import org.apache.cayenne.access.jdbc.PSParameter;
+import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor;
import org.apache.cayenne.access.translator.EJBQLTranslator;
import org.apache.cayenne.access.translator.ProcedureTranslator;
import org.apache.cayenne.access.translator.SelectTranslator;
import org.apache.cayenne.access.types.ExtendedTypeMap;
import org.apache.cayenne.di.Provider;
-import org.apache.cayenne.log.SqlLogger;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.query.ProcedureQuery;
-import org.apache.cayenne.query.Select;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.SQLAction;
+import org.apache.cayenne.query.Select;
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
@@ -55,7 +54,6 @@ public class AutoAdapter implements DbAdapter {
protected Provider<DbAdapter> adapterProvider;
protected PkGenerator pkGenerator;
- protected SqlLogger logger;
/**
* The actual adapter that is delegated methods execution.
@@ -68,14 +66,13 @@ public class AutoAdapter implements DbAdapter {
*
* @since 3.1
*/
- public AutoAdapter(Provider<DbAdapter> adapterProvider, SqlLogger
logger) {
+ public AutoAdapter(Provider<DbAdapter> adapterProvider) {
if (adapterProvider == null) {
throw new CayenneRuntimeException("Null
adapterProvider");
}
this.adapterProvider = adapterProvider;
- this.logger = logger;
}
/**
diff --git
a/cayenne/src/main/java/org/apache/cayenne/tx/CayenneTransaction.java
b/cayenne/src/main/java/org/apache/cayenne/tx/CayenneTransaction.java
index 2ee586f56..c1b6df871 100644
--- a/cayenne/src/main/java/org/apache/cayenne/tx/CayenneTransaction.java
+++ b/cayenne/src/main/java/org/apache/cayenne/tx/CayenneTransaction.java
@@ -32,24 +32,24 @@ import java.sql.SQLException;
*/
public class CayenneTransaction extends BaseTransaction {
- protected SqlLogger logger;
+ protected SqlLogger sqlLogger;
- public CayenneTransaction(SqlLogger logger) {
- this(logger, TransactionDescriptor.defaultDescriptor());
+ public CayenneTransaction(SqlLogger sqlLogger) {
+ this(sqlLogger, TransactionDescriptor.defaultDescriptor());
}
/**
* @since 4.1
*/
- public CayenneTransaction(SqlLogger jdbcEventLogger, TransactionDescriptor
descriptor) {
+ public CayenneTransaction(SqlLogger sqlLogger, TransactionDescriptor
descriptor) {
super(descriptor);
- this.logger = jdbcEventLogger;
+ this.sqlLogger = sqlLogger;
}
@Override
public void begin() {
super.begin();
- logger.logTransactionStart();
+ sqlLogger.logTransactionStart();
}
@Override
@@ -107,10 +107,10 @@ public class CayenneTransaction extends BaseTransaction {
}
if (deferredException != null) {
- logger.logTransactionRollback();
+ sqlLogger.logTransactionRollback();
throw new CayenneRuntimeException(deferredException);
} else {
- logger.logTransactionCommit();
+ sqlLogger.logTransactionCommit();
}
}
@@ -135,7 +135,7 @@ public class CayenneTransaction extends BaseTransaction {
}
}
- logger.logTransactionRollback();
+ sqlLogger.logTransactionRollback();
if (deferredException != null) {
throw new CayenneRuntimeException(deferredException);
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
b/cayenne/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
index d18663a06..c6034d9c1 100644
--- a/cayenne/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
@@ -29,11 +29,11 @@ import org.apache.cayenne.log.SqlLogger;
public class DefaultTransactionFactory implements TransactionFactory {
protected boolean externalTransactions;
- protected SqlLogger jdbcEventLogger;
+ protected SqlLogger sqlLogger;
- public DefaultTransactionFactory(@Inject RuntimeProperties properties,
@Inject SqlLogger jdbcEventLogger) {
+ public DefaultTransactionFactory(@Inject RuntimeProperties properties,
@Inject SqlLogger sqlLogger) {
this.externalTransactions =
properties.getBoolean(Constants.EXTERNAL_TX_PROPERTY, false);
- this.jdbcEventLogger = jdbcEventLogger;
+ this.sqlLogger = sqlLogger;
}
/**
@@ -42,8 +42,8 @@ public class DefaultTransactionFactory implements
TransactionFactory {
@Override
public Transaction createTransaction(TransactionDescriptor descriptor) {
return externalTransactions
- ? new ExternalTransaction(jdbcEventLogger, descriptor)
- : new CayenneTransaction(jdbcEventLogger, descriptor);
+ ? new ExternalTransaction(sqlLogger, descriptor)
+ : new CayenneTransaction(sqlLogger, descriptor);
}
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/tx/ExternalTransaction.java
b/cayenne/src/main/java/org/apache/cayenne/tx/ExternalTransaction.java
index 117907b5c..76503576c 100644
--- a/cayenne/src/main/java/org/apache/cayenne/tx/ExternalTransaction.java
+++ b/cayenne/src/main/java/org/apache/cayenne/tx/ExternalTransaction.java
@@ -28,28 +28,28 @@ import org.apache.cayenne.log.SqlLogger;
*/
public class ExternalTransaction extends BaseTransaction {
- protected SqlLogger logger;
+ protected SqlLogger sqlLogger;
- public ExternalTransaction(SqlLogger jdbcEventLogger) {
- this(jdbcEventLogger, TransactionDescriptor.defaultDescriptor());
+ public ExternalTransaction(SqlLogger sqlLogger) {
+ this(sqlLogger, TransactionDescriptor.defaultDescriptor());
}
/**
* @since 4.1
*/
- public ExternalTransaction(SqlLogger jdbcEventLogger,
TransactionDescriptor descriptor) {
+ public ExternalTransaction(SqlLogger sqlLogger, TransactionDescriptor
descriptor) {
super(descriptor);
- this.logger = jdbcEventLogger;
+ this.sqlLogger = sqlLogger;
}
@Override
protected void processCommit() {
- logger.logTransactionCommit();
+ sqlLogger.logTransactionCommit();
}
@Override
protected void processRollback() {
- logger.logTransactionRollback();
+ sqlLogger.logTransactionRollback();
}
@Override
diff --git a/cayenne/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
b/cayenne/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
index 960adf836..709951f2d 100644
--- a/cayenne/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/dba/AutoAdapterIT.java
@@ -20,7 +20,6 @@
package org.apache.cayenne.dba;
import org.apache.cayenne.access.jdbc.SQLTemplateAction;
-import org.apache.cayenne.log.NoopSqlLogger;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.query.SQLTemplate;
@@ -39,7 +38,7 @@ public class AutoAdapterIT {
@Test
public void getAdapter_Proxy() {
- AutoAdapter adapter = new AutoAdapter(() ->
env.dataNode().getAdapter(), NoopSqlLogger.getInstance());
+ AutoAdapter adapter = new AutoAdapter(() ->
env.dataNode().getAdapter());
DbAdapter detected = adapter.getAdapter();
assertSame(env.dataNode().getAdapter(), detected);
}
@@ -62,7 +61,7 @@ public class AutoAdapterIT {
@Test
public void correctProxyMethods() {
DbAdapter adapter = env.dataNode().getAdapter();
- AutoAdapter autoAdapter = new AutoAdapter(() -> adapter,
NoopSqlLogger.getInstance());
+ AutoAdapter autoAdapter = new AutoAdapter(() -> adapter);
ObjectSelect<Artist> select = ObjectSelect.query(Artist.class);
