WELD-2821 Address deprecations from JBoss Logging

manovotn · manovotn · commit d9de236fa4b7 · 2025-11-25T14:45:34.000+01:00
diff --git a/impl/src/main/java/org/jboss/weld/logging/BeanLogger.java b/impl/src/main/java/org/jboss/weld/logging/BeanLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.Logger.Level;
 import org.jboss.logging.annotations.Cause;
@@ -44,7 +46,7 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface BeanLogger extends WeldLogger {
 
-    BeanLogger LOG = Logger.getMessageLogger(BeanLogger.class, Category.BEAN.getName());
+    BeanLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), BeanLogger.class, Category.BEAN.getName());
 
     @LogMessage(level = Level.TRACE)
     @Message(id = 1, value = "Exactly one constructor ({0}) annotated with @Inject defined, using it as the bean constructor for {1}", format = Format.MESSAGE_FORMAT)
diff --git a/impl/src/main/java/org/jboss/weld/logging/BeanManagerLogger.java b/impl/src/main/java/org/jboss/weld/logging/BeanManagerLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import javax.naming.NamingException;
 
 import org.jboss.logging.Logger;
@@ -38,7 +40,8 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface BeanManagerLogger extends WeldLogger {
 
-    BeanManagerLogger LOG = Logger.getMessageLogger(BeanManagerLogger.class, Category.BEAN_MANAGER.getName());
+    BeanManagerLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), BeanManagerLogger.class,
+            Category.BEAN_MANAGER.getName());
 
     @Message(id = 1300, value = "Unable to locate BeanManager")
     NamingException cannotLocateBeanManager();
@@ -137,4 +140,4 @@ public interface BeanManagerLogger extends WeldLogger {
     @Message(id = 1339, value = "Provided event type {0} cannot contain unresolvable type parameter", format = Format.MESSAGE_FORMAT)
     IllegalArgumentException eventTypeUnresolvableWildcard(Object param1);
 
-}
+}
diff --git a/impl/src/main/java/org/jboss/weld/logging/BootstrapLogger.java b/impl/src/main/java/org/jboss/weld/logging/BootstrapLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import jakarta.enterprise.inject.spi.ObserverMethod;
 
 import org.jboss.logging.Logger;
@@ -41,9 +43,10 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface BootstrapLogger extends WeldLogger {
 
-    BootstrapLogger LOG = Logger.getMessageLogger(BootstrapLogger.class, Category.BOOTSTRAP.getName());
+    BootstrapLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), BootstrapLogger.class, Category.BOOTSTRAP.getName());
 
-    BootstrapLogger TRACKER_LOG = Logger.getMessageLogger(BootstrapLogger.class, Category.BOOTSTRAP_TRACKER.getName());
+    BootstrapLogger TRACKER_LOG = Logger.getMessageLogger(MethodHandles.lookup(), BootstrapLogger.class,
+            Category.BOOTSTRAP_TRACKER.getName());
 
     @LogMessage(level = Level.DEBUG)
     @Message(id = 100, value = "Weld initialized. Validating beans")
diff --git a/impl/src/main/java/org/jboss/weld/logging/ConfigurationLogger.java b/impl/src/main/java/org/jboss/weld/logging/ConfigurationLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.Logger.Level;
 import org.jboss.logging.annotations.LogMessage;
@@ -34,7 +36,8 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface ConfigurationLogger extends WeldLogger {
 
-    ConfigurationLogger LOG = Logger.getMessageLogger(ConfigurationLogger.class, Category.CONFIGURATION.getName());
+    ConfigurationLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), ConfigurationLogger.class,
+            Category.CONFIGURATION.getName());
 
     @Message(id = 1900, value = "Invalid configuration property value {0} for key {1}", format = Format.MESSAGE_FORMAT)
     IllegalStateException invalidConfigurationPropertyValue(Object value, Object key);
@@ -69,4 +72,4 @@ public interface ConfigurationLogger extends WeldLogger {
     @Message(id = 1908, value = "Configuration property {0} can only be set by integrator - value {1} ignored", format = Format.MESSAGE_FORMAT)
     void cannotSetIntegratorOnlyConfigurationProperty(Object key, Object value);
 
-}
+}
diff --git a/impl/src/main/java/org/jboss/weld/logging/ContextLogger.java b/impl/src/main/java/org/jboss/weld/logging/ContextLogger.java
@@ -19,6 +19,7 @@
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
 import java.lang.annotation.Annotation;
+import java.lang.invoke.MethodHandles;
 
 import jakarta.enterprise.context.spi.Context;
 
@@ -41,7 +42,7 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface ContextLogger extends WeldLogger {
 
-    ContextLogger LOG = Logger.getMessageLogger(ContextLogger.class, Category.CONTEXT.getName());
+    ContextLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), ContextLogger.class, Category.CONTEXT.getName());
 
     @LogMessage(level = Level.TRACE)
     @Message(id = 200, value = "Looked for {0} and got {1} in {2}", format = Format.MESSAGE_FORMAT)
diff --git a/impl/src/main/java/org/jboss/weld/logging/ConversationLogger.java b/impl/src/main/java/org/jboss/weld/logging/ConversationLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.Logger.Level;
 import org.jboss.logging.annotations.LogMessage;
@@ -35,7 +37,8 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface ConversationLogger extends WeldLogger {
 
-    ConversationLogger LOG = Logger.getMessageLogger(ConversationLogger.class, Category.CONVERSATION.getName());
+    ConversationLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), ConversationLogger.class,
+            Category.CONVERSATION.getName());
 
     @LogMessage(level = Level.TRACE)
     @Message(id = 304, value = "Cleaning up conversation {0}", format = Format.MESSAGE_FORMAT)
diff --git a/impl/src/main/java/org/jboss/weld/logging/ElLogger.java b/impl/src/main/java/org/jboss/weld/logging/ElLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.Logger.Level;
 import org.jboss.logging.annotations.LogMessage;
@@ -33,7 +35,7 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface ElLogger extends WeldLogger {
 
-    ElLogger LOG = Logger.getMessageLogger(ElLogger.class, Category.EL.getName());
+    ElLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), ElLogger.class, Category.EL.getName());
 
     @Message(id = 1001, value = "Cannot pass null expressionFactory")
     IllegalArgumentException nullExpressionFactory();
@@ -46,4 +48,4 @@ public interface ElLogger extends WeldLogger {
     @Message(id = 1003, value = "EL property {0} resolved to {1}", format = Format.MESSAGE_FORMAT)
     void propertyResolved(Object param1, Object param2);
 
-}
+}
diff --git a/impl/src/main/java/org/jboss/weld/logging/EventLogger.java b/impl/src/main/java/org/jboss/weld/logging/EventLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import jakarta.enterprise.inject.spi.ObserverMethod;
 
 import org.jboss.logging.Logger;
@@ -38,7 +40,7 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface EventLogger extends WeldLogger {
 
-    EventLogger LOG = Logger.getMessageLogger(EventLogger.class, Category.EVENT.getName());
+    EventLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), EventLogger.class, Category.EVENT.getName());
 
     @LogMessage(level = Level.DEBUG)
     @Message(id = 400, value = "Sending event {0} directly to observer {1}", format = Format.MESSAGE_FORMAT)
diff --git a/impl/src/main/java/org/jboss/weld/logging/InterceptorLogger.java b/impl/src/main/java/org/jboss/weld/logging/InterceptorLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.Logger.Level;
 import org.jboss.logging.annotations.LogMessage;
@@ -36,7 +38,8 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface InterceptorLogger extends WeldLogger {
 
-    InterceptorLogger LOG = Logger.getMessageLogger(InterceptorLogger.class, Category.INTERCEPTOR.getName());
+    InterceptorLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), InterceptorLogger.class,
+            Category.INTERCEPTOR.getName());
 
     @LogMessage(level = Level.WARN)
     @Message(id = 1700, value = "Interceptor annotation class {0} not found, interception based on it is not enabled", format = Format.MESSAGE_FORMAT)
