Skip to content

Commit a961a48

Browse files
gavinkinggavinking
committed
use existing helper method to obtain CoreMessageLogger
1 parent 0df7b6f commit a961a48

File tree

44 files changed

+89
-205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+89
-205
lines changed

‎hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55
package org.hibernate.boot.beanvalidation;
66

7-
import java.lang.invoke.MethodHandles;
87
import java.util.HashSet;
98
import java.util.Map;
109
import java.util.Set;
@@ -24,12 +23,11 @@
2423
import org.hibernate.event.spi.PreUpdateEventListener;
2524
import org.hibernate.event.spi.PreUpsertEvent;
2625
import org.hibernate.event.spi.PreUpsertEventListener;
26+
import org.hibernate.internal.CoreLogging;
2727
import org.hibernate.internal.CoreMessageLogger;
2828
import org.hibernate.metamodel.RepresentationMode;
2929
import org.hibernate.persister.entity.EntityPersister;
3030

31-
import org.jboss.logging.Logger;
32-
3331
import jakarta.validation.ConstraintViolation;
3432
import jakarta.validation.ConstraintViolationException;
3533
import jakarta.validation.Validator;
@@ -49,11 +47,7 @@ public class BeanValidationEventListener
4947
implements PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener, PreUpsertEventListener, PreCollectionUpdateEventListener,
5048
SessionFactoryObserver {
5149

52-
private static final CoreMessageLogger log = Logger.getMessageLogger(
53-
MethodHandles.lookup(),
54-
CoreMessageLogger.class,
55-
BeanValidationEventListener.class.getName()
56-
);
50+
private static final CoreMessageLogger log = CoreLogging.messageLogger( BeanValidationEventListener.class );
5751

5852
private final HibernateTraversableResolver traversableResolver;
5953
private final Validator validator;

‎hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationIntegrator.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55
package org.hibernate.boot.beanvalidation;
66

7-
import java.lang.invoke.MethodHandles;
87
import java.lang.reflect.InvocationTargetException;
98
import java.lang.reflect.Method;
109
import java.util.Set;
@@ -16,24 +15,19 @@
1615
import org.hibernate.engine.config.spi.ConfigurationService;
1716
import org.hibernate.engine.spi.SessionFactoryImplementor;
1817
import org.hibernate.integrator.spi.Integrator;
18+
import org.hibernate.internal.CoreLogging;
1919
import org.hibernate.internal.CoreMessageLogger;
2020
import org.hibernate.service.spi.ServiceRegistryImplementor;
2121
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
2222

23-
import org.jboss.logging.Logger;
24-
2523
/**
2624
* In {@link Integrator} for Bean Validation.
2725
*
2826
* @author Steve Ebersole
2927
*/
3028
public class BeanValidationIntegrator implements Integrator {
3129

32-
private static final CoreMessageLogger log = Logger.getMessageLogger(
33-
MethodHandles.lookup(),
34-
CoreMessageLogger.class,
35-
BeanValidationIntegrator.class.getName()
36-
);
30+
private static final CoreMessageLogger log = CoreLogging.messageLogger( BeanValidationIntegrator.class );
3731

3832
public static final String APPLY_CONSTRAINTS = "hibernate.validator.apply_to_ddl";
3933

‎hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.lang.annotation.Annotation;
88
import java.lang.reflect.InvocationTargetException;
99
import java.lang.reflect.Method;
10-
import java.lang.invoke.MethodHandles;
1110
import java.util.Collection;
1211
import java.util.HashMap;
1312
import java.util.HashSet;
@@ -36,6 +35,7 @@
3635
import org.hibernate.engine.spi.SessionFactoryImplementor;
3736
import org.hibernate.event.service.spi.EventListenerRegistry;
3837
import org.hibernate.event.spi.EventType;
38+
import org.hibernate.internal.CoreLogging;
3939
import org.hibernate.internal.CoreMessageLogger;
4040
import org.hibernate.mapping.CheckConstraint;
4141
import org.hibernate.mapping.Column;
@@ -46,7 +46,6 @@
4646
import org.hibernate.mapping.SingleTableSubclass;
4747

4848
import org.hibernate.service.spi.SessionFactoryServiceRegistry;
49-
import org.jboss.logging.Logger;
5049

5150
import jakarta.validation.Validation;
5251
import jakarta.validation.ValidatorFactory;
@@ -73,7 +72,7 @@
7372
*/
7473
class TypeSafeActivator {
7574

76-
private static final CoreMessageLogger log = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, TypeSafeActivator.class.getName() );
75+
private static final CoreMessageLogger log = CoreLogging.messageLogger( TypeSafeActivator.class );
7776

7877
/**
7978
* Used to validate a supplied ValidatorFactory instance as being castable to ValidatorFactory.

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,15 +1144,15 @@ private void detectMappedByProblem(boolean isMappedBy) {
11441144
if ( oneToMany ) {
11451145
if ( property.hasDirectAnnotationUsage( MapKeyColumn.class ) ) {
11461146
log.warn( "Association '"
1147-
+ qualify( propertyHolder.getPath(), propertyName )
1148-
+ "' is 'mappedBy' another entity and should not specify a '@MapKeyColumn'"
1149-
+ " (use '@MapKey' instead)" );
1147+
+ qualify( propertyHolder.getPath(), propertyName )
1148+
+ "' is 'mappedBy' another entity and should not specify a '@MapKeyColumn'"
1149+
+ " (use '@MapKey' instead)" );
11501150
}
11511151
if ( property.hasDirectAnnotationUsage( OrderColumn.class ) ) {
11521152
log.warn( "Association '"
1153-
+ qualify( propertyHolder.getPath(), propertyName )
1154-
+ "' is 'mappedBy' another entity and should not specify an '@OrderColumn'"
1155-
+ " (use '@OrderBy' instead)" );
1153+
+ qualify( propertyHolder.getPath(), propertyName )
1154+
+ "' is 'mappedBy' another entity and should not specify an '@OrderColumn'"
1155+
+ " (use '@OrderBy' instead)" );
11561156
}
11571157
}
11581158
else {

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
public class EntityBinder {
135135

136136
private static final CoreMessageLogger log = messageLogger( EntityBinder.class );
137-
137+
138138
private static final String NATURAL_ID_CACHE_SUFFIX = "##NaturalId";
139139

140140
private final MetadataBuildingContext context;
@@ -1030,7 +1030,7 @@ private boolean useDiscriminatorColumnForJoined(DiscriminatorColumn discriminato
10301030
if ( ignore ) {
10311031
if ( log.isTraceEnabled() ) {
10321032
log.trace( "Ignoring explicit @DiscriminatorColumn annotation on: "
1033-
+ annotatedClass.getName() );
1033+
+ annotatedClass.getName() );
10341034
}
10351035
}
10361036
return !ignore;
@@ -1040,7 +1040,7 @@ private boolean useDiscriminatorColumnForJoined(DiscriminatorColumn discriminato
10401040
if ( createImplicit ) {
10411041
if ( log.isTraceEnabled() ) {
10421042
log.trace( "Inferring implicit @DiscriminatorColumn using defaults for: "
1043-
+ annotatedClass.getName() );
1043+
+ annotatedClass.getName() );
10441044
}
10451045
}
10461046
return createImplicit;

‎hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55
package org.hibernate.context.internal;
66

7-
import java.lang.invoke.MethodHandles;
87
import java.util.Map;
98
import java.util.concurrent.ConcurrentHashMap;
109
import jakarta.transaction.Synchronization;
@@ -18,10 +17,10 @@
1817
import org.hibernate.engine.spi.SessionFactoryImplementor;
1918
import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
2019
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
20+
import org.hibernate.internal.CoreLogging;
2121
import org.hibernate.internal.CoreMessageLogger;
2222

2323
import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
24-
import org.jboss.logging.Logger;
2524

2625
/**
2726
* An implementation of {@link org.hibernate.context.spi.CurrentSessionContext} which scopes the notion
@@ -45,11 +44,7 @@
4544
*/
4645
public class JTASessionContext extends AbstractCurrentSessionContext {
4746

48-
private static final CoreMessageLogger log = Logger.getMessageLogger(
49-
MethodHandles.lookup(),
50-
CoreMessageLogger.class,
51-
JTASessionContext.class.getName()
52-
);
47+
private static final CoreMessageLogger log = CoreLogging.messageLogger( JTASessionContext.class );
5348

5449
private transient final Map<Object, Session> currentSessionMap = new ConcurrentHashMap<>();
5550

‎hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import java.io.ObjectOutputStream;
1010
import java.io.Serial;
1111
import java.io.Serializable;
12-
import java.lang.invoke.MethodHandles;
1312
import java.lang.reflect.InvocationHandler;
1413
import java.lang.reflect.InvocationTargetException;
1514
import java.lang.reflect.Method;
@@ -29,12 +28,11 @@
2928
import org.hibernate.engine.spi.SessionFactoryImplementor;
3029
import org.hibernate.engine.spi.SessionImplementor;
3130
import org.hibernate.event.spi.EventSource;
31+
import org.hibernate.internal.CoreLogging;
3232
import org.hibernate.internal.CoreMessageLogger;
3333
import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
3434
import org.hibernate.resource.transaction.spi.TransactionStatus;
3535

36-
import org.jboss.logging.Logger;
37-
3836
/**
3937
* A {@link org.hibernate.context.spi.CurrentSessionContext} impl which scopes the notion of current
4038
* session by the current thread of execution. Unlike the JTA counterpart, threads do not give us a nice
@@ -60,11 +58,7 @@
6058
*/
6159
public class ThreadLocalSessionContext extends AbstractCurrentSessionContext {
6260

63-
private static final CoreMessageLogger log = Logger.getMessageLogger(
64-
MethodHandles.lookup(),
65-
CoreMessageLogger.class,
66-
ThreadLocalSessionContext.class.getName()
67-
);
61+
private static final CoreMessageLogger log = CoreLogging.messageLogger( ThreadLocalSessionContext.class );
6862

6963
private static final Class<?>[] SESSION_PROXY_INTERFACES = new Class<?>[] {
7064
Session.class,

‎hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
8181
import org.hibernate.exception.spi.SQLExceptionConverter;
8282
import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
83+
import org.hibernate.internal.CoreLogging;
8384
import org.hibernate.internal.CoreMessageLogger;
8485
import org.hibernate.internal.util.collections.ArrayHelper;
8586
import org.hibernate.loader.ast.spi.MultiKeyLoadSizingStrategy;
@@ -173,13 +174,11 @@
173174
import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
174175
import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
175176
import org.hibernate.type.spi.TypeConfiguration;
176-
import org.jboss.logging.Logger;
177177

178178
import java.io.IOException;
179179
import java.io.InputStream;
180180
import java.io.OutputStream;
181181
import java.io.Reader;
182-
import java.lang.invoke.MethodHandles;
183182
import java.sql.Blob;
184183
import java.sql.CallableStatement;
185184
import java.sql.Clob;
@@ -339,7 +338,7 @@ public abstract class Dialect implements ConversionContext, TypeContributor, Fun
339338
"^\\s*(select\\b.+?\\bfrom\\b.+?)(\\b(?:natural )?(?:left |right |full )?(?:inner |outer |cross )?join.+?\\b)?(\\bwhere\\b.+?)$",
340339
Pattern.CASE_INSENSITIVE);
341340

342-
private static final CoreMessageLogger log = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Dialect.class.getName() );
341+
private static final CoreMessageLogger log = CoreLogging.messageLogger( Dialect.class );
343342

344343
//needed for converting precision from decimal to binary digits
345344
protected static final double LOG_BASE2OF10 = log(10)/log(2);

‎hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55
package org.hibernate.dialect.lock;
66

7-
import java.lang.invoke.MethodHandles;
87
import java.sql.PreparedStatement;
98
import java.sql.SQLException;
109

@@ -15,13 +14,13 @@
1514
import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
1615
import org.hibernate.engine.spi.SessionFactoryImplementor;
1716
import org.hibernate.engine.spi.SharedSessionContractImplementor;
17+
import org.hibernate.internal.CoreLogging;
1818
import org.hibernate.internal.CoreMessageLogger;
1919
import org.hibernate.persister.entity.EntityPersister;
2020
import org.hibernate.pretty.MessageHelper;
2121
import org.hibernate.sql.Update;
2222
import org.hibernate.stat.spi.StatisticsImplementor;
2323

24-
import org.jboss.logging.Logger;
2524

2625
/**
2726
* A pessimistic locking strategy where a lock is obtained via
@@ -37,11 +36,7 @@
3736
*/
3837
public class PessimisticReadUpdateLockingStrategy implements LockingStrategy {
3938

40-
private static final CoreMessageLogger log = Logger.getMessageLogger(
41-
MethodHandles.lookup(),
42-
CoreMessageLogger.class,
43-
PessimisticReadUpdateLockingStrategy.class.getName()
44-
);
39+
private static final CoreMessageLogger log = CoreLogging.messageLogger( PessimisticReadUpdateLockingStrategy.class );
4540

4641
private final EntityPersister lockable;
4742
private final LockMode lockMode;

‎hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55
package org.hibernate.dialect.lock;
66

7-
import java.lang.invoke.MethodHandles;
87
import java.sql.PreparedStatement;
98
import java.sql.SQLException;
109

@@ -15,13 +14,13 @@
1514
import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
1615
import org.hibernate.engine.spi.SessionFactoryImplementor;
1716
import org.hibernate.engine.spi.SharedSessionContractImplementor;
17+
import org.hibernate.internal.CoreLogging;
1818
import org.hibernate.internal.CoreMessageLogger;
1919
import org.hibernate.persister.entity.EntityPersister;
2020
import org.hibernate.pretty.MessageHelper;
2121
import org.hibernate.sql.Update;
2222
import org.hibernate.stat.spi.StatisticsImplementor;
2323

24-
import org.jboss.logging.Logger;
2524

2625
/**
2726
* A pessimistic locking strategy where a lock is obtained via
@@ -37,11 +36,7 @@
3736
*/
3837
public class PessimisticWriteUpdateLockingStrategy implements LockingStrategy {
3938

40-
private static final CoreMessageLogger log = Logger.getMessageLogger(
41-
MethodHandles.lookup(),
42-
CoreMessageLogger.class,
43-
PessimisticWriteUpdateLockingStrategy.class.getName()
44-
);
39+
private static final CoreMessageLogger log = CoreLogging.messageLogger( PessimisticWriteUpdateLockingStrategy.class );
4540

4641
private final EntityPersister lockable;
4742
private final LockMode lockMode;

0 commit comments

Comments
 (0)