From 28988a9a5c1061c9fe769ee0844c881d1682e139 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Sat, 10 Aug 2024 21:47:12 +0200 Subject: [PATCH] HHH-18488 Bump the jboss logging dependency --- .../java/org/hibernate/c3p0/internal/C3P0MessageLogger.java | 4 +++- .../hibernate/community/dialect/CockroachLegacyDialect.java | 3 ++- .../org/hibernate/community/dialect/HSQLLegacyDialect.java | 2 ++ .../org/hibernate/community/dialect/RDMSOS2200Dialect.java | 2 ++ .../java/org/hibernate/LazyInitializationException.java | 3 +++ hibernate-core/src/main/java/org/hibernate/Version.java | 4 +++- .../action/internal/UnresolvedEntityInsertActions.java | 6 ++++-- .../boot/beanvalidation/BeanValidationEventListener.java | 2 ++ .../boot/beanvalidation/BeanValidationIntegrator.java | 2 ++ .../hibernate/boot/beanvalidation/TypeSafeActivator.java | 3 ++- .../src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java | 4 +++- .../org/hibernate/boot/model/internal/AnnotatedColumn.java | 3 ++- .../org/hibernate/boot/model/internal/BasicValueBinder.java | 3 ++- .../org/hibernate/boot/model/internal/CollectionBinder.java | 3 ++- .../hibernate/boot/model/internal/CollectionSecondPass.java | 3 ++- .../org/hibernate/boot/model/internal/EntityBinder.java | 3 ++- .../org/hibernate/boot/model/internal/PropertyBinder.java | 3 ++- .../hibernate/boot/model/internal/PropertyContainer.java | 3 ++- .../java/org/hibernate/boot/model/internal/QueryBinder.java | 3 ++- .../java/org/hibernate/boot/model/internal/TableBinder.java | 3 ++- .../enhance/spi/interceptor/BytecodeInterceptorLogging.java | 4 +++- .../org/hibernate/cache/spi/SecondLevelCacheLogger.java | 4 +++- .../src/main/java/org/hibernate/cfg/Environment.java | 3 ++- .../org/hibernate/context/internal/JTASessionContext.java | 2 ++ .../context/internal/ThreadLocalSessionContext.java | 2 ++ .../main/java/org/hibernate/dialect/CockroachDialect.java | 3 ++- .../src/main/java/org/hibernate/dialect/Dialect.java | 3 ++- .../src/main/java/org/hibernate/dialect/DialectLogging.java | 4 +++- .../function/array/AbstractArrayContainsFunction.java | 4 +++- .../dialect/lock/PessimisticReadUpdateLockingStrategy.java | 2 ++ .../dialect/lock/PessimisticWriteUpdateLockingStrategy.java | 2 ++ .../org/hibernate/dialect/lock/UpdateLockingStrategy.java | 2 ++ .../engine/config/internal/ConfigurationServiceImpl.java | 2 ++ .../hibernate/engine/internal/BatchFetchQueueHelper.java | 2 ++ .../java/org/hibernate/engine/internal/Collections.java | 3 +++ .../engine/internal/StatefulPersistenceContext.java | 2 ++ .../main/java/org/hibernate/engine/internal/Versioning.java | 3 +++ .../main/java/org/hibernate/engine/jdbc/JdbcLogging.java | 4 +++- .../org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java | 4 +++- .../engine/jdbc/env/internal/JdbcEnvironmentInitiator.java | 2 ++ .../engine/jdbc/env/internal/LobCreationLogging.java | 4 +++- .../org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java | 2 ++ .../main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java | 2 ++ .../org/hibernate/engine/jndi/internal/JndiServiceImpl.java | 2 ++ .../java/org/hibernate/engine/spi/CascadingActions.java | 2 ++ .../jta/platform/internal/JtaPlatformInitiator.java | 3 ++- .../event/internal/AbstractFlushingEventListener.java | 3 ++- .../event/internal/DefaultAutoFlushEventListener.java | 4 +++- .../hibernate/event/internal/DefaultLockEventListener.java | 3 +++ .../org/hibernate/generator/internal/SourceGeneration.java | 2 ++ .../java/org/hibernate/id/enhanced/OptimizerFactory.java | 2 ++ .../java/org/hibernate/id/enhanced/PooledLoOptimizer.java | 2 ++ .../hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java | 2 ++ .../java/org/hibernate/id/enhanced/PooledOptimizer.java | 2 ++ .../java/org/hibernate/id/enhanced/SequenceStructure.java | 2 ++ .../org/hibernate/id/enhanced/SequenceStyleGenerator.java | 2 ++ .../main/java/org/hibernate/id/enhanced/TableGenerator.java | 2 ++ .../main/java/org/hibernate/id/enhanced/TableStructure.java | 2 ++ .../src/main/java/org/hibernate/internal/CoreLogging.java | 4 +++- .../src/main/java/org/hibernate/internal/HEMLogging.java | 4 +++- .../org/hibernate/internal/log/ConnectionAccessLogger.java | 3 +++ .../org/hibernate/internal/log/ConnectionInfoLogger.java | 3 ++- .../java/org/hibernate/internal/log/DeprecationLogger.java | 3 ++- .../java/org/hibernate/internal/log/IncubationLogger.java | 4 +++- .../java/org/hibernate/internal/log/UrlMessageBundle.java | 3 ++- .../org/hibernate/internal/util/xml/DTDEntityResolver.java | 3 ++- .../java/org/hibernate/jpa/internal/util/LogHelper.java | 3 ++- .../metamodel/mapping/MappingModelCreationLogging.java | 4 +++- .../src/main/java/org/hibernate/query/QueryLogging.java | 6 ++++-- .../src/main/java/org/hibernate/query/hql/HqlLogging.java | 6 ++++-- .../resource/beans/internal/BeansMessageLogger.java | 4 +++- .../java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java | 4 +++- .../src/main/java/org/hibernate/sql/exec/SqlExecLogger.java | 4 +++- .../main/java/org/hibernate/sql/results/LoadingLogger.java | 4 +++- .../main/java/org/hibernate/sql/results/ResultsLogger.java | 4 +++- .../org/hibernate/stat/internal/StatisticsInitiator.java | 4 +++- .../src/main/java/org/hibernate/type/CollectionType.java | 3 ++- .../java/org/hibernate/type/descriptor/java/DataHelper.java | 3 ++- .../hibernate/type/descriptor/java/LobStreamDataHelper.java | 3 ++- .../JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java | 3 ++- .../JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java | 3 ++- .../formula/ManyToManyNotIgnoreLazyFetchingTest.java | 3 ++- .../ImmutableEntityUpdateQueryHandlingModeWarningTest.java | 5 +++-- .../inheritance/EntityInheritanceAttributeOverrideTest.java | 4 +++- .../uniqueconstraint/UniqueConstraintBatchingTest.java | 4 +++- .../test/annotations/xml/ejb3/OrmVersion1SupportedTest.java | 3 +++ .../test/boot/database/metadata/MetadataAccessTests.java | 3 ++- .../enhancement/lazy/proxy/NoProxyFactoryTests.java | 4 +++- .../test/cache/NonRootEntityWithCacheAnnotationTest.java | 3 ++- .../cache/NonRootEntityWithCacheableAnnotationTest.java | 3 ++- .../orm/test/dialect/DialectMinimumVersionTest.java | 4 +++- .../orm/test/dialect/unit/CockroachDialectVersionTest.java | 4 +++- .../hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java | 2 ++ ...equenceMismatchStrategyFixWithSequenceGeneratorTest.java | 2 ++ .../test/id/hhh12973/SequenceMismatchStrategyLogTest.java | 2 ++ ...equenceMismatchStrategyWithoutSequenceGeneratorTest.java | 2 ++ .../orm/test/id/sequence/NegativeValueSequenceTest.java | 4 +++- .../orm/test/jpa/callbacks/PrivateConstructorTest.java | 6 ++++-- .../persistenceunit/DuplicatePersistenceUnitNameTest.java | 3 ++- .../test/jpa/persistenceunit/PersistenceXmlParserTest.java | 3 ++- .../orm/test/locking/warning/LockNoneWarmingTest.java | 3 ++- .../orm/test/mapping/converted/enums/EnumTypeTest.java | 4 ++++ .../generated/delegate/MutationDelegateIdentityTest.java | 3 ++- .../delegate/MutationDelegateStatementReleaseTest.java | 2 ++ .../mapping/onetoone/OneToOneMapsIdChangeParentTest.java | 3 +++ .../test/persister/entity/TemporaryTableStrategyTest.java | 3 ++- .../orm/test/query/hql/DynamicMapInstantiationTest.java | 4 +++- .../orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java | 3 ++- .../test/session/AssociateEntityWithTwoSessionsTest.java | 4 +++- .../orm/test/stateless/StatelessSessionConnectionTest.java | 3 +++ .../IndividuallySchemaValidatorImplConnectionTest.java | 3 ++- .../tool/schema/IndividuallySchemaValidatorImplTest.java | 3 ++- .../orm/test/tool/schema/JtaPlatformLoggingTest.java | 3 ++- .../java/org/hibernate/envers/boot/EnversBootLogger.java | 3 +++ .../envers/configuration/internal/ClassesAuditingData.java | 2 ++ .../internal/metadata/AuditMetadataGenerator.java | 2 ++ .../internal/metadata/CollectionMappedByResolver.java | 2 ++ .../metadata/JoinColumnCollectionMetadataGenerator.java | 3 +++ .../metadata/MiddleTableCollectionMetadataGenerator.java | 3 +++ .../java/org/hibernate/envers/internal/EnversLogging.java | 4 +++- .../hibernate/envers/internal/reader/FirstLevelCache.java | 2 ++ .../hibernate/proxool/internal/ProxoolMessageLogger.java | 4 +++- .../main/java/org/hibernate/spatial/HSMessageLogger.java | 4 +++- .../java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java | 2 ++ .../org/hibernate/spatial/integration/SpatialService.java | 3 +++ .../spatial/dialect/hana/TestHANASpatialFunctions.java | 2 ++ .../spatial/testing/AbstractExpectationsFactory.java | 2 ++ .../java/org/hibernate/testing/logger/LoggingRuleTest.java | 6 ++++-- settings.gradle | 2 +- .../java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java | 3 ++- 130 files changed, 316 insertions(+), 85 deletions(-) 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 766b63001d..02d94f1b50 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 @@ -15,6 +15,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.WARN; /** @@ -32,7 +34,7 @@ import static org.jboss.logging.Logger.Level.WARN; public interface C3P0MessageLogger extends ConnectionInfoLogger { String NAME = ConnectionInfoLogger.LOGGER_NAME + ".c3p0"; - C3P0MessageLogger C3P0_MSG_LOGGER = Logger.getMessageLogger( C3P0MessageLogger.class, NAME ); + C3P0MessageLogger C3P0_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), C3P0MessageLogger.class, NAME ); /** * Log a message (WARN) about conflicting {@code hibernate.c3p0.XYZ} and {@code c3p0.XYZ} settings diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java index c0b8b58403..2a60983ff9 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java @@ -6,6 +6,7 @@ */ package org.hibernate.community.dialect; +import java.lang.invoke.MethodHandles; import java.sql.DatabaseMetaData; import java.sql.ResultSet; import java.sql.SQLException; @@ -120,7 +121,7 @@ import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithM */ public class CockroachLegacyDialect extends Dialect { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, CockroachLegacyDialect.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, CockroachLegacyDialect.class.getName() ); // KNOWN LIMITATIONS: // * no support for java.sql.Clob diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java index fc4f493ef6..2446f29dd4 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java @@ -6,6 +6,7 @@ */ package org.hibernate.community.dialect; +import java.lang.invoke.MethodHandles; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.sql.Types; @@ -95,6 +96,7 @@ import static org.hibernate.type.SqlTypes.NUMERIC; */ public class HSQLLegacyDialect extends Dialect { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, org.hibernate.community.dialect.HSQLLegacyDialect.class.getName() ); diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java index c29ad8702b..a53cc04e1a 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java @@ -6,6 +6,7 @@ */ package org.hibernate.community.dialect; +import java.lang.invoke.MethodHandles; import java.sql.Types; import org.hibernate.LockMode; @@ -81,6 +82,7 @@ import static org.hibernate.type.SqlTypes.VARCHAR; */ public class RDMSOS2200Dialect extends Dialect { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, RDMSOS2200Dialect.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java b/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java index fb12f5f357..90f35d9f9d 100644 --- a/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java +++ b/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java @@ -10,6 +10,8 @@ import org.hibernate.internal.CoreMessageLogger; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * Indicates an attempt to access unfetched data outside the context * of an open stateful {@link Session}. @@ -24,6 +26,7 @@ import org.jboss.logging.Logger; public class LazyInitializationException extends HibernateException { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, LazyInitializationException.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/Version.java b/hibernate-core/src/main/java/org/hibernate/Version.java index b82f7fbddc..7e3282b391 100644 --- a/hibernate-core/src/main/java/org/hibernate/Version.java +++ b/hibernate-core/src/main/java/org/hibernate/Version.java @@ -11,6 +11,8 @@ import org.hibernate.internal.build.AllowSysOut; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * Information about the version of Hibernate. * @@ -41,7 +43,7 @@ public final class Version { * Logs the Hibernate version (using {@link #getVersionString()}) to the logging system. */ public static void logVersion() { - Logger.getMessageLogger( CoreMessageLogger.class, Version.class.getName() ).version( getVersionString() ); + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Version.class.getName() ).version( getVersionString() ); } /** diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java index 3557a9a0f2..982c6edef7 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java @@ -9,6 +9,7 @@ package org.hibernate.action.internal; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.lang.invoke.MethodHandles; import java.util.IdentityHashMap; import java.util.Map; import java.util.Set; @@ -45,8 +46,9 @@ import static org.hibernate.pretty.MessageHelper.infoString; */ public class UnresolvedEntityInsertActions { private static final CoreMessageLogger LOG = Logger.getMessageLogger( - CoreMessageLogger.class, - UnresolvedEntityInsertActions.class.getName() + MethodHandles.lookup(), + CoreMessageLogger.class, + UnresolvedEntityInsertActions.class.getName() ); private static final int INIT_SIZE = 5; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java index b579c91b16..6e2cc3d9c3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java @@ -6,6 +6,7 @@ */ package org.hibernate.boot.beanvalidation; +import java.lang.invoke.MethodHandles; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -47,6 +48,7 @@ public class BeanValidationEventListener implements PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener, PreUpsertEventListener { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, BeanValidationEventListener.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java index d187a700e0..567d23b197 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java @@ -6,6 +6,7 @@ */ package org.hibernate.boot.beanvalidation; +import java.lang.invoke.MethodHandles; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Set; @@ -30,6 +31,7 @@ import org.jboss.logging.Logger; */ public class BeanValidationIntegrator implements Integrator { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, BeanValidationIntegrator.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java index b66b4d623a..d91d956078 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java @@ -7,6 +7,7 @@ package org.hibernate.boot.beanvalidation; import java.lang.annotation.Annotation; +import java.lang.invoke.MethodHandles; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -60,7 +61,7 @@ import static org.hibernate.cfg.ValidationSettings.JPA_VALIDATION_FACTORY; */ class TypeSafeActivator { - private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, TypeSafeActivator.class.getName()); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, TypeSafeActivator.class.getName() ); /** * Used to validate a supplied ValidatorFactory instance as being castable to ValidatorFactory. 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 4e3bd28d12..fd0b95217a 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 @@ -14,6 +14,8 @@ import org.jboss.logging.Logger; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + /** * @author Steve Ebersole */ @@ -25,5 +27,5 @@ import org.jboss.logging.annotations.ValidIdRange; ) public interface JaxbLogger extends BasicLogger { String LOGGER_NAME = BootLogging.NAME + ".jaxb"; - JaxbLogger JAXB_LOGGER = Logger.getMessageLogger( JaxbLogger.class, LOGGER_NAME ); + JaxbLogger JAXB_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JaxbLogger.class, LOGGER_NAME ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java index a78de20c3c..b23f5108fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java @@ -6,6 +6,7 @@ */ package org.hibernate.boot.model.internal; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -68,7 +69,7 @@ import static org.hibernate.internal.util.StringHelper.nullIfEmpty; */ public class AnnotatedColumn { - private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, AnnotatedColumn.class.getName()); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, AnnotatedColumn.class.getName() ); private Column mappingColumn; private boolean insertable = true; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java index afd068dd65..028a8f150e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java @@ -7,6 +7,7 @@ package org.hibernate.boot.model.internal; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.lang.reflect.ParameterizedType; import java.util.Collection; import java.util.Collections; @@ -113,7 +114,7 @@ public class BasicValueBinder implements JdbcTypeIndicators { // forward this class should undergo major changes: see the comments in #setType // but as always the "design" of these classes make it unclear exactly how to change it properly. - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, BasicValueBinder.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, BasicValueBinder.class.getName() ); public enum Kind { ATTRIBUTE( ValueMappingAccess.INSTANCE ), diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java index 72ca47d7de..7891df0876 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java @@ -7,6 +7,7 @@ package org.hibernate.boot.model.internal; import java.lang.annotation.Annotation; +import java.lang.invoke.MethodHandles; import java.util.Comparator; import java.util.HashMap; import java.util.List; @@ -186,7 +187,7 @@ import static org.hibernate.mapping.MappingHelper.createLocalUserCollectionTypeB * @author Emmanuel Bernard */ public abstract class CollectionBinder { - private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, CollectionBinder.class.getName()); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, CollectionBinder.class.getName() ); private static final List> INFERRED_CLASS_PRIORITY = List.of( List.class, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java index be122407d3..344dd0dd69 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionSecondPass.java @@ -6,6 +6,7 @@ */ package org.hibernate.boot.model.internal; +import java.lang.invoke.MethodHandles; import java.util.Map; import org.hibernate.MappingException; @@ -27,7 +28,7 @@ import org.jboss.logging.Logger; */ public abstract class CollectionSecondPass implements SecondPass { - private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, CollectionSecondPass.class.getName()); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, CollectionSecondPass.class.getName() ); private final Collection collection; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java index ee3ca3ac4d..ddfafdd607 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java @@ -7,6 +7,7 @@ package org.hibernate.boot.model.internal; import java.lang.annotation.Annotation; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -171,7 +172,7 @@ import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpt */ public class EntityBinder { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, EntityBinder.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, EntityBinder.class.getName() ); private static final String NATURAL_ID_CACHE_SUFFIX = "##NaturalId"; private MetadataBuildingContext context; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java index d1debc0484..ed15f34139 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java @@ -7,6 +7,7 @@ package org.hibernate.boot.model.internal; import java.lang.annotation.Annotation; +import java.lang.invoke.MethodHandles; import java.util.EnumSet; import java.util.List; import java.util.Map; @@ -102,7 +103,7 @@ import static org.hibernate.internal.util.StringHelper.qualify; * @author Emmanuel Bernard */ public class PropertyBinder { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, PropertyBinder.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, PropertyBinder.class.getName() ); private MetadataBuildingContext buildingContext; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java index 7bb38fd9c9..ecc2fd1ead 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java @@ -9,6 +9,7 @@ package org.hibernate.boot.model.internal; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -56,7 +57,7 @@ import jakarta.persistence.Transient; */ public class PropertyContainer { - private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, PropertyContainer.class.getName()); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, PropertyContainer.class.getName() ); /** * The class for which this container is created. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java index ee32a98ec0..232d690627 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java @@ -6,6 +6,7 @@ */ package org.hibernate.boot.model.internal; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -67,7 +68,7 @@ import static org.hibernate.internal.util.collections.CollectionHelper.setOf; * @author Emmanuel Bernard */ public abstract class QueryBinder { - private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, QueryBinder.class.getName()); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, QueryBinder.class.getName() ); public static void bindQuery( NamedQuery namedQuery, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java index 3afcde6d5a..b74fec73b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java @@ -6,6 +6,7 @@ */ package org.hibernate.boot.model.internal; +import java.lang.invoke.MethodHandles; import java.util.List; import org.hibernate.AnnotationException; @@ -57,7 +58,7 @@ import static org.hibernate.internal.util.StringHelper.unquote; * @author Emmanuel Bernard */ public class TableBinder { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, TableBinder.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, TableBinder.class.getName() ); private MetadataBuildingContext buildingContext; 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 9ef8c87315..de20cc9710 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 @@ -16,6 +16,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.WARN; /** @@ -32,7 +34,7 @@ public interface BytecodeInterceptorLogging extends BasicLogger { String LOGGER_NAME = BytecodeLogging.LOGGER_NAME + "." + SUB_NAME; Logger LOGGER = Logger.getLogger( LOGGER_NAME ); - BytecodeInterceptorLogging MESSAGE_LOGGER = Logger.getMessageLogger(BytecodeInterceptorLogging.class, LOGGER_NAME ); + BytecodeInterceptorLogging MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BytecodeInterceptorLogging.class, LOGGER_NAME ); @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 d564c57726..8ae58622ba 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 @@ -16,6 +16,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.INFO; import static org.jboss.logging.Logger.Level.WARN; @@ -31,7 +33,7 @@ import static org.jboss.logging.Logger.Level.WARN; public interface SecondLevelCacheLogger extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".cache"; - SecondLevelCacheLogger L2CACHE_LOGGER = Logger.getMessageLogger( SecondLevelCacheLogger.class, LOGGER_NAME ); + SecondLevelCacheLogger L2CACHE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SecondLevelCacheLogger.class, LOGGER_NAME ); int NAMESPACE = 90001000; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java b/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java index 9250d732ba..56911b54d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java @@ -8,6 +8,7 @@ package org.hibernate.cfg; import java.io.IOException; import java.io.InputStream; +import java.lang.invoke.MethodHandles; import java.util.Properties; import org.hibernate.HibernateException; @@ -132,7 +133,7 @@ import org.jboss.logging.Logger; */ @Internal public final class Environment implements AvailableSettings { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, Environment.class.getName()); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Environment.class.getName()); private static final Properties GLOBAL_PROPERTIES; diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java index 212bd20c66..a60b963880 100644 --- a/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java +++ b/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java @@ -6,6 +6,7 @@ */ package org.hibernate.context.internal; +import java.lang.invoke.MethodHandles; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import jakarta.transaction.Synchronization; @@ -46,6 +47,7 @@ import org.jboss.logging.Logger; */ public class JTASessionContext extends AbstractCurrentSessionContext { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, JTASessionContext.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java index a6e50cb110..71de16441d 100644 --- a/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java +++ b/hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java @@ -10,6 +10,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -60,6 +61,7 @@ import org.jboss.logging.Logger; */ public class ThreadLocalSessionContext extends AbstractCurrentSessionContext { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, ThreadLocalSessionContext.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java index c9d3c00c55..8d165a641e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java @@ -6,6 +6,7 @@ */ package org.hibernate.dialect; +import java.lang.invoke.MethodHandles; import java.sql.DatabaseMetaData; import java.sql.ResultSet; import java.sql.SQLException; @@ -122,7 +123,7 @@ import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithM */ public class CockroachDialect extends Dialect { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, CockroachDialect.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, CockroachDialect.class.getName() ); // KNOWN LIMITATIONS: // * no support for java.sql.Clob diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index 8de47394a7..2139373c8b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -10,6 +10,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; +import java.lang.invoke.MethodHandles; import java.sql.Blob; import java.sql.CallableStatement; import java.sql.Clob; @@ -313,7 +314,7 @@ public abstract class Dialect implements ConversionContext, TypeContributor, Fun private static final Pattern ESCAPE_CLOSING_COMMENT_PATTERN = Pattern.compile( "\\*/" ); private static final Pattern ESCAPE_OPENING_COMMENT_PATTERN = Pattern.compile( "/\\*" ); - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, Dialect.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Dialect.class.getName() ); //needed for converting precision from decimal to binary digits protected static final double LOG_BASE2OF10 = log(10)/log(2); 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 b9c57de204..0a3613f282 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,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.DEBUG; /** @@ -28,7 +30,7 @@ import static org.jboss.logging.Logger.Level.DEBUG; public interface DialectLogging { String LOGGER_NAME = SubSystemLogging.BASE + ".dialect"; Logger DIALECT_LOGGER = Logger.getLogger(LOGGER_NAME); - DialectLogging DIALECT_MESSAGE_LOGGER = Logger.getMessageLogger(DialectLogging.class, LOGGER_NAME); + DialectLogging DIALECT_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), DialectLogging.class, LOGGER_NAME ); @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 1c2761955c..cbf3347a2f 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 @@ -14,13 +14,15 @@ import org.hibernate.type.spi.TypeConfiguration; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * Encapsulates the validator, return type and argument type resolvers for the array_contains function. * Subclasses only have to implement the rendering. */ public abstract class AbstractArrayContainsFunction extends AbstractSqmSelfRenderingFunctionDescriptor { - protected static final DeprecationLogger LOG = Logger.getMessageLogger( DeprecationLogger.class, AbstractArrayContainsFunction.class.getName() ); + protected static final DeprecationLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, AbstractArrayContainsFunction.class.getName() ); protected final boolean nullable; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java index 347832c885..62c32e9416 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java @@ -6,6 +6,7 @@ */ package org.hibernate.dialect.lock; +import java.lang.invoke.MethodHandles; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -38,6 +39,7 @@ import org.jboss.logging.Logger; */ public class PessimisticReadUpdateLockingStrategy implements LockingStrategy { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, PessimisticReadUpdateLockingStrategy.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java index d1a794264f..dfa8aebc1e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java @@ -6,6 +6,7 @@ */ package org.hibernate.dialect.lock; +import java.lang.invoke.MethodHandles; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -38,6 +39,7 @@ import org.jboss.logging.Logger; */ public class PessimisticWriteUpdateLockingStrategy implements LockingStrategy { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, PessimisticWriteUpdateLockingStrategy.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java index ef300e7817..c4f39e6a72 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java @@ -6,6 +6,7 @@ */ package org.hibernate.dialect.lock; +import java.lang.invoke.MethodHandles; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -36,6 +37,7 @@ import org.jboss.logging.Logger; */ public class UpdateLockingStrategy implements LockingStrategy { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, UpdateLockingStrategy.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java index a9d9332316..2b8355ba12 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java @@ -6,6 +6,7 @@ */ package org.hibernate.engine.config.internal; +import java.lang.invoke.MethodHandles; import java.util.Collections; import java.util.Map; @@ -29,6 +30,7 @@ import org.checkerframework.checker.nullness.qual.PolyNull; */ public class ConfigurationServiceImpl implements ConfigurationService, ServiceRegistryAwareService { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, ConfigurationServiceImpl.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/BatchFetchQueueHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/BatchFetchQueueHelper.java index e6e04d438f..994109f08f 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/BatchFetchQueueHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/BatchFetchQueueHelper.java @@ -7,6 +7,7 @@ package org.hibernate.engine.internal; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -27,6 +28,7 @@ import static java.util.Arrays.asList; */ public class BatchFetchQueueHelper { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, BatchFetchQueueHelper.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java index bb90f5bdbd..a48d65a45b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java @@ -24,6 +24,8 @@ import org.hibernate.type.CollectionType; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * Implements book-keeping for the collection persistence by reachability algorithm * @@ -31,6 +33,7 @@ import org.jboss.logging.Logger; */ public final class Collections { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, Collections.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java index f22ad6c35d..75f23941e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java @@ -11,6 +11,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -92,6 +93,7 @@ import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttrib */ public class StatefulPersistenceContext implements PersistenceContext { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, StatefulPersistenceContext.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java index 1e2e887164..96b0ebf898 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Versioning.java @@ -14,6 +14,8 @@ import org.hibernate.type.descriptor.java.VersionJavaType; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + import static org.hibernate.generator.EventType.INSERT; import static org.hibernate.generator.EventType.UPDATE; @@ -24,6 +26,7 @@ import static org.hibernate.generator.EventType.UPDATE; */ public final class Versioning { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, Versioning.class.getName() ); 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 171b770eed..1a6149b5eb 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 @@ -15,6 +15,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.WARN; /** @@ -32,7 +34,7 @@ public interface JdbcLogging extends BasicLogger { String NAME = "org.hibernate.orm.jdbc"; Logger JDBC_LOGGER = Logger.getLogger( NAME ); - JdbcLogging JDBC_MESSAGE_LOGGER = Logger.getMessageLogger( JdbcLogging.class, NAME ); + JdbcLogging JDBC_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcLogging.class, NAME ); @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 10de5317c0..08e0519e50 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,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.ERROR; import static org.jboss.logging.Logger.Level.INFO; @@ -33,7 +35,7 @@ public interface JdbcBatchLogging extends BasicLogger { String NAME = "org.hibernate.orm.jdbc.batch"; Logger BATCH_LOGGER = Logger.getLogger( NAME ); - JdbcBatchLogging BATCH_MESSAGE_LOGGER = Logger.getMessageLogger( JdbcBatchLogging.class, NAME ); + JdbcBatchLogging BATCH_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcBatchLogging.class, NAME ); @LogMessage(level = ERROR) @Message(id = 100501, value = "Exception executing batch [%s], SQL: %s") diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java index cfdf92279a..14408c701e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java @@ -6,6 +6,7 @@ */ package org.hibernate.engine.jdbc.env.internal; +import java.lang.invoke.MethodHandles; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.SQLException; @@ -79,6 +80,7 @@ import static org.hibernate.internal.util.config.ConfigurationHelper.getInteger; */ public class JdbcEnvironmentInitiator implements StandardServiceInitiator { private static final CoreMessageLogger log = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, JdbcEnvironmentInitiator.class.getName() ); 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 6c4ee34c67..e19c9166dd 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,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.DEBUG; /** @@ -32,7 +34,7 @@ public interface LobCreationLogging extends BasicLogger { String NAME = JdbcLogging.NAME + ".lob"; Logger LOB_LOGGER = Logger.getLogger( NAME ); - LobCreationLogging LOB_MESSAGE_LOGGER = Logger.getMessageLogger( LobCreationLogging.class, NAME ); + LobCreationLogging LOB_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LobCreationLogging.class, NAME ); @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/SqlExceptionHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java index cccd23b162..1a39827446 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java @@ -6,6 +6,7 @@ */ package org.hibernate.engine.jdbc.spi; +import java.lang.invoke.MethodHandles; import java.sql.Connection; import java.sql.SQLException; import java.sql.SQLWarning; @@ -31,6 +32,7 @@ import org.jboss.logging.Logger.Level; */ public class SqlExceptionHelper { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, SqlExceptionHelper.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java index 6e838e3b68..85a8cc6510 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java @@ -6,6 +6,7 @@ */ package org.hibernate.engine.jdbc.spi; +import java.lang.invoke.MethodHandles; import java.sql.DatabaseMetaData; import java.sql.ResultSet; import java.sql.SQLException; @@ -23,6 +24,7 @@ import org.jboss.logging.Logger; */ public class TypeInfo { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, TypeInfo.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java index 95a08643b2..13e82ce827 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jndi/internal/JndiServiceImpl.java @@ -6,6 +6,7 @@ */ package org.hibernate.engine.jndi.internal; +import java.lang.invoke.MethodHandles; import java.net.URI; import java.net.URISyntaxException; import java.util.Hashtable; @@ -35,6 +36,7 @@ import org.jboss.logging.Logger; */ final class JndiServiceImpl implements JndiService { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, JndiServiceImpl.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java index 76a2ab8623..c655f93362 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java @@ -22,6 +22,7 @@ import org.hibernate.internal.CoreMessageLogger; import org.hibernate.type.CollectionType; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; import java.util.Iterator; import static java.util.Collections.emptyIterator; @@ -33,6 +34,7 @@ import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy; */ public class CascadingActions { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, CascadingAction.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java index 74f9544003..55475374bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java @@ -6,6 +6,7 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; +import java.lang.invoke.MethodHandles; import java.util.Map; import org.hibernate.boot.registry.StandardServiceInitiator; @@ -28,7 +29,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; public class JtaPlatformInitiator implements StandardServiceInitiator { public static final JtaPlatformInitiator INSTANCE = new JtaPlatformInitiator(); - private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, JtaPlatformInitiator.class.getName()); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, JtaPlatformInitiator.class.getName() ); @Override public Class getServiceInitiated() { diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java index 99abc17c6f..972b10d1fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java @@ -6,6 +6,7 @@ */ package org.hibernate.event.internal; +import java.lang.invoke.MethodHandles; import java.util.Map; import org.hibernate.HibernateException; @@ -51,7 +52,7 @@ import static org.hibernate.engine.internal.Collections.skipRemoval; */ public abstract class AbstractFlushingEventListener implements JpaBootstrapSensitive { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, AbstractFlushingEventListener.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, AbstractFlushingEventListener.class.getName() ); @Override public void wasJpaBootstrap(boolean wasJpaBootstrap) { diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java index b9ceed9856..3fcccb781e 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java @@ -21,6 +21,8 @@ import org.hibernate.stat.spi.StatisticsImplementor; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * Defines the default flush event listeners used by hibernate for * flushing session state in response to generated auto-flush events. @@ -29,7 +31,7 @@ import org.jboss.logging.Logger; */ public class DefaultAutoFlushEventListener extends AbstractFlushingEventListener implements AutoFlushEventListener { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, DefaultAutoFlushEventListener.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, DefaultAutoFlushEventListener.class.getName() ); /** * Handle the given auto-flush event. diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java index 5f0bd4648c..68844bd0e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java @@ -24,6 +24,8 @@ import org.hibernate.persister.entity.EntityPersister; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * Defines the default lock event listeners used by hibernate to lock entities * in response to generated lock events. @@ -33,6 +35,7 @@ import org.jboss.logging.Logger; public class DefaultLockEventListener extends AbstractLockUpgradeEventListener implements LockEventListener { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, DefaultLockEventListener.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java index cb92042fd6..140c9b8566 100644 --- a/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java +++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java @@ -21,6 +21,7 @@ import org.hibernate.type.descriptor.java.JavaType; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; import java.lang.reflect.Member; import java.sql.CallableStatement; import java.sql.PreparedStatement; @@ -53,6 +54,7 @@ import static org.hibernate.generator.EventTypeSets.INSERT_AND_UPDATE; public class SourceGeneration implements BeforeExecutionGenerator { private static final CoreMessageLogger log = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, SourceGeneration.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java index 6bdc45b794..48daf0e005 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java @@ -6,6 +6,7 @@ */ package org.hibernate.id.enhanced; +import java.lang.invoke.MethodHandles; import java.lang.reflect.Constructor; import java.util.Properties; @@ -23,6 +24,7 @@ import static org.hibernate.internal.util.StringHelper.isNotEmpty; */ public class OptimizerFactory { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, OptimizerFactory.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java index 5a20568d1d..00e2611903 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoOptimizer.java @@ -7,6 +7,7 @@ package org.hibernate.id.enhanced; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; @@ -27,6 +28,7 @@ import org.jboss.logging.Logger; */ public class PooledLoOptimizer extends AbstractOptimizer { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, PooledLoOptimizer.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java index 04568d2f96..6c8dfc6cb8 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledLoThreadLocalOptimizer.java @@ -7,6 +7,7 @@ package org.hibernate.id.enhanced; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Map; @@ -28,6 +29,7 @@ import org.jboss.logging.Logger; */ public class PooledLoThreadLocalOptimizer extends AbstractOptimizer { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, PooledLoOptimizer.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java index 045a262b46..0cc4dafb8e 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java @@ -7,6 +7,7 @@ package org.hibernate.id.enhanced; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.Lock; @@ -34,6 +35,7 @@ import org.jboss.logging.Logger; */ public class PooledOptimizer extends AbstractOptimizer implements InitialValueAwareOptimizer { private static final CoreMessageLogger log = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, PooledOptimizer.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java index 5fc4e67e13..049bacfcdd 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java @@ -6,6 +6,7 @@ */ package org.hibernate.id.enhanced; +import java.lang.invoke.MethodHandles; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -32,6 +33,7 @@ import static org.hibernate.id.IdentifierGeneratorHelper.getIntegralDataTypeHold */ public class SequenceStructure implements DatabaseStructure { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, SequenceStructure.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java index b930d6e619..cd6b734c9e 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java @@ -6,6 +6,7 @@ */ package org.hibernate.id.enhanced; +import java.lang.invoke.MethodHandles; import java.util.Iterator; import java.util.Properties; import java.util.Set; @@ -112,6 +113,7 @@ public class SequenceStyleGenerator implements PersistentIdentifierGenerator, BulkInsertionCapableIdentifierGenerator { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, SequenceStyleGenerator.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java index 106b4a6057..2e2270d9df 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java @@ -6,6 +6,7 @@ */ package org.hibernate.id.enhanced; +import java.lang.invoke.MethodHandles; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -133,6 +134,7 @@ import static org.hibernate.internal.util.config.ConfigurationHelper.getString; */ public class TableGenerator implements PersistentIdentifierGenerator { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, TableGenerator.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java index 3483313814..1bcf4ec1d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java @@ -6,6 +6,7 @@ */ package org.hibernate.id.enhanced; +import java.lang.invoke.MethodHandles; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -46,6 +47,7 @@ import static org.hibernate.id.IdentifierGeneratorHelper.getIntegralDataTypeHold */ public class TableStructure implements DatabaseStructure { private static final CoreMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, TableStructure.class.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreLogging.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreLogging.java index 961b36b55d..39d1b4479e 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreLogging.java @@ -8,6 +8,8 @@ package org.hibernate.internal; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * Quite sad, really, when you need helpers for generating loggers... * @@ -26,7 +28,7 @@ public class CoreLogging { } public static CoreMessageLogger messageLogger(String loggerName) { - return Logger.getMessageLogger( CoreMessageLogger.class, loggerName ); + return Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, loggerName ); } public static Logger logger(Class classNeedingLogging) { diff --git a/hibernate-core/src/main/java/org/hibernate/internal/HEMLogging.java b/hibernate-core/src/main/java/org/hibernate/internal/HEMLogging.java index 5c7d31e38f..690a847583 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/HEMLogging.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/HEMLogging.java @@ -8,6 +8,8 @@ package org.hibernate.internal; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * Sad when you need helpers for generating loggers... * @@ -25,7 +27,7 @@ public class HEMLogging { } public static EntityManagerMessageLogger messageLogger(String loggerName) { - return Logger.getMessageLogger( EntityManagerMessageLogger .class, loggerName ); + return Logger.getMessageLogger( MethodHandles.lookup(), EntityManagerMessageLogger .class, loggerName ); } public static Logger logger(Class classNeedingLogging) { 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 8372646e8f..0a062209f9 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 @@ -15,6 +15,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.INFO; /** @@ -33,6 +35,7 @@ public interface ConnectionAccessLogger extends BasicLogger { * Static access to the logging instance */ ConnectionAccessLogger INSTANCE = Logger.getMessageLogger( + MethodHandles.lookup(), ConnectionAccessLogger.class, LOGGER_NAME ); 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 52a6bf9c7b..8d43bf7023 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 @@ */ package org.hibernate.internal.log; +import java.lang.invoke.MethodHandles; import java.sql.SQLException; import org.jboss.logging.BasicLogger; @@ -35,7 +36,7 @@ public interface ConnectionInfoLogger extends BasicLogger { /** * Static access to the logging instance */ - ConnectionInfoLogger INSTANCE = Logger.getMessageLogger( ConnectionInfoLogger.class, LOGGER_NAME ); + ConnectionInfoLogger INSTANCE = Logger.getMessageLogger( MethodHandles.lookup(), ConnectionInfoLogger.class, LOGGER_NAME ); @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 b86df4cb93..d7a2e1af23 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 @@ package org.hibernate.internal.log; import java.lang.annotation.Annotation; +import java.lang.invoke.MethodHandles; import org.hibernate.boot.jaxb.SourceType; import org.hibernate.cfg.AvailableSettings; @@ -36,7 +37,7 @@ import static org.jboss.logging.Logger.Level.WARN; public interface DeprecationLogger extends BasicLogger { String CATEGORY = SubSystemLogging.BASE + ".deprecation"; - DeprecationLogger DEPRECATION_LOGGER = Logger.getMessageLogger( DeprecationLogger.class, CATEGORY ); + DeprecationLogger DEPRECATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, CATEGORY ); @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 87d5f04809..c0eaa923a4 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,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.WARN; /** @@ -22,7 +24,7 @@ import static org.jboss.logging.Logger.Level.WARN; public interface IncubationLogger { String CATEGORY = SubSystemLogging.BASE + ".incubating"; - IncubationLogger INCUBATION_LOGGER = Logger.getMessageLogger( IncubationLogger.class, CATEGORY ); + IncubationLogger INCUBATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), IncubationLogger.class, CATEGORY ); @LogMessage(level = WARN) @Message( 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 da10595fea..7d1e09d47b 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 @@ -6,6 +6,7 @@ */ package org.hibernate.internal.log; +import java.lang.invoke.MethodHandles; import java.net.URISyntaxException; import java.net.URL; @@ -35,7 +36,7 @@ public interface UrlMessageBundle { String LOGGER_NAME = SubSystemLogging.BASE + ".url"; Logger URL_LOGGER = Logger.getLogger( LOGGER_NAME ); - UrlMessageBundle URL_MESSAGE_LOGGER = Logger.getMessageLogger( UrlMessageBundle.class, LOGGER_NAME ); + UrlMessageBundle URL_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), UrlMessageBundle.class, LOGGER_NAME ); /** * Logs a warning about a malformed URL, caused by a {@link URISyntaxException} diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java index 3a0dad0245..b22311aba8 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java @@ -8,6 +8,7 @@ package org.hibernate.internal.util.xml; import java.io.InputStream; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.ConfigHelper; @@ -44,7 +45,7 @@ import org.xml.sax.InputSource; @Deprecated public class DTDEntityResolver implements EntityResolver, Serializable { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, DTDEntityResolver.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, DTDEntityResolver.class.getName() ); private static final String HIBERNATE_NAMESPACE = "http://www.hibernate.org/dtd/"; private static final String OLD_HIBERNATE_NAMESPACE = "http://hibernate.sourceforge.net/"; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java index 05a5739382..beef18f56c 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LogHelper.java @@ -6,6 +6,7 @@ */ package org.hibernate.jpa.internal.util; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.Enumeration; import java.util.List; @@ -21,7 +22,7 @@ import org.jboss.logging.Logger; * @author Steve Ebersole */ public final class LogHelper { - private static final EntityManagerMessageLogger log = Logger.getMessageLogger( EntityManagerMessageLogger.class, LogHelper.class.getName() ); + private static final EntityManagerMessageLogger log = Logger.getMessageLogger( MethodHandles.lookup(), EntityManagerMessageLogger.class, LogHelper.class.getName() ); private LogHelper() { } 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 9d0334ddcb..6007f006d7 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 @@ -13,6 +13,8 @@ import org.jboss.logging.Logger; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + /** * Logger used during mapping-model creation * @@ -28,5 +30,5 @@ public interface MappingModelCreationLogging extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".model.mapping.creation"; Logger MAPPING_MODEL_CREATION_LOGGER = Logger.getLogger( LOGGER_NAME ); - MappingModelCreationLogging MAPPING_MODEL_CREATION_MESSAGE_LOGGER = Logger.getMessageLogger( MappingModelCreationLogging.class, LOGGER_NAME ); + MappingModelCreationLogging MAPPING_MODEL_CREATION_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), MappingModelCreationLogging.class, LOGGER_NAME ); } 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 f4f75440b2..e0d2615fd2 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,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.ERROR; import static org.jboss.logging.Logger.Level.INFO; import static org.jboss.logging.Logger.Level.WARN; @@ -34,7 +36,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( QueryLogging.class, LOGGER_NAME ); + QueryLogging QUERY_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), QueryLogging.class, LOGGER_NAME ); static String subLoggerName(String subName) { return LOGGER_NAME + '.' + subName; @@ -45,7 +47,7 @@ public interface QueryLogging extends BasicLogger { } static T subLogger(String subName, Class loggerJavaType) { - return Logger.getMessageLogger( loggerJavaType, subLoggerName( subName ) ); + return Logger.getMessageLogger( MethodHandles.lookup(), loggerJavaType, subLoggerName( subName ) ); } @LogMessage(level = ERROR) 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 46778ca641..0de098c94e 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 @@ -18,6 +18,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.ERROR; /** @@ -32,7 +34,7 @@ import static org.jboss.logging.Logger.Level.ERROR; public interface HqlLogging extends BasicLogger { String LOGGER_NAME = QueryLogging.LOGGER_NAME + ".hql"; - HqlLogging QUERY_LOGGER = Logger.getMessageLogger( HqlLogging.class, LOGGER_NAME ); + HqlLogging QUERY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), HqlLogging.class, LOGGER_NAME ); static String subLoggerName(String subName) { return LOGGER_NAME + '.' + subName; @@ -43,7 +45,7 @@ public interface HqlLogging extends BasicLogger { } static T subLogger(String subName, Class loggerJavaType) { - return Logger.getMessageLogger( loggerJavaType, subLoggerName( subName ) ); + return Logger.getMessageLogger( MethodHandles.lookup(), loggerJavaType, subLoggerName( subName ) ); } @LogMessage(level = ERROR) 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 6ad722fc12..e04b7a9212 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 @@ -15,6 +15,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.INFO; import static org.jboss.logging.Logger.Level.WARN; @@ -31,7 +33,7 @@ import static org.jboss.logging.Logger.Level.WARN; public interface BeansMessageLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".beans"; - BeansMessageLogger BEANS_MSG_LOGGER = Logger.getMessageLogger( BeansMessageLogger.class, LOGGER_NAME ); + BeansMessageLogger BEANS_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BeansMessageLogger.class, LOGGER_NAME ); @LogMessage( level = WARN ) @Message( 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 52d2199eb8..869163c494 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 @@ -14,6 +14,8 @@ import org.jboss.logging.Logger; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + /** * Dedicated logger for rendering a SQL AST * @@ -31,6 +33,6 @@ public interface SqlAstTreeLogger extends BasicLogger { /** * Static access to the logging instance */ - SqlAstTreeLogger INSTANCE = Logger.getMessageLogger( SqlAstTreeLogger.class, LOGGER_NAME ); + SqlAstTreeLogger INSTANCE = Logger.getMessageLogger( MethodHandles.lookup(), SqlAstTreeLogger.class, LOGGER_NAME ); } 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 4652fdfb50..634269aa14 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 @@ -13,6 +13,8 @@ import org.jboss.logging.Logger; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + /** * @author Steve Ebersole */ @@ -25,5 +27,5 @@ import org.jboss.logging.annotations.ValidIdRange; public interface SqlExecLogger extends BasicLogger { String LOGGER_NAME = SubSystemLogging.BASE + ".sql.exec"; - SqlExecLogger SQL_EXEC_LOGGER = Logger.getMessageLogger( SqlExecLogger.class, LOGGER_NAME ); + SqlExecLogger SQL_EXEC_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SqlExecLogger.class, LOGGER_NAME ); } 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 859eba7d55..e7f167ed43 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 @@ -13,6 +13,8 @@ import org.jboss.logging.Logger; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + /** * @author Steve Ebersole */ @@ -26,7 +28,7 @@ public interface LoadingLogger extends BasicLogger { String LOGGER_NAME = ResultsLogger.LOGGER_NAME + ".loading"; Logger LOGGER = Logger.getLogger( LOGGER_NAME ); - LoadingLogger MESSAGE_LOGGER = Logger.getMessageLogger( LoadingLogger.class, LOGGER_NAME ); + LoadingLogger MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LoadingLogger.class, LOGGER_NAME ); 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 eec1909874..83f4ea0a5e 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,8 @@ import org.jboss.logging.Logger; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + /** * @asciidoc * @@ -34,7 +36,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( ResultsLogger.class, LOGGER_NAME ); + ResultsLogger RESULTS_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ResultsLogger.class, LOGGER_NAME ); // todo (6.0) : make sure sql result processing classes use this logger diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java index 00f1ef5f36..d0e8bca648 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java @@ -21,13 +21,15 @@ import org.jboss.logging.Logger; import org.checkerframework.checker.nullness.qual.Nullable; +import java.lang.invoke.MethodHandles; + import static org.hibernate.cfg.StatisticsSettings.STATS_BUILDER; /** * @author Steve Ebersole */ public class StatisticsInitiator implements SessionFactoryServiceInitiator { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, StatisticsInitiator.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, StatisticsInitiator.class.getName() ); public static final StatisticsInitiator INSTANCE = new StatisticsInitiator(); diff --git a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java index 8e1900fce7..41a9a4ad6e 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java @@ -7,6 +7,7 @@ package org.hibernate.type; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.ArrayList; @@ -59,7 +60,7 @@ import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer; */ public abstract class CollectionType extends AbstractType implements AssociationType { - private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, CollectionType.class.getName()); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, CollectionType.class.getName() ); @Internal public static final Object UNFETCHED_COLLECTION = new MarkerObject( "UNFETCHED COLLECTION" ); diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java index 6193dbd42d..ea5f34fc73 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java @@ -11,6 +11,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; import java.io.StringReader; +import java.lang.invoke.MethodHandles; import java.sql.Clob; import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; @@ -34,7 +35,7 @@ public final class DataHelper { /** The size of the buffer we will use to deserialize larger streams */ private static final int BUFFER_SIZE = 1024 * 4; - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, DataHelper.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, DataHelper.class.getName() ); public static boolean isNClob(final Class type) { return java.sql.NClob.class.isAssignableFrom( type ); diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LobStreamDataHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LobStreamDataHelper.java index 581f1f7589..cb799ab411 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LobStreamDataHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LobStreamDataHelper.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; import java.io.StringReader; +import java.lang.invoke.MethodHandles; import java.sql.Clob; import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; @@ -33,7 +34,7 @@ public final class LobStreamDataHelper { /** The size of the buffer we will use to deserialize larger streams */ private static final int BUFFER_SIZE = 1024 * 4; - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, LobStreamDataHelper.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LobStreamDataHelper.class.getName() ); public static boolean isNClob(final Class type) { return java.sql.NClob.class.isAssignableFrom( type ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java index c7025cb4fc..d2f100b7d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java @@ -7,6 +7,7 @@ package org.hibernate.orm.test.annotations.formula; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.util.List; import org.hibernate.annotations.JoinColumnOrFormula; @@ -44,7 +45,7 @@ public class JoinFormulaManyToOneNotIgnoreLazyFetchingTest extends BaseEntityMan @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, ToOneBinder.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, ToOneBinder.class.getName() ) ); private final Triggerable triggerable = logInspection.watchForLogMessages( "HHH000491" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java index 83b30fc024..60d3106640 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java @@ -7,6 +7,7 @@ package org.hibernate.orm.test.annotations.formula; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.util.List; import org.hibernate.annotations.JoinColumnOrFormula; @@ -44,7 +45,7 @@ public class JoinFormulaOneToOneNotIgnoreLazyFetchingTest extends BaseEntityMana @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, ToOneBinder.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, ToOneBinder.class.getName() ) ); private final Triggerable triggerable = logInspection.watchForLogMessages( "HHH000491" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java index 303c8edbc0..2e872e180b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java @@ -7,6 +7,7 @@ package org.hibernate.orm.test.annotations.formula; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; @@ -46,7 +47,7 @@ public class ManyToManyNotIgnoreLazyFetchingTest extends BaseEntityManagerFuncti @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, AnnotationBinder.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, AnnotationBinder.class.getName() ) ); private Triggerable triggerable = logInspection.watchForLogMessages( "HHH000491" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java index 2ac4c0d88d..89129528e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableEntityUpdateQueryHandlingModeWarningTest.java @@ -18,9 +18,10 @@ import org.junit.Test; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; /** * @author Vlad Mihalcea @@ -30,7 +31,7 @@ public class ImmutableEntityUpdateQueryHandlingModeWarningTest extends BaseNonCo @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, SqmUpdateStatement.class.getName() ) ); + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, SqmUpdateStatement.class.getName() ) ); @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java index fc0923bfd9..192b8193a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/override/inheritance/EntityInheritanceAttributeOverrideTest.java @@ -24,6 +24,8 @@ import org.jboss.logging.Logger; import org.junit.Rule; import org.junit.jupiter.api.Test; +import java.lang.invoke.MethodHandles; + import static org.junit.jupiter.api.Assertions.fail; @@ -35,7 +37,7 @@ public class EntityInheritanceAttributeOverrideTest extends EntityManagerFactory @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, EntityBinder.class.getName() ) ); + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, EntityBinder.class.getName() ) ); @Override public Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java index 7224c1840e..66b9080de9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java @@ -26,6 +26,8 @@ import org.jboss.logging.Logger; import jakarta.persistence.PersistenceException; +import java.lang.invoke.MethodHandles; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -48,7 +50,7 @@ public class UniqueConstraintBatchingTest { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, SqlExceptionHelper.class.getName() ) ); + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, SqlExceptionHelper.class.getName() ) ); private Triggerable triggerable; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java index abddef229c..4399d05d2d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java @@ -20,6 +20,8 @@ import org.junit.Test; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -34,6 +36,7 @@ public class OrmVersion1SupportedTest extends BaseCoreFunctionalTestCase { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, "org.hibernate.internal.util.xml.ErrorLogger" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java index 70de7b20b9..02bf8327c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java @@ -10,6 +10,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.dialect.SimpleDatabaseVersion.ZERO_VERSION; import static org.junit.jupiter.api.Assertions.fail; +import java.lang.invoke.MethodHandles; import java.lang.reflect.Field; import java.util.stream.Stream; @@ -60,7 +61,7 @@ public class MetadataAccessTests { @RegisterExtension public LoggerInspectionExtension logger = LoggerInspectionExtension .builder().setLogger( - Logger.getMessageLogger( CoreMessageLogger.class, Dialect.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Dialect.class.getName() ) ).build(); @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java index af1cdfcab4..7986f5cb6e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java @@ -30,6 +30,8 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; +import java.lang.invoke.MethodHandles; + import static org.assertj.core.api.Assertions.assertThat; /** @@ -42,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class NoProxyFactoryTests extends BaseNonConfigCoreFunctionalTestCase { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, EntityRepresentationStrategyPojoStandard.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, EntityRepresentationStrategyPojoStandard.class.getName() ) ); /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java index 0daee371de..cc0205c5b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheAnnotationTest.java @@ -6,6 +6,7 @@ */ package org.hibernate.orm.test.cache; +import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Map; @@ -44,7 +45,7 @@ public class NonRootEntityWithCacheAnnotationTest { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, EntityBinder.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, EntityBinder.class.getName() ) ); @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java index b9a18bed8e..c682656887 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonRootEntityWithCacheableAnnotationTest.java @@ -6,6 +6,7 @@ */ package org.hibernate.orm.test.cache; +import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Map; @@ -45,7 +46,7 @@ public class NonRootEntityWithCacheableAnnotationTest { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, EntityBinder.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, EntityBinder.class.getName() ) ); @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectMinimumVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectMinimumVersionTest.java index 96ae9c0b80..a87d5f7c0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectMinimumVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectMinimumVersionTest.java @@ -21,6 +21,8 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * @author Jan Schatteman */ @@ -31,7 +33,7 @@ public class DialectMinimumVersionTest { @RegisterExtension public LoggerInspectionExtension logger = LoggerInspectionExtension .builder().setLogger( - Logger.getMessageLogger( CoreMessageLogger.class, Dialect.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Dialect.class.getName() ) ).build(); @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java index 8ff08a01e2..ed9f49584d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java @@ -21,6 +21,8 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -34,7 +36,7 @@ public class CockroachDialectVersionTest { @RegisterExtension public LoggerInspectionExtension logger = LoggerInspectionExtension .builder().setLogger( - Logger.getMessageLogger( CoreMessageLogger.class, CockroachDialect.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, CockroachDialect.class.getName() ) ).build(); @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java index 06cc07f1a0..2a6898ef67 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java @@ -7,6 +7,7 @@ package org.hibernate.orm.test.id.hhh12973; import java.io.StringReader; +import java.lang.invoke.MethodHandles; import java.sql.Statement; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; @@ -53,6 +54,7 @@ public class PostgreSQLSequenceGeneratorWithSerialTest extends EntityManagerFact @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, SequenceStyleGenerator.class.getName() ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java index f010b81efb..15a8301ba3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyFixWithSequenceGeneratorTest.java @@ -6,6 +6,7 @@ */ package org.hibernate.orm.test.id.hhh12973; +import java.lang.invoke.MethodHandles; import java.util.EnumSet; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; @@ -53,6 +54,7 @@ public class SequenceMismatchStrategyFixWithSequenceGeneratorTest extends Entity @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, SequenceStyleGenerator.class.getName() ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java index 7dd718362f..c0791bde46 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java @@ -6,6 +6,7 @@ */ package org.hibernate.orm.test.id.hhh12973; +import java.lang.invoke.MethodHandles; import java.util.EnumSet; import java.util.Map; import jakarta.persistence.Entity; @@ -51,6 +52,7 @@ public class SequenceMismatchStrategyLogTest extends EntityManagerFactoryBasedFu @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, SequenceStyleGenerator.class.getName() ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java index 636f289d2c..66067c8338 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyWithoutSequenceGeneratorTest.java @@ -6,6 +6,7 @@ */ package org.hibernate.orm.test.id.hhh12973; +import java.lang.invoke.MethodHandles; import java.util.EnumSet; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; @@ -52,6 +53,7 @@ public class SequenceMismatchStrategyWithoutSequenceGeneratorTest extends Entity @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, SequenceStyleGenerator.class.getName() ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java index ef832c59e9..c0631e7bc4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java @@ -35,6 +35,8 @@ import org.junit.jupiter.api.Test; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -46,7 +48,7 @@ public class NegativeValueSequenceTest { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, SequenceStyleGenerator.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, SequenceStyleGenerator.class.getName() ) ); @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java index 2bd4b372ad..997c130b2c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorTest.java @@ -34,6 +34,8 @@ import org.junit.jupiter.api.Test; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -46,9 +48,9 @@ public class PrivateConstructorTest { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, - proxyFactoryClass() - .getName() + proxyFactoryClass().getName() ) ); @AfterEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java index 08a91822ac..caf7edcb53 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java @@ -7,6 +7,7 @@ package org.hibernate.orm.test.jpa.persistenceunit; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.Arrays; import java.util.Collections; @@ -44,7 +45,7 @@ public class DuplicatePersistenceUnitNameTest extends BaseUnitTestCase { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, PersistenceXmlParser.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, PersistenceXmlParser.class.getName() ) ); @Before diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java index d306c34e54..5cd8c627db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/PersistenceXmlParserTest.java @@ -10,6 +10,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.internal.util.ConfigHelper.findAsResource; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.Arrays; import java.util.Collections; @@ -39,7 +40,7 @@ public class PersistenceXmlParserTest { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, PersistenceXmlParser.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, PersistenceXmlParser.class.getName() ) ); @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java index b9da8efe4b..0febf85f8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarmingTest.java @@ -7,6 +7,7 @@ package org.hibernate.orm.test.locking.warning; import java.io.Serializable; +import java.lang.invoke.MethodHandles; import java.util.HashSet; import java.util.Set; import jakarta.persistence.Column; @@ -46,7 +47,7 @@ public class LockNoneWarmingTest extends BaseCoreFunctionalTestCase { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, LockNoneWarmingTest.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LockNoneWarmingTest.class.getName() ) ); @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java index 046963631c..f499851639 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/EnumTypeTest.java @@ -26,6 +26,8 @@ import org.junit.Test; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -37,12 +39,14 @@ public class EnumTypeTest extends BaseCoreFunctionalTestCase { @Rule public LoggerInspectionRule binderLogInspection = new LoggerInspectionRule( Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, JdbcBindingLogging.NAME ) ); @Rule public LoggerInspectionRule extractorLogInspection = new LoggerInspectionRule( Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, JdbcExtractingLogging.NAME ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java index adace835e7..3933ad3a2c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateIdentityTest.java @@ -6,6 +6,7 @@ */ package org.hibernate.orm.test.mapping.generated.delegate; +import java.lang.invoke.MethodHandles; import java.util.Date; import org.hibernate.annotations.ColumnDefault; @@ -253,7 +254,7 @@ public class MutationDelegateIdentityTest { @RegisterExtension public LoggerInspectionExtension logger = LoggerInspectionExtension.builder().setLogger( - Logger.getMessageLogger( CoreMessageLogger.class, SqlExceptionHelper.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, SqlExceptionHelper.class.getName() ) ).build(); @BeforeAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java index 30e7280ef5..f259d120a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/MutationDelegateStatementReleaseTest.java @@ -6,6 +6,7 @@ */ package org.hibernate.orm.test.mapping.generated.delegate; +import java.lang.invoke.MethodHandles; import java.util.Date; import java.util.Set; @@ -65,6 +66,7 @@ public class MutationDelegateStatementReleaseTest { LogInspectionHelper.registerListener( trigger, Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, ResourceRegistryStandardImpl.class.getName() ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java index 7b8859ebe2..e80ac24802 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneMapsIdChangeParentTest.java @@ -24,6 +24,8 @@ import org.junit.jupiter.api.Test; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -42,6 +44,7 @@ public class OneToOneMapsIdChangeParentTest { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, UpdateCoordinatorStandard.class.getName() ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java index 9d32d19737..bd51dab686 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/TemporaryTableStrategyTest.java @@ -6,6 +6,7 @@ */ package org.hibernate.orm.test.persister.entity; +import java.lang.invoke.MethodHandles; import java.util.Set; import org.hibernate.dialect.OracleDialect; @@ -51,7 +52,7 @@ public class TemporaryTableStrategyTest { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, GlobalTemporaryTableStrategy.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, GlobalTemporaryTableStrategy.class.getName() ) ); private final Triggerable triggerable = logInspection.watchForLogMessages( Set.of( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java index 79cb5505b2..9bf7313afc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DynamicMapInstantiationTest.java @@ -23,6 +23,8 @@ import jakarta.persistence.Id; import jakarta.persistence.Query; import jakarta.persistence.Table; +import java.lang.invoke.MethodHandles; + @DomainModel( annotatedClasses = { DynamicMapInstantiationTest.Parent.class @@ -37,7 +39,7 @@ public class DynamicMapInstantiationTest { @RegisterExtension public LoggerInspectionExtension logger = LoggerInspectionExtension .builder().setLogger( - Logger.getMessageLogger( CoreMessageLogger.class, SqmDynamicInstantiation.class.getName() ) + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, SqmDynamicInstantiation.class.getName() ) ).build(); @BeforeEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java index 87f9ae650c..8cf7756dac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java @@ -2,6 +2,7 @@ package org.hibernate.orm.test.schemaupdate; import static org.junit.Assert.assertFalse; +import java.lang.invoke.MethodHandles; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -28,7 +29,7 @@ public class Hbm2ddlCreateOnlyTest { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( - CoreMessageLogger.class, SessionFactoryOptionsBuilder.class.getName() ) ); + MethodHandles.lookup(), CoreMessageLogger.class, SessionFactoryOptionsBuilder.class.getName() ) ); @SuppressWarnings({ "rawtypes", "unchecked" }) @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java index 272b62f5fe..0732711b1f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java @@ -28,6 +28,8 @@ import org.junit.jupiter.api.Test; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -42,7 +44,7 @@ public class AssociateEntityWithTwoSessionsTest { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, AbstractLazyInitializer.class.getName() ) ); + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, AbstractLazyInitializer.class.getName() ) ); @Test @TestForIssue( jiraKey = "HHH-12216" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java index 23233884e4..cb8bc8a8ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionConnectionTest.java @@ -22,6 +22,8 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + import static org.junit.jupiter.api.Assertions.assertFalse; @@ -35,6 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; public class StatelessSessionConnectionTest { final CoreMessageLogger messageLogger = Logger.getMessageLogger( + MethodHandles.lookup(), CoreMessageLogger.class, SequenceStyleGenerator.class.getName() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java index 1a9f3b1f11..2864d5dfa6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java @@ -8,6 +8,7 @@ package org.hibernate.orm.test.tool.schema; import java.io.FileInputStream; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.sql.Connection; import java.sql.SQLException; @@ -69,7 +70,7 @@ public class IndividuallySchemaValidatorImplConnectionTest extends BaseUnitTestC @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, IndividuallySchemaValidatorImplConnectionTest.class.getName() ) ); + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, IndividuallySchemaValidatorImplConnectionTest.class.getName() ) ); private StandardServiceRegistry ssr; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java index dfb7a60abf..7a5915bccf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java @@ -8,6 +8,7 @@ package org.hibernate.orm.test.tool.schema; import java.io.FileInputStream; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.HashMap; import java.util.Map; @@ -67,7 +68,7 @@ public class IndividuallySchemaValidatorImplTest extends BaseUnitTestCase { @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, IndividuallySchemaValidatorImplTest.class.getName() ) ); + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, IndividuallySchemaValidatorImplTest.class.getName() ) ); private StandardServiceRegistry ssr; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java index 7f66e42775..35a708e964 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java @@ -6,6 +6,7 @@ */ package org.hibernate.orm.test.tool.schema; +import java.lang.invoke.MethodHandles; import java.util.Map; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -35,7 +36,7 @@ public class JtaPlatformLoggingTest extends BaseNonConfigCoreFunctionalTestCase @Rule public LoggerInspectionRule logInspection = new LoggerInspectionRule( - Logger.getMessageLogger( CoreMessageLogger.class, JtaPlatformInitiator.class.getName() ) ); + Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, JtaPlatformInitiator.class.getName() ) ); private Triggerable triggerable = logInspection.watchForLogMessages( "HHH000490" ); 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 cdce0dcbc3..ee867af006 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 @@ -15,6 +15,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.INFO; /** @@ -31,6 +33,7 @@ public interface EnversBootLogger extends BasicLogger { String LOGGER_NAME = "org.hibernate.envers.boot"; EnversBootLogger BOOT_LOGGER = Logger.getMessageLogger( + MethodHandles.lookup(), EnversBootLogger.class, LOGGER_NAME ); 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 a108be43a1..4fb2ac4b2d 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 @@ -6,6 +6,7 @@ */ package org.hibernate.envers.configuration.internal; +import java.lang.invoke.MethodHandles; import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; @@ -37,6 +38,7 @@ import org.jboss.logging.Logger; */ public class ClassesAuditingData { private static final EnversMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), EnversMessageLogger.class, ClassesAuditingData.class.getName() ); 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 22fecf2b8b..4abe393434 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 @@ -6,6 +6,7 @@ */ package org.hibernate.envers.configuration.internal.metadata; +import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Iterator; import java.util.Locale; @@ -51,6 +52,7 @@ import org.jboss.logging.Logger; public final class AuditMetadataGenerator extends AbstractMetadataGenerator { private static final EnversMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), EnversMessageLogger.class, AuditMetadataGenerator.class.getName() ); 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 e779c9b92a..a6412e9d59 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 @@ -6,6 +6,7 @@ */ package org.hibernate.envers.configuration.internal.metadata; +import java.lang.invoke.MethodHandles; import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -35,6 +36,7 @@ import org.jboss.logging.Logger; public class CollectionMappedByResolver { private static final EnversMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), EnversMessageLogger.class, CollectionMappedByResolver.class.getName() ); 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 ce11bc7662..4b9802149c 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 @@ -31,6 +31,8 @@ import org.hibernate.type.Type; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * An implementation of {@link AbstractCollectionMetadataGenerator} that builds collection metadata * and association mappings where the association uses a join column mapping. @@ -40,6 +42,7 @@ import org.jboss.logging.Logger; public class JoinColumnCollectionMetadataGenerator extends AbstractCollectionMetadataGenerator { private static final EnversMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), EnversMessageLogger.class, JoinColumnCollectionMetadataGenerator.class.getName() ); 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 95ebb85471..c44f04ca3b 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 @@ -27,6 +27,8 @@ import org.hibernate.mapping.PersistentClass; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * An implementation of {@link AbstractCollectionMetadataGenerator} that builds collection metadata * and association mappings where the association uses a middle table mapping. @@ -36,6 +38,7 @@ import org.jboss.logging.Logger; public class MiddleTableCollectionMetadataGenerator extends AbstractCollectionMetadataGenerator { private static final EnversMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), EnversMessageLogger.class, MiddleTableCollectionMetadataGenerator.class.getName() ); 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 c94dcc2e10..f1e420ad25 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 @@ -8,6 +8,8 @@ package org.hibernate.envers.internal; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * Sad when you need helpers for generating loggers... * @@ -25,7 +27,7 @@ public class EnversLogging { } public static EnversMessageLogger messageLogger(String loggerName) { - return Logger.getMessageLogger( EnversMessageLogger .class, loggerName ); + return Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger .class, loggerName ); } 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 673d51716d..f4b5c70a91 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 @@ -6,6 +6,7 @@ */ package org.hibernate.envers.internal.reader; +import java.lang.invoke.MethodHandles; import java.util.Map; import org.hibernate.envers.internal.EnversMessageLogger; @@ -25,6 +26,7 @@ import static org.hibernate.envers.internal.tools.Triple.make; */ public class FirstLevelCache { private static final EnversMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), EnversMessageLogger.class, FirstLevelCache.class.getName() ); diff --git a/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java b/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java index a8e264f2bc..a51e1464a1 100644 --- a/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java +++ b/hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java @@ -15,6 +15,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.DEBUG; /** @@ -31,7 +33,7 @@ import static org.jboss.logging.Logger.Level.DEBUG; ) public interface ProxoolMessageLogger extends ConnectionInfoLogger { String LOGGER_NAME = ConnectionInfoLogger.LOGGER_NAME + ".proxool"; - ProxoolMessageLogger PROXOOL_MESSAGE_LOGGER = Logger.getMessageLogger( ProxoolMessageLogger.class, LOGGER_NAME ); + ProxoolMessageLogger PROXOOL_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ProxoolMessageLogger.class, LOGGER_NAME ); /** * Logs the name of a named pool to be used for configuration information 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 5710912993..fd3d890cea 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java @@ -16,6 +16,8 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.ValidIdRange; +import java.lang.invoke.MethodHandles; + import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.INFO; @@ -35,7 +37,7 @@ public interface HSMessageLogger extends BasicLogger { String LOGGER_NAME = "org.hibernate.spatial"; - HSMessageLogger SPATIAL_MSG_LOGGER = Logger.getMessageLogger( HSMessageLogger.class, LOGGER_NAME ); + HSMessageLogger SPATIAL_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), HSMessageLogger.class, LOGGER_NAME ); @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 701d348dcf..49fcda7d1e 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 @@ -11,6 +11,7 @@ package org.hibernate.spatial.dialect.h2gis; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.lang.invoke.MethodHandles; import java.sql.Blob; import org.hibernate.HibernateException; @@ -43,6 +44,7 @@ import org.geolatte.geom.jts.JTS; public class H2GISWkb { private static final HSMessageLogger LOGGER = Logger.getMessageLogger( + MethodHandles.lookup(), HSMessageLogger.class, H2GISWkb.class.getName() ); 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 fc74e5b40b..acfee7f22d 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 @@ -13,6 +13,8 @@ import org.hibernate.spatial.HSMessageLogger; import org.jboss.logging.Logger; +import java.lang.invoke.MethodHandles; + /** * Central service for spatial integration * @@ -27,6 +29,7 @@ public class SpatialService implements Service { public static final String INTEGRATION_ENABLED = "hibernate.integration.spatial.enabled"; private static final HSMessageLogger log = Logger.getMessageLogger( + MethodHandles.lookup(), HSMessageLogger.class, SpatialService.class.getName() ); 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 ec6c9d5a05..eea1977e83 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 @@ -7,6 +7,7 @@ package org.hibernate.spatial.dialect.hana; +import java.lang.invoke.MethodHandles; import java.sql.SQLException; import java.util.HashMap; import java.util.Locale; @@ -39,6 +40,7 @@ import static java.lang.String.format; public class TestHANASpatialFunctions extends SpatialFunctionalTestCase { private static final HSMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), HSMessageLogger.class, TestHANASpatialFunctions.class.getName() ); 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 314e4d5a0e..d7313e36d6 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 @@ -7,6 +7,7 @@ package org.hibernate.spatial.testing; +import java.lang.invoke.MethodHandles; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -43,6 +44,7 @@ public abstract class AbstractExpectationsFactory { public final static int BOOLEAN = 5; public final static int OBJECT = -1; private static final HSMessageLogger LOG = Logger.getMessageLogger( + MethodHandles.lookup(), HSMessageLogger.class, AbstractExpectationsFactory.class.getName() ); 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 2c0a6cf863..f4aa1e7bac 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 @@ -14,6 +14,8 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; +import java.lang.invoke.MethodHandles; + /** * Example usage for the JUnit rule to assert logging events * @@ -24,12 +26,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( CoreMessageLogger.class, SessionImpl.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, SessionImpl.class.getName() ); //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( CoreMessageLogger.class, SessionImpl.class.getName() ) ); + public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, SessionImpl.class.getName() ) ); @Test public void testRule() { diff --git a/settings.gradle b/settings.gradle index 824f4ee64b..2fe3990d23 100644 --- a/settings.gradle +++ b/settings.gradle @@ -80,7 +80,7 @@ dependencyResolutionManagement { def jandexVersion = version "jandex", "3.2.0" def hcannVersion = version "hcann", "7.0.1.Final" def jacksonVersion = version "jackson", "2.17.0" - def jbossLoggingVersion = version "jbossLogging", "3.5.0.Final" + def jbossLoggingVersion = version "jbossLogging", "3.6.0.Final" def jbossLoggingToolVersion = version "jbossLoggingTool", "3.0.1.Final" def agroalVersion = version "agroal", "2.0" diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java index 5fa206bf84..6e30a716b3 100644 --- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java +++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java @@ -6,6 +6,7 @@ */ package org.hibernate.tool.hbm2ddl; +import java.lang.invoke.MethodHandles; import java.sql.Connection; import java.sql.SQLException; import java.sql.SQLWarning; @@ -25,7 +26,7 @@ import org.jboss.logging.Logger; */ @Deprecated class DatabaseExporter implements Exporter { - private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, DatabaseExporter.class.getName() ); + private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, DatabaseExporter.class.getName() ); private final ConnectionHelper connectionHelper; private final SqlExceptionHelper sqlExceptionHelper;