Merge pull request wildfly#18015 from marko-bekhta/jboss-logging-upgrade

WFLY-19500 Replace deprecated calls to the JBoss Logger methods

appclient/src/main/java/org/jboss/as/appclient/logging/AppClientLogger.java

@@ -8,6 +8,7 @@
 import static org.jboss.logging.Logger.Level.ERROR;
 
 import java.io.File;
+import java.lang.invoke.MethodHandles;
 import java.net.URL;
 
 import javax.xml.stream.Location;
@@ -32,7 +33,7 @@ public interface AppClientLogger extends BasicLogger {
     /**
      * The root logger.
      */
-    AppClientLogger ROOT_LOGGER = Logger.getMessageLogger(AppClientLogger.class, "org.jboss.as.appclient");
+    AppClientLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), AppClientLogger.class, "org.jboss.as.appclient");
 
 //    /**
 //     * Logs a generic error message using the {@link Throwable#toString() t.toString()} for the error message.

batch-jberet/src/main/java/org/wildfly/extension/batch/jberet/_private/BatchLogger.java

@@ -5,6 +5,7 @@
 
 package org.wildfly.extension.batch.jberet._private;
 
+import java.lang.invoke.MethodHandles;
 import java.security.Permission;
 import jakarta.batch.operations.BatchRuntimeException;
 import jakarta.batch.operations.JobSecurityException;
@@ -31,7 +32,7 @@ public interface BatchLogger extends BasicLogger {
     /**
      * A logger with the category {@code org.wildfly.extension.batch}.
      */
-    BatchLogger LOGGER = Logger.getMessageLogger(BatchLogger.class, "org.wildfly.extension.batch");
+    BatchLogger LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), BatchLogger.class, "org.wildfly.extension.batch");
 
     /**
      * Creates an exception indicating there was an error processing the batch jobs directory.

bean-validation/src/main/java/org/wildfly/extension/beanvalidation/logging/BeanValidationLogger.java

@@ -5,6 +5,8 @@
 
 package org.wildfly.extension.beanvalidation.logging;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.MessageLogger;
@@ -15,6 +17,6 @@
 @MessageLogger(projectCode = "WFLYBV", length = 4)
 public interface BeanValidationLogger extends BasicLogger {
 
-    BeanValidationLogger ROOT_LOGGER = Logger.getMessageLogger(BeanValidationLogger.class, "org.wildfly.extension.beanvalidation");
+    BeanValidationLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), BeanValidationLogger.class, "org.wildfly.extension.beanvalidation");
 
 }

clustering/common/src/main/java/org/jboss/as/clustering/logging/ClusteringLogger.java

@@ -7,6 +7,7 @@
 
 import static org.jboss.logging.Logger.Level.WARN;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Set;
 
 import org.jboss.as.controller.OperationFailedException;
@@ -28,7 +29,7 @@ public interface ClusteringLogger extends BasicLogger {
     /**
      * The root logger.
      */
-    ClusteringLogger ROOT_LOGGER = Logger.getMessageLogger(ClusteringLogger.class, ROOT_LOGGER_CATEGORY);
+    ClusteringLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ClusteringLogger.class, ROOT_LOGGER_CATEGORY);
 
     @Message(id = 1, value = "%2$g is not a valid value for parameter %1$s. The value must be %3$s %4$g")
     OperationFailedException parameterValueOutOfBounds(String name, double value, String relationalOperator, double bound);

clustering/ee/infinispan/src/main/java/org/wildfly/clustering/ee/infinispan/logging/Logger.java

@@ -6,6 +6,8 @@
 
 import static org.jboss.logging.Logger.Level.INFO;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
@@ -20,7 +22,7 @@
 public interface Logger extends BasicLogger {
     String ROOT_LOGGER_CATEGORY = "org.wildfly.clustering.ee.infinispan";
 
-    Logger ROOT_LOGGER = org.jboss.logging.Logger.getMessageLogger(Logger.class, ROOT_LOGGER_CATEGORY);
+    Logger ROOT_LOGGER = org.jboss.logging.Logger.getMessageLogger(MethodHandles.lookup(), Logger.class, ROOT_LOGGER_CATEGORY);
 
     @LogMessage(level = INFO)
     @Message(id = 1, value = "Failed to cancel %s on primary owner.")

clustering/ejb/infinispan/src/main/java/org/wildfly/clustering/ejb/infinispan/logging/InfinispanEjbLogger.java

@@ -6,6 +6,8 @@
 
 import static org.jboss.logging.Logger.Level.WARN;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.Cause;
@@ -26,7 +28,7 @@ public interface InfinispanEjbLogger extends BasicLogger {
     /**
      * A logger with the category of the default clustering package.
      */
-    InfinispanEjbLogger ROOT_LOGGER = Logger.getMessageLogger(InfinispanEjbLogger.class, ROOT_LOGGER_CATEGORY);
+    InfinispanEjbLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), InfinispanEjbLogger.class, ROOT_LOGGER_CATEGORY);
 
 //    @LogMessage(level = WARN)
 //    @Message(id = 1, value = "Failed to passivate stateful session bean %s")

clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/logging/InfinispanLogger.java

@@ -8,6 +8,7 @@
 import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.WARN;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Set;
 
 import org.infinispan.client.hotrod.exceptions.HotRodClientException;
@@ -30,7 +31,7 @@ public interface InfinispanLogger extends BasicLogger {
     /**
      * The root logger.
      */
-    InfinispanLogger ROOT_LOGGER = Logger.getMessageLogger(InfinispanLogger.class, ROOT_LOGGER_CATEGORY);
+    InfinispanLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), InfinispanLogger.class, ROOT_LOGGER_CATEGORY);
 
     /**
      * Logs an informational message indicating the Infinispan subsystem is being activated.

clustering/jgroups/extension/src/main/java/org/jboss/as/clustering/jgroups/logging/JGroupsLogger.java

@@ -8,6 +8,7 @@
 import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.WARN;
 
+import java.lang.invoke.MethodHandles;
 import java.net.InetSocketAddress;
 import java.net.URL;
 import java.net.UnknownHostException;
@@ -33,7 +34,7 @@ public interface JGroupsLogger extends BasicLogger {
     /**
      * The root logger.
      */
-    JGroupsLogger ROOT_LOGGER = Logger.getMessageLogger(JGroupsLogger.class, ROOT_LOGGER_CATEGORY);
+    JGroupsLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), JGroupsLogger.class, ROOT_LOGGER_CATEGORY);
 
     /**
      * Logs an informational message indicating the JGroups subsystem is being activated.

clustering/server/infinispan/src/main/java/org/wildfly/clustering/server/infinispan/ClusteringServerLogger.java

@@ -6,6 +6,7 @@
 
 import static org.jboss.logging.Logger.Level.WARN;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
@@ -29,7 +30,7 @@ public interface ClusteringServerLogger extends BasicLogger {
     /**
      * The root logger.
      */
-    ClusteringServerLogger ROOT_LOGGER = Logger.getMessageLogger(ClusteringServerLogger.class, ROOT_LOGGER_CATEGORY);
+    ClusteringServerLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ClusteringServerLogger.class, ROOT_LOGGER_CATEGORY);
 
     /* Command dispatcher messages */
 

clustering/singleton/extension/src/main/java/org/wildfly/extension/clustering/singleton/SingletonLogger.java

@@ -7,6 +7,8 @@
 
 import static org.jboss.logging.Logger.Level.INFO;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.LogMessage;
@@ -21,7 +23,7 @@
 public interface SingletonLogger extends BasicLogger {
     String ROOT_LOGGER_CATEGORY = "org.wildfly.extension.clustering.singleton";
 
-    SingletonLogger ROOT_LOGGER = Logger.getMessageLogger(SingletonLogger.class, ROOT_LOGGER_CATEGORY);
+    SingletonLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), SingletonLogger.class, ROOT_LOGGER_CATEGORY);
 
     @LogMessage(level = INFO)
     @Message(id = 1, value = "Singleton deployment detected. Deployment will reset using %s policy.")

clustering/singleton/server/src/main/java/org/wildfly/clustering/singleton/server/SingletonLogger.java

@@ -8,6 +8,7 @@
 import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.WARN;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Collection;
 
 import org.jboss.logging.BasicLogger;
@@ -29,7 +30,7 @@ public interface SingletonLogger extends BasicLogger {
     /**
      * The root logger.
      */
-    SingletonLogger ROOT_LOGGER = Logger.getMessageLogger(SingletonLogger.class, ROOT_LOGGER_CATEGORY);
+    SingletonLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), SingletonLogger.class, ROOT_LOGGER_CATEGORY);
 
     @LogMessage(level = INFO)
     @Message(id = 1, value = "This node will now operate as the singleton provider of the %s service")

clustering/web/cache/src/main/java/org/wildfly/clustering/web/cache/logging/Logger.java

@@ -5,6 +5,8 @@
 
 package org.wildfly.clustering.web.cache.logging;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageLogger;
@@ -16,7 +18,7 @@
 public interface Logger extends BasicLogger {
     String ROOT_LOGGER_CATEGORY = "org.wildfly.clustering.web.cache";
 
-    Logger ROOT_LOGGER = org.jboss.logging.Logger.getMessageLogger(Logger.class, ROOT_LOGGER_CATEGORY);
+    Logger ROOT_LOGGER = org.jboss.logging.Logger.getMessageLogger(MethodHandles.lookup(), Logger.class, ROOT_LOGGER_CATEGORY);
 
     @Message(id = 1, value = "Session %s is not valid")
     IllegalStateException invalidSession(String sessionId);

clustering/web/hotrod/src/main/java/org/wildfly/clustering/web/hotrod/logging/Logger.java

@@ -7,6 +7,8 @@
 
 import static org.jboss.logging.Logger.Level.*;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
@@ -20,7 +22,7 @@
 public interface Logger extends BasicLogger {
     String ROOT_LOGGER_CATEGORY = "org.wildfly.clustering.web.hotrod";
 
-    Logger ROOT_LOGGER = org.jboss.logging.Logger.getMessageLogger(Logger.class, ROOT_LOGGER_CATEGORY);
+    Logger ROOT_LOGGER = org.jboss.logging.Logger.getMessageLogger(MethodHandles.lookup(), Logger.class, ROOT_LOGGER_CATEGORY);
 
     @LogMessage(level = WARN)
     @Message(id = 1, value = "Failed to expire session %s")

clustering/web/infinispan/src/main/java/org/wildfly/clustering/web/infinispan/logging/InfinispanWebLogger.java

@@ -7,6 +7,8 @@
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.WARN;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.Cause;
@@ -25,7 +27,7 @@
 public interface InfinispanWebLogger extends BasicLogger {
     String ROOT_LOGGER_CATEGORY = "org.wildfly.clustering.web.infinispan";
 
-    InfinispanWebLogger ROOT_LOGGER = Logger.getMessageLogger(InfinispanWebLogger.class, ROOT_LOGGER_CATEGORY);
+    InfinispanWebLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), InfinispanWebLogger.class, ROOT_LOGGER_CATEGORY);
 
     @LogMessage(level = WARN)
     @Message(id = 1, value = "Failed to passivate attributes of session %s")

clustering/web/undertow/src/main/java/org/wildfly/clustering/web/undertow/logging/UndertowClusteringLogger.java

@@ -5,6 +5,8 @@
 
 package org.wildfly.clustering.web.undertow.logging;
 
+import java.lang.invoke.MethodHandles;
+
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.Logger.Level;
@@ -15,7 +17,7 @@
 @MessageLogger(projectCode = "WFLYCLWEBUT", length = 4)
 public interface UndertowClusteringLogger extends BasicLogger {
 
-    UndertowClusteringLogger ROOT_LOGGER = Logger.getMessageLogger(UndertowClusteringLogger.class, "org.wildfly.clustering.web.undertow");
+    UndertowClusteringLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), UndertowClusteringLogger.class, "org.wildfly.clustering.web.undertow");
 
     @Message(id = 1, value = "Session %s is invalid")
     IllegalStateException sessionIsInvalid(String sessionId);

connector/src/main/java/org/jboss/as/connector/logging/ConnectorLogger.java

@@ -10,6 +10,7 @@
 import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.WARN;
 
+import java.lang.invoke.MethodHandles;
 import java.sql.Driver;
 import java.util.Set;
 
@@ -42,42 +43,42 @@ public interface ConnectorLogger extends BasicLogger {
     /**
      * The root logger with a category of the default package.
      */
-    ConnectorLogger ROOT_LOGGER = Logger.getMessageLogger(ConnectorLogger.class, "org.jboss.as.connector");
+    ConnectorLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ConnectorLogger.class, "org.jboss.as.connector");
 
     /**
      * A logger with the category {@code org.jboss.as.connector.deployers.jdbc}.
      */
-    ConnectorLogger DEPLOYER_JDBC_LOGGER = Logger.getMessageLogger(ConnectorLogger.class, "org.jboss.as.connector.deployers.jdbc");
+    ConnectorLogger DEPLOYER_JDBC_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ConnectorLogger.class, "org.jboss.as.connector.deployers.jdbc");
 
     /**
      * A logger with the category {@code org.jboss.as.deployment.connector}.
      */
-    ConnectorLogger DEPLOYMENT_CONNECTOR_LOGGER = Logger.getMessageLogger(ConnectorLogger.class, "org.jboss.as.connector.deployment");
+    ConnectorLogger DEPLOYMENT_CONNECTOR_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ConnectorLogger.class, "org.jboss.as.connector.deployment");
 
     /**
      * A logger with the category {@code org.jboss.as.deployment.connector.registry}.
      */
-    ConnectorLogger DEPLOYMENT_CONNECTOR_REGISTRY_LOGGER = Logger.getMessageLogger(ConnectorLogger.class, "org.jboss.as.connector.deployment.registry");
+    ConnectorLogger DEPLOYMENT_CONNECTOR_REGISTRY_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ConnectorLogger.class, "org.jboss.as.connector.deployment.registry");
 
     /**
      * A logger with the category {@code org.jboss.as.connector.deployer.dsdeployer}.
      */
-    ConnectorLogger DS_DEPLOYER_LOGGER = Logger.getMessageLogger(ConnectorLogger.class, "org.jboss.as.connector.deployer.dsdeployer");
+    ConnectorLogger DS_DEPLOYER_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ConnectorLogger.class, "org.jboss.as.connector.deployer.dsdeployer");
 
     /**
      * A logger with the category {@code org.jboss.as.connector.services.mdr}.
      */
-    ConnectorLogger MDR_LOGGER = Logger.getMessageLogger(ConnectorLogger.class, "org.jboss.as.connector.services.mdr");
+    ConnectorLogger MDR_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ConnectorLogger.class, "org.jboss.as.connector.services.mdr");
 
     /**
      * A logger with the category {@code org.jboss.as.connector.subsystems.datasources}.
      */
-    ConnectorLogger SUBSYSTEM_DATASOURCES_LOGGER = Logger.getMessageLogger(ConnectorLogger.class, "org.jboss.as.connector.subsystems.datasources");
+    ConnectorLogger SUBSYSTEM_DATASOURCES_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ConnectorLogger.class, "org.jboss.as.connector.subsystems.datasources");
 
     /**
      * A logger with the category {@code org.jboss.as.connector.subsystems.resourceadapters}.
      */
-    ConnectorLogger SUBSYSTEM_RA_LOGGER = Logger.getMessageLogger(ConnectorLogger.class, "org.jboss.as.connector.subsystems.resourceadapters");
+    ConnectorLogger SUBSYSTEM_RA_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ConnectorLogger.class, "org.jboss.as.connector.subsystems.resourceadapters");
 
     /**
      * Logs an informational message indicating the data source has been bound.

connector/src/main/java/org/jboss/as/connector/metadata/common/CredentialImpl.java

@@ -4,6 +4,7 @@
  */
 package org.jboss.as.connector.metadata.common;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Objects;
 
 import org.jboss.as.connector.logging.ConnectorLogger;
@@ -25,7 +26,7 @@ public class CredentialImpl implements Credential {
 
     private static final long serialVersionUID = 7990943957924515091L;
 
-    private static CommonBundle bundle = (CommonBundle) Messages.getBundle(CommonBundle.class);
+    private static CommonBundle bundle = Messages.getBundle(MethodHandles.lookup(), CommonBundle.class);
     private final String userName;
     private final String password;
     private final String securityDomain;

connector/src/main/java/org/jboss/as/connector/services/resourceadapters/ResourceAdapterActivatorService.java

@@ -8,6 +8,7 @@
 import static org.jboss.as.connector.logging.ConnectorLogger.DEPLOYMENT_CONNECTOR_LOGGER;
 
 import java.io.File;
+import java.lang.invoke.MethodHandles;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -45,7 +46,7 @@
 public final class ResourceAdapterActivatorService extends AbstractResourceAdapterDeploymentService implements
         Service<ResourceAdapterDeployment> {
 
-    private static final DeployersLogger DEPLOYERS_LOGGER = Logger.getMessageLogger(DeployersLogger.class, ResourceAdapterActivator.class.getName());
+    private static final DeployersLogger DEPLOYERS_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), DeployersLogger.class, ResourceAdapterActivator.class.getName());
 
     private final ClassLoader cl;
     private final Connector cmd;

connector/src/main/java/org/jboss/as/connector/services/resourceadapters/deployment/ResourceAdapterDeploymentService.java

@@ -8,6 +8,7 @@
 import static org.jboss.as.connector.logging.ConnectorLogger.DEPLOYMENT_CONNECTOR_LOGGER;
 
 import java.io.File;
+import java.lang.invoke.MethodHandles;
 import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
@@ -54,7 +55,7 @@
 public final class ResourceAdapterDeploymentService extends AbstractResourceAdapterDeploymentService implements
         Service<ResourceAdapterDeployment> {
 
-    private static final DeployersLogger DEPLOYERS_LOGGER = Logger.getMessageLogger(DeployersLogger.class, "org.jboss.as.connector.deployers.RADeployer");
+    private static final DeployersLogger DEPLOYERS_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), DeployersLogger.class, "org.jboss.as.connector.deployers.RADeployer");
 
     private final ClassLoader classLoader;
     private final ConnectorXmlDescriptor connectorXmlDescriptor;

connector/src/main/java/org/jboss/as/connector/services/resourceadapters/deployment/ResourceAdapterXmlDeploymentService.java

@@ -8,6 +8,7 @@
 import static org.jboss.as.connector.logging.ConnectorLogger.DEPLOYMENT_CONNECTOR_LOGGER;
 
 import java.io.File;
+import java.lang.invoke.MethodHandles;
 import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
@@ -43,7 +44,7 @@
 public final class ResourceAdapterXmlDeploymentService extends AbstractResourceAdapterDeploymentService implements
         Service<ResourceAdapterDeployment> {
 
-    private static final DeployersLogger DEPLOYERS_LOGGER = Logger.getMessageLogger(DeployersLogger.class, "org.jboss.as.connector.deployers.RaXmlDeployer");
+    private static final DeployersLogger DEPLOYERS_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), DeployersLogger.class, "org.jboss.as.connector.deployers.RaXmlDeployer");
 
     private final Module module;
     private final ConnectorXmlDescriptor connectorXmlDescriptor;