This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch past-M2 in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit dccb5d90133777a6ee311c6f8ca7f1da1d9be51a Author: Andrus Adamchik <[email protected]> AuthorDate: Sun Jun 14 17:03:32 2026 -0400 cleanup - uppercasing static loggers --- .../apache/cayenne/test/jdbc/UtilityLogger.java | 4 +-- .../value/DefaultValueTransformerFactory.java | 4 +-- .../apache/cayenne/tools/CayenneGeneratorMojo.java | 8 +++--- .../CompatibilityDataChannelDescriptorLoader.java | 4 +-- .../project/extension/info/PropertyHandler.java | 4 +-- .../project/upgrade/DefaultUpgradeService.java | 6 ++-- .../upgrade/handlers/UpgradeHandler_V11.java | 4 +-- .../upgrade/handlers/UpgradeHandler_V9.java | 6 ++-- .../org/apache/cayenne/access/DataRowStore.java | 24 ++++++++-------- .../access/event/SnapshotEventListener.java | 2 -- .../cayenne/access/jdbc/RowDescriptorBuilder.java | 4 +-- .../sqltemplate/parser/ASTDirective.java | 4 +-- .../access/types/SerializableTypeFactory.java | 6 ++-- .../meta/AnnotationCommitLogEntityFactory.java | 4 +-- .../DefaultDataChannelDescriptorMerger.java | 10 +++---- .../configuration/runtime/DataDomainProvider.java | 14 +++++----- .../runtime/DelegatingDataSourceFactory.java | 8 +++--- .../runtime/XMLPoolingDataSourceFactory.java | 4 +-- .../xml/DataChannelChildrenHandler.java | 4 +-- .../configuration/xml/DataChannelHandler.java | 4 +-- .../xml/DataSourceChildrenHandler.java | 6 ++-- .../configuration/xml/DefaultHandlerFactory.java | 4 +-- .../configuration/xml/ObjEntityHandler.java | 4 +-- .../xml/XMLDataChannelDescriptorLoader.java | 4 +-- .../apache/cayenne/dba/mysql/MySQLPkGenerator.java | 6 ++-- .../cayenne/dba/oracle/OracleUtilDateType.java | 2 -- .../apache/cayenne/log/Slf4jJdbcEventLogger.java | 32 +++++++++++----------- .../java/org/apache/cayenne/map/MappingCache.java | 6 ++-- .../org/apache/cayenne/query/CacheableQuery.java | 2 +- .../org/apache/cayenne/ConfigExceptionTest.java | 2 -- .../apache/cayenne/DataContextConcurrencyIT.java | 4 +-- .../cayenne/access/jdbc/ColumnDescriptorTest.java | 2 -- .../cayenne/access/types/BooleanTypeTest.java | 2 -- .../cayenne/configuration/runtime/JNDISetup.java | 4 +-- .../org/apache/cayenne/event/EventBridgeTest.java | 2 -- .../apache/cayenne/exp/ExpressionEqualsTest.java | 2 -- .../apache/cayenne/jira/CAY_10062004_ExpTest.java | 2 -- .../java/org/apache/cayenne/jira/CAY_115IT.java | 2 -- .../org/apache/cayenne/jira/CAY_207Manager1.java | 2 -- .../org/apache/cayenne/jira/CAY_207Manager2.java | 2 -- .../org/apache/cayenne/jira/CAY_207String1.java | 2 -- .../org/apache/cayenne/jira/CAY_207String2.java | 2 -- .../apache/cayenne/jira/CAY_207StringType2.java | 2 -- .../org/apache/cayenne/map/DbAttributeTest.java | 2 -- .../java/org/apache/cayenne/map/DbJoinTest.java | 2 -- .../java/org/apache/cayenne/map/MockEntity.java | 2 -- .../org/apache/cayenne/map/MockEntityResolver.java | 2 -- .../apache/cayenne/map/MockObjRelationship.java | 2 -- .../java/org/apache/cayenne/map/MockSQLAction.java | 2 -- .../map/ObjEntitySingleTableInheritanceTest.java | 2 -- .../java/org/apache/cayenne/map/ProcedureTest.java | 2 -- .../cayenne/map/QueryDescriptorLoaderTest.java | 2 -- .../cayenne/map/SQLTemplateDescriptorTest.java | 2 -- .../cayenne/map/SelectQueryDescriptorTest.java | 2 -- .../apache/cayenne/query/MockAbstractQuery.java | 2 -- .../apache/cayenne/query/ProcedureQueryTest.java | 2 -- .../java/org/apache/cayenne/util/IDUtilTest.java | 2 -- .../cayenne/validation/ValidationResultTest.java | 2 -- .../apache/cayenne/wocompat/EOModelProcessor.java | 4 +-- .../java/org/apache/cayenne/wocompat/EOQuery.java | 6 ++-- 60 files changed, 103 insertions(+), 163 deletions(-) diff --git a/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UtilityLogger.java b/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UtilityLogger.java index fc79f15d9..7d0ccf29f 100644 --- a/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UtilityLogger.java +++ b/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UtilityLogger.java @@ -23,9 +23,9 @@ import org.slf4j.LoggerFactory; class UtilityLogger { - private static Logger logger = LoggerFactory.getLogger(UtilityLogger.class); + private static Logger LOGGER = LoggerFactory.getLogger(UtilityLogger.class); static void log(String sql) { - logger.info(sql); + LOGGER.info(sql); } } diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java index 5a30e100c..21bc082e5 100644 --- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java +++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java @@ -45,7 +45,7 @@ import java.util.concurrent.ConcurrentMap; */ public class DefaultValueTransformerFactory implements ValueTransformerFactory { - private static final Logger logger = LoggerFactory.getLogger(DefaultValueTransformerFactory.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultValueTransformerFactory.class); public static final String DB_TO_BYTE_CONVERTERS_KEY = "org.apache.cayenne.crypto.transformer.value.DefaultValueTransformerFactory.dbToBytes"; @@ -171,7 +171,7 @@ public class DefaultValueTransformerFactory implements ValueTransformerFactory { String attributeName = dbEntity.getName() + "." + a.getName(); String msg = javaTypes.size() > 1 ? "ObjAttributes with different java types" : "No ObjAttributes"; // Warn user about this problem as there is nothing else we can do - logger.warn(msg + " bound to DbAttribute '" + attributeName + "', " + javaType + " type will be used."); + LOGGER.warn(msg + " bound to DbAttribute '" + attributeName + "', " + javaType + " type will be used."); return javaType; } diff --git a/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java b/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java index a85a3a4e4..bd6bf2326 100644 --- a/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java +++ b/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java @@ -250,7 +250,7 @@ public class CayenneGeneratorMojo extends AbstractMojo { private transient Injector injector; - private static final Logger logger = LoggerFactory.getLogger(CayenneGeneratorMojo.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CayenneGeneratorMojo.class); private boolean useConfigFromDataMap; @@ -338,14 +338,14 @@ public class CayenneGeneratorMojo extends AbstractMojo { List<CgenConfiguration> buildConfigurations(DataMap dataMap) { CgenConfigList cgenConfigList = injector.getInstance(DataChannelMetaData.class).get(dataMap, CgenConfigList.class); if (hasConfig()) { - logger.info("Using cgen config from pom.xml"); + LOGGER.info("Using cgen config from pom.xml"); return Collections.singletonList(cgenConfigFromPom(dataMap)); } else if (cgenConfigList != null) { - logger.info("Using cgen config from dataMap"); + LOGGER.info("Using cgen config from dataMap"); useConfigFromDataMap = true; return cgenConfigList.getAll(); } else { - logger.info("Using default cgen config."); + LOGGER.info("Using default cgen config."); CgenConfiguration cgenConfiguration = new CgenConfiguration(); cgenConfiguration.setDataMap(dataMap); cgenConfiguration.updateOutputPath(defaultDir.toPath()); diff --git a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoader.java b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoader.java index 4fa520ca1..befea26f4 100644 --- a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoader.java +++ b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/configuration/CompatibilityDataChannelDescriptorLoader.java @@ -54,7 +54,7 @@ import org.xml.sax.XMLReader; */ public class CompatibilityDataChannelDescriptorLoader extends XMLDataChannelDescriptorLoader { - private static final Logger logger = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); + private static final Logger LOGGER = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); @Inject Provider<UpgradeService> upgradeServiceProvider; @@ -97,7 +97,7 @@ public class CompatibilityDataChannelDescriptorLoader extends XMLDataChannelDesc throw new ConfigurationException("Unable to upgrade " + configurationURL); } - logger.info("Loading XML configuration resource from " + configurationURL); + LOGGER.info("Loading XML configuration resource from " + configurationURL); final DataChannelDescriptor descriptor = new DataChannelDescriptor(); descriptor.setConfigurationSource(configurationResource); diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/extension/info/PropertyHandler.java b/cayenne-project/src/main/java/org/apache/cayenne/project/extension/info/PropertyHandler.java index f59182fd0..0743adee5 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/extension/info/PropertyHandler.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/extension/info/PropertyHandler.java @@ -43,7 +43,7 @@ class PropertyHandler extends NamespaceAwareNestedTagHandler { static final String PROPERTY_TAG = "property"; - private static final Logger logger = LoggerFactory.getLogger(PropertyHandler.class); + private static final Logger LOGGER = LoggerFactory.getLogger(PropertyHandler.class); private DataChannelMetaData metaData; @@ -67,7 +67,7 @@ class PropertyHandler extends NamespaceAwareNestedTagHandler { } String oldValue = info.put(name, attributes.getValue("value")); if(oldValue != null) { - logger.warn("Duplicated property {} for object {}", name, parentObject); + LOGGER.warn("Duplicated property {} for object {}", name, parentObject); } } return true; diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/DefaultUpgradeService.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/DefaultUpgradeService.java index f9234559b..4c219ada3 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/DefaultUpgradeService.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/DefaultUpgradeService.java @@ -87,7 +87,7 @@ import static org.apache.cayenne.util.Util.isBlank; */ public class DefaultUpgradeService implements UpgradeService { - private static final Logger logger = LoggerFactory.getLogger(DefaultUpgradeService.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultUpgradeService.class); public static final String UNKNOWN_VERSION = "0"; public static final String MIN_SUPPORTED_VERSION = "6"; @@ -242,7 +242,7 @@ public class DefaultUpgradeService implements UpgradeService { resources.add(mapResource); } } catch (Exception ex) { - logger.warn("Can't get additional dataMap resources: ", ex); + LOGGER.warn("Can't get additional dataMap resources: ", ex); } return resources; } @@ -255,7 +255,7 @@ public class DefaultUpgradeService implements UpgradeService { Transformer transformer = TransformerFactory.newInstance().newTransformer(); transformer.transform(input, output); } catch (Exception ex) { - logger.warn("Can't save the document: ", ex); + LOGGER.warn("Can't save the document: ", ex); } } diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java index e6f280aea..a22d746b6 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java @@ -49,7 +49,7 @@ import java.util.List; */ public class UpgradeHandler_V11 implements UpgradeHandler { - private static final Logger logger = LoggerFactory.getLogger(UpgradeHandler_V11.class); + private static final Logger LOGGER = LoggerFactory.getLogger(UpgradeHandler_V11.class); private static final List<String> defaultTemplatePaths = List.of( "templates/v4_1/singleclass.vm", @@ -289,7 +289,7 @@ public class UpgradeHandler_V11 implements UpgradeHandler { } catch (NoSuchFileException e) { return "The template " + path + " was not found during the project upgrade. Use the template editor in Cayenne modeler to set the template"; } catch (IOException e) { - logger.warn("Can't read the file: " + path, e); + LOGGER.warn("Can't read the file: " + path, e); return "Can't read the file: " + path + e.getMessage(); } } else { diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9.java index 05ce5ec00..59a06b405 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9.java @@ -37,7 +37,7 @@ import org.w3c.dom.Node; */ public class UpgradeHandler_V9 implements UpgradeHandler { - private static final Logger logger = LoggerFactory.getLogger(UpgradeHandler_V9.class); + private static final Logger LOGGER = LoggerFactory.getLogger(UpgradeHandler_V9.class); @Override public String getVersion() { @@ -67,13 +67,13 @@ public class UpgradeHandler_V9 implements UpgradeHandler { File file = new File(directoryPath + "/" + reFileName); if (file.exists()) { if(!file.delete()) { - logger.warn("Can't delete file " + file); + LOGGER.warn("Can't delete file " + file); } } dataMap.removeChild(reNode); } } catch (Exception ex) { - logger.warn("Can't process dataMap DOM: ", ex); + LOGGER.warn("Can't process dataMap DOM: ", ex); } } } diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataRowStore.java b/cayenne/src/main/java/org/apache/cayenne/access/DataRowStore.java index a7545ba2b..49f935306 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/DataRowStore.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/DataRowStore.java @@ -51,7 +51,7 @@ import java.util.concurrent.ConcurrentMap; */ public class DataRowStore implements Serializable { - private static final Logger logger = LoggerFactory.getLogger(DataRowStore.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DataRowStore.class); // default property values @@ -101,8 +101,8 @@ public class DataRowStore implements Serializable { // expiration time is never used actually maxSize = properties.getInt(Constants.SNAPSHOT_CACHE_SIZE_PROPERTY, SNAPSHOT_CACHE_SIZE_DEFAULT); - if (logger.isDebugEnabled()) { - logger.debug("DataRowStore property " + Constants.SNAPSHOT_CACHE_SIZE_PROPERTY + " = " + maxSize); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("DataRowStore property " + Constants.SNAPSHOT_CACHE_SIZE_PROPERTY + " = " + maxSize); } this.snapshots = new ConcurrentLinkedHashMap.Builder<ObjectId, DataRow>() @@ -290,8 +290,8 @@ public class DataRowStore implements Serializable { return; } - if (logger.isDebugEnabled()) { - logger.debug("remote event: " + event); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("remote event: " + event); } Collection<ObjectId> deletedSnapshotIds = event.getDeletedIds(); @@ -303,7 +303,7 @@ public class DataRowStore implements Serializable { && invalidatedSnapshotIds.isEmpty() && diffs.isEmpty() && indirectlyModifiedIds.isEmpty()) { - logger.warn("processRemoteEvent.. bogus call... no changes."); + LOGGER.warn("processRemoteEvent.. bogus call... no changes."); return; } @@ -335,7 +335,7 @@ public class DataRowStore implements Serializable { && invalidatedSnapshotIds.isEmpty() && updatedSnapshots.isEmpty() && (indirectlyModifiedIds == null || indirectlyModifiedIds.isEmpty())) { - logger.warn("postSnapshotsChangeEvent.. bogus call... no changes."); + LOGGER.warn("postSnapshotsChangeEvent.. bogus call... no changes."); return; } @@ -403,8 +403,8 @@ public class DataRowStore implements Serializable { // snapshots can be huge potentially.. so print them only if the // user is expecting them to be printed - if (logger.isDebugEnabled()) { - logger + if (LOGGER.isDebugEnabled()) { + LOGGER .debug("snapshot version changed, don't know what to do... Old: " + oldSnapshot + ", New: " @@ -469,8 +469,8 @@ public class DataRowStore implements Serializable { invalidatedSnapshotIDs, indirectlyModifiedIds); - if (logger.isDebugEnabled()) { - logger.debug("postSnapshotsChangeEvent: " + event); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("postSnapshotsChangeEvent: " + event); } // synchronously notify listeners; leaving it up to the listeners to @@ -498,7 +498,7 @@ public class DataRowStore implements Serializable { try { remoteNotificationsHandler.shutdown(); } catch (Exception ex) { - logger.info("Exception shutting down EventBridge.", ex); + LOGGER.info("Exception shutting down EventBridge.", ex); } remoteNotificationsHandler = null; } diff --git a/cayenne/src/main/java/org/apache/cayenne/access/event/SnapshotEventListener.java b/cayenne/src/main/java/org/apache/cayenne/access/event/SnapshotEventListener.java index 8f923c180..32f6816f4 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/event/SnapshotEventListener.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/event/SnapshotEventListener.java @@ -21,8 +21,6 @@ package org.apache.cayenne.access.event; import java.util.EventListener; -/** - */ public interface SnapshotEventListener extends EventListener { public void snapshotsChanged(SnapshotEvent event); } diff --git a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java index e9e23d880..1aca46cfa 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java @@ -43,7 +43,7 @@ import java.util.function.Function; */ public class RowDescriptorBuilder { - private static final Logger logger = LoggerFactory.getLogger(RowDescriptorBuilder.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RowDescriptorBuilder.class); private static final Function<String, String> UPPERCASE_TRANSFORMER = input -> input != null ? input.toUpperCase() : null; @@ -138,7 +138,7 @@ public class RowDescriptorBuilder { } if(validateDuplicateColumnNames && !duplicates.isEmpty()) { - logger.warn("Found duplicated columns '" + String.join("', '", duplicates) + "' in row descriptor. " + + LOGGER.warn("Found duplicated columns '" + String.join("', '", duplicates) + "' in row descriptor. " + "This can lead to errors when converting result to persistent objects."); } diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/parser/ASTDirective.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/parser/ASTDirective.java index 803ca0af8..24edd375b 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/parser/ASTDirective.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/parser/ASTDirective.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; */ public class ASTDirective extends IdentifierNode { - private static final Logger logger = LoggerFactory.getLogger(ASTDirective.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ASTDirective.class); public ASTDirective(int id) { super(id); @@ -39,7 +39,7 @@ public class ASTDirective extends IdentifierNode { public void evaluate(Context context) { Directive directive = context.getDirective(getIdentifier()); if(directive == null) { - logger.warn("Unknown directive #{}", getIdentifier()); + LOGGER.warn("Unknown directive #{}", getIdentifier()); return; } diff --git a/cayenne/src/main/java/org/apache/cayenne/access/types/SerializableTypeFactory.java b/cayenne/src/main/java/org/apache/cayenne/access/types/SerializableTypeFactory.java index 5c1575613..e1d5ff51e 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/types/SerializableTypeFactory.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/types/SerializableTypeFactory.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; */ class SerializableTypeFactory implements ExtendedTypeFactory { - private static final Logger logger = LoggerFactory.getLogger(SerializableTypeFactory.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SerializableTypeFactory.class); private ExtendedTypeMap map; @@ -45,11 +45,11 @@ class SerializableTypeFactory implements ExtendedTypeFactory { } public ExtendedType getType(Class<?> objectClass) { - logger.warn("Haven't found suitable ExtendedType for class '" + objectClass.getCanonicalName() + LOGGER.warn("Haven't found suitable ExtendedType for class '" + objectClass.getCanonicalName() + "'. Most likely you need to define a custom ExtendedType."); if (Serializable.class.isAssignableFrom(objectClass)) { - logger.warn("SerializableType will be used for type conversion."); + LOGGER.warn("SerializableType will be used for type conversion."); // using a binary stream delegate instead of byte[] may actually // speed up things in some dbs, but at least byte[] type works consistently diff --git a/cayenne/src/main/java/org/apache/cayenne/commitlog/meta/AnnotationCommitLogEntityFactory.java b/cayenne/src/main/java/org/apache/cayenne/commitlog/meta/AnnotationCommitLogEntityFactory.java index 6193b5e05..245c4819e 100644 --- a/cayenne/src/main/java/org/apache/cayenne/commitlog/meta/AnnotationCommitLogEntityFactory.java +++ b/cayenne/src/main/java/org/apache/cayenne/commitlog/meta/AnnotationCommitLogEntityFactory.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; */ public class AnnotationCommitLogEntityFactory implements CommitLogEntityFactory { - private static final Logger logger = LoggerFactory.getLogger(AnnotationCommitLogEntityFactory.class); + private static final Logger LOGGER = LoggerFactory.getLogger(AnnotationCommitLogEntityFactory.class); private static final CommitLogEntity BLOCKED_ENTITY = new CommitLogEntity() { @@ -105,7 +105,7 @@ public class AnnotationCommitLogEntityFactory implements CommitLogEntityFactory @SuppressWarnings("deprecation") org.apache.cayenne.commitlog.CommitLog legacyA = objectClass.getAnnotation(org.apache.cayenne.commitlog.CommitLog.class); if (legacyA != null) { - logger.warn("Entity class '{}' uses deprecated @org.apache.cayenne.commitlog.CommitLog annotation. " + + LOGGER.warn("Entity class '{}' uses deprecated @org.apache.cayenne.commitlog.CommitLog annotation. " + "Replace with @org.apache.cayenne.annotation.CommitLog.", objectClass.getName()); ObjEntity entity = entityResolver.getObjEntity(entityName); return new MutableCommitLogLogEntity(entity).setConfidential(legacyA.confidential()) diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMerger.java b/cayenne/src/main/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMerger.java index 0f7eea62f..3685fda85 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMerger.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMerger.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; */ public class DefaultDataChannelDescriptorMerger implements DataChannelDescriptorMerger { - private static final Logger logger = LoggerFactory + private static final Logger LOGGER = LoggerFactory .getLogger(DefaultDataChannelDescriptorMerger.class); public DataChannelDescriptor merge(DataChannelDescriptor... descriptors) { @@ -78,7 +78,7 @@ public class DefaultDataChannelDescriptorMerger implements DataChannelDescriptor DataMap existing = merged.getDataMap(map.getName()); if (existing != null) { - logger.info("Discarding overridden DataMap '" + LOGGER.info("Discarding overridden DataMap '" + map.getName() + "' from descriptor '" + descriptor.getName() @@ -86,7 +86,7 @@ public class DefaultDataChannelDescriptorMerger implements DataChannelDescriptor } else { - logger.info("Using DataMap '" + LOGGER.info("Using DataMap '" + map.getName() + "' from descriptor '" + descriptor.getName() @@ -100,7 +100,7 @@ public class DefaultDataChannelDescriptorMerger implements DataChannelDescriptor DataNodeDescriptor existing = merged.getNodeDescriptor(node.getName()); if (existing != null) { - logger.info("Discarding overridden DataNode '" + LOGGER.info("Discarding overridden DataNode '" + node.getName() + "' from descriptor '" + descriptor.getName() @@ -113,7 +113,7 @@ public class DefaultDataChannelDescriptorMerger implements DataChannelDescriptor } } else { - logger.info("Using DataNode '" + LOGGER.info("Using DataNode '" + node.getName() + "' from descriptor '" + descriptor.getName() diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainProvider.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainProvider.java index 81831d606..a5ce21452 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainProvider.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainProvider.java @@ -61,7 +61,7 @@ import java.util.Map; */ public class DataDomainProvider implements Provider<DataDomain> { - private static final Logger logger = LoggerFactory.getLogger(DataDomainProvider.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DataDomainProvider.class); @Inject protected ResourceLocator resourceLocator; @@ -170,7 +170,7 @@ public class DataDomainProvider implements Provider<DataDomain> { } if (defaultNode != null) { - logger.info("setting DataNode '" + defaultNode.getName() + "' as default, used by all unlinked DataMaps"); + LOGGER.info("setting DataNode '" + defaultNode.getName() + "' as default, used by all unlinked DataMaps"); dataDomain.setDefaultNode(defaultNode); } @@ -223,8 +223,8 @@ public class DataDomainProvider implements Provider<DataDomain> { long t0 = System.currentTimeMillis(); - if (logger.isDebugEnabled()) { - logger.debug("starting configuration loading: " + locations); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("starting configuration loading: " + locations); } DataChannelDescriptor[] descriptors = new DataChannelDescriptor[locations.size()]; @@ -243,7 +243,7 @@ public class DataDomainProvider implements Provider<DataDomain> { // no support for multiple configs yet, but this is not a hard error if (configurations.size() > 1) { - logger.info("found " + configurations.size() + " configurations for " + location + LOGGER.info("found " + configurations.size() + " configurations for " + location + ", will use the first one: " + configurationResource.getURL()); } @@ -258,8 +258,8 @@ public class DataDomainProvider implements Provider<DataDomain> { long t1 = System.currentTimeMillis(); - if (logger.isDebugEnabled()) { - logger.debug("finished configuration loading in " + (t1 - t0) + " ms."); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("finished configuration loading in " + (t1 - t0) + " ms."); } return descriptorMerger.merge(descriptors); diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DelegatingDataSourceFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DelegatingDataSourceFactory.java index 1374e80fd..9390ce4eb 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DelegatingDataSourceFactory.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DelegatingDataSourceFactory.java @@ -48,7 +48,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public class DelegatingDataSourceFactory implements DataSourceFactory { - private static final Logger logger = LoggerFactory + private static final Logger LOGGER = LoggerFactory .getLogger(DelegatingDataSourceFactory.class); @Inject @@ -124,7 +124,7 @@ public class DelegatingDataSourceFactory implements DataSourceFactory { } private void findUnusedProperties(DataNodeDescriptor nodeDescriptor) { - if(!logger.isInfoEnabled() || nodeDescriptor.getDataChannelDescriptor() == null) { + if(!LOGGER.isInfoEnabled() || nodeDescriptor.getDataChannelDescriptor() == null) { return; } boolean found = false; @@ -154,7 +154,7 @@ public class DelegatingDataSourceFactory implements DataSourceFactory { logResult.delete(logResult.length() - 2, logResult.length()) .append(". Will use project DataSource configuration. ") .append("Set driver and url properties to enable DataSource configuration override. "); - logger.info(logResult.toString()); + LOGGER.info(logResult.toString()); } } @@ -187,7 +187,7 @@ public class DelegatingDataSourceFactory implements DataSourceFactory { return false; } - logger + LOGGER .info(String .format( "Found DataSourceFactory system property overrides for URL and Driver " diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/XMLPoolingDataSourceFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/XMLPoolingDataSourceFactory.java index 77f3c4818..7af3c97e5 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/XMLPoolingDataSourceFactory.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/XMLPoolingDataSourceFactory.java @@ -43,7 +43,7 @@ import java.sql.Driver; // TODO: this factory does not read XML anymore, should we rename it to something else? public class XMLPoolingDataSourceFactory implements DataSourceFactory { - private static final Logger logger = LoggerFactory.getLogger(XMLPoolingDataSourceFactory.class); + private static final Logger LOGGER = LoggerFactory.getLogger(XMLPoolingDataSourceFactory.class); @Inject private RuntimeProperties properties; @@ -57,7 +57,7 @@ public class XMLPoolingDataSourceFactory implements DataSourceFactory { DataSourceDescriptor descriptor = nodeDescriptor.getDataSourceDescriptor(); if (descriptor == null) { String message = "Null dataSourceDescriptor for nodeDescriptor '" + nodeDescriptor.getName() + "'"; - logger.info(message); + LOGGER.info(message); throw new ConfigurationException(message); } diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java index 20fc70941..67d244e1f 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java @@ -34,7 +34,7 @@ import org.xml.sax.ContentHandler; */ final class DataChannelChildrenHandler extends NamespaceAwareNestedTagHandler { - private static final Logger logger = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); + private static final Logger LOGGER = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); static final String OLD_MAP_TAG = "map"; static final String NODE_TAG = "node"; @@ -107,7 +107,7 @@ final class DataChannelChildrenHandler extends NamespaceAwareNestedTagHandler { Resource dataMapResource = baseResource.getRelativeResource(dataMapLocation); - logger.info("Loading XML DataMap resource from " + dataMapResource.getURL()); + LOGGER.info("Loading XML DataMap resource from " + dataMapResource.getURL()); DataMap dataMap = xmlDataChannelDescriptorLoader.dataMapLoader.load(dataMapResource); dataMap.setName(dataMapName); diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java index 72136bdfa..d2db4ec3a 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataChannelHandler.java @@ -30,7 +30,7 @@ import org.xml.sax.ContentHandler; */ public final class DataChannelHandler extends VersionAwareHandler { - private static final Logger logger = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); + private static final Logger LOGGER = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); static final String DOMAIN_TAG = "domain"; @@ -52,7 +52,7 @@ public final class DataChannelHandler extends VersionAwareHandler { return new DataChannelChildrenHandler(xmlDataChannelDescriptorLoader, this); } - logger.info(unexpectedTagMessage(localName, DOMAIN_TAG)); + LOGGER.info(unexpectedTagMessage(localName, DOMAIN_TAG)); return super.createChildTagHandler(namespaceURI, localName, name, attributes); } } diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataSourceChildrenHandler.java b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataSourceChildrenHandler.java index 950b7fc8b..a6e61f9a6 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataSourceChildrenHandler.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DataSourceChildrenHandler.java @@ -30,7 +30,7 @@ import org.xml.sax.Attributes; */ class DataSourceChildrenHandler extends NamespaceAwareNestedTagHandler { - private static final Logger logger = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); + private static final Logger LOGGER = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); static final String DRIVER_TAG = "driver"; static final String LOGIN_TAG = "login"; @@ -85,7 +85,7 @@ class DataSourceChildrenHandler extends NamespaceAwareNestedTagHandler { try { dataSourceDescriptor.setMinConnections(Integer.parseInt(min)); } catch (NumberFormatException nfex) { - logger.info("Non-numeric 'min' attribute", nfex); + LOGGER.info("Non-numeric 'min' attribute", nfex); throw new ConfigurationException("Non-numeric 'min' attribute '%s'", nfex, min); } } @@ -95,7 +95,7 @@ class DataSourceChildrenHandler extends NamespaceAwareNestedTagHandler { try { dataSourceDescriptor.setMaxConnections(Integer.parseInt(max)); } catch (NumberFormatException nfex) { - logger.info("Non-numeric 'max' attribute", nfex); + LOGGER.info("Non-numeric 'max' attribute", nfex); throw new ConfigurationException("Non-numeric 'max' attribute '%s'", nfex, max); } } diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DefaultHandlerFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DefaultHandlerFactory.java index 38a42e4a5..72a27d9d8 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DefaultHandlerFactory.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/DefaultHandlerFactory.java @@ -28,14 +28,14 @@ import org.xml.sax.Attributes; */ public class DefaultHandlerFactory implements HandlerFactory { - private static final Logger logger = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); + private static final Logger LOGGER = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); @Override public NamespaceAwareNestedTagHandler createHandler(String namespace, String localName, NamespaceAwareNestedTagHandler parent) { return new NamespaceAwareNestedTagHandler(parent, namespace) { @Override protected boolean processElement(String namespaceURI, String localName, Attributes attributes) { - logger.debug("Skipping unknown tag <{}:{}>", namespaceURI, localName); + LOGGER.debug("Skipping unknown tag <{}:{}>", namespaceURI, localName); return true; } }; diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/ObjEntityHandler.java b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/ObjEntityHandler.java index f96e3913d..b1c43a461 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/ObjEntityHandler.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/ObjEntityHandler.java @@ -38,7 +38,7 @@ import static org.apache.cayenne.util.Util.isBlank; */ public class ObjEntityHandler extends NamespaceAwareNestedTagHandler { - private static final Logger logger = LoggerFactory.getLogger(ObjEntityHandler.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ObjEntityHandler.class); private static final String OBJ_ENTITY_TAG = "obj-entity"; private static final String OBJ_ATTRIBUTE_TAG = "obj-attribute"; @@ -205,7 +205,7 @@ public class ObjEntityHandler extends NamespaceAwareNestedTagHandler { try { entity.setDeclaredQualifier(ExpressionFactory.exp(qualifier)); } catch (ExpressionException ex) { - logger.warn("Unable to parse entity " + entity.getName() + " qualifier", ex); + LOGGER.warn("Unable to parse entity " + entity.getName() + " qualifier", ex); } } } diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/XMLDataChannelDescriptorLoader.java b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/XMLDataChannelDescriptorLoader.java index 7fb711a84..243265d5a 100644 --- a/cayenne/src/main/java/org/apache/cayenne/configuration/xml/XMLDataChannelDescriptorLoader.java +++ b/cayenne/src/main/java/org/apache/cayenne/configuration/xml/XMLDataChannelDescriptorLoader.java @@ -42,7 +42,7 @@ import java.util.Arrays; */ public class XMLDataChannelDescriptorLoader implements DataChannelDescriptorLoader { - private static final Logger logger = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); + private static final Logger LOGGER = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class); /** * Versions of project XML files that this loader can read. @@ -77,7 +77,7 @@ public class XMLDataChannelDescriptorLoader implements DataChannelDescriptorLoad URL configurationURL = configurationResource.getURL(); - logger.info("Loading XML configuration resource from " + configurationURL); + LOGGER.info("Loading XML configuration resource from " + configurationURL); final DataChannelDescriptor descriptor = new DataChannelDescriptor(); descriptor.setConfigurationSource(configurationResource); 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 c49ee9d84..77cd7fcdf 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 @@ -35,11 +35,9 @@ import org.apache.cayenne.tx.Transaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - */ public class MySQLPkGenerator extends JdbcPkGenerator { - private static final Logger logger = LoggerFactory.getLogger(MySQLPkGenerator.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MySQLPkGenerator.class); /** * Used by DI @@ -75,7 +73,7 @@ public class MySQLPkGenerator extends JdbcPkGenerator { // See https://issues.apache.org/jira/browse/CAY-2186 for details. Transaction transaction = BaseTransaction.getThreadTransaction(); if (transaction != null && transaction.isExternal()) { - logger.warn("Using MysqlPkGenerator with external transaction manager may lead to inconsistent state."); + LOGGER.warn("Using MysqlPkGenerator with external transaction manager may lead to inconsistent state."); } BaseTransaction.bindThreadTransaction(null); diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleUtilDateType.java b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleUtilDateType.java index 9b86dbc9f..17cf0af98 100644 --- a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleUtilDateType.java +++ b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleUtilDateType.java @@ -27,8 +27,6 @@ import java.util.Date; import org.apache.cayenne.access.types.UtilDateType; -/** - */ public class OracleUtilDateType extends UtilDateType { @Override diff --git a/cayenne/src/main/java/org/apache/cayenne/log/Slf4jJdbcEventLogger.java b/cayenne/src/main/java/org/apache/cayenne/log/Slf4jJdbcEventLogger.java index 474cfc278..641811dcd 100644 --- a/cayenne/src/main/java/org/apache/cayenne/log/Slf4jJdbcEventLogger.java +++ b/cayenne/src/main/java/org/apache/cayenne/log/Slf4jJdbcEventLogger.java @@ -31,14 +31,14 @@ import org.slf4j.LoggerFactory; import java.sql.SQLException; /** - * A {@link JdbcEventLogger} built on top of slf4j-api logger. + * A {@link JdbcEventLogger} built on top of slf4j-api LOGGER. * * @since 3.1 * @since 4.0 renamed from CommonsJdbcEventLogger to Slf4jJdbcEventLogger as part of migration to SLF4J */ public class Slf4jJdbcEventLogger implements JdbcEventLogger { - private static final Logger logger = LoggerFactory.getLogger(JdbcEventLogger.class); + private static final Logger LOGGER = LoggerFactory.getLogger(JdbcEventLogger.class); protected long queryExecutionTimeLoggingThreshold; @@ -50,7 +50,7 @@ public class Slf4jJdbcEventLogger implements JdbcEventLogger { @Override public void log(String message) { if (message != null) { - logger.info(message); + LOGGER.info(message); } } @@ -58,7 +58,7 @@ public class Slf4jJdbcEventLogger implements JdbcEventLogger { public void logGeneratedKey(DbAttribute attribute, Object value) { if (isLoggable()) { String entity = attribute.getEntity().getName(); - logger.info("Generated PK: " + entity + "." + attribute.getName() + " = " + value); + LOGGER.info("Generated PK: " + entity + "." + attribute.getName() + " = " + value); } } @@ -70,7 +70,7 @@ public class Slf4jJdbcEventLogger implements JdbcEventLogger { appendParameters(buffer, "bind", bindings); if (buffer.length() > 0) { - logger.info(buffer.toString()); + LOGGER.info(buffer.toString()); } } } @@ -84,7 +84,7 @@ public class Slf4jJdbcEventLogger implements JdbcEventLogger { appendParameters(buffer, label, bindings); if (buffer.length() > 0) { - logger.info(buffer.toString()); + LOGGER.info(buffer.toString()); } } } @@ -156,12 +156,12 @@ public class Slf4jJdbcEventLogger implements JdbcEventLogger { buf.append(" - took ").append(time).append(" ms."); } - logger.info(buf.toString()); + LOGGER.info(buf.toString()); } if (queryExecutionTimeLoggingThreshold > 0 && time > queryExecutionTimeLoggingThreshold) { String message = "Query time exceeded threshold (" + time + " ms): "; - logger.warn(message + sql, new CayenneRuntimeException(message + "%s", sql)); + LOGGER.warn(message + sql, new CayenneRuntimeException(message + "%s", sql)); } } @@ -169,27 +169,27 @@ public class Slf4jJdbcEventLogger implements JdbcEventLogger { public void logUpdateCount(int count) { if (isLoggable()) { if (count < 0) { - logger.info("=== updated ? rows"); + LOGGER.info("=== updated ? rows"); } else { String countStr = (count == 1) ? "=== updated 1 row." : "=== updated " + count + " rows."; - logger.info(countStr); + LOGGER.info(countStr); } } } @Override public void logBeginTransaction(String transactionLabel) { - logger.info("--- " + transactionLabel); + LOGGER.info("--- " + transactionLabel); } @Override public void logCommitTransaction(String transactionLabel) { - logger.info("+++ " + transactionLabel); + LOGGER.info("+++ " + transactionLabel); } @Override public void logRollbackTransaction(String transactionLabel) { - logger.info("*** " + transactionLabel); + LOGGER.info("*** " + transactionLabel); } @Override @@ -199,12 +199,12 @@ public class Slf4jJdbcEventLogger implements JdbcEventLogger { th = Util.unwindException(th); } - logger.info("*** error.", th); + LOGGER.info("*** error.", th); if (th instanceof SQLException) { SQLException sqlException = ((SQLException) th).getNextException(); while (sqlException != null) { - logger.info("*** nested SQL error.", sqlException); + LOGGER.info("*** nested SQL error.", sqlException); sqlException = sqlException.getNextException(); } } @@ -213,6 +213,6 @@ public class Slf4jJdbcEventLogger implements JdbcEventLogger { @Override public boolean isLoggable() { - return logger.isInfoEnabled(); + return LOGGER.isInfoEnabled(); } } diff --git a/cayenne/src/main/java/org/apache/cayenne/map/MappingCache.java b/cayenne/src/main/java/org/apache/cayenne/map/MappingCache.java index 2c8d31a12..3306f1e2e 100644 --- a/cayenne/src/main/java/org/apache/cayenne/map/MappingCache.java +++ b/cayenne/src/main/java/org/apache/cayenne/map/MappingCache.java @@ -38,7 +38,7 @@ class MappingCache implements MappingNamespace { private static final ObjEntity OBJ_DUPLICATE_MARKER = new ObjEntity(); - protected static final Logger logger = LoggerFactory.getLogger(MappingCache.class); + protected static final Logger LOGGER = LoggerFactory.getLogger(MappingCache.class); protected Collection<DataMap> maps; protected Map<String, QueryDescriptor> queryDesriptors; @@ -136,7 +136,7 @@ class MappingCache implements MappingNamespace { } else { // bad mapping? Or most likely some classloader // issue - logger.warn("No super entity mapping for '" + superOEName + "'"); + LOGGER.warn("No super entity mapping for '" + superOEName + "'"); continue; } } @@ -161,7 +161,7 @@ class MappingCache implements MappingNamespace { CayenneMapEntry duplicate = dst.get(entry.getName()); if(duplicate != null) { DataMap parent = (DataMap) duplicate.getParent(); - logger.warn("Found duplicated name " + entry.getName() + LOGGER.warn("Found duplicated name " + entry.getName() + " in datamaps " + srcMap.getName() + " and " + parent.getName()); } } diff --git a/cayenne/src/main/java/org/apache/cayenne/query/CacheableQuery.java b/cayenne/src/main/java/org/apache/cayenne/query/CacheableQuery.java index ca643cb2a..970f98a8c 100644 --- a/cayenne/src/main/java/org/apache/cayenne/query/CacheableQuery.java +++ b/cayenne/src/main/java/org/apache/cayenne/query/CacheableQuery.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; */ public abstract class CacheableQuery implements Query { - protected static final Logger logger = LoggerFactory.getLogger(CacheableQuery.class); + protected static final Logger LOGGER = LoggerFactory.getLogger(CacheableQuery.class); abstract protected BaseQueryMetadata getBaseMetaData(); diff --git a/cayenne/src/test/java/org/apache/cayenne/ConfigExceptionTest.java b/cayenne/src/test/java/org/apache/cayenne/ConfigExceptionTest.java index 4b48e1bb0..c904ae745 100644 --- a/cayenne/src/test/java/org/apache/cayenne/ConfigExceptionTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/ConfigExceptionTest.java @@ -26,8 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class ConfigExceptionTest { @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/DataContextConcurrencyIT.java b/cayenne/src/test/java/org/apache/cayenne/DataContextConcurrencyIT.java index 8c975c3d3..878c3d1d9 100644 --- a/cayenne/src/test/java/org/apache/cayenne/DataContextConcurrencyIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/DataContextConcurrencyIT.java @@ -41,7 +41,7 @@ public class DataContextConcurrencyIT { @RegisterExtension static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT); - private static final Logger logger = LoggerFactory.getLogger(DataContextConcurrencyIT.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DataContextConcurrencyIT.class); /** * see https://issues.apache.org/jira/browse/CAY-2382 @@ -96,7 +96,7 @@ public class DataContextConcurrencyIT { serializationStartSignal.countDown(); } } catch (Exception e) { - logger.error("Serialization failed", e); + LOGGER.error("Serialization failed", e); return false; } } diff --git a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java index c0d7c04eb..f171db9f6 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java @@ -29,8 +29,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class ColumnDescriptorTest { @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/access/types/BooleanTypeTest.java b/cayenne/src/test/java/org/apache/cayenne/access/types/BooleanTypeTest.java index b5a1eb76e..9426e4fe1 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/types/BooleanTypeTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/types/BooleanTypeTest.java @@ -28,8 +28,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; -/** - */ public class BooleanTypeTest { @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/JNDISetup.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/JNDISetup.java index 978a27882..025668bf0 100644 --- a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/JNDISetup.java +++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/JNDISetup.java @@ -42,7 +42,7 @@ import java.util.concurrent.ConcurrentHashMap; */ class JNDISetup { - private static final Logger logger = LoggerFactory.getLogger(JNDISetup.class); + private static final Logger LOGGER = LoggerFactory.getLogger(JNDISetup.class); private static final String ENV_SUBCONTEXT = "java:comp/env"; @@ -61,7 +61,7 @@ class JNDISetup { try { NamingManager.setInitialContextFactoryBuilder(new InMemoryContextFactoryBuilder()); } catch (NamingException e) { - logger.error("Can't perform JNDI setup, ignoring...", e); + LOGGER.error("Can't perform JNDI setup, ignoring...", e); } setup = true; } diff --git a/cayenne/src/test/java/org/apache/cayenne/event/EventBridgeTest.java b/cayenne/src/test/java/org/apache/cayenne/event/EventBridgeTest.java index 382a22c04..a641acd56 100644 --- a/cayenne/src/test/java/org/apache/cayenne/event/EventBridgeTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/event/EventBridgeTest.java @@ -33,8 +33,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class EventBridgeTest { private List<DefaultEventManager> managersToClean = new ArrayList<>(); diff --git a/cayenne/src/test/java/org/apache/cayenne/exp/ExpressionEqualsTest.java b/cayenne/src/test/java/org/apache/cayenne/exp/ExpressionEqualsTest.java index fd429f2d1..7365ab8e0 100644 --- a/cayenne/src/test/java/org/apache/cayenne/exp/ExpressionEqualsTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/exp/ExpressionEqualsTest.java @@ -24,8 +24,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -/** - */ public class ExpressionEqualsTest { @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_10062004_ExpTest.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_10062004_ExpTest.java index 5ad458281..3ad9e0dc2 100644 --- a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_10062004_ExpTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_10062004_ExpTest.java @@ -25,8 +25,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class CAY_10062004_ExpTest { @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_115IT.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_115IT.java index 29abaf5e7..b803127c0 100644 --- a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_115IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_115IT.java @@ -36,8 +36,6 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class CAY_115IT { @RegisterExtension diff --git a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager1.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager1.java index 5508a5497..55da83e64 100644 --- a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager1.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager1.java @@ -21,8 +21,6 @@ package org.apache.cayenne.jira; import org.apache.cayenne.testdo.inheritance_people.Manager; -/** - */ public class CAY_207Manager1 extends Manager { public void setClientContactType(CAY_207String1 clientContactType) { diff --git a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager2.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager2.java index 59894a7a0..fb64712c4 100644 --- a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager2.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207Manager2.java @@ -21,8 +21,6 @@ package org.apache.cayenne.jira; import org.apache.cayenne.testdo.inheritance_people.Manager; -/** - */ public class CAY_207Manager2 extends Manager { public void setClientContactType(CAY_207String1 clientContactType) { diff --git a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String1.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String1.java index aff54eb3b..3b32c670d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String1.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String1.java @@ -19,8 +19,6 @@ package org.apache.cayenne.jira; -/** - */ public class CAY_207String1 { protected String string; diff --git a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String2.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String2.java index 83c4d6a49..c57d368f6 100644 --- a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String2.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207String2.java @@ -19,8 +19,6 @@ package org.apache.cayenne.jira; -/** - */ public class CAY_207String2 { protected String string; diff --git a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207StringType2.java b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207StringType2.java index 2d7f0e12b..4a6832465 100644 --- a/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207StringType2.java +++ b/cayenne/src/test/java/org/apache/cayenne/jira/CAY_207StringType2.java @@ -25,8 +25,6 @@ import java.sql.CallableStatement; import java.sql.PreparedStatement; import java.sql.ResultSet; -/** - */ public class CAY_207StringType2 implements ExtendedType<CAY_207String2> { @Override diff --git a/cayenne/src/test/java/org/apache/cayenne/map/DbAttributeTest.java b/cayenne/src/test/java/org/apache/cayenne/map/DbAttributeTest.java index a825a5a0c..310a0bf8b 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/DbAttributeTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/DbAttributeTest.java @@ -32,8 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class DbAttributeTest { @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/map/DbJoinTest.java b/cayenne/src/test/java/org/apache/cayenne/map/DbJoinTest.java index 05325b062..39dd1c803 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/DbJoinTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/DbJoinTest.java @@ -25,8 +25,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class DbJoinTest { @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/map/MockEntity.java b/cayenne/src/test/java/org/apache/cayenne/map/MockEntity.java index b31221744..36dede130 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/MockEntity.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/MockEntity.java @@ -29,8 +29,6 @@ import org.apache.cayenne.exp.path.CayennePath; import org.apache.cayenne.util.CayenneMapEntry; import org.apache.cayenne.util.XMLEncoder; -/** - */ public class MockEntity extends Entity<MockEntity, MockAttribute, MockRelationship> { public MockEntity() { diff --git a/cayenne/src/test/java/org/apache/cayenne/map/MockEntityResolver.java b/cayenne/src/test/java/org/apache/cayenne/map/MockEntityResolver.java index 0abf8b6e9..3c529c5cc 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/MockEntityResolver.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/MockEntityResolver.java @@ -22,8 +22,6 @@ package org.apache.cayenne.map; import org.apache.cayenne.Persistent; import org.apache.cayenne.query.Query; -/** - */ public class MockEntityResolver extends EntityResolver { protected ObjEntity mockObjEntity; diff --git a/cayenne/src/test/java/org/apache/cayenne/map/MockObjRelationship.java b/cayenne/src/test/java/org/apache/cayenne/map/MockObjRelationship.java index dccf36ae4..610ad70c2 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/MockObjRelationship.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/MockObjRelationship.java @@ -19,8 +19,6 @@ package org.apache.cayenne.map; -/** - */ public class MockObjRelationship extends ObjRelationship { protected ObjRelationship reverseRelationship; diff --git a/cayenne/src/test/java/org/apache/cayenne/map/MockSQLAction.java b/cayenne/src/test/java/org/apache/cayenne/map/MockSQLAction.java index 32e178a46..d4a84a8c8 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/MockSQLAction.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/MockSQLAction.java @@ -25,8 +25,6 @@ import java.sql.SQLException; import org.apache.cayenne.access.OperationObserver; import org.apache.cayenne.query.SQLAction; -/** - */ public class MockSQLAction implements SQLAction { public MockSQLAction() { diff --git a/cayenne/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java b/cayenne/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java index 8f4da12ec..5f9a930fa 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java @@ -29,8 +29,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; -/** - */ public class ObjEntitySingleTableInheritanceTest { protected DataMap map; diff --git a/cayenne/src/test/java/org/apache/cayenne/map/ProcedureTest.java b/cayenne/src/test/java/org/apache/cayenne/map/ProcedureTest.java index 9a84c78c0..dac465394 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/ProcedureTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/ProcedureTest.java @@ -24,8 +24,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -/** - */ public class ProcedureTest { protected Procedure procedure; diff --git a/cayenne/src/test/java/org/apache/cayenne/map/QueryDescriptorLoaderTest.java b/cayenne/src/test/java/org/apache/cayenne/map/QueryDescriptorLoaderTest.java index 92595e3dc..8cdce0e07 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/QueryDescriptorLoaderTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/QueryDescriptorLoaderTest.java @@ -24,8 +24,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; -/** - */ public class QueryDescriptorLoaderTest { protected QueryDescriptorLoader builder; diff --git a/cayenne/src/test/java/org/apache/cayenne/map/SQLTemplateDescriptorTest.java b/cayenne/src/test/java/org/apache/cayenne/map/SQLTemplateDescriptorTest.java index c976700d0..9cae9a257 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/SQLTemplateDescriptorTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/SQLTemplateDescriptorTest.java @@ -27,8 +27,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class SQLTemplateDescriptorTest { @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/map/SelectQueryDescriptorTest.java b/cayenne/src/test/java/org/apache/cayenne/map/SelectQueryDescriptorTest.java index b25408628..bbfc331f5 100644 --- a/cayenne/src/test/java/org/apache/cayenne/map/SelectQueryDescriptorTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/map/SelectQueryDescriptorTest.java @@ -26,8 +26,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; -/** - */ public class SelectQueryDescriptorTest { @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/query/MockAbstractQuery.java b/cayenne/src/test/java/org/apache/cayenne/query/MockAbstractQuery.java index 517424ab9..c56510665 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/MockAbstractQuery.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/MockAbstractQuery.java @@ -20,8 +20,6 @@ package org.apache.cayenne.query; -/** - */ public class MockAbstractQuery extends AbstractQuery { public MockAbstractQuery() { diff --git a/cayenne/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java b/cayenne/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java index 445da1f75..e8183b6c5 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java @@ -33,8 +33,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class ProcedureQueryTest { @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/util/IDUtilTest.java b/cayenne/src/test/java/org/apache/cayenne/util/IDUtilTest.java index 593a0683a..54229e7d0 100644 --- a/cayenne/src/test/java/org/apache/cayenne/util/IDUtilTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/util/IDUtilTest.java @@ -26,8 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -/** - */ public class IDUtilTest { @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java b/cayenne/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java index 8bf1532f8..859b79093 100644 --- a/cayenne/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java @@ -26,8 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -/** - */ public class ValidationResultTest { private ValidationResult res; diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java index bb7fca52f..9edda6469 100644 --- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java +++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java @@ -59,7 +59,7 @@ import java.util.stream.Collectors; */ public class EOModelProcessor { - private static final Logger logger = LoggerFactory.getLogger(EOModelProcessor.class); + private static final Logger LOGGER = LoggerFactory.getLogger(EOModelProcessor.class); protected Predicate<String> prototypeChecker; @@ -721,7 +721,7 @@ public class EOModelProcessor { try { flatRel.setDbRelationshipPath(targetPath); } catch (ExpressionException ex) { - logger.warn("Invalid relationship: " + targetPath); + LOGGER.warn("Invalid relationship: " + targetPath); continue; } diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java index c08c3da1d..37b509778 100644 --- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java +++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java @@ -250,7 +250,7 @@ public class EOQuery<T> extends ObjectSelect<T> { private static final String OBJ_C = ":"; // Objective-C syntax addition. private static Map<String, Integer> selectorToExpressionBridge; - private static final Logger logger = LoggerFactory.getLogger(EOFetchSpecificationParser.class); + private static final Logger LOGGER = LoggerFactory.getLogger(EOFetchSpecificationParser.class); /** * selectorToExpressionBridge is just a mapping of EOModeler's selector @@ -476,7 +476,7 @@ public class EOQuery<T> extends ObjectSelect<T> { try { keyExp = entity.translateToDbPath(keyExp); } catch (Exception dbpathEx) { - logger.warn("Couldn't find " + keyExp + " in " + entity.getName() + " in EOModel"); + LOGGER.warn("Couldn't find " + keyExp + " in " + entity.getName() + " in EOModel"); } } @@ -487,7 +487,7 @@ public class EOQuery<T> extends ObjectSelect<T> { exp.setOperand(1, comparisonValue); return exp; } catch (ExpressionException e) { - logger.warn(e.getUnlabeledMessage()); + LOGGER.warn(e.getUnlabeledMessage()); return null; } }
