Skip to content

Commit 28988a9

Browse files
marko-bekhtasebersole
authored andcommitted
HHH-18488 Bump the jboss logging dependency
1 parent e87a64d commit 28988a9

File tree

130 files changed

+316
-85
lines changed

Some content is hidden

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

130 files changed

+316
-85
lines changed

hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import org.jboss.logging.annotations.MessageLogger;
1616
import org.jboss.logging.annotations.ValidIdRange;
1717

18+
import java.lang.invoke.MethodHandles;
19+
1820
import static org.jboss.logging.Logger.Level.WARN;
1921

2022
/**
@@ -32,7 +34,7 @@
3234
public interface C3P0MessageLogger extends ConnectionInfoLogger {
3335
String NAME = ConnectionInfoLogger.LOGGER_NAME + ".c3p0";
3436

35-
C3P0MessageLogger C3P0_MSG_LOGGER = Logger.getMessageLogger( C3P0MessageLogger.class, NAME );
37+
C3P0MessageLogger C3P0_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), C3P0MessageLogger.class, NAME );
3638

3739
/**
3840
* Log a message (WARN) about conflicting {@code hibernate.c3p0.XYZ} and {@code c3p0.XYZ} settings

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
package org.hibernate.community.dialect;
88

9+
import java.lang.invoke.MethodHandles;
910
import java.sql.DatabaseMetaData;
1011
import java.sql.ResultSet;
1112
import java.sql.SQLException;
@@ -120,7 +121,7 @@
120121
*/
121122
public class CockroachLegacyDialect extends Dialect {
122123

123-
private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, CockroachLegacyDialect.class.getName() );
124+
private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, CockroachLegacyDialect.class.getName() );
124125
// KNOWN LIMITATIONS:
125126
// * no support for java.sql.Clob
126127

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
package org.hibernate.community.dialect;
88

9+
import java.lang.invoke.MethodHandles;
910
import java.sql.DatabaseMetaData;
1011
import java.sql.SQLException;
1112
import java.sql.Types;
@@ -95,6 +96,7 @@
9596
*/
9697
public class HSQLLegacyDialect extends Dialect {
9798
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
99+
MethodHandles.lookup(),
98100
CoreMessageLogger.class,
99101
org.hibernate.community.dialect.HSQLLegacyDialect.class.getName()
100102
);

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
package org.hibernate.community.dialect;
88

9+
import java.lang.invoke.MethodHandles;
910
import java.sql.Types;
1011

1112
import org.hibernate.LockMode;
@@ -81,6 +82,7 @@
8182
*/
8283
public class RDMSOS2200Dialect extends Dialect {
8384
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
85+
MethodHandles.lookup(),
8486
CoreMessageLogger.class,
8587
RDMSOS2200Dialect.class.getName()
8688
);

hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
import org.jboss.logging.Logger;
1212

13+
import java.lang.invoke.MethodHandles;
14+
1315
/**
1416
* Indicates an attempt to access unfetched data outside the context
1517
* of an open stateful {@link Session}.
@@ -24,6 +26,7 @@
2426
public class LazyInitializationException extends HibernateException {
2527

2628
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
29+
MethodHandles.lookup(),
2730
CoreMessageLogger.class,
2831
LazyInitializationException.class.getName()
2932
);

hibernate-core/src/main/java/org/hibernate/Version.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
import org.jboss.logging.Logger;
1313

14+
import java.lang.invoke.MethodHandles;
15+
1416
/**
1517
* Information about the version of Hibernate.
1618
*
@@ -41,7 +43,7 @@ public static String getVersionString() {
4143
* Logs the Hibernate version (using {@link #getVersionString()}) to the logging system.
4244
*/
4345
public static void logVersion() {
44-
Logger.getMessageLogger( CoreMessageLogger.class, Version.class.getName() ).version( getVersionString() );
46+
Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, Version.class.getName() ).version( getVersionString() );
4547
}
4648

4749
/**

hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.io.IOException;
1010
import java.io.ObjectInputStream;
1111
import java.io.ObjectOutputStream;
12+
import java.lang.invoke.MethodHandles;
1213
import java.util.IdentityHashMap;
1314
import java.util.Map;
1415
import java.util.Set;
@@ -45,8 +46,9 @@
4546
*/
4647
public class UnresolvedEntityInsertActions {
4748
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
48-
CoreMessageLogger.class,
49-
UnresolvedEntityInsertActions.class.getName()
49+
MethodHandles.lookup(),
50+
CoreMessageLogger.class,
51+
UnresolvedEntityInsertActions.class.getName()
5052
);
5153

5254
private static final int INIT_SIZE = 5;

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

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

9+
import java.lang.invoke.MethodHandles;
910
import java.util.HashSet;
1011
import java.util.Map;
1112
import java.util.Set;
@@ -47,6 +48,7 @@ public class BeanValidationEventListener
4748
implements PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener, PreUpsertEventListener {
4849

4950
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
51+
MethodHandles.lookup(),
5052
CoreMessageLogger.class,
5153
BeanValidationEventListener.class.getName()
5254
);

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

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

9+
import java.lang.invoke.MethodHandles;
910
import java.lang.reflect.InvocationTargetException;
1011
import java.lang.reflect.Method;
1112
import java.util.Set;
@@ -30,6 +31,7 @@
3031
*/
3132
public class BeanValidationIntegrator implements Integrator {
3233
private static final CoreMessageLogger LOG = Logger.getMessageLogger(
34+
MethodHandles.lookup(),
3335
CoreMessageLogger.class,
3436
BeanValidationIntegrator.class.getName()
3537
);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package org.hibernate.boot.beanvalidation;
88

99
import java.lang.annotation.Annotation;
10+
import java.lang.invoke.MethodHandles;
1011
import java.util.Arrays;
1112
import java.util.Collection;
1213
import java.util.Collections;
@@ -60,7 +61,7 @@
6061
*/
6162
class TypeSafeActivator {
6263

63-
private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, TypeSafeActivator.class.getName());
64+
private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, TypeSafeActivator.class.getName() );
6465

6566
/**
6667
* Used to validate a supplied ValidatorFactory instance as being castable to ValidatorFactory.

0 commit comments

Comments
 (0)