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 aa4485606 CAY-2912 Compact SQL logger
aa4485606 is described below
commit aa4485606b0bdbb18dfaf2809ab08a8840b2f99e
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sun Jul 5 19:51:37 2026 -0400
CAY-2912 Compact SQL logger
consistent logger class name capitalization
---
.../java/org/apache/cayenne/tools/DbGeneratorTask.java | 4 ++--
.../org/apache/cayenne/crypto/map/CryptoDataMapLoader.java | 6 +++---
.../cayenne/dbsync/merge/token/db/AbstractToDbToken.java | 4 ++--
.../cayenne/dbsync/reverse/configuration/ToolsModule.java | 6 +++---
.../main/java/org/apache/cayenne/tools/DbGenerateTask.java | 4 ++--
.../java/org/apache/cayenne/tools/DbGeneratorMojo.java | 4 ++--
.../src/main/java/org/apache/cayenne/access/DataNode.java | 12 ++++++------
.../main/java/org/apache/cayenne/access/DbGenerator.java | 10 +++++-----
.../java/org/apache/cayenne/access/LoggingObserver.java | 8 ++++----
.../apache/cayenne/configuration/runtime/CoreModule.java | 6 +++---
.../configuration/runtime/DefaultDataNodeFactory.java | 6 +++---
.../src/main/java/org/apache/cayenne/dba/JdbcAdapter.java | 6 +++---
.../org/apache/cayenne/dba/mysql/MySQLPkGenerator.java | 4 ++--
.../cayenne/log/{NoopSqlLogger.java => NoopSQLLogger.java} | 10 +++++-----
.../{SqlBindingRenderer.java => SQLBindingRenderer.java} | 4 ++--
.../apache/cayenne/log/{SqlLogger.java => SQLLogger.java} | 2 +-
.../log/{Slf4jSqlLogger.java => Slf4jSQLLogger.java} | 10 +++++-----
.../java/org/apache/cayenne/tx/CayenneTransaction.java | 8 ++++----
.../org/apache/cayenne/tx/DefaultTransactionFactory.java | 6 +++---
.../java/org/apache/cayenne/tx/ExternalTransaction.java | 8 ++++----
.../cayenne/access/DataContextPerformQueryAPIIT.java | 4 ++--
.../apache/cayenne/access/DataContextProcedureQueryIT.java | 8 ++++----
.../test/java/org/apache/cayenne/access/DbGeneratorIT.java | 4 ++--
.../cayenne/access/DefaultDataRowStoreFactoryIT.java | 8 ++++----
.../org/apache/cayenne/access/LoggingObserverTest.java | 4 ++--
.../configuration/runtime/DataContextFactoryTest.java | 8 ++++----
.../configuration/runtime/DataDomainProviderTest.java | 6 +++---
.../runtime/DefaultDataSourceFactoryLoaderTest.java | 10 +++++-----
.../configuration/runtime/DefaultDbAdapterFactoryTest.java | 12 ++++++------
.../{Slf4jSqlLoggerTest.java => Slf4jSQLLoggerTest.java} | 14 +++++++-------
.../test/java/org/apache/cayenne/query/MappedQueryIT.java | 4 ++--
.../java/org/apache/cayenne/query/ProcedureCallIT.java | 4 ++--
.../apache/cayenne/tx/TransactionCustomConnectionIT.java | 6 +++---
.../java/org/apache/cayenne/tx/TransactionThreadIT.java | 4 ++--
.../test/java/org/apache/cayenne/tx/UserTransactionIT.java | 4 ++--
.../cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java | 4 ++--
36 files changed, 116 insertions(+), 116 deletions(-)
diff --git
a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
index 339e0c79f..2c99a7ffb 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dbsync.DbSyncModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
@@ -84,7 +84,7 @@ public class DbGeneratorTask extends CayenneTask {
DbAdapter adapter = getAdapter(injector, dataSource);
DbGenerator generator = new DbGenerator(adapter,
dataMap, Collections.<DbEntity> emptyList(), null,
- NoopSqlLogger.getInstance());
+ NoopSQLLogger.getInstance());
generator.setShouldCreateFKConstraints(createFK);
generator.setShouldCreatePKSupport(createPK);
generator.setShouldCreateTables(createTables);
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 cda2f3927..a086ab253 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
@@ -21,7 +21,7 @@ package org.apache.cayenne.crypto.map;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.configuration.DataMapLoader;
import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.SQLLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
@@ -41,12 +41,12 @@ public class CryptoDataMapLoader implements DataMapLoader {
protected final DataMapLoader delegate;
protected final ColumnMapper columnMapper;
- protected final SqlLogger sqlLogger;
+ protected final SQLLogger sqlLogger;
public CryptoDataMapLoader(
@Inject DataMapLoader delegate,
@Inject ColumnMapper columnMapper,
- @Inject SqlLogger sqlLogger) {
+ @Inject SQLLogger sqlLogger) {
this.delegate = delegate;
this.columnMapper = columnMapper;
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/db/AbstractToDbToken.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/db/AbstractToDbToken.java
index 75cc6e39d..2279d0ade 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/db/AbstractToDbToken.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/db/AbstractToDbToken.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.dbsync.merge.context.MergeDirection;
import org.apache.cayenne.dbsync.merge.context.MergerContext;
import org.apache.cayenne.dbsync.merge.token.AbstractMergerToken;
import org.apache.cayenne.dbsync.merge.token.MergerToken;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.SQLLogger;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.validation.SimpleValidationFailure;
@@ -52,7 +52,7 @@ public abstract class AbstractToDbToken extends
AbstractMergerToken {
}
void executeSql(MergerContext mergerContext, String sql) {
- SqlLogger logger = mergerContext.getDataNode().getSqlLogger();
+ SQLLogger logger = mergerContext.getDataNode().getSqlLogger();
logger.logMessage(sql);
try (Connection conn =
mergerContext.getDataNode().getDataSource().getConnection()) {
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
index 8fd922c51..d7a36044e 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
@@ -88,8 +88,8 @@ import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.spi.DefaultAdhocObjectFactory;
import org.apache.cayenne.di.spi.DefaultClassLoaderManager;
-import org.apache.cayenne.log.SqlLogger;
-import org.apache.cayenne.log.Slf4jSqlLogger;
+import org.apache.cayenne.log.SQLLogger;
+import org.apache.cayenne.log.Slf4jSQLLogger;
import org.apache.cayenne.project.extension.ExtensionAwareHandlerFactory;
import
org.apache.cayenne.reflect.generic.DefaultValueComparisonStrategyFactory;
import org.apache.cayenne.reflect.generic.ValueComparisonStrategyFactory;
@@ -160,7 +160,7 @@ public class ToolsModule implements Module {
binder.bind(Key.get(BatchTranslator.class,
BatchTranslator.INSERT)).to(InsertBatchTranslator.class);
binder.bind(Key.get(BatchTranslator.class,
BatchTranslator.UPDATE)).to(UpdateBatchTranslator.class);
binder.bind(Key.get(BatchTranslator.class,
BatchTranslator.DELETE)).to(DeleteBatchTranslator.class);
- binder.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ binder.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
binder.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
binder.bind(PkGenerator.class).to(JdbcPkGenerator.class);
diff --git
a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java
b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java
index 444059cd4..5306bdeb5 100644
---
a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java
+++
b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java
@@ -35,7 +35,7 @@ import
org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.resource.URLResource;
import org.apache.cayenne.tools.model.DataSourceConfig;
@@ -147,7 +147,7 @@ public class DbGenerateTask extends BaseCayenneTask {
DbGenerator createGenerator(DataMap dataMap, Injector injector, DataSource
realDataSource) throws Exception {
DbAdapter dbAdapter = createDbAdapter(injector, realDataSource);
- DbGenerator generator = new DbGenerator(dbAdapter, dataMap,
NoopSqlLogger.getInstance());
+ DbGenerator generator = new DbGenerator(dbAdapter, dataMap,
NoopSQLLogger.getInstance());
generator.setShouldCreateFKConstraints(createFK);
generator.setShouldCreatePKSupport(createPK);
generator.setShouldCreateTables(createTables);
diff --git
a/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
b/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
index 66ac71690..8d4c14478 100644
---
a/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
+++
b/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.dbsync.DbSyncModule;
import org.apache.cayenne.di.ClassLoaderManager;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
import org.apache.cayenne.resource.URLResource;
@@ -146,7 +146,7 @@ public class DbGeneratorMojo extends AbstractMojo {
// Load the data map and run the db generator.
DataMap dataMap = loadDataMap(injector);
- DbGenerator generator = new DbGenerator(dbAdapter, dataMap,
NoopSqlLogger.getInstance());
+ DbGenerator generator = new DbGenerator(dbAdapter, dataMap,
NoopSQLLogger.getInstance());
generator.setShouldCreateFKConstraints(createFK);
generator.setShouldCreatePKSupport(createPK);
generator.setShouldCreateTables(createTables);
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java
b/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java
index e3cea59be..36f0522b8 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java
@@ -28,8 +28,8 @@ import
org.apache.cayenne.access.translator.ProcedureTranslator;
import org.apache.cayenne.access.translator.SQLTemplateTranslator;
import org.apache.cayenne.access.translator.SelectTranslator;
import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.log.NoopSqlLogger;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
+import org.apache.cayenne.log.SQLLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.query.DeleteBatchQuery;
@@ -65,7 +65,7 @@ public class DataNode {
protected Map<String, DataMap> dataMaps;
private DataSource dataSource;
- private SqlLogger sqlLogger;
+ private SQLLogger sqlLogger;
private RowReaderFactory rowReaderFactory;
private BatchTranslator<InsertBatchQuery> insertBatchTranslator;
private BatchTranslator<UpdateBatchQuery> updateBatchTranslator;
@@ -91,7 +91,7 @@ public class DataNode {
this.dataMaps = new HashMap<>();
// make sure logger is not null
- this.sqlLogger = NoopSqlLogger.getInstance();
+ this.sqlLogger = NoopSQLLogger.getInstance();
}
/**
@@ -111,14 +111,14 @@ public class DataNode {
/**
* @since 3.1
*/
- public SqlLogger getSqlLogger() {
+ public SQLLogger getSqlLogger() {
return sqlLogger;
}
/**
* @since 3.1
*/
- public void setSqlLogger(SqlLogger logger) {
+ public void setSQLLogger(SQLLogger logger) {
this.sqlLogger = logger;
}
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 5d3ad6056..074410c40 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DbGenerator.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DbGenerator.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.ashwood.AshwoodEntitySorter;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.PkGenerator;
import org.apache.cayenne.dba.TypesMapping;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.SQLLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
@@ -64,7 +64,7 @@ public class DbGenerator {
// situations
protected DataDomain domain;
- protected SqlLogger sqlLogger;
+ protected SQLLogger sqlLogger;
// stores generated SQL statements
protected Map<String, Collection<String>> dropTables;
@@ -91,14 +91,14 @@ public class DbGenerator {
/**
* @since 3.1
*/
- public DbGenerator(DbAdapter adapter, DataMap map, SqlLogger logger) {
+ public DbGenerator(DbAdapter adapter, DataMap map, SQLLogger logger) {
this(adapter, map, logger, Collections.emptyList());
}
/**
* @since 3.1
*/
- public DbGenerator(DbAdapter adapter, DataMap map, SqlLogger logger,
Collection<DbEntity> excludedEntities) {
+ public DbGenerator(DbAdapter adapter, DataMap map, SQLLogger logger,
Collection<DbEntity> excludedEntities) {
this(adapter, map, excludedEntities, null, logger);
}
@@ -117,7 +117,7 @@ public class DbGenerator {
* @since 3.1
*/
public DbGenerator(DbAdapter adapter, DataMap map, Collection<DbEntity>
excludedEntities, DataDomain domain,
- SqlLogger logger) {
+ SQLLogger logger) {
// sanity check
if (adapter == null) {
throw new IllegalArgumentException("Adapter must not be
null.");
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/LoggingObserver.java
b/cayenne/src/main/java/org/apache/cayenne/access/LoggingObserver.java
index 07be51b70..6332dde89 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/LoggingObserver.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/LoggingObserver.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.ObjectId;
import org.apache.cayenne.ResultIterator;
import org.apache.cayenne.access.translator.TranslatedBatch;
import org.apache.cayenne.access.translator.TranslatedStatement;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.SQLLogger;
import org.apache.cayenne.query.Query;
import java.sql.Statement;
@@ -35,13 +35,13 @@ import java.util.Map;
/**
* An {@link OperationObserver} decorator that correlates each executed
statement (reported via
- * {@link #nextStatement}) with its results (reported via the {@code next*}
callbacks) and drives a {@link SqlLogger}
+ * {@link #nextStatement}) with its results (reported via the {@code next*}
callbacks) and drives a {@link SQLLogger}
* to emit compact, single-line log messages. All callbacks are delegated to
the wrapped observer unchanged.
*/
class LoggingObserver implements OperationObserver {
private final OperationObserver delegate;
- private final SqlLogger logger;
+ private final SQLLogger logger;
private TranslatedStatement current;
private boolean headerEmitted;
@@ -52,7 +52,7 @@ class LoggingObserver implements OperationObserver {
// lazily allocated on the first nextGeneratedRows call, since most
statements produce no generated keys
private List<Map<String, ?>> generatedKeys;
- LoggingObserver(OperationObserver delegate, SqlLogger logger) {
+ LoggingObserver(OperationObserver delegate, SQLLogger logger) {
this.delegate = delegate;
this.logger = logger;
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
index 1237bcc4a..6e76dd343 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
@@ -122,8 +122,8 @@ import org.apache.cayenne.event.EventBridge;
import org.apache.cayenne.event.EventManager;
import org.apache.cayenne.event.EventManagerProvider;
import org.apache.cayenne.event.NoopEventBridgeProvider;
-import org.apache.cayenne.log.SqlLogger;
-import org.apache.cayenne.log.Slf4jSqlLogger;
+import org.apache.cayenne.log.SQLLogger;
+import org.apache.cayenne.log.Slf4jSQLLogger;
import org.apache.cayenne.map.EntitySorter;
import
org.apache.cayenne.reflect.generic.DefaultValueComparisonStrategyFactory;
import org.apache.cayenne.reflect.generic.ValueComparisonStrategyFactory;
@@ -422,7 +422,7 @@ public class CoreModule implements Module {
binder.bind(ValueObjectTypeRegistry.class).to(DefaultValueObjectTypeRegistry.class);
binder.bind(ValueComparisonStrategyFactory.class).to(DefaultValueComparisonStrategyFactory.class);
- binder.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ binder.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java
index dfbd5bfb9..dcfc3a621 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.query.UpdateBatchQuery;
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.SQLLogger;
import javax.sql.DataSource;
@@ -42,7 +42,7 @@ import javax.sql.DataSource;
public class DefaultDataNodeFactory implements DataNodeFactory {
@Inject
- protected SqlLogger sqlLogger;
+ protected SQLLogger sqlLogger;
@Inject
protected RowReaderFactory rowReaderFactory;
@@ -85,7 +85,7 @@ public class DefaultDataNodeFactory implements
DataNodeFactory {
DataNode dataNode = doCreateDataNode(nodeDescriptor.getName());
- dataNode.setSqlLogger(sqlLogger);
+ dataNode.setSQLLogger(sqlLogger);
dataNode.setRowReaderFactory(rowReaderFactory);
dataNode.setInsertBatchTranslator(insertBatchTranslator);
dataNode.setUpdateBatchTranslator(updateBatchTranslator);
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
index 150758f6f..d410524e3 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
@@ -38,7 +38,7 @@ import
org.apache.cayenne.access.types.ValueObjectTypeRegistry;
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.SQLLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
@@ -84,7 +84,7 @@ public class JdbcAdapter implements DbAdapter {
@Inject
@Deprecated(since = "5.0", forRemoval = true)
- protected SqlLogger logger;
+ protected SQLLogger logger;
/**
* Creates new JdbcAdapter with a set of default parameters.
@@ -124,7 +124,7 @@ public class JdbcAdapter implements DbAdapter {
* @deprecated logger should be taken from the DataNode
*/
@Deprecated(since = "5.0", forRemoval = true)
- public SqlLogger getSqlLogger() {
+ public SQLLogger getSQLLogger() {
return this.logger;
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
index 157859504..96c0efd1b 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.JdbcPkGenerator;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.SQLLogger;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.tx.BaseTransaction;
import org.apache.cayenne.tx.Transaction;
@@ -149,7 +149,7 @@ public class MySQLPkGenerator extends JdbcPkGenerator {
/**
* @since 3.0
*/
- protected long getLongPrimaryKey(SqlLogger logger, Statement statement,
String entityName) throws SQLException {
+ protected long getLongPrimaryKey(SQLLogger logger, Statement statement,
String entityName) throws SQLException {
// lock
String lockString = "LOCK TABLES AUTO_PK_SUPPORT WRITE";
logger.logMessage(lockString);
diff --git a/cayenne/src/main/java/org/apache/cayenne/log/NoopSqlLogger.java
b/cayenne/src/main/java/org/apache/cayenne/log/NoopSQLLogger.java
similarity index 89%
rename from cayenne/src/main/java/org/apache/cayenne/log/NoopSqlLogger.java
rename to cayenne/src/main/java/org/apache/cayenne/log/NoopSQLLogger.java
index a72eb0420..c5bb5a433 100644
--- a/cayenne/src/main/java/org/apache/cayenne/log/NoopSqlLogger.java
+++ b/cayenne/src/main/java/org/apache/cayenne/log/NoopSQLLogger.java
@@ -24,21 +24,21 @@ import java.util.List;
import java.util.Map;
/**
- * A no-op {@link SqlLogger}. Used as a null-object default in contexts that
run without a configured logger, such as
+ * A no-op {@link SQLLogger}. Used as a null-object default in contexts that
run without a configured logger, such as
* schema-generation tools and tests. It always reports {@link #isEnabled()}
as false; to actually disable logging in a
* running application, set the {@code cayenne-sql} log level instead.
*
* @since 5.0
*/
-public class NoopSqlLogger implements SqlLogger {
+public class NoopSQLLogger implements SQLLogger {
- private static final NoopSqlLogger instance = new NoopSqlLogger();
+ private static final NoopSQLLogger instance = new NoopSQLLogger();
- public static NoopSqlLogger getInstance() {
+ public static NoopSQLLogger getInstance() {
return instance;
}
- private NoopSqlLogger() {
+ private NoopSQLLogger() {
}
@Override
diff --git
a/cayenne/src/main/java/org/apache/cayenne/log/SqlBindingRenderer.java
b/cayenne/src/main/java/org/apache/cayenne/log/SQLBindingRenderer.java
similarity index 99%
rename from cayenne/src/main/java/org/apache/cayenne/log/SqlBindingRenderer.java
rename to cayenne/src/main/java/org/apache/cayenne/log/SQLBindingRenderer.java
index 8c50c5bdb..6a103aa54 100644
--- a/cayenne/src/main/java/org/apache/cayenne/log/SqlBindingRenderer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/log/SQLBindingRenderer.java
@@ -33,9 +33,9 @@ import java.util.Map;
/**
* Renders the parameter bindings of a {@link TranslatedStatement} in the
compact {@code bind:[...]} form used by
- * {@link SqlLogger}.
+ * {@link SQLLogger}.
*/
-class SqlBindingRenderer {
+class SQLBindingRenderer {
public static void appendBindings(StringBuilder buffer,
TranslatedStatement statement, int batchRowThreshold) {
switch (statement) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/log/SqlLogger.java
b/cayenne/src/main/java/org/apache/cayenne/log/SQLLogger.java
similarity index 99%
rename from cayenne/src/main/java/org/apache/cayenne/log/SqlLogger.java
rename to cayenne/src/main/java/org/apache/cayenne/log/SQLLogger.java
index d0eb08c33..f6601aaef 100644
--- a/cayenne/src/main/java/org/apache/cayenne/log/SqlLogger.java
+++ b/cayenne/src/main/java/org/apache/cayenne/log/SQLLogger.java
@@ -29,7 +29,7 @@ import java.util.Map;
*
* @since 5.0
*/
-public interface SqlLogger {
+public interface SQLLogger {
/**
* Returns true if statement logging is enabled. Callers should skip the
work of assembling results when this
diff --git a/cayenne/src/main/java/org/apache/cayenne/log/Slf4jSqlLogger.java
b/cayenne/src/main/java/org/apache/cayenne/log/Slf4jSQLLogger.java
similarity index 94%
rename from cayenne/src/main/java/org/apache/cayenne/log/Slf4jSqlLogger.java
rename to cayenne/src/main/java/org/apache/cayenne/log/Slf4jSQLLogger.java
index a531ce1f5..e2e0f7233 100644
--- a/cayenne/src/main/java/org/apache/cayenne/log/Slf4jSqlLogger.java
+++ b/cayenne/src/main/java/org/apache/cayenne/log/Slf4jSQLLogger.java
@@ -30,18 +30,18 @@ import java.util.List;
import java.util.Map;
/**
- * A {@link SqlLogger} that emits compact, single-line messages through
slf4j-api under the fixed logger name
+ * A {@link SQLLogger} that emits compact, single-line messages through
slf4j-api under the fixed logger name
* {@code cayenne-sql}. Statement lines are logged at INFO; transaction
boundaries at DEBUG.
*
* @since 5.0
*/
-public class Slf4jSqlLogger implements SqlLogger {
+public class Slf4jSQLLogger implements SQLLogger {
private static final Logger LOGGER =
LoggerFactory.getLogger("cayenne-sql");
protected final int batchRowThreshold;
- public Slf4jSqlLogger(@Inject RuntimeProperties runtimeProperties) {
+ public Slf4jSQLLogger(@Inject RuntimeProperties runtimeProperties) {
this.batchRowThreshold =
runtimeProperties.getInt(Constants.JDBC_LOG_BATCH_ROW_THRESHOLD_PROPERTY, 20);
}
@@ -69,7 +69,7 @@ public class Slf4jSqlLogger implements SqlLogger {
if (generatedKeys != null && !generatedKeys.isEmpty()) {
buffer.append(" generated:");
for (Map<String, ?> keys : generatedKeys) {
- SqlBindingRenderer.appendGeneratedKeys(buffer, keys);
+ SQLBindingRenderer.appendGeneratedKeys(buffer, keys);
}
}
buffer.append(" time_ms:").append(durationMillis);
@@ -101,7 +101,7 @@ public class Slf4jSqlLogger implements SqlLogger {
buffer.append(statement.sql()).append(" |");
int lengthWithoutBindings = buffer.length();
buffer.append(' ');
- SqlBindingRenderer.appendBindings(buffer, statement,
batchRowThreshold);
+ SQLBindingRenderer.appendBindings(buffer, statement,
batchRowThreshold);
if (buffer.length() == lengthWithoutBindings + 1) {
// no bindings were rendered - drop the separator space so the
next block follows "|" directly
buffer.setLength(lengthWithoutBindings);
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 c1b6df871..7c33998c3 100644
--- a/cayenne/src/main/java/org/apache/cayenne/tx/CayenneTransaction.java
+++ b/cayenne/src/main/java/org/apache/cayenne/tx/CayenneTransaction.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.tx;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.SQLLogger;
import java.sql.Connection;
import java.sql.SQLException;
@@ -32,16 +32,16 @@ import java.sql.SQLException;
*/
public class CayenneTransaction extends BaseTransaction {
- protected SqlLogger sqlLogger;
+ protected SQLLogger sqlLogger;
- public CayenneTransaction(SqlLogger sqlLogger) {
+ public CayenneTransaction(SQLLogger sqlLogger) {
this(sqlLogger, TransactionDescriptor.defaultDescriptor());
}
/**
* @since 4.1
*/
- public CayenneTransaction(SqlLogger sqlLogger, TransactionDescriptor
descriptor) {
+ public CayenneTransaction(SQLLogger sqlLogger, TransactionDescriptor
descriptor) {
super(descriptor);
this.sqlLogger = sqlLogger;
}
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 c6034d9c1..d42321f77 100644
--- a/cayenne/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.tx;
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.SQLLogger;
/**
* @since 4.0
@@ -29,9 +29,9 @@ import org.apache.cayenne.log.SqlLogger;
public class DefaultTransactionFactory implements TransactionFactory {
protected boolean externalTransactions;
- protected SqlLogger sqlLogger;
+ protected SQLLogger sqlLogger;
- public DefaultTransactionFactory(@Inject RuntimeProperties properties,
@Inject SqlLogger sqlLogger) {
+ public DefaultTransactionFactory(@Inject RuntimeProperties properties,
@Inject SQLLogger sqlLogger) {
this.externalTransactions =
properties.getBoolean(Constants.EXTERNAL_TX_PROPERTY, false);
this.sqlLogger = sqlLogger;
}
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 76503576c..8691d6ad9 100644
--- a/cayenne/src/main/java/org/apache/cayenne/tx/ExternalTransaction.java
+++ b/cayenne/src/main/java/org/apache/cayenne/tx/ExternalTransaction.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.tx;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.SQLLogger;
/**
* Represents a container-managed transaction.
@@ -28,16 +28,16 @@ import org.apache.cayenne.log.SqlLogger;
*/
public class ExternalTransaction extends BaseTransaction {
- protected SqlLogger sqlLogger;
+ protected SQLLogger sqlLogger;
- public ExternalTransaction(SqlLogger sqlLogger) {
+ public ExternalTransaction(SQLLogger sqlLogger) {
this(sqlLogger, TransactionDescriptor.defaultDescriptor());
}
/**
* @since 4.1
*/
- public ExternalTransaction(SqlLogger sqlLogger, TransactionDescriptor
descriptor) {
+ public ExternalTransaction(SQLLogger sqlLogger, TransactionDescriptor
descriptor) {
super(descriptor);
this.sqlLogger = sqlLogger;
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
index 3b1caca54..375912148 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.access;
import org.apache.cayenne.Cayenne;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
@@ -120,7 +120,7 @@ public class DataContextPerformQueryAPIIT {
List<?> artists;
// Sybase blows whenever a transaction wraps a SP, so turn of
transactions
- Transaction t = new ExternalTransaction(NoopSqlLogger.getInstance());
+ Transaction t = new ExternalTransaction(NoopSQLLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
artists = context.performQuery("ProcedureQuery", parameters, true);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
index b3dce1593..2d929a456 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.access;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.dba.TypesMapping;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.query.CapsStrategy;
import org.apache.cayenne.query.ObjectSelect;
@@ -70,7 +70,7 @@ public class DataContextProcedureQueryIT {
// since stored procedure commits its stuff, we must use an explicit
// non-committing transaction
- BaseTransaction t = new
ExternalTransaction(NoopSqlLogger.getInstance());
+ BaseTransaction t = new
ExternalTransaction(NoopSQLLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
@@ -106,7 +106,7 @@ public class DataContextProcedureQueryIT {
// since stored procedure commits its stuff, we must use an explicit
// non-committing transaction
- BaseTransaction t = new
ExternalTransaction(NoopSqlLogger.getInstance());
+ BaseTransaction t = new
ExternalTransaction(NoopSQLLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
@@ -381,7 +381,7 @@ public class DataContextProcedureQueryIT {
// e.g.
//
http://stackoverflow.com/questions/16921942/porting-apache-cayenne-from-oracle-to-postgresql
- BaseTransaction t = new
ExternalTransaction(NoopSqlLogger.getInstance());
+ BaseTransaction t = new
ExternalTransaction(NoopSQLLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
index 503e73960..4726bcc46 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.access;
import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.runtime.CayenneRuntime;
@@ -47,7 +47,7 @@ public class DbGeneratorIT {
runtime = env.runtime();
generator = new DbGenerator(adapter, runtime
.getDataDomain()
- .getDataMap("testmap"), NoopSqlLogger.getInstance());
+ .getDataMap("testmap"), NoopSQLLogger.getInstance());
}
@Test
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
index e87a3d166..c38b2f5d9 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
@@ -43,8 +43,8 @@ import org.apache.cayenne.event.EventManager;
import org.apache.cayenne.event.MockEventBridge;
import org.apache.cayenne.event.MockEventBridgeProvider;
import org.apache.cayenne.event.NoopEventBridgeProvider;
-import org.apache.cayenne.log.SqlLogger;
-import org.apache.cayenne.log.Slf4jSqlLogger;
+import org.apache.cayenne.log.SQLLogger;
+import org.apache.cayenne.log.Slf4jSQLLogger;
import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.tx.DefaultTransactionFactory;
import org.apache.cayenne.tx.DefaultTransactionManager;
@@ -85,7 +85,7 @@ public class DefaultDataRowStoreFactoryIT {
binder.bind(EventManager.class).toInstance(EVENT_MANAGER);
binder.bind(TransactionManager.class).to(DefaultTransactionManager.class);
binder.bind(TransactionFactory.class).to(DefaultTransactionFactory.class);
- binder.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ binder.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
binder.bind(EventBridge.class).toProvider(NoopEventBridgeProvider.class);
binder.bind(DataRowStoreFactory.class).to(DefaultDataRowStoreFactory.class);
@@ -111,7 +111,7 @@ public class DefaultDataRowStoreFactoryIT {
binder.bind(EventManager.class).toInstance(EVENT_MANAGER);
binder.bind(TransactionManager.class).to(DefaultTransactionManager.class);
binder.bind(TransactionFactory.class).to(DefaultTransactionFactory.class);
- binder.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ binder.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
binder.bind(EventBridge.class).toProvider(MockEventBridgeProvider.class);
binder.bind(DataRowStoreFactory.class).to(DefaultDataRowStoreFactory.class);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/LoggingObserverTest.java
b/cayenne/src/test/java/org/apache/cayenne/access/LoggingObserverTest.java
index e5833db27..8006f55c3 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/LoggingObserverTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/LoggingObserverTest.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.access.translator.TranslatedBatch;
import org.apache.cayenne.access.translator.TranslatedProcedure;
import org.apache.cayenne.access.translator.TranslatedSelect;
import org.apache.cayenne.access.translator.TranslatedStatement;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.SQLLogger;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
@@ -55,7 +55,7 @@ public class LoggingObserverTest {
return new TranslatedProcedure("call p()", new CSParameter<?>[0]);
}
- private static class CapturingLogger implements SqlLogger {
+ private static class CapturingLogger implements SQLLogger {
final List<String> calls = new ArrayList<>();
@Override
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataContextFactoryTest.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataContextFactoryTest.java
index a6eb6df11..82e38b2b2 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataContextFactoryTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataContextFactoryTest.java
@@ -48,8 +48,8 @@ import org.apache.cayenne.event.EventBridge;
import org.apache.cayenne.event.EventManager;
import org.apache.cayenne.event.MockEventManager;
import org.apache.cayenne.event.NoopEventBridgeProvider;
-import org.apache.cayenne.log.SqlLogger;
-import org.apache.cayenne.log.Slf4jSqlLogger;
+import org.apache.cayenne.log.SQLLogger;
+import org.apache.cayenne.log.Slf4jSQLLogger;
import org.apache.cayenne.map.EntitySorter;
import org.apache.cayenne.tx.DefaultTransactionFactory;
import org.apache.cayenne.tx.DefaultTransactionManager;
@@ -72,7 +72,7 @@ public class DataContextFactoryTest {
domain.setSharedCacheEnabled(false);
Module testModule = binder -> {
- binder.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ binder.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
binder.bind(DataDomain.class).toInstance(domain);
binder.bind(EventManager.class).toInstance(eventManager);
binder.bind(QueryCache.class).toInstance(new MapQueryCache(5));
@@ -115,7 +115,7 @@ public class DataContextFactoryTest {
domain.setValidatingObjectsOnCommit(true);
Module testModule = binder -> {
- binder.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ binder.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
binder.bind(DataDomain.class).toInstance(domain);
binder.bind(EventManager.class).toInstance(eventManager);
binder.bind(QueryCache.class).toInstance(new MapQueryCache(5));
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java
index 76d114b04..2d74d35d8 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java
@@ -106,8 +106,8 @@ import org.apache.cayenne.event.EventBridge;
import org.apache.cayenne.event.EventManager;
import org.apache.cayenne.event.MockEventManager;
import org.apache.cayenne.event.NoopEventBridgeProvider;
-import org.apache.cayenne.log.SqlLogger;
-import org.apache.cayenne.log.Slf4jSqlLogger;
+import org.apache.cayenne.log.SQLLogger;
+import org.apache.cayenne.log.Slf4jSQLLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntitySorter;
import org.apache.cayenne.map.LifecycleEvent;
@@ -230,7 +230,7 @@ public class DataDomainProviderTest {
b.bind(EJBQLTranslator.class).to(DbAdapterDelegatedEJBQLTranslator.class);
b.bind(DataSourceFactory.class).toInstance(new
MockDataSourceFactory());
- b.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ b.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
b.bind(QueryCache.class).toInstance(mock(QueryCache.class));
b.bind(RowReaderFactory.class).toInstance(mock(RowReaderFactory.class));
b.bind(DataNodeFactory.class).to(DefaultDataNodeFactory.class);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataSourceFactoryLoaderTest.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataSourceFactoryLoaderTest.java
index 257dfe1e6..3a00cc0cc 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataSourceFactoryLoaderTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataSourceFactoryLoaderTest.java
@@ -32,8 +32,8 @@ import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.spi.DefaultAdhocObjectFactory;
import org.apache.cayenne.di.spi.DefaultClassLoaderManager;
-import org.apache.cayenne.log.Slf4jSqlLogger;
-import org.apache.cayenne.log.SqlLogger;
+import org.apache.cayenne.log.Slf4jSQLLogger;
+import org.apache.cayenne.log.SQLLogger;
import org.apache.cayenne.resource.ResourceLocator;
import org.apache.cayenne.resource.mock.MockResourceLocator;
import org.junit.jupiter.api.BeforeEach;
@@ -58,7 +58,7 @@ public class DefaultDataSourceFactoryLoaderTest {
binder.bind(ResourceLocator.class).to(MockResourceLocator.class);
binder.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).to(MockResourceLocator.class);
binder.bind(RuntimeProperties.class).toInstance(mock(RuntimeProperties.class));
- binder.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ binder.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
};
this.injector = DIBootstrap.createInjector(testModule);
@@ -117,7 +117,7 @@ public class DefaultDataSourceFactoryLoaderTest {
binder.bind(ResourceLocator.class).to(MockResourceLocator.class);
binder.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).to(MockResourceLocator.class);
binder.bind(RuntimeProperties.class).toInstance(properties);
- binder.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ binder.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
};
Injector injector = DIBootstrap.createInjector(testModule);
@@ -162,7 +162,7 @@ public class DefaultDataSourceFactoryLoaderTest {
binder.bind(ResourceLocator.class).to(MockResourceLocator.class);
binder.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).to(MockResourceLocator.class);
binder.bind(RuntimeProperties.class).toInstance(properties);
- binder.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ binder.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
};
Injector injector = DIBootstrap.createInjector(testModule);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java
index 67441c1ab..fcaa476cb 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java
@@ -39,8 +39,8 @@ import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.spi.DefaultAdhocObjectFactory;
import org.apache.cayenne.di.spi.DefaultClassLoaderManager;
-import org.apache.cayenne.log.SqlLogger;
-import org.apache.cayenne.log.Slf4jSqlLogger;
+import org.apache.cayenne.log.SQLLogger;
+import org.apache.cayenne.log.Slf4jSQLLogger;
import org.apache.cayenne.map.DbEntity;
import
org.apache.cayenne.reflect.generic.DefaultValueComparisonStrategyFactory;
import org.apache.cayenne.reflect.generic.ValueComparisonStrategyFactory;
@@ -80,7 +80,7 @@ public class DefaultDbAdapterFactoryTest {
binder.bind(PkGenerator.class).to(JdbcPkGenerator.class);
binder.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
- binder.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ binder.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
@@ -110,7 +110,7 @@ public class DefaultDbAdapterFactoryTest {
b.bind(PkGenerator.class).to(JdbcPkGenerator.class);
b.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
- b.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ b.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
b.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
b.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
b.bind(ResourceLocator.class).to(ClassLoaderResourceLocator.class);
@@ -147,7 +147,7 @@ public class DefaultDbAdapterFactoryTest {
b.bind(PkGenerator.class).to(JdbcPkGenerator.class);
b.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
- b.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ b.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
b.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
b.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
b.bind(ResourceLocator.class).to(ClassLoaderResourceLocator.class);
@@ -192,7 +192,7 @@ public class DefaultDbAdapterFactoryTest {
binder.bind(PkGenerator.class).to(JdbcPkGenerator.class);
binder.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
- binder.bind(SqlLogger.class).to(Slf4jSqlLogger.class);
+ binder.bind(SQLLogger.class).to(Slf4jSQLLogger.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
binder.bind(Key.get(BatchTranslator.class,
BatchTranslator.INSERT)).toInstance(mock(BatchTranslator.class));
diff --git
a/cayenne/src/test/java/org/apache/cayenne/log/Slf4jSqlLoggerTest.java
b/cayenne/src/test/java/org/apache/cayenne/log/Slf4jSQLLoggerTest.java
similarity index 96%
rename from cayenne/src/test/java/org/apache/cayenne/log/Slf4jSqlLoggerTest.java
rename to cayenne/src/test/java/org/apache/cayenne/log/Slf4jSQLLoggerTest.java
index 9829861b3..8b0cbc1e2 100644
--- a/cayenne/src/test/java/org/apache/cayenne/log/Slf4jSqlLoggerTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/log/Slf4jSQLLoggerTest.java
@@ -39,30 +39,30 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class Slf4jSqlLoggerTest {
+public class Slf4jSQLLoggerTest {
- private Slf4jSqlLogger logger;
+ private Slf4jSQLLogger logger;
@BeforeEach
public void setUp() {
RuntimeProperties props = mock(RuntimeProperties.class);
when(props.getInt(eq(Constants.JDBC_LOG_BATCH_ROW_THRESHOLD_PROPERTY),
anyInt())).thenReturn(3);
- logger = new Slf4jSqlLogger(props);
+ logger = new Slf4jSQLLogger(props);
}
- private static Slf4jSqlLogger loggerWithThreshold(int threshold) {
+ private static Slf4jSQLLogger loggerWithThreshold(int threshold) {
RuntimeProperties props = mock(RuntimeProperties.class);
when(props.getInt(eq(Constants.JDBC_LOG_BATCH_ROW_THRESHOLD_PROPERTY),
anyInt())).thenReturn(threshold);
- return new Slf4jSqlLogger(props);
+ return new Slf4jSQLLogger(props);
}
- private static String line(Slf4jSqlLogger logger, TranslatedStatement
statement, String label, int count) {
+ private static String line(Slf4jSQLLogger logger, TranslatedStatement
statement, String label, int count) {
StringBuilder buffer = new StringBuilder();
logger.appendStatementLine(buffer, statement, label, count);
return buffer.toString();
}
- private static String errorLine(Slf4jSqlLogger logger, TranslatedStatement
statement, Throwable error, long durationMillis) {
+ private static String errorLine(Slf4jSQLLogger logger, TranslatedStatement
statement, Throwable error, long durationMillis) {
StringBuilder buffer = new StringBuilder();
logger.appendErrorLine(buffer, statement, error, durationMillis);
return buffer.toString();
diff --git a/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
b/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
index 14ab03043..475ad1981 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.query;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.QueryResponse;
import org.apache.cayenne.ResultBatchIterator;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
@@ -175,7 +175,7 @@ public class MappedQueryIT {
// e.g.
//
http://stackoverflow.com/questions/16921942/porting-apache-cayenne-from-oracle-to-postgresql
- BaseTransaction t = new
ExternalTransaction(NoopSqlLogger.getInstance());
+ BaseTransaction t = new
ExternalTransaction(NoopSQLLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
b/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
index f35e85c4c..c0cfdba3d 100644
--- a/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/query/ProcedureCallIT.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.query;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ProcedureResult;
import org.apache.cayenne.dba.TypesMapping;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.tx.BaseTransaction;
@@ -276,7 +276,7 @@ public class ProcedureCallIT {
// e.g.
//
http://stackoverflow.com/questions/16921942/porting-apache-cayenne-from-oracle-to-postgresql
- BaseTransaction t = new
ExternalTransaction(NoopSqlLogger.getInstance());
+ BaseTransaction t = new
ExternalTransaction(NoopSQLLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
index 1a6f44751..cb4417646 100644
---
a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionCustomConnectionIT.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.tx;
import org.apache.cayenne.access.DataContext;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.testdo.testmap.Artist;
@@ -73,7 +73,7 @@ public class TransactionCustomConnectionIT {
*/
@Test
public void connectionDecorationWithListeners() {
- Transaction t = new CayenneTransaction(NoopSqlLogger.getInstance());
+ Transaction t = new CayenneTransaction(NoopSQLLogger.getInstance());
//add listeners which will check if connection object will be changed
after every decorate call
List<TransactionListener> listeners =
addAndGetListenersWithCustomReadonlyTo(t);
BaseTransaction.bindThreadTransaction(t);
@@ -180,7 +180,7 @@ public class TransactionCustomConnectionIT {
@Test
public void defaultConnectionInDescriptor() {
- Transaction t = new CayenneTransaction(NoopSqlLogger.getInstance());
+ Transaction t = new CayenneTransaction(NoopSQLLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
ObjectSelect.query(Artist.class).select(context);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionThreadIT.java
b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionThreadIT.java
index c6ba8bf81..6576be5e4 100644
--- a/cayenne/src/test/java/org/apache/cayenne/tx/TransactionThreadIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/tx/TransactionThreadIT.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.tx;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.CayenneProjects;
@@ -37,7 +37,7 @@ public class TransactionThreadIT {
@Test
public void threadConnectionReuseOnSelect() {
- Transaction t = new CayenneTransaction(NoopSqlLogger.getInstance());
+ Transaction t = new CayenneTransaction(NoopSQLLogger.getInstance());
BaseTransaction.bindThreadTransaction(t);
try {
diff --git a/cayenne/src/test/java/org/apache/cayenne/tx/UserTransactionIT.java
b/cayenne/src/test/java/org/apache/cayenne/tx/UserTransactionIT.java
index 6670c5738..dd0e5609a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/tx/UserTransactionIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/tx/UserTransactionIT.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.tx;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.CayenneProjects;
import org.apache.cayenne.unit.CayenneTestsEnv;
@@ -44,7 +44,7 @@ public class UserTransactionIT {
Artist a = env.context().newObject(Artist.class);
a.setArtistName("AAA");
- TxWrapper t = new TxWrapper(new
CayenneTransaction(NoopSqlLogger.getInstance()));
+ TxWrapper t = new TxWrapper(new
CayenneTransaction(NoopSQLLogger.getInstance()));
BaseTransaction.bindThreadTransaction(t);
try {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
index ba292675f..e601d6b3f 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
@@ -25,7 +25,7 @@ import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
import org.apache.cayenne.access.DbGenerator;
import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.log.NoopSqlLogger;
+import org.apache.cayenne.log.NoopSQLLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.pref.dbconnector.DBConnector;
import org.apache.cayenne.modeler.dbconnector.DBConnectorFactory;
@@ -268,7 +268,7 @@ public class DBGeneratorOptionsDialog extends ProjectDialog
{
dataMap,
tables.getExcludedTables(),
null,
- NoopSqlLogger.getInstance()));
+ NoopSQLLogger.getInstance()));
}
} catch (Exception ex) {
reportError("Error loading adapter", ex);