@@ -82,4 +85,4 @@ public interface InterceptorLogger extends WeldLogger {
     @Message(id = 1711, value = "InterceptionFactory is not supported on interfaces. Check InterceptionFactory<{0}>", format = Format.MESSAGE_FORMAT)
     IllegalStateException interceptionFactoryNotOnInstance(Object param1);
 
-}
+}
diff --git a/impl/src/main/java/org/jboss/weld/logging/InvokerLogger.java b/impl/src/main/java/org/jboss/weld/logging/InvokerLogger.java
@@ -2,6 +2,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.Message;
@@ -20,7 +22,7 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface InvokerLogger extends WeldLogger {
 
-    InvokerLogger LOG = Logger.getMessageLogger(InvokerLogger.class, Category.INVOKER.getName());
+    InvokerLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), InvokerLogger.class, Category.INVOKER.getName());
 
     @Message(id = 2000, value = "Cannot apply {0} to method argument with position {1}; total number of method parameters is {2}", format = Message.Format.MESSAGE_FORMAT)
     IllegalArgumentException invalidArgumentPosition(String kindOfTransformer, int position, int argLookupLength);
diff --git a/impl/src/main/java/org/jboss/weld/logging/MetadataLogger.java b/impl/src/main/java/org/jboss/weld/logging/MetadataLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.Logger.Level;
 import org.jboss.logging.annotations.LogMessage;
@@ -37,7 +39,7 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface MetadataLogger extends WeldLogger {
 
-    MetadataLogger LOG = Logger.getMessageLogger(MetadataLogger.class, Category.BOOTSTRAP.getName());
+    MetadataLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), MetadataLogger.class, Category.BOOTSTRAP.getName());
 
     @Message(id = 1100, value = "{0} can only be applied to an annotation.  It was applied to {1}", format = Format.MESSAGE_FORMAT)
     DefinitionException metaAnnotationOnWrongType(Object param1, Object param2);
@@ -129,4 +131,4 @@ void notInHierarchy(Object memberName, Object member, Object annotatedTypeJavaCl
     @Message(id = 1127, value = "Stereotype {0} cannot declare @Alternative and @Reserve at the same time", format = Format.MESSAGE_FORMAT)
     DefinitionException alternativeAndReserveSimultaneously(Object param1);
 
-}
+}
diff --git a/impl/src/main/java/org/jboss/weld/logging/ReflectionLogger.java b/impl/src/main/java/org/jboss/weld/logging/ReflectionLogger.java
@@ -18,6 +18,7 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 
@@ -40,7 +41,8 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface ReflectionLogger extends WeldLogger {
 
-    ReflectionLogger LOG = Logger.getMessageLogger(ReflectionLogger.class, Category.REFLECTION.getName());
+    ReflectionLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), ReflectionLogger.class,
+            Category.REFLECTION.getName());
 
     @LogMessage(level = Level.DEBUG)
     @Message(id = 600, value = "{0} is missing @Retention(RUNTIME). Weld will use this annotation, however this may make the application unportable.", format = Format.MESSAGE_FORMAT)
diff --git a/impl/src/main/java/org/jboss/weld/logging/ResolutionLogger.java b/impl/src/main/java/org/jboss/weld/logging/ResolutionLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.Message;
@@ -35,12 +37,13 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface ResolutionLogger extends WeldLogger {
 
-    ResolutionLogger LOG = Logger.getMessageLogger(ResolutionLogger.class, Category.RESOLUTION.getName());
+    ResolutionLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), ResolutionLogger.class,
+            Category.RESOLUTION.getName());
 
     @Message(id = 1601, value = "Cannot extract rawType from {0}", format = Format.MESSAGE_FORMAT)
     IllegalArgumentException cannotExtractRawType(Object param1);
 
     @Message(id = 1602, value = "Cannot create qualifier instance model for {0}\n\tat {1}\n  StackTrace:", format = Format.MESSAGE_FORMAT)
     WeldException cannotCreateQualifierInstanceValues(Object annotation, Object stackElement, @Cause Exception cause);
 
-}
+}
diff --git a/impl/src/main/java/org/jboss/weld/logging/SerializationLogger.java b/impl/src/main/java/org/jboss/weld/logging/SerializationLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.Message;
@@ -34,12 +36,13 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface SerializationLogger extends WeldLogger {
 
-    SerializationLogger LOG = Logger.getMessageLogger(SerializationLogger.class, Category.SERIALIZATION.getName());
+    SerializationLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), SerializationLogger.class,
+            Category.SERIALIZATION.getName());
 
     @Message(id = 1800, value = "Unable to get bean identifier at position {0} from {1}", format = Format.MESSAGE_FORMAT)
     IllegalStateException unableToGetBeanIdentifier(int index, Object info);
 
     @Message(id = 1801, value = "Unable to deserialize {0}", format = Format.MESSAGE_FORMAT)
     InvalidObjectException unableToDeserialize(Object info, @Cause Throwable cause);
 
-}
+}
diff --git a/impl/src/main/java/org/jboss/weld/logging/UtilLogger.java b/impl/src/main/java/org/jboss/weld/logging/UtilLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.Logger.Level;
 import org.jboss.logging.annotations.Cause;
@@ -39,7 +41,7 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface UtilLogger extends WeldLogger {
 
-    UtilLogger LOG = Logger.getMessageLogger(UtilLogger.class, Category.UTIL.getName());
+    UtilLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), UtilLogger.class, Category.UTIL.getName());
 
     // log message with id 802 was removed
 
@@ -106,4 +108,4 @@ public interface UtilLogger extends WeldLogger {
     @Message(id = 834, value = "Unable to inject resource - most probably incorrect InjectionServices SPI implementation: {0}\n\tat {1}", format = Format.MESSAGE_FORMAT)
     void unableToInjectResource(Object member, Object stackElement);
 
-}
+}
diff --git a/impl/src/main/java/org/jboss/weld/logging/ValidatorLogger.java b/impl/src/main/java/org/jboss/weld/logging/ValidatorLogger.java
@@ -18,6 +18,7 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 import java.util.Collection;
 
@@ -43,7 +44,7 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface ValidatorLogger extends WeldLogger {
 
-    ValidatorLogger LOG = Logger.getMessageLogger(ValidatorLogger.class, Category.VALIDATOR.getName());
+    ValidatorLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), ValidatorLogger.class, Category.VALIDATOR.getName());
 
     MessageCallback<DefinitionException> INJECTION_INTO_DISPOSER_METHOD = (t) -> ValidatorLogger.LOG
             .injectionIntoDisposerMethod(t[0], t[1]);
diff --git a/impl/src/main/java/org/jboss/weld/logging/VersionLogger.java b/impl/src/main/java/org/jboss/weld/logging/VersionLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.Logger.Level;
 import org.jboss.logging.annotations.LogMessage;
@@ -32,10 +34,10 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface VersionLogger extends WeldLogger {
 
-    VersionLogger LOG = Logger.getMessageLogger(VersionLogger.class, Category.VERSION.getName());
+    VersionLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), VersionLogger.class, Category.VERSION.getName());
 
     @LogMessage(level = Level.INFO)
     @Message(id = 900, value = "{0}", format = Format.MESSAGE_FORMAT)
     void version(Object info);
 
-}
+}
diff --git a/impl/src/main/java/org/jboss/weld/logging/XmlLogger.java b/impl/src/main/java/org/jboss/weld/logging/XmlLogger.java
@@ -18,6 +18,8 @@
 
 import static org.jboss.weld.logging.WeldLogger.WELD_PROJECT_CODE;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.Logger;
 import org.jboss.logging.Logger.Level;
 import org.jboss.logging.annotations.Cause;
@@ -36,7 +38,7 @@
 @MessageLogger(projectCode = WELD_PROJECT_CODE)
 public interface XmlLogger extends WeldLogger {
 
-    XmlLogger LOG = Logger.getMessageLogger(XmlLogger.class, Category.BOOTSTRAP.getName());
+    XmlLogger LOG = Logger.getMessageLogger(MethodHandles.lookup(), XmlLogger.class, Category.BOOTSTRAP.getName());
 
     @Message(id = 1200, value = "Error configuring XML parser")
     IllegalStateException configurationError(@Cause Throwable cause);
@@ -67,4 +69,4 @@ public interface XmlLogger extends WeldLogger {
     @Message(id = 1210, value = "Warning when validating {0}@{1} against xsd. {2}", format = Format.MESSAGE_FORMAT)
     void xsdValidationWarning(Object param1, Object param2, Object param3);
 
-}
+}
