diff --git a/design/logger_id_ranges.adoc b/design/logger_id_ranges.adoc index 6ef47008a7ed..cfaaecd4dcb5 100644 --- a/design/logger_id_ranges.adoc +++ b/design/logger_id_ranges.adoc @@ -56,7 +56,7 @@ well as some helper info such as whether DEBUG or TRACE are enabled. E.g.: public interface MappingModelCreationLogger extends BasicLogger { String LOGGER_NAME = "org.hibernate.orm.model.mapping.creation"; - MappingModelCreationLogger LOGGER = Logger.getMessageLogger( MappingModelCreationLogger.class, LOGGER_NAME ); + MappingModelCreationLogger LOGGER = Logger.getMessageLogger( MappingModelCreationLogger.class, LOGGER_NAME, Locale.ROOT ); boolean TRACE_ENABLED = LOGGER.isTraceEnabled(); boolean DEBUG_ENABLED = LOGGER.isDebugEnabled(); diff --git a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java index fde5cf50a2db..dd10aa428eac 100644 --- a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java +++ b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java @@ -14,6 +14,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.WARN; @@ -32,7 +33,7 @@ public interface C3P0MessageLogger extends ConnectionInfoLogger { String NAME = ConnectionInfoLogger.LOGGER_NAME + ".c3p0"; - C3P0MessageLogger C3P0_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), C3P0MessageLogger.class, NAME ); + C3P0MessageLogger C3P0_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), C3P0MessageLogger.class, NAME, Locale.ROOT ); /** * Log a message (WARN) about conflicting {@code hibernate.c3p0.XYZ} and {@code c3p0.XYZ} settings diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/ActionLogging.java b/hibernate-core/src/main/java/org/hibernate/action/internal/ActionLogging.java index c305ea79a3f9..c7bbab5ce95f 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/ActionLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/ActionLogging.java @@ -5,6 +5,7 @@ package org.hibernate.action.internal; import java.lang.invoke.MethodHandles; +import java.util.Locale; import java.util.Set; import org.hibernate.Internal; @@ -34,7 +35,7 @@ public interface ActionLogging extends BasicLogger { String NAME = SubSystemLogging.BASE + ".action"; ActionLogging ACTION_LOGGER = Logger.getMessageLogger( - MethodHandles.lookup(), ActionLogging.class, NAME + MethodHandles.lookup(), ActionLogging.class, NAME, Locale.ROOT ); int NAMESPACE = 90032000; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java b/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java index c97d1331a293..bfb96c9ef7e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java @@ -10,6 +10,7 @@ import org.hibernate.internal.log.SubSystemLogging; import java.lang.invoke.MethodHandles; +import java.util.Locale; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; @@ -39,7 +40,7 @@ @Internal public interface BootLogging extends BasicLogger { String NAME = SubSystemLogging.BASE + ".boot"; - BootLogging BOOT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BootLogging.class, NAME ); + BootLogging BOOT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BootLogging.class, NAME, Locale.ROOT ); @LogMessage(level = WARN) @Message(id = 160101, value = "Duplicate generator name: '%s'") diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScannerLogger.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScannerLogger.java index 3cac3e83bf6a..f404ba38202f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScannerLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScannerLogger.java @@ -15,6 +15,7 @@ import java.lang.invoke.MethodHandles; import java.net.URL; +import java.util.Locale; /** * Logging related to {@linkplain org.hibernate.boot.archive.scan.spi.Scanner scanning}. @@ -30,7 +31,7 @@ public interface ScannerLogger extends BasicLogger { String NAME = BootLogging.NAME + ".scan"; - ScannerLogger SCANNER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ScannerLogger.class, NAME ); + ScannerLogger SCANNER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ScannerLogger.class, NAME, Locale.ROOT ); @LogMessage(level = Logger.Level.WARN) @Message(id = 60001, value = "Multiple ScannerFactory services available; using '%s'") diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationLogger.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationLogger.java index aa3ac5b03886..2c8d60ab929e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationLogger.java @@ -16,6 +16,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.hibernate.cfg.ValidationSettings.JAKARTA_VALIDATION_MODE; import static org.jboss.logging.Logger.Level.DEBUG; @@ -35,7 +36,7 @@ public interface BeanValidationLogger extends BasicLogger { String NAME = SubSystemLogging.BASE + ".beanvalidation"; - BeanValidationLogger BEAN_VALIDATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BeanValidationLogger.class, NAME ); + BeanValidationLogger BEAN_VALIDATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BeanValidationLogger.class, NAME, Locale.ROOT ); @LogMessage(level = DEBUG) @Message(id = 101001, value = "Unable to acquire Jakarta Validation ValidatorFactory, skipping activation") diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java index cab2dfc73a99..e2326b1a0e22 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java @@ -21,6 +21,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.INFO; @@ -39,7 +40,7 @@ @Internal public interface JaxbLogger extends BasicLogger { String LOGGER_NAME = BootLogging.NAME + ".jaxb"; - JaxbLogger JAXB_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JaxbLogger.class, LOGGER_NAME ); + JaxbLogger JAXB_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JaxbLogger.class, LOGGER_NAME, Locale.ROOT ); @LogMessage(level = DEBUG) @Message(id = 90005501, value = "Unable to close StAX reader") diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java index 5247e46e47b1..b958bac7f48b 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java @@ -14,6 +14,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.INFO; @@ -32,7 +33,7 @@ @Internal public interface BytecodeEnhancementLogging extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".bytecode.enhancement"; - BytecodeEnhancementLogging ENHANCEMENT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BytecodeEnhancementLogging.class, LOGGER_NAME ); + BytecodeEnhancementLogging ENHANCEMENT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BytecodeEnhancementLogging.class, LOGGER_NAME, Locale.ROOT ); // ---- trace messages ---- @LogMessage(level = TRACE) diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java index 77a410795b9c..63bd19288e6a 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java @@ -15,6 +15,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.TRACE; import static org.jboss.logging.Logger.Level.DEBUG; @@ -34,7 +35,7 @@ public interface BytecodeInterceptorLogging extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".bytecode.interceptor"; Logger LOGGER = Logger.getLogger( LOGGER_NAME ); - BytecodeInterceptorLogging BYTECODE_INTERCEPTOR_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BytecodeInterceptorLogging.class, LOGGER_NAME ); + BytecodeInterceptorLogging BYTECODE_INTERCEPTOR_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BytecodeInterceptorLogging.class, LOGGER_NAME, Locale.ROOT ); @LogMessage(level = WARN) @Message( diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java index f8f6d3e0edf8..8118ccbd33fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java @@ -17,6 +17,7 @@ import java.lang.invoke.MethodHandles; import java.util.UUID; +import java.util.Locale; import static org.hibernate.cfg.CacheSettings.CACHE_REGION_FACTORY; import static org.jboss.logging.Logger.Level.DEBUG; @@ -37,7 +38,7 @@ public interface SecondLevelCacheLogger extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".cache"; - SecondLevelCacheLogger L2CACHE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SecondLevelCacheLogger.class, LOGGER_NAME ); + SecondLevelCacheLogger L2CACHE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SecondLevelCacheLogger.class, LOGGER_NAME, Locale.ROOT ); int NAMESPACE = 90001000; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/CollectionLogger.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/CollectionLogger.java index 765c54baf96e..6259734c6927 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/internal/CollectionLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/CollectionLogger.java @@ -15,6 +15,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.INFO; @@ -33,7 +34,7 @@ public interface CollectionLogger extends BasicLogger { String NAME = SubSystemLogging.BASE + ".collection"; - CollectionLogger COLLECTION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CollectionLogger.class, NAME ); + CollectionLogger COLLECTION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CollectionLogger.class, NAME, Locale.ROOT ); @LogMessage(level = WARN) @Message(id = 90030001, value = "Unable to close temporary session used to load lazy collection associated to no session") diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/CurrentSessionLogging.java b/hibernate-core/src/main/java/org/hibernate/context/internal/CurrentSessionLogging.java index acff2c2c57c3..6e73fd95eb10 100644 --- a/hibernate-core/src/main/java/org/hibernate/context/internal/CurrentSessionLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/context/internal/CurrentSessionLogging.java @@ -16,6 +16,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.TRACE; @@ -34,7 +35,7 @@ public interface CurrentSessionLogging extends BasicLogger { String NAME = SubSystemLogging.BASE + ".current_session"; - CurrentSessionLogging CURRENT_SESSION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CurrentSessionLogging.class, NAME ); + CurrentSessionLogging CURRENT_SESSION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CurrentSessionLogging.class, NAME, Locale.ROOT ); @LogMessage(level = WARN) @Message(id = 90070001, value = "Session already bound on call to bind(); make sure you clean up your sessions") diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java b/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java index cbe35342b302..bc04c258c33e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java @@ -14,6 +14,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; @@ -30,7 +31,7 @@ public interface DialectLogging { String LOGGER_NAME = SubSystemLogging.BASE + ".dialect"; Logger DIALECT_LOGGER = Logger.getLogger(LOGGER_NAME); - DialectLogging DIALECT_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), DialectLogging.class, LOGGER_NAME ); + DialectLogging DIALECT_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), DialectLogging.class, LOGGER_NAME, Locale.ROOT ); @LogMessage(level = DEBUG) @Message(value = "Using dialect: %s", id = 35001) diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java index 5b2964e0ead8..53e28f37a919 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java @@ -13,6 +13,7 @@ import org.jboss.logging.Logger; import java.lang.invoke.MethodHandles; +import java.util.Locale; /** * Encapsulates the validator, return type and argument type resolvers for the array_contains function. @@ -20,7 +21,7 @@ */ public abstract class AbstractArrayContainsFunction extends AbstractSqmSelfRenderingFunctionDescriptor { - protected static final DeprecationLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, AbstractArrayContainsFunction.class.getName() ); + protected static final DeprecationLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, AbstractArrayContainsFunction.class.getName(), Locale.ROOT ); protected final boolean nullable; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdLogging.java index f6efdfc2e508..b530a60db8e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdLogging.java @@ -15,6 +15,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.TRACE; @@ -36,7 +37,8 @@ public interface NaturalIdLogging extends BasicLogger { NaturalIdLogging NATURAL_ID_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), NaturalIdLogging.class, - LOGGER_NAME + LOGGER_NAME, + Locale.ROOT ); @LogMessage(level = TRACE) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/PersistenceContextLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/PersistenceContextLogging.java index d10fd1fedd73..a5dba6d7528c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/PersistenceContextLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/PersistenceContextLogging.java @@ -15,6 +15,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.TRACE; @@ -33,7 +34,7 @@ public interface PersistenceContextLogging extends BasicLogger { String NAME = SubSystemLogging.BASE + ".persistenceContext"; - PersistenceContextLogging PERSISTENCE_CONTEXT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), PersistenceContextLogging.class, NAME ); + PersistenceContextLogging PERSISTENCE_CONTEXT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), PersistenceContextLogging.class, NAME, Locale.ROOT ); @LogMessage(level = TRACE) @Message("Setting proxy identifier: %s") diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionMetricsLogger.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionMetricsLogger.java index 1bc782582807..7cbf0f358d45 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionMetricsLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionMetricsLogger.java @@ -12,6 +12,7 @@ import org.jboss.logging.annotations.MessageLogger; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; @@ -23,7 +24,7 @@ public interface SessionMetricsLogger extends BasicLogger { String LOGGER_NAME = "org.hibernate.session.metrics"; - SessionMetricsLogger SESSION_METRICS_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionMetricsLogger.class, LOGGER_NAME ); + SessionMetricsLogger SESSION_METRICS_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionMetricsLogger.class, LOGGER_NAME, Locale.ROOT ); @LogMessage(level = DEBUG) @Message( diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/VersionLogger.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/VersionLogger.java index 950767dcf29c..49dfa605b707 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/VersionLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/VersionLogger.java @@ -14,6 +14,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.TRACE; @@ -26,7 +27,7 @@ @Internal public interface VersionLogger extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".versioning"; - VersionLogger INSTANCE = Logger.getMessageLogger( MethodHandles.lookup(), VersionLogger.class, LOGGER_NAME ); + VersionLogger INSTANCE = Logger.getMessageLogger( MethodHandles.lookup(), VersionLogger.class, LOGGER_NAME, Locale.ROOT ); @LogMessage(level = TRACE) @Message(value = "Seeding version: %s", id = 160001) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java index 7431747a12a1..f9d131bf138b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java @@ -18,6 +18,7 @@ import java.lang.invoke.MethodHandles; import java.sql.SQLException; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.INFO; @@ -39,7 +40,7 @@ public interface JdbcLogging extends BasicLogger { String NAME = SubSystemLogging.BASE + ".jdbc"; - JdbcLogging JDBC_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcLogging.class, NAME ); + JdbcLogging JDBC_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcLogging.class, NAME, Locale.ROOT ); @LogMessage(level = WARN) @Message( diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java index 1a693908d5fb..86c5adfca3f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java @@ -15,6 +15,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.INFO; import static org.jboss.logging.Logger.Level.TRACE; @@ -35,7 +36,7 @@ public interface JdbcBatchLogging extends BasicLogger { String NAME = "org.hibernate.orm.jdbc.batch"; - JdbcBatchLogging BATCH_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcBatchLogging.class, NAME ); + JdbcBatchLogging BATCH_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcBatchLogging.class, NAME, Locale.ROOT ); @LogMessage(level = INFO) @Message(id=100501, value = "Automatic JDBC statement batching enabled (maximum batch size %s)") diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderLogging.java index b67f5059f27f..b09ce1a11dae 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderLogging.java @@ -12,6 +12,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.INFO; import static org.jboss.logging.Logger.Level.WARN; @@ -29,7 +30,7 @@ @ValidIdRange(min = 102001, max = 102100) interface ConnectionProviderLogging { String NAME = SubSystemLogging.BASE + ".connection"; - ConnectionProviderLogging CONNECTION_PROVIDER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ConnectionProviderLogging.class, NAME ); + ConnectionProviderLogging CONNECTION_PROVIDER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ConnectionProviderLogging.class, NAME, Locale.ROOT ); @LogMessage(level = WARN) @Message(id = 102001, diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java index 80fe1d707bbd..3e480762c326 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java @@ -17,6 +17,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; @@ -34,7 +35,7 @@ public interface LobCreationLogging extends BasicLogger { String NAME = JdbcLogging.NAME + ".lob"; Logger LOB_LOGGER = Logger.getLogger( NAME ); - LobCreationLogging LOB_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LobCreationLogging.class, NAME ); + LobCreationLogging LOB_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LobCreationLogging.class, NAME, Locale.ROOT ); @LogMessage(level = DEBUG) @Message(value = "Disabling contextual LOB creation as %s is true", id = 10010001) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionLogging.java index 717a4bfaa2a1..c17f1e62b6e9 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionLogging.java @@ -14,6 +14,7 @@ import java.lang.invoke.MethodHandles; import java.sql.SQLException; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.WARN; @@ -30,8 +31,8 @@ public interface SQLExceptionLogging extends BasicLogger { String ERROR_NAME = SubSystemLogging.BASE + ".jdbc.error"; String WARN_NAME = SubSystemLogging.BASE + ".jdbc.warn"; - SQLExceptionLogging ERROR_LOG = Logger.getMessageLogger( MethodHandles.lookup(), SQLExceptionLogging.class, ERROR_NAME ); - SQLExceptionLogging WARNING_LOG = Logger.getMessageLogger( MethodHandles.lookup(), SQLExceptionLogging.class, WARN_NAME ); + SQLExceptionLogging ERROR_LOG = Logger.getMessageLogger( MethodHandles.lookup(), SQLExceptionLogging.class, ERROR_NAME, Locale.ROOT ); + SQLExceptionLogging WARNING_LOG = Logger.getMessageLogger( MethodHandles.lookup(), SQLExceptionLogging.class, WARN_NAME, Locale.ROOT ); @LogMessage(level = WARN) @Message(value = "ErrorCode: %s, SQLState: %s", id = 247) diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyLogging.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyLogging.java index 9933de5d4553..3d8e63cada09 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyLogging.java @@ -14,6 +14,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.TRACE; @@ -31,7 +32,7 @@ public interface EntityCopyLogging extends BasicLogger { String NAME = EventListenerLogging.NAME + ".copy"; - EntityCopyLogging EVENT_COPY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), EntityCopyLogging.class, NAME ); + EntityCopyLogging EVENT_COPY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), EntityCopyLogging.class, NAME, Locale.ROOT ); // EntityCopyObserver diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java index 0a284a8003bd..362892d6322a 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java @@ -15,6 +15,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.TRACE; @@ -32,7 +33,7 @@ public interface EventListenerLogging extends BasicLogger { String NAME = SubSystemLogging.BASE + ".event"; - EventListenerLogging EVENT_LISTENER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), EventListenerLogging.class, NAME ); + EventListenerLogging EVENT_LISTENER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), EventListenerLogging.class, NAME, Locale.ROOT ); // Load diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java index 43834809bdcd..437c0c3fa29c 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java @@ -16,6 +16,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.WARN; @@ -35,7 +36,8 @@ public interface UUIDLogger extends BasicLogger { UUIDLogger UUID_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), UUIDLogger.class, - NAME + NAME, + Locale.ROOT ); @LogMessage(level = WARN) diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerLogger.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerLogger.java index c5fdb650677d..4193c44f076a 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerLogger.java @@ -16,6 +16,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.INFO; @@ -38,7 +39,8 @@ public interface OptimizerLogger extends BasicLogger { OptimizerLogger OPTIMIZER_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), OptimizerLogger.class, - NAME + NAME, + Locale.ROOT ); @LogMessage(level = TRACE) diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java index 594374d762a2..8ca1218a6130 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java @@ -14,6 +14,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.INFO; import static org.jboss.logging.Logger.Level.TRACE; @@ -37,7 +38,8 @@ public interface SequenceGeneratorLogger extends BasicLogger { SequenceGeneratorLogger SEQUENCE_GENERATOR_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SequenceGeneratorLogger.class, - NAME + NAME, + Locale.ROOT ); @LogMessage(level = INFO) diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java index ec836d4599f9..096ad9edb6a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java @@ -18,6 +18,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.ERROR; import static org.jboss.logging.Logger.Level.INFO; @@ -41,7 +42,8 @@ public interface TableGeneratorLogger extends BasicLogger { TableGeneratorLogger TABLE_GENERATOR_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), TableGeneratorLogger.class, - NAME + NAME, + Locale.ROOT ); @LogMessage(level = ERROR) diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java index 13ae7684593b..3016f7179ddd 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -10,6 +10,7 @@ import java.net.URL; import java.sql.SQLException; import java.sql.SQLWarning; +import java.util.Locale; import java.util.Properties; import org.hibernate.HibernateException; @@ -52,7 +53,7 @@ public interface CoreMessageLogger extends BasicLogger { String NAME = SubSystemLogging.BASE + ".core"; - CoreMessageLogger CORE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, NAME ); + CoreMessageLogger CORE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, NAME, Locale.ROOT ); @LogMessage(level = INFO) @Message(value = "Hibernate ORM core version %s", id = 1) diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryLogging.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryLogging.java index 5697463fdfe2..309f4adb160c 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryLogging.java @@ -16,6 +16,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import java.util.Map; import static org.jboss.logging.Logger.Level.DEBUG; @@ -35,7 +36,7 @@ public interface SessionFactoryLogging extends BasicLogger { String NAME = SubSystemLogging.BASE + ".factory"; - SessionFactoryLogging SESSION_FACTORY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionFactoryLogging.class, NAME ); + SessionFactoryLogging SESSION_FACTORY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionFactoryLogging.class, NAME, Locale.ROOT ); // ---- SessionFactoryImpl related --------------------------------------------------------------- diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java index 96835db000ea..682030b90656 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java @@ -17,6 +17,7 @@ import javax.naming.NamingException; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.ERROR; @@ -36,7 +37,7 @@ public interface SessionFactoryRegistryMessageLogger extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".factoryRegistry"; SessionFactoryRegistryMessageLogger REGISTRY_LOGGER = - getMessageLogger( MethodHandles.lookup(), SessionFactoryRegistryMessageLogger.class, LOGGER_NAME ); + getMessageLogger( MethodHandles.lookup(), SessionFactoryRegistryMessageLogger.class, LOGGER_NAME, Locale.ROOT ); @LogMessage(level = TRACE) @Message("Initializing SessionFactoryRegistry @%s") diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionLogging.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionLogging.java index a82a6fa12e56..f11920add427 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionLogging.java @@ -16,6 +16,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import java.util.UUID; import static org.jboss.logging.Logger.Level.DEBUG; @@ -36,7 +37,7 @@ public interface SessionLogging extends BasicLogger { String NAME = SubSystemLogging.BASE + ".session"; - SessionLogging SESSION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionLogging.class, NAME ); + SessionLogging SESSION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionLogging.class, NAME, Locale.ROOT ); @LogMessage(level = DEBUG) @Message("Session creation specified 'autoJoinTransactions', " diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java index ee17c0cd9c45..e44fac29867a 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java @@ -14,6 +14,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.TRACE; @@ -36,7 +37,8 @@ public interface ConnectionAccessLogger extends BasicLogger { ConnectionAccessLogger INSTANCE = Logger.getMessageLogger( MethodHandles.lookup(), ConnectionAccessLogger.class, - LOGGER_NAME + LOGGER_NAME, + Locale.ROOT ); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java index 4ecde3be82ed..79ed53876bfd 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java @@ -6,6 +6,7 @@ import java.lang.invoke.MethodHandles; import java.sql.SQLException; +import java.util.Locale; import org.hibernate.Internal; import org.hibernate.cfg.JdbcSettings; @@ -38,7 +39,7 @@ public interface ConnectionInfoLogger extends BasicLogger { /** * Static access to the logging instance */ - ConnectionInfoLogger CONNECTION_INFO_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ConnectionInfoLogger.class, LOGGER_NAME ); + ConnectionInfoLogger CONNECTION_INFO_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ConnectionInfoLogger.class, LOGGER_NAME, Locale.ROOT ); @LogMessage(level = WARN) @Message(value = "Using built-in connection pool (not intended for production use)", id = 10001002) diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java index 8d8ac5a9987a..a95f19ad10f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java @@ -7,6 +7,7 @@ import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandles; import java.util.List; +import java.util.Locale; import org.hibernate.Internal; import org.hibernate.boot.jaxb.SourceType; @@ -37,7 +38,7 @@ public interface DeprecationLogger extends BasicLogger { String CATEGORY = SubSystemLogging.BASE + ".deprecation"; - DeprecationLogger DEPRECATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, CATEGORY ); + DeprecationLogger DEPRECATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, CATEGORY, Locale.ROOT ); @LogMessage(level = WARN) @Message( diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java index 99e2852fe729..535a47fd1d17 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java @@ -12,6 +12,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.INFO; @@ -24,7 +25,7 @@ public interface IncubationLogger { String CATEGORY = SubSystemLogging.BASE + ".incubating"; - IncubationLogger INCUBATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), IncubationLogger.class, CATEGORY ); + IncubationLogger INCUBATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), IncubationLogger.class, CATEGORY, Locale.ROOT ); @LogMessage(level = INFO) @Message( diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/StatisticsLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/StatisticsLogger.java index e7c12ac90ad5..9d15bd818108 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/StatisticsLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/StatisticsLogger.java @@ -11,6 +11,7 @@ import org.jboss.logging.annotations.MessageLogger; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.INFO; @@ -24,7 +25,7 @@ public interface StatisticsLogger extends BasicLogger { String LOGGER_NAME = "org.hibernate.statistics"; - StatisticsLogger STATISTICS_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), StatisticsLogger.class, LOGGER_NAME ); + StatisticsLogger STATISTICS_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), StatisticsLogger.class, LOGGER_NAME, Locale.ROOT ); @LogMessage(level = TRACE) @Message(value = "Statistics initialized", id = 460) diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java index b1e270f329f2..805fb776ec0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java @@ -7,6 +7,7 @@ import java.lang.invoke.MethodHandles; import java.net.URISyntaxException; import java.net.URL; +import java.util.Locale; import org.hibernate.Internal; import org.jboss.logging.Logger; @@ -36,7 +37,7 @@ public interface UrlMessageBundle { String LOGGER_NAME = SubSystemLogging.BASE + ".url"; Logger URL_LOGGER = Logger.getLogger( LOGGER_NAME ); - UrlMessageBundle URL_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), UrlMessageBundle.class, LOGGER_NAME ); + UrlMessageBundle URL_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), UrlMessageBundle.class, LOGGER_NAME, Locale.ROOT ); /** * Logs a warning about a malformed URL, caused by a {@link URISyntaxException} diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaLogger.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaLogger.java index 9024e217f5bc..5c6a96c00bca 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaLogger.java @@ -16,6 +16,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.INFO; @@ -36,7 +37,7 @@ public interface JpaLogger extends BasicLogger { String NAME = SubSystemLogging.BASE + ".jpa"; - JpaLogger JPA_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JpaLogger.class, NAME ); + JpaLogger JPA_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JpaLogger.class, NAME, Locale.ROOT ); @LogMessage(level = WARN) @Message(value = "Defining %s=true ignored in HEM", id = 8059) diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java index 450395721f85..2f57294f29cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java @@ -15,6 +15,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.TRACE; @@ -38,7 +39,7 @@ public interface MultiKeyLoadLogging extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".loader.multi"; - MultiKeyLoadLogging MULTI_KEY_LOAD_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), MultiKeyLoadLogging.class, LOGGER_NAME ); + MultiKeyLoadLogging MULTI_KEY_LOAD_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), MultiKeyLoadLogging.class, LOGGER_NAME, Locale.ROOT ); // Enablement messages @LogMessage(level = TRACE) diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java index a7adf7f432a9..d12a3e09cbfb 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java @@ -15,6 +15,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.TRACE; import static org.jboss.logging.Logger.Level.WARN; @@ -36,7 +37,7 @@ public interface MappingModelCreationLogging extends BasicLogger { Logger MAPPING_MODEL_CREATION_LOGGER = Logger.getLogger( LOGGER_NAME ); MappingModelCreationLogging MAPPING_MODEL_CREATION_MESSAGE_LOGGER = - Logger.getMessageLogger( MethodHandles.lookup(), MappingModelCreationLogging.class, LOGGER_NAME ); + Logger.getMessageLogger( MethodHandles.lookup(), MappingModelCreationLogging.class, LOGGER_NAME, Locale.ROOT ); @LogMessage(level = TRACE) @Message(id = 90005701, value = "Wrapping up metadata context...") diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java b/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java index c3165a97e5a3..eae24d66f98c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java @@ -17,6 +17,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.ERROR; import static org.jboss.logging.Logger.Level.INFO; @@ -36,7 +37,7 @@ public interface QueryLogging extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".query"; Logger QUERY_LOGGER = Logger.getLogger( LOGGER_NAME ); - QueryLogging QUERY_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), QueryLogging.class, LOGGER_NAME ); + QueryLogging QUERY_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), QueryLogging.class, LOGGER_NAME, Locale.ROOT ); static String subLoggerName(String subName) { return LOGGER_NAME + '.' + subName; diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java b/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java index dc984324048c..d9fff5863628 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java @@ -14,6 +14,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; /** * @author Steve Ebersole @@ -28,7 +29,7 @@ public interface HqlLogging extends BasicLogger { String LOGGER_NAME = QueryLogging.LOGGER_NAME + ".hql"; - HqlLogging QUERY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), HqlLogging.class, LOGGER_NAME ); + HqlLogging QUERY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), HqlLogging.class, LOGGER_NAME, Locale.ROOT ); static String subLoggerName(String subName) { return LOGGER_NAME + '.' + subName; @@ -39,6 +40,6 @@ static Logger subLogger(String subName) { } static T subLogger(String subName, Class loggerJavaType) { - return Logger.getMessageLogger( MethodHandles.lookup(), loggerJavaType, subLoggerName( subName ) ); + return Logger.getMessageLogger( MethodHandles.lookup(), loggerJavaType, subLoggerName( subName ), Locale.ROOT ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java index c2133bf06433..750005e7d7f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java @@ -16,6 +16,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.INFO; @@ -34,7 +35,7 @@ public interface BeansMessageLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".beans"; - BeansMessageLogger BEANS_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BeansMessageLogger.class, LOGGER_NAME ); + BeansMessageLogger BEANS_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BeansMessageLogger.class, LOGGER_NAME, Locale.ROOT ); @LogMessage( level = TRACE ) @Message( diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java index a92125d364e6..dfcbc4127984 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java @@ -15,6 +15,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.hibernate.cfg.JdbcSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT; import static org.jboss.logging.Logger.Level.DEBUG; @@ -34,7 +35,7 @@ public interface LogicalConnectionLogging extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".resource.jdbc"; LogicalConnectionLogging CONNECTION_LOGGER = Logger.getMessageLogger( - MethodHandles.lookup(), LogicalConnectionLogging.class, LOGGER_NAME + MethodHandles.lookup(), LogicalConnectionLogging.class, LOGGER_NAME, Locale.ROOT ); // ---- TRACE: lifecycle around JDBC transactions on logical connection ---- diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryLogger.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryLogger.java index fa591dd617aa..02ffb5563c2b 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryLogger.java @@ -16,6 +16,7 @@ import java.lang.invoke.MethodHandles; import java.sql.ResultSet; import java.sql.Statement; +import java.util.Locale; import static org.jboss.logging.Logger.Level.TRACE; import static org.jboss.logging.Logger.Level.DEBUG; @@ -40,7 +41,8 @@ public interface ResourceRegistryLogger extends BasicLogger { ResourceRegistryLogger RESOURCE_REGISTRY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ResourceRegistryLogger.class, - LOGGER_NAME + LOGGER_NAME, + Locale.ROOT ); @LogMessage(level = TRACE) diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java index 554dd0d3efa9..a48f1485b4a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java @@ -17,6 +17,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.TRACE; import static org.jboss.logging.Logger.Level.WARN; @@ -37,7 +38,7 @@ public interface JtaLogging extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".jta"; - JtaLogging JTA_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JtaLogging.class, LOGGER_NAME ); + JtaLogging JTA_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JtaLogging.class, LOGGER_NAME, Locale.ROOT ); int NAMESPACE = 90007000; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationLogging.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationLogging.java index b3d0a18a7515..0c8363fea921 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationLogging.java @@ -17,6 +17,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.ERROR; import static org.jboss.logging.Logger.Level.INFO; @@ -36,7 +37,7 @@ public interface SynchronizationLogging extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".synchronization"; SynchronizationLogging SYNCHRONIZATION_LOGGER = Logger.getMessageLogger( - MethodHandles.lookup(), SynchronizationLogging.class, LOGGER_NAME + MethodHandles.lookup(), SynchronizationLogging.class, LOGGER_NAME, Locale.ROOT ); int NAMESPACE = 90008000; diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceLogger.java b/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceLogger.java index 0dacd2bc847e..853d57018b23 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceLogger.java @@ -17,6 +17,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import java.util.ServiceConfigurationError; import static org.jboss.logging.Logger.Level.DEBUG; @@ -39,7 +40,7 @@ public interface ServiceLogger extends BasicLogger { String NAME = SubSystemLogging.BASE + ".service"; Logger LOGGER = Logger.getLogger( NAME ); - ServiceLogger SERVICE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ServiceLogger.class, NAME ); + ServiceLogger SERVICE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ServiceLogger.class, NAME, Locale.ROOT ); @LogMessage(level = TRACE) @Message(id = 10500, value = "Initializing service: %s") diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java index cef3b905becf..9b5f72c3df4f 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java @@ -13,6 +13,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; /** * Dedicated logger for rendering a SQL AST @@ -32,6 +33,6 @@ public interface SqlAstTreeLogger extends BasicLogger { /** * Static access to the logging instance */ - SqlAstTreeLogger INSTANCE = Logger.getMessageLogger( MethodHandles.lookup(), SqlAstTreeLogger.class, LOGGER_NAME ); + SqlAstTreeLogger INSTANCE = Logger.getMessageLogger( MethodHandles.lookup(), SqlAstTreeLogger.class, LOGGER_NAME, Locale.ROOT ); } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java index a6da9c00c368..6eeba945c9ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java @@ -15,6 +15,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import java.util.Set; import static org.jboss.logging.Logger.Level.DEBUG; @@ -33,7 +34,7 @@ public interface SqlExecLogger extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".sql.exec"; - SqlExecLogger SQL_EXEC_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SqlExecLogger.class, LOGGER_NAME ); + SqlExecLogger SQL_EXEC_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SqlExecLogger.class, LOGGER_NAME, Locale.ROOT ); @LogMessage(level = DEBUG) @Message(id = 90004001, value = "Collection locking for collection table '%s' - %s") diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java index 77bec869b1a7..a462844ef420 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java @@ -8,6 +8,7 @@ import org.hibernate.internal.log.SubSystemLogging; import java.lang.invoke.MethodHandles; +import java.util.Locale; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; @@ -34,7 +35,7 @@ public interface ModelMutationLogging extends BasicLogger { String NAME = SubSystemLogging.BASE + ".jdbc.mutation"; - ModelMutationLogging MODEL_MUTATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ModelMutationLogging.class, NAME ); + ModelMutationLogging MODEL_MUTATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ModelMutationLogging.class, NAME, Locale.ROOT ); @LogMessage(level = TRACE) @Message(id = 90005101, value = "Static SQL for entity: %s") diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java index 78e94bf6b6d0..288090eb1e4c 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java @@ -15,6 +15,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; @@ -31,7 +32,7 @@ public interface LoadingLogger extends BasicLogger { String LOGGER_NAME = ResultsLogger.LOGGER_NAME + ".loading"; - LoadingLogger LOADING_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LoadingLogger.class, LOGGER_NAME ); + LoadingLogger LOADING_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LoadingLogger.class, LOGGER_NAME, Locale.ROOT ); static String subLoggerName(String subName) { return LOGGER_NAME + "." + subName; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java index d0efafd6d929..961ae8af6ecb 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java @@ -13,6 +13,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; /// Logger for DomainResult related messages. This includes messages related to: /// * creation of the DomainResult / Fetch nodes @@ -31,7 +32,7 @@ public interface ResultsLogger extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".results"; Logger RESULTS_LOGGER = Logger.getLogger( LOGGER_NAME ); - ResultsLogger RESULTS_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ResultsLogger.class, LOGGER_NAME ); + ResultsLogger RESULTS_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ResultsLogger.class, LOGGER_NAME, Locale.ROOT ); // todo (6.0) : make sure sql result processing classes use this logger diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java index ad37e71bce18..2abaf628a8d5 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java @@ -14,6 +14,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.INFO; @@ -33,7 +34,8 @@ public interface EnversBootLogger extends BasicLogger { EnversBootLogger BOOT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), EnversBootLogger.class, - LOGGER_NAME + LOGGER_NAME, + Locale.ROOT ); boolean TRACE_ENABLED = BOOT_LOGGER.isTraceEnabled(); diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java index 796ea84f9d66..dd7ccfd2befb 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java @@ -38,7 +38,8 @@ public class ClassesAuditingData { private static final EnversMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger.class, - ClassesAuditingData.class.getName() + ClassesAuditingData.class.getName(), + Locale.ROOT ); private final Map entityNameToAuditingData = new HashMap<>(); diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java index 01b9ad30af9d..6f1b1a5d8dda 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java @@ -52,7 +52,8 @@ public final class AuditMetadataGenerator extends AbstractMetadataGenerator { private static final EnversMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger.class, - AuditMetadataGenerator.class.getName() + AuditMetadataGenerator.class.getName(), + Locale.ROOT ); private final EnversMetadataBuildingContext metadataBuildingContext; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java index 31711780631d..360b0ee105c2 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java @@ -35,7 +35,8 @@ public class CollectionMappedByResolver { private static final EnversMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger.class, - CollectionMappedByResolver.class.getName() + CollectionMappedByResolver.class.getName(), + Locale.ROOT ); public static String resolveMappedBy( diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java index 3c7827686c6b..db9abb6005cd 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java @@ -30,6 +30,7 @@ import org.jboss.logging.Logger; import java.lang.invoke.MethodHandles; +import java.util.Locale; /** * An implementation of {@link AbstractCollectionMetadataGenerator} that builds collection metadata @@ -42,7 +43,8 @@ public class JoinColumnCollectionMetadataGenerator extends AbstractCollectionMet private static final EnversMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger.class, - JoinColumnCollectionMetadataGenerator.class.getName() + JoinColumnCollectionMetadataGenerator.class.getName(), + Locale.ROOT ); public JoinColumnCollectionMetadataGenerator( diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java index fa6ef6a53714..84d797ae50ed 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java @@ -25,6 +25,7 @@ import org.jboss.logging.Logger; import java.lang.invoke.MethodHandles; +import java.util.Locale; /** * An implementation of {@link AbstractCollectionMetadataGenerator} that builds collection metadata @@ -37,7 +38,8 @@ public class MiddleTableCollectionMetadataGenerator extends AbstractCollectionMe private static final EnversMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger.class, - MiddleTableCollectionMetadataGenerator.class.getName() + MiddleTableCollectionMetadataGenerator.class.getName(), + Locale.ROOT ); public MiddleTableCollectionMetadataGenerator( diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java index 3b3f64736bdb..506a3f90b479 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java @@ -7,6 +7,7 @@ import org.jboss.logging.Logger; import java.lang.invoke.MethodHandles; +import java.util.Locale; /** * Sad when you need helpers for generating loggers... @@ -25,7 +26,7 @@ public static EnversMessageLogger messageLogger(Class classNeedingLogging) { } public static EnversMessageLogger messageLogger(String loggerName) { - return Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger .class, loggerName ); + return Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger .class, loggerName, Locale.ROOT ); } public static Logger logger(Class classNeedingLogging) { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java index 8cc3e95bc579..46f38eac99c1 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java @@ -5,6 +5,7 @@ package org.hibernate.envers.internal.reader; import java.lang.invoke.MethodHandles; +import java.util.Locale; import java.util.Map; import org.hibernate.envers.internal.EnversMessageLogger; @@ -26,7 +27,8 @@ public class FirstLevelCache { private static final EnversMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger.class, - FirstLevelCache.class.getName() + FirstLevelCache.class.getName(), + Locale.ROOT ); /** diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/metamodel/RevisionEntitiesMetamodelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/metamodel/RevisionEntitiesMetamodelTest.java index 25468c8a084f..e2140ee69236 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/metamodel/RevisionEntitiesMetamodelTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/metamodel/RevisionEntitiesMetamodelTest.java @@ -32,6 +32,7 @@ import java.lang.invoke.MethodHandles; import java.time.Instant; +import java.util.Locale; import static org.assertj.core.api.Assertions.assertThat; @@ -52,7 +53,8 @@ public void setUp() { logger = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, - MetadataContext.class.getName() + MetadataContext.class.getName(), + Locale.ROOT ); // HHH-17612 - Injecting the class_ type field fails t1 = new TriggerOnPrefixLogListener( "HHH015007: Illegal argument on static metamodel field injection" ); diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java index 7d218c37197b..0d4fe184eabb 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java @@ -14,6 +14,7 @@ import org.jboss.logging.annotations.ValidIdRange; import java.lang.invoke.MethodHandles; +import java.util.Locale; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.INFO; @@ -34,7 +35,7 @@ public interface HSMessageLogger extends BasicLogger { String LOGGER_NAME = "org.hibernate.spatial"; - HSMessageLogger SPATIAL_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), HSMessageLogger.class, LOGGER_NAME ); + HSMessageLogger SPATIAL_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), HSMessageLogger.class, LOGGER_NAME, Locale.ROOT ); @LogMessage(level = INFO) @Message(value = "Hibernate Spatial integration enabled: %s", id = 80000001) diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java index e1bd9dd2c56b..c11c9292713e 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java @@ -10,6 +10,7 @@ import java.io.InputStream; import java.lang.invoke.MethodHandles; import java.sql.Blob; +import java.util.Locale; import org.hibernate.HibernateException; import org.hibernate.spatial.HSMessageLogger; @@ -43,7 +44,8 @@ public class H2GISWkb { private static final HSMessageLogger LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), HSMessageLogger.class, - H2GISWkb.class.getName() + H2GISWkb.class.getName(), + Locale.ROOT ); private H2GISWkb() { diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java index 949926c056ee..721b2c507151 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java @@ -12,6 +12,7 @@ import org.jboss.logging.Logger; import java.lang.invoke.MethodHandles; +import java.util.Locale; /** * Central service for spatial integration @@ -29,7 +30,8 @@ public class SpatialService implements Service { private static final HSMessageLogger log = Logger.getMessageLogger( MethodHandles.lookup(), HSMessageLogger.class, - SpatialService.class.getName() + SpatialService.class.getName(), + Locale.ROOT ); private boolean integrationEnabled; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java index f65087fd3d9b..1e733b18e56b 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java @@ -37,7 +37,8 @@ public class TestHANASpatialFunctions extends SpatialFunctionalTestCase { private static final HSMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), HSMessageLogger.class, - TestHANASpatialFunctions.class.getName() + TestHANASpatialFunctions.class.getName(), + Locale.ROOT ); protected HANAExpectationsFactory hanaExpectationsFactory; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java index 3d22db64f146..ba21cda660df 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java @@ -8,6 +8,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.Locale; import org.hibernate.spatial.HSMessageLogger; @@ -43,7 +44,8 @@ public abstract class AbstractExpectationsFactory { private static final HSMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), HSMessageLogger.class, - AbstractExpectationsFactory.class.getName() + AbstractExpectationsFactory.class.getName(), + Locale.ROOT ); private final static int TEST_SRID = 4326; private static final int MAX_BYTE_LEN = 1024; diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java index 8bb5fd05a2a8..d5fa3fda169e 100644 --- a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java +++ b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java @@ -12,6 +12,7 @@ import org.junit.Test; import java.lang.invoke.MethodHandles; +import java.util.Locale; /** * Example usage for the JUnit rule to assert logging events @@ -23,12 +24,12 @@ public class LoggingRuleTest { //Taking this specific logger as a representative example of a Logger //(The purpose of this test is not to log but to exercise the logger methods) - private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LoggingRuleTest.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LoggingRuleTest.class.getName(), Locale.ROOT ); //We'll generally not be able to access the same LOG *instance* so make sure a fresh lookup //from Logger#getMessageLogger will work fine as well @Rule - public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LoggingRuleTest.class.getName() ) ); + public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LoggingRuleTest.class.getName(), Locale.ROOT ) ); @Test public void testRule() {