From 778e667f0571160367bd1f5594f6555c6558fb6d Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Wed, 3 Jul 2024 22:30:33 +0200 Subject: [PATCH] [WFCORE-6883] Use new logging APIs instead of deprecated ones --- .../runtime/_private/BootableJarLogger.java | 3 ++- .../_private/BootScriptInvokerLogger.java | 3 ++- .../logging/ControllerClientLogger.java | 3 ++- .../controller/logging/ControllerLogger.java | 9 ++++---- .../transform/TransformersLogger.java | 3 ++- .../logging/CoreManagementLogger.java | 5 +++-- .../logging/DeploymentRepositoryLogger.java | 3 ++- .../logging/DeploymentScannerLogger.java | 3 ++- .../wildfly/extension/discovery/Messages.java | 4 +++- .../http/server/logging/HttpServerLogger.java | 3 ++- .../logging/DomainManagementLogger.java | 5 +++-- .../_private/ElytronToolWrapperMessages.java | 4 +++- .../_private/ElytronSubsystemMessages.java | 3 ++- .../core/embedded/logging/EmbeddedLogger.java | 3 ++- .../logging/DomainControllerLogger.java | 5 +++-- .../logging/HostControllerLogger.java | 7 ++++--- .../core/instmgr/logging/InstMgrLogger.java | 3 ++- .../extension/io/logging/IOLogger.java | 3 ++- .../org/jboss/as/jmx/logging/JmxLogger.java | 3 ++- .../as/logging/logging/LoggingLogger.java | 3 ++- .../content/ManagedDMRContentLogger.java | 3 ++- .../as/network/logging/NetworkMessages.java | 4 +++- .../as/patching/logging/PatchLogger.java | 3 ++- .../mbean/logging/PlatformMBeanLogger.java | 4 +++- .../org/jboss/as/process/ManagedProcess.java | 7 ++++--- .../as/process/logging/ProcessLogger.java | 13 ++++++------ .../as/protocol/logging/ProtocolLogger.java | 7 ++++--- .../as/remoting/logging/RemotingLogger.java | 3 ++- .../logging/RequestControllerLogger.java | 4 +++- .../logging/SecurityManagerLogger.java | 3 ++- .../org/jboss/as/server/ServerService.java | 1 + .../jboss/as/server/logging/ServerLogger.java | 21 ++++++++++--------- .../UnstableAnnotationApiTestLogger.java | 4 +++- .../org/jboss/as/threads/ThreadsLogger.java | 3 ++- 34 files changed, 99 insertions(+), 59 deletions(-) diff --git a/bootable-jar/runtime/src/main/java/org/wildfly/core/jar/runtime/_private/BootableJarLogger.java b/bootable-jar/runtime/src/main/java/org/wildfly/core/jar/runtime/_private/BootableJarLogger.java index 5ae75924d1b..86880e36fc7 100644 --- a/bootable-jar/runtime/src/main/java/org/wildfly/core/jar/runtime/_private/BootableJarLogger.java +++ b/bootable-jar/runtime/src/main/java/org/wildfly/core/jar/runtime/_private/BootableJarLogger.java @@ -5,6 +5,7 @@ package org.wildfly.core.jar.runtime._private; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.nio.file.Path; import java.util.List; import java.util.Set; @@ -31,7 +32,7 @@ public interface BootableJarLogger extends BasicLogger { /** * Default root logger with category of the package name. */ - BootableJarLogger ROOT_LOGGER = Logger.getMessageLogger(BootableJarLogger.class, "org.wildfly.jar"); + BootableJarLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), BootableJarLogger.class, "org.wildfly.jar"); @LogMessage(level = DEBUG) @Message(id = 1, value = "Shutting down") diff --git a/cli/src/main/java/org/jboss/as/cli/impl/_private/BootScriptInvokerLogger.java b/cli/src/main/java/org/jboss/as/cli/impl/_private/BootScriptInvokerLogger.java index 0de7bcf812a..6ae9d4ab1e7 100644 --- a/cli/src/main/java/org/jboss/as/cli/impl/_private/BootScriptInvokerLogger.java +++ b/cli/src/main/java/org/jboss/as/cli/impl/_private/BootScriptInvokerLogger.java @@ -5,6 +5,7 @@ package org.jboss.as.cli.impl._private; import java.io.File; +import java.lang.invoke.MethodHandles; import org.jboss.logging.BasicLogger; import org.jboss.logging.annotations.MessageLogger; @@ -26,7 +27,7 @@ public interface BootScriptInvokerLogger extends BasicLogger { /** * Default root logger with category of the package name. */ - BootScriptInvokerLogger ROOT_LOGGER = Logger.getMessageLogger(BootScriptInvokerLogger.class, "org.jboss.as.cli"); + BootScriptInvokerLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), BootScriptInvokerLogger.class, "org.jboss.as.cli"); /** * Logs an info message to advertise that a script file is being processed. diff --git a/controller-client/src/main/java/org/jboss/as/controller/client/logging/ControllerClientLogger.java b/controller-client/src/main/java/org/jboss/as/controller/client/logging/ControllerClientLogger.java index c6284eb2f62..76c0ef42eb4 100644 --- a/controller-client/src/main/java/org/jboss/as/controller/client/logging/ControllerClientLogger.java +++ b/controller-client/src/main/java/org/jboss/as/controller/client/logging/ControllerClientLogger.java @@ -8,6 +8,7 @@ import static org.jboss.logging.Logger.Level.WARN; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URI; import java.net.URL; @@ -30,7 +31,7 @@ public interface ControllerClientLogger extends BasicLogger { /** * A logger with the default package name. */ - ControllerClientLogger ROOT_LOGGER = Logger.getMessageLogger(ControllerClientLogger.class, "org.jboss.as.controller.client"); + ControllerClientLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ControllerClientLogger.class, "org.jboss.as.controller.client"); /** * Creates an exception indicating after starting creation of the rollout plan no deployment actions can be added. diff --git a/controller/src/main/java/org/jboss/as/controller/logging/ControllerLogger.java b/controller/src/main/java/org/jboss/as/controller/logging/ControllerLogger.java index 47622d56808..6b62f606f26 100644 --- a/controller/src/main/java/org/jboss/as/controller/logging/ControllerLogger.java +++ b/controller/src/main/java/org/jboss/as/controller/logging/ControllerLogger.java @@ -14,6 +14,7 @@ import java.io.Closeable; import java.io.File; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.file.Path; @@ -76,22 +77,22 @@ public interface ControllerLogger extends BasicLogger { /** * Default root logger with category of the package name. */ - ControllerLogger ROOT_LOGGER = Logger.getMessageLogger(ControllerLogger.class, "org.jboss.as.controller"); + ControllerLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ControllerLogger.class, "org.jboss.as.controller"); /** * Logger for management operation messages. */ - ControllerLogger MGMT_OP_LOGGER = Logger.getMessageLogger(ControllerLogger.class, "org.jboss.as.controller.management-operation"); + ControllerLogger MGMT_OP_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ControllerLogger.class, "org.jboss.as.controller.management-operation"); /** * A logger for logging deprecated resources usage */ - ControllerLogger DEPRECATED_LOGGER = Logger.getMessageLogger(ControllerLogger.class, "org.jboss.as.controller.management-deprecated"); + ControllerLogger DEPRECATED_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ControllerLogger.class, "org.jboss.as.controller.management-deprecated"); /** * A logger for access control related messages. */ - ControllerLogger ACCESS_LOGGER = Logger.getMessageLogger(ControllerLogger.class, "org.jboss.as.controller.access-control"); + ControllerLogger ACCESS_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ControllerLogger.class, "org.jboss.as.controller.access-control"); /** * Logs a warning message indicating the address, represented by the {@code address} parameter, could not be diff --git a/controller/src/main/java/org/jboss/as/controller/transform/TransformersLogger.java b/controller/src/main/java/org/jboss/as/controller/transform/TransformersLogger.java index d22a65677ac..2f2b58eb0d0 100644 --- a/controller/src/main/java/org/jboss/as/controller/transform/TransformersLogger.java +++ b/controller/src/main/java/org/jboss/as/controller/transform/TransformersLogger.java @@ -7,6 +7,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; +import java.lang.invoke.MethodHandles; import java.util.Arrays; import java.util.Collections; import java.util.Iterator; @@ -46,7 +47,7 @@ public class TransformersLogger { private TransformersLogger(TransformationTarget target) { this.target = target; - logger = Logger.getMessageLogger(ControllerLogger.class, "org.jboss.as.controller.transformer." + target.getHostName()); + logger = Logger.getMessageLogger(MethodHandles.lookup(), ControllerLogger.class, "org.jboss.as.controller.transformer." + target.getHostName()); } public static TransformersLogger getLogger(TransformationTarget target){ diff --git a/core-management/core-management-subsystem/src/main/java/org/wildfly/extension/core/management/logging/CoreManagementLogger.java b/core-management/core-management-subsystem/src/main/java/org/wildfly/extension/core/management/logging/CoreManagementLogger.java index 63860b511f0..21128d4fc13 100644 --- a/core-management/core-management-subsystem/src/main/java/org/wildfly/extension/core/management/logging/CoreManagementLogger.java +++ b/core-management/core-management-subsystem/src/main/java/org/wildfly/extension/core/management/logging/CoreManagementLogger.java @@ -16,6 +16,7 @@ import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; +import java.lang.invoke.MethodHandles; import java.util.Set; /** @@ -28,9 +29,9 @@ public interface CoreManagementLogger extends BasicLogger { /** * A logger with a category of the package name. */ - CoreManagementLogger ROOT_LOGGER = Logger.getMessageLogger(CoreManagementLogger.class, "org.wildfly.extension.core.management"); + CoreManagementLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), CoreManagementLogger.class, "org.wildfly.extension.core.management"); - CoreManagementLogger UNSUPPORTED_ANNOTATION_LOGGER = Logger.getMessageLogger(CoreManagementLogger.class, "org.wildfly.annotation.unsupported"); + CoreManagementLogger UNSUPPORTED_ANNOTATION_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), CoreManagementLogger.class, "org.wildfly.annotation.unsupported"); // @Message(id = 1, value = "The resource %s wasn't working properly and has been removed.") // String removedOutOfOrderResource(final String address); diff --git a/deployment-repository/src/main/java/org/jboss/as/repository/logging/DeploymentRepositoryLogger.java b/deployment-repository/src/main/java/org/jboss/as/repository/logging/DeploymentRepositoryLogger.java index e78911ca53b..73448121023 100644 --- a/deployment-repository/src/main/java/org/jboss/as/repository/logging/DeploymentRepositoryLogger.java +++ b/deployment-repository/src/main/java/org/jboss/as/repository/logging/DeploymentRepositoryLogger.java @@ -9,6 +9,7 @@ import static org.jboss.logging.Logger.Level.INFO; import static org.jboss.logging.Logger.Level.WARN; +import java.lang.invoke.MethodHandles; import java.nio.file.Path; import org.jboss.as.repository.ExplodedContentException; import org.jboss.logging.BasicLogger; @@ -28,7 +29,7 @@ public interface DeploymentRepositoryLogger extends BasicLogger { /** * A logger with the category of the package name. */ - DeploymentRepositoryLogger ROOT_LOGGER = Logger.getMessageLogger(DeploymentRepositoryLogger.class, "org.jboss.as.repository"); + DeploymentRepositoryLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), DeploymentRepositoryLogger.class, "org.jboss.as.repository"); /** * Logs an informational message indicating the content was added at the location, represented by the {@code path} diff --git a/deployment-scanner/src/main/java/org/jboss/as/server/deployment/scanner/logging/DeploymentScannerLogger.java b/deployment-scanner/src/main/java/org/jboss/as/server/deployment/scanner/logging/DeploymentScannerLogger.java index d4775d67e30..b836b9ca550 100644 --- a/deployment-scanner/src/main/java/org/jboss/as/server/deployment/scanner/logging/DeploymentScannerLogger.java +++ b/deployment-scanner/src/main/java/org/jboss/as/server/deployment/scanner/logging/DeploymentScannerLogger.java @@ -10,6 +10,7 @@ import static org.jboss.logging.Logger.Level.WARN; import java.io.File; +import java.lang.invoke.MethodHandles; import java.util.Set; import org.jboss.as.controller.OperationFailedException; @@ -31,7 +32,7 @@ public interface DeploymentScannerLogger extends BasicLogger { /** * A logger with the category of the package name. */ - DeploymentScannerLogger ROOT_LOGGER = Logger.getMessageLogger(DeploymentScannerLogger.class, "org.jboss.as.server.deployment.scanner"); + DeploymentScannerLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), DeploymentScannerLogger.class, "org.jboss.as.server.deployment.scanner"); /** * Logs a warning message indicating the extraneous deployment marker file could not be removed. diff --git a/discovery/src/main/java/org/wildfly/extension/discovery/Messages.java b/discovery/src/main/java/org/wildfly/extension/discovery/Messages.java index 51d13deaa8b..d84d5c7736b 100644 --- a/discovery/src/main/java/org/wildfly/extension/discovery/Messages.java +++ b/discovery/src/main/java/org/wildfly/extension/discovery/Messages.java @@ -5,6 +5,8 @@ package org.wildfly.extension.discovery; +import java.lang.invoke.MethodHandles; + import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.MessageLogger; @@ -14,5 +16,5 @@ */ @MessageLogger(projectCode = "WFDISCEXT", length = 5) interface Messages extends BasicLogger { - Messages log = Logger.getMessageLogger(Messages.class, "org.wildfly.extension.discovery"); + Messages log = Logger.getMessageLogger(MethodHandles.lookup(), Messages.class, "org.wildfly.extension.discovery"); } diff --git a/domain-http/interface/src/main/java/org/jboss/as/domain/http/server/logging/HttpServerLogger.java b/domain-http/interface/src/main/java/org/jboss/as/domain/http/server/logging/HttpServerLogger.java index 64e8c9a9b0a..1b27e923157 100644 --- a/domain-http/interface/src/main/java/org/jboss/as/domain/http/server/logging/HttpServerLogger.java +++ b/domain-http/interface/src/main/java/org/jboss/as/domain/http/server/logging/HttpServerLogger.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.InetAddress; import org.jboss.logging.BasicLogger; @@ -25,7 +26,7 @@ @MessageLogger(projectCode = "WFLYDMHTTP", length = 4) public interface HttpServerLogger extends BasicLogger { - HttpServerLogger ROOT_LOGGER = Logger.getMessageLogger(HttpServerLogger.class, "org.jboss.as.domain.http.api.undertow"); + HttpServerLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), HttpServerLogger.class, "org.jboss.as.domain.http.api.undertow"); @LogMessage(level = ERROR) @Message(id = 1, value = "Unexpected error executing model request") diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/logging/DomainManagementLogger.java b/domain-management/src/main/java/org/jboss/as/domain/management/logging/DomainManagementLogger.java index 380742890e3..bf0fe37bc30 100644 --- a/domain-management/src/main/java/org/jboss/as/domain/management/logging/DomainManagementLogger.java +++ b/domain-management/src/main/java/org/jboss/as/domain/management/logging/DomainManagementLogger.java @@ -9,6 +9,7 @@ import static org.jboss.logging.Logger.Level.WARN; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.security.GeneralSecurityException; import java.util.Collection; import java.util.Set; @@ -44,12 +45,12 @@ public interface DomainManagementLogger extends BasicLogger { /** * A logger with a category of the package name. */ - DomainManagementLogger ROOT_LOGGER = Logger.getMessageLogger(DomainManagementLogger.class, "org.jboss.as.domain.management"); + DomainManagementLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), DomainManagementLogger.class, "org.jboss.as.domain.management"); /** * A logger with category specifically for logging per request security related messages. */ - DomainManagementLogger SECURITY_LOGGER = Logger.getMessageLogger(DomainManagementLogger.class, "org.jboss.as.domain.management.security"); + DomainManagementLogger SECURITY_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), DomainManagementLogger.class, "org.jboss.as.domain.management.security"); /** * Logs a warning message indicating the user and password were found in the properties file. diff --git a/elytron-tool-wrapper/src/main/java/org/wildfly/core/elytron/tool/wrapper/_private/ElytronToolWrapperMessages.java b/elytron-tool-wrapper/src/main/java/org/wildfly/core/elytron/tool/wrapper/_private/ElytronToolWrapperMessages.java index d7f1695eaa6..87efa0c12fb 100644 --- a/elytron-tool-wrapper/src/main/java/org/wildfly/core/elytron/tool/wrapper/_private/ElytronToolWrapperMessages.java +++ b/elytron-tool-wrapper/src/main/java/org/wildfly/core/elytron/tool/wrapper/_private/ElytronToolWrapperMessages.java @@ -5,6 +5,8 @@ package org.wildfly.core.elytron.tool.wrapper._private; +import java.lang.invoke.MethodHandles; + import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Message; @@ -21,7 +23,7 @@ public interface ElytronToolWrapperMessages extends BasicLogger { /** * A root logger with the category of the package name. */ - ElytronToolWrapperMessages ROOT_LOGGER = Logger.getMessageLogger(ElytronToolWrapperMessages.class, "org.wildfly.core.elytron.tool.wrapper"); + ElytronToolWrapperMessages ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ElytronToolWrapperMessages.class, "org.wildfly.core.elytron.tool.wrapper"); @Message(id = Message.NONE, value = "To make use of the WildFly Elytron Tool, the elytron-tool script should be used instead of wildfly-elytron-tool.jar.\n\n" + "Run elytron-tool.sh, elytron-tool.bat, or elytron-tool.ps1 with the same arguments that were previously passed when using wildfly-elytron-tool.jar.\n\n" + diff --git a/elytron/src/main/java/org/wildfly/extension/elytron/_private/ElytronSubsystemMessages.java b/elytron/src/main/java/org/wildfly/extension/elytron/_private/ElytronSubsystemMessages.java index 5a1390105c3..ecb12a40f61 100644 --- a/elytron/src/main/java/org/wildfly/extension/elytron/_private/ElytronSubsystemMessages.java +++ b/elytron/src/main/java/org/wildfly/extension/elytron/_private/ElytronSubsystemMessages.java @@ -8,6 +8,7 @@ import static org.jboss.logging.Logger.Level.WARN; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.UnknownHostException; import java.security.KeyStore; import java.security.KeyStoreException; @@ -45,7 +46,7 @@ public interface ElytronSubsystemMessages extends BasicLogger { /** * A root logger with the category of the package name. */ - ElytronSubsystemMessages ROOT_LOGGER = Logger.getMessageLogger(ElytronSubsystemMessages.class, "org.wildfly.extension.elytron"); + ElytronSubsystemMessages ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ElytronSubsystemMessages.class, "org.wildfly.extension.elytron"); /** * {@link OperationFailedException} if the same realm is injected multiple times for a single domain. diff --git a/embedded/src/main/java/org/wildfly/core/embedded/logging/EmbeddedLogger.java b/embedded/src/main/java/org/wildfly/core/embedded/logging/EmbeddedLogger.java index 084b1c70ca1..9ef2ce9a0f3 100644 --- a/embedded/src/main/java/org/wildfly/core/embedded/logging/EmbeddedLogger.java +++ b/embedded/src/main/java/org/wildfly/core/embedded/logging/EmbeddedLogger.java @@ -6,6 +6,7 @@ package org.wildfly.core.embedded.logging; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; import org.jboss.logging.BasicLogger; @@ -29,7 +30,7 @@ public interface EmbeddedLogger extends BasicLogger { /** * A logger with a category of the package name. */ - EmbeddedLogger ROOT_LOGGER = Logger.getMessageLogger(EmbeddedLogger.class, "org.jboss.as.embedded"); + EmbeddedLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), EmbeddedLogger.class, "org.jboss.as.embedded"); // /** // * Logs a warning message indicating the file handle, represented by the {@code file} parameter, could not be diff --git a/host-controller/src/main/java/org/jboss/as/domain/controller/logging/DomainControllerLogger.java b/host-controller/src/main/java/org/jboss/as/domain/controller/logging/DomainControllerLogger.java index afcce96ef94..475bf18e2d0 100644 --- a/host-controller/src/main/java/org/jboss/as/domain/controller/logging/DomainControllerLogger.java +++ b/host-controller/src/main/java/org/jboss/as/domain/controller/logging/DomainControllerLogger.java @@ -11,6 +11,7 @@ import static org.jboss.logging.Logger.Level.WARN; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.util.Collection; import java.util.List; import java.util.Set; @@ -46,14 +47,14 @@ public interface DomainControllerLogger extends BasicLogger { * in code specific to the function of the primary Host Controller, e.g. the registration/deregistration * of secondary Host Contollers. */ - DomainControllerLogger ROOT_LOGGER = Logger.getMessageLogger(DomainControllerLogger.class, "org.jboss.as.domain.controller"); + DomainControllerLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), DomainControllerLogger.class, "org.jboss.as.domain.controller"); /** * A logger with the category of {@code org.jboss.as.host.controller}. * Usage: Use this in code related to Host Controller functionality, except * for areas described in the documentation of {@link #ROOT_LOGGER}. */ - DomainControllerLogger HOST_CONTROLLER_LOGGER = Logger.getMessageLogger(DomainControllerLogger.class, "org.jboss.as.host.controller"); + DomainControllerLogger HOST_CONTROLLER_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), DomainControllerLogger.class, "org.jboss.as.host.controller"); @LogMessage(level = Level.WARN) @Message(id = 1, value = "Ignoring 'include' child of 'socket-binding-group' %s") diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/logging/HostControllerLogger.java b/host-controller/src/main/java/org/jboss/as/host/controller/logging/HostControllerLogger.java index a16a17ead14..ee227f7b03f 100644 --- a/host-controller/src/main/java/org/jboss/as/host/controller/logging/HostControllerLogger.java +++ b/host-controller/src/main/java/org/jboss/as/host/controller/logging/HostControllerLogger.java @@ -11,6 +11,7 @@ import java.io.File; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.URI; import java.net.URL; import java.nio.file.Path; @@ -52,7 +53,7 @@ public interface HostControllerLogger extends BasicLogger { * Usage: Use this in code related to Host Controller functionality, except * for areas described in the documentation of {@link #DOMAIN_LOGGER}. */ - HostControllerLogger ROOT_LOGGER = Logger.getMessageLogger(HostControllerLogger.class, "org.jboss.as.host.controller"); + HostControllerLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), HostControllerLogger.class, "org.jboss.as.host.controller"); /** * A logger with a category of {@code org.jboss.as.domain.controller}. @@ -60,7 +61,7 @@ public interface HostControllerLogger extends BasicLogger { * in code specific to the function of the primary Host Controller, e.g. the registration/deregistration * of secondary Host Contollers. */ - HostControllerLogger DOMAIN_LOGGER = Logger.getMessageLogger(HostControllerLogger.class, "org.jboss.as.domain.controller"); + HostControllerLogger DOMAIN_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), HostControllerLogger.class, "org.jboss.as.domain.controller"); /** * Logs a warning message indicating the remote domain controller could not connect. @@ -1478,4 +1479,4 @@ void noDomainControllerConfigurationProvidedForAdminOnly(String policyAttribute, @Message(id = Message.NONE, value = "- Minimum feature stability level: %s") String stabilityInUse(Stability stability); -} \ No newline at end of file +} diff --git a/installation-manager/src/main/java/org/wildfly/core/instmgr/logging/InstMgrLogger.java b/installation-manager/src/main/java/org/wildfly/core/instmgr/logging/InstMgrLogger.java index dbfe181e7a2..fa9d6639bc7 100644 --- a/installation-manager/src/main/java/org/wildfly/core/instmgr/logging/InstMgrLogger.java +++ b/installation-manager/src/main/java/org/wildfly/core/instmgr/logging/InstMgrLogger.java @@ -5,6 +5,7 @@ package org.wildfly.core.instmgr.logging; +import java.lang.invoke.MethodHandles; import java.nio.file.Path; import java.util.Collection; import java.util.zip.ZipException; @@ -24,7 +25,7 @@ @MessageLogger(projectCode = "WFLYIM", length = 4) public interface InstMgrLogger extends BasicLogger { - InstMgrLogger ROOT_LOGGER = Logger.getMessageLogger(InstMgrLogger.class, "org.wildfly.core.installationmanager"); + InstMgrLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), InstMgrLogger.class, "org.wildfly.core.installationmanager"); @Message(id = 1, value = "There is an installation prepared and ready to be applied. The current prepared installation can be discarded by using the 'clean' operation.") OperationFailedException serverAlreadyPrepared(); diff --git a/io/subsystem/src/main/java/org/wildfly/extension/io/logging/IOLogger.java b/io/subsystem/src/main/java/org/wildfly/extension/io/logging/IOLogger.java index 9133b200f2f..e0fdff61f70 100644 --- a/io/subsystem/src/main/java/org/wildfly/extension/io/logging/IOLogger.java +++ b/io/subsystem/src/main/java/org/wildfly/extension/io/logging/IOLogger.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 org.jboss.as.controller.OperationFailedException; @@ -28,7 +29,7 @@ public interface IOLogger extends BasicLogger { /** * A root logger with the category of the package name. */ - IOLogger ROOT_LOGGER = Logger.getMessageLogger(IOLogger.class, "org.wildfly.extension.io"); + IOLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), IOLogger.class, "org.wildfly.extension.io"); @LogMessage(level = INFO) diff --git a/jmx/src/main/java/org/jboss/as/jmx/logging/JmxLogger.java b/jmx/src/main/java/org/jboss/as/jmx/logging/JmxLogger.java index 5e5f926fa43..2c16e6b76e6 100644 --- a/jmx/src/main/java/org/jboss/as/jmx/logging/JmxLogger.java +++ b/jmx/src/main/java/org/jboss/as/jmx/logging/JmxLogger.java @@ -8,6 +8,7 @@ import static org.jboss.logging.Logger.Level.ERROR; import static org.jboss.logging.Logger.Level.WARN; +import java.lang.invoke.MethodHandles; import java.util.Hashtable; import java.util.List; import java.util.Map; @@ -44,7 +45,7 @@ public interface JmxLogger extends BasicLogger { /** * A logger with the category of the package name. */ - JmxLogger ROOT_LOGGER = Logger.getMessageLogger(JmxLogger.class, "org.jboss.as.jmx"); + JmxLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), JmxLogger.class, "org.jboss.as.jmx"); // /** // * Creates an exception indicating the inability to shutdown the RMI registry. diff --git a/logging/src/main/java/org/jboss/as/logging/logging/LoggingLogger.java b/logging/src/main/java/org/jboss/as/logging/logging/LoggingLogger.java index 47e27387250..cac29bb6f57 100644 --- a/logging/src/main/java/org/jboss/as/logging/logging/LoggingLogger.java +++ b/logging/src/main/java/org/jboss/as/logging/logging/LoggingLogger.java @@ -9,6 +9,7 @@ import static org.jboss.logging.Logger.Level.WARN; import java.io.File; +import java.lang.invoke.MethodHandles; import java.util.Collection; import java.util.Set; @@ -43,7 +44,7 @@ public interface LoggingLogger extends BasicLogger { /** * A root logger with the category of the package name. */ - LoggingLogger ROOT_LOGGER = Logger.getMessageLogger(LoggingLogger.class, "org.jboss.as.logging"); + LoggingLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), LoggingLogger.class, "org.jboss.as.logging"); // id = 1, value = "%s caught exception attempting to revert operation %s at address %s" -- now unused diff --git a/management-client-content/src/main/java/org/jboss/as/management/client/content/ManagedDMRContentLogger.java b/management-client-content/src/main/java/org/jboss/as/management/client/content/ManagedDMRContentLogger.java index f5c0e30b230..49fed634c81 100644 --- a/management-client-content/src/main/java/org/jboss/as/management/client/content/ManagedDMRContentLogger.java +++ b/management-client-content/src/main/java/org/jboss/as/management/client/content/ManagedDMRContentLogger.java @@ -5,6 +5,7 @@ package org.jboss.as.management.client.content; +import java.lang.invoke.MethodHandles; import java.security.NoSuchAlgorithmException; import org.jboss.as.controller.OperationFailedException; @@ -26,7 +27,7 @@ interface ManagedDMRContentLogger extends BasicLogger { /** * A logger with the category of the package. */ - ManagedDMRContentLogger ROOT_LOGGER = Logger.getMessageLogger(ManagedDMRContentLogger.class, "org.jboss.as.management.client.content"); + ManagedDMRContentLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ManagedDMRContentLogger.class, "org.jboss.as.management.client.content"); /** * Creates an exception indicating the expected content hash provided by the caller does not match the current value. diff --git a/network/src/main/java/org/jboss/as/network/logging/NetworkMessages.java b/network/src/main/java/org/jboss/as/network/logging/NetworkMessages.java index 798e9baf297..686d45378c1 100644 --- a/network/src/main/java/org/jboss/as/network/logging/NetworkMessages.java +++ b/network/src/main/java/org/jboss/as/network/logging/NetworkMessages.java @@ -5,6 +5,8 @@ package org.jboss.as.network.logging; +import java.lang.invoke.MethodHandles; + import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; import org.jboss.logging.Messages; @@ -20,7 +22,7 @@ public interface NetworkMessages { /** * The default messages */ - NetworkMessages MESSAGES = Messages.getBundle(NetworkMessages.class); + NetworkMessages MESSAGES = Messages.getBundle(MethodHandles.lookup(), NetworkMessages.class); /** * Creates an exception indicating the value cannot be changed while the socket is bound. diff --git a/patching/src/main/java/org/jboss/as/patching/logging/PatchLogger.java b/patching/src/main/java/org/jboss/as/patching/logging/PatchLogger.java index 5c9528a3e7e..29a17028d05 100644 --- a/patching/src/main/java/org/jboss/as/patching/logging/PatchLogger.java +++ b/patching/src/main/java/org/jboss/as/patching/logging/PatchLogger.java @@ -10,6 +10,7 @@ import java.io.IOException; import java.io.SyncFailedException; +import java.lang.invoke.MethodHandles; import java.util.Collection; import org.jboss.as.controller.OperationFailedException; @@ -33,7 +34,7 @@ @MessageLogger(projectCode = "WFLYPAT", length = 4) public interface PatchLogger extends BasicLogger { - PatchLogger ROOT_LOGGER = Logger.getMessageLogger(PatchLogger.class, "org.jboss.as.patching"); + PatchLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), PatchLogger.class, "org.jboss.as.patching"); @LogMessage(level = WARN) @Message(id = 1, value = "Cannot delete file %s") diff --git a/platform-mbean/src/main/java/org/jboss/as/platform/mbean/logging/PlatformMBeanLogger.java b/platform-mbean/src/main/java/org/jboss/as/platform/mbean/logging/PlatformMBeanLogger.java index 142c1c9f2b4..7d4de088024 100644 --- a/platform-mbean/src/main/java/org/jboss/as/platform/mbean/logging/PlatformMBeanLogger.java +++ b/platform-mbean/src/main/java/org/jboss/as/platform/mbean/logging/PlatformMBeanLogger.java @@ -5,6 +5,8 @@ package org.jboss.as.platform.mbean.logging; +import java.lang.invoke.MethodHandles; + import org.jboss.as.controller.OperationFailedException; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; @@ -20,7 +22,7 @@ public interface PlatformMBeanLogger extends BasicLogger { /** * A logger with the category of the package. */ - PlatformMBeanLogger ROOT_LOGGER = Logger.getMessageLogger(PlatformMBeanLogger.class, "org.jboss.as.platform.mbean"); + PlatformMBeanLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), PlatformMBeanLogger.class, "org.jboss.as.platform.mbean"); /** * Creates an exception indicating that an operation parameter attribute name is unknown diff --git a/process-controller/src/main/java/org/jboss/as/process/ManagedProcess.java b/process-controller/src/main/java/org/jboss/as/process/ManagedProcess.java index 653d7aac706..b2654b32fe7 100644 --- a/process-controller/src/main/java/org/jboss/as/process/ManagedProcess.java +++ b/process-controller/src/main/java/org/jboss/as/process/ManagedProcess.java @@ -24,6 +24,7 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintStream; +import java.lang.invoke.MethodHandles; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -125,9 +126,9 @@ enum State { this.pcAuthKey = pcAuthKey; isPrivileged = privileged; respawnPolicy = respawn ? RespawnPolicy.RESPAWN : RespawnPolicy.NONE; - logStatus = Logger.getMessageLogger(ProcessLogger.class, "org.jboss.as.process." + processName + ".status"); - logSystemErr = Logger.getMessageLogger(ProcessLogger.class, "org.jboss.as.process." + processName + ".system.stderr"); - logSystemOut = Logger.getMessageLogger(ProcessLogger.class, "org.jboss.as.process." + processName + ".system.stdout"); + logStatus = Logger.getMessageLogger(MethodHandles.lookup(), ProcessLogger.class, "org.jboss.as.process." + processName + ".status"); + logSystemErr = Logger.getMessageLogger(MethodHandles.lookup(), ProcessLogger.class, "org.jboss.as.process." + processName + ".system.stderr"); + logSystemOut = Logger.getMessageLogger(MethodHandles.lookup(), ProcessLogger.class, "org.jboss.as.process." + processName + ".system.stdout"); } int incrementAndGetRespawnCount() { diff --git a/process-controller/src/main/java/org/jboss/as/process/logging/ProcessLogger.java b/process-controller/src/main/java/org/jboss/as/process/logging/ProcessLogger.java index 41e7187b436..f07d94696ca 100644 --- a/process-controller/src/main/java/org/jboss/as/process/logging/ProcessLogger.java +++ b/process-controller/src/main/java/org/jboss/as/process/logging/ProcessLogger.java @@ -12,6 +12,7 @@ import java.io.EOFException; import java.io.IOException; import java.io.UTFDataFormatException; +import java.lang.invoke.MethodHandles; import java.net.InetAddress; import java.net.ServerSocket; import java.util.Set; @@ -36,32 +37,32 @@ public interface ProcessLogger extends BasicLogger { /** * The root logger with a category of the package. */ - ProcessLogger ROOT_LOGGER = Logger.getMessageLogger(ProcessLogger.class, "org.jboss.as.process"); + ProcessLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ProcessLogger.class, "org.jboss.as.process"); /** * A logger with the category {@code org.jboss.as.process-controller.client}. */ - ProcessLogger CLIENT_LOGGER = Logger.getMessageLogger(ProcessLogger.class, "org.jboss.as.process-controller.client"); + ProcessLogger CLIENT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ProcessLogger.class, "org.jboss.as.process-controller.client"); /** * A logger with the category {@code org.jboss.as.process.protocol} */ - ProcessLogger PROTOCOL_LOGGER = Logger.getMessageLogger(ProcessLogger.class, "org.jboss.as.process.protocol"); + ProcessLogger PROTOCOL_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ProcessLogger.class, "org.jboss.as.process.protocol"); /** * A logger with the category {@code org.jboss.as.process.protocol.client} */ - ProcessLogger PROTOCOL_CLIENT_LOGGER = Logger.getMessageLogger(ProcessLogger.class, "org.jboss.as.protocol.client"); + ProcessLogger PROTOCOL_CLIENT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ProcessLogger.class, "org.jboss.as.protocol.client"); /** * A logger with the category {@code org.jboss.as.process.protocol.client} */ - ProcessLogger PROTOCOL_CONNECTION_LOGGER = Logger.getMessageLogger(ProcessLogger.class, "org.jboss.as.protocol.connection"); + ProcessLogger PROTOCOL_CONNECTION_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ProcessLogger.class, "org.jboss.as.protocol.connection"); /** * A logger with the category {@code org.jboss.as.process-controller.server}. */ - ProcessLogger SERVER_LOGGER = Logger.getMessageLogger(ProcessLogger.class, "org.jboss.as.process-controller.server"); + ProcessLogger SERVER_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ProcessLogger.class, "org.jboss.as.process-controller.server"); /** * Logs a warning message indicating an attempt to reconnect a non-existent process. diff --git a/protocol/src/main/java/org/jboss/as/protocol/logging/ProtocolLogger.java b/protocol/src/main/java/org/jboss/as/protocol/logging/ProtocolLogger.java index 94433c652df..0f97edb67e3 100644 --- a/protocol/src/main/java/org/jboss/as/protocol/logging/ProtocolLogger.java +++ b/protocol/src/main/java/org/jboss/as/protocol/logging/ProtocolLogger.java @@ -10,6 +10,7 @@ import static org.jboss.logging.Logger.Level.WARN; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.ConnectException; import java.net.ServerSocket; import java.net.URI; @@ -33,17 +34,17 @@ public interface ProtocolLogger extends BasicLogger { /** * The root logger with a category of the package. */ - ProtocolLogger ROOT_LOGGER = Logger.getMessageLogger(ProtocolLogger.class, "org.jboss.as.protocol"); + ProtocolLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ProtocolLogger.class, "org.jboss.as.protocol"); // /** // * A logger with the category {@code org.jboss.as.protocol.client}. // */ -// ProtocolLogger CLIENT_LOGGER = Logger.getMessageLogger(ProtocolLogger.class, "org.jboss.as.protocol.client"); +// ProtocolLogger CLIENT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ProtocolLogger.class, "org.jboss.as.protocol.client"); /** * A logger with the category {@code org.jboss.as.protocol.connection}. */ - ProtocolLogger CONNECTION_LOGGER = Logger.getMessageLogger(ProtocolLogger.class, "org.jboss.as.protocol.connection"); + ProtocolLogger CONNECTION_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ProtocolLogger.class, "org.jboss.as.protocol.connection"); /** * Logs a warning message indicating an error occurred when closing the channel. diff --git a/remoting/subsystem/src/main/java/org/jboss/as/remoting/logging/RemotingLogger.java b/remoting/subsystem/src/main/java/org/jboss/as/remoting/logging/RemotingLogger.java index 41c411a9911..5969df39800 100644 --- a/remoting/subsystem/src/main/java/org/jboss/as/remoting/logging/RemotingLogger.java +++ b/remoting/subsystem/src/main/java/org/jboss/as/remoting/logging/RemotingLogger.java @@ -8,6 +8,7 @@ import static org.jboss.logging.Logger.Level.INFO; import java.io.IOException; +import java.lang.invoke.MethodHandles; import java.net.BindException; import org.jboss.as.controller.OperationFailedException; @@ -32,7 +33,7 @@ public interface RemotingLogger extends BasicLogger { /** * A logger with a category of the package name. */ - RemotingLogger ROOT_LOGGER = Logger.getMessageLogger(RemotingLogger.class, "org.jboss.as.remoting"); + RemotingLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), RemotingLogger.class, "org.jboss.as.remoting"); @LogMessage(level = INFO) @Message(id = 1, value = "Listening on %s") diff --git a/request-controller/src/main/java/org/wildfly/extension/requestcontroller/logging/RequestControllerLogger.java b/request-controller/src/main/java/org/wildfly/extension/requestcontroller/logging/RequestControllerLogger.java index 6952b5d6858..bd01beb57ae 100644 --- a/request-controller/src/main/java/org/wildfly/extension/requestcontroller/logging/RequestControllerLogger.java +++ b/request-controller/src/main/java/org/wildfly/extension/requestcontroller/logging/RequestControllerLogger.java @@ -7,6 +7,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; @@ -23,7 +25,7 @@ public interface RequestControllerLogger extends BasicLogger { /** * A root logger with the category of the package name. */ - RequestControllerLogger ROOT_LOGGER = Logger.getMessageLogger(RequestControllerLogger.class, "org.wildfly.extension.requestcontroller"); + RequestControllerLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), RequestControllerLogger.class, "org.wildfly.extension.requestcontroller"); @LogMessage(level = WARN) diff --git a/security-manager/src/main/java/org/wildfly/extension/security/manager/logging/SecurityManagerLogger.java b/security-manager/src/main/java/org/wildfly/extension/security/manager/logging/SecurityManagerLogger.java index ed89ad9e632..f8d6f02474d 100644 --- a/security-manager/src/main/java/org/wildfly/extension/security/manager/logging/SecurityManagerLogger.java +++ b/security-manager/src/main/java/org/wildfly/extension/security/manager/logging/SecurityManagerLogger.java @@ -5,6 +5,7 @@ package org.wildfly.extension.security.manager.logging; +import java.lang.invoke.MethodHandles; import javax.xml.namespace.QName; import javax.xml.stream.Location; import javax.xml.stream.XMLStreamException; @@ -26,7 +27,7 @@ @MessageLogger(projectCode = "WFLYSM", length = 4) public interface SecurityManagerLogger extends BasicLogger { - SecurityManagerLogger ROOT_LOGGER = Logger.getMessageLogger(SecurityManagerLogger.class, "org.wildfly.extension.security.manager"); + SecurityManagerLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), SecurityManagerLogger.class, "org.wildfly.extension.security.manager"); // @LogMessage(level = INFO) // @Message(id = 1, value = "Installing the WildFly Security Manager") diff --git a/server/src/main/java/org/jboss/as/server/ServerService.java b/server/src/main/java/org/jboss/as/server/ServerService.java index 0a23e834013..e4f740f1796 100644 --- a/server/src/main/java/org/jboss/as/server/ServerService.java +++ b/server/src/main/java/org/jboss/as/server/ServerService.java @@ -433,6 +433,7 @@ public void undeploy(DeploymentUnit context) { } String message = ServerLogger.ROOT_LOGGER.unsuccessfulBoot(String.join(" ", messages)); bootstrapListener.bootFailure(new Exception(message, cause)); + cause.printStackTrace(); SystemExiter.logAndExit(new SystemExiter.ExitLogger() { @Override public void logExit() { diff --git a/server/src/main/java/org/jboss/as/server/logging/ServerLogger.java b/server/src/main/java/org/jboss/as/server/logging/ServerLogger.java index 36c63a3b74b..edae0173909 100644 --- a/server/src/main/java/org/jboss/as/server/logging/ServerLogger.java +++ b/server/src/main/java/org/jboss/as/server/logging/ServerLogger.java @@ -14,6 +14,7 @@ import java.io.File; import java.io.IOException; import java.io.InvalidObjectException; +import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; @@ -67,51 +68,51 @@ public interface ServerLogger extends BasicLogger { /** * A logger with a category of the package name. */ - ServerLogger ROOT_LOGGER = Logger.getMessageLogger(ServerLogger.class, "org.jboss.as.server"); + ServerLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ServerLogger.class, "org.jboss.as.server"); /** * A logger with the category {@code org.jboss.as}. */ - ServerLogger AS_ROOT_LOGGER = Logger.getMessageLogger(ServerLogger.class, "org.jboss.as"); + ServerLogger AS_ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ServerLogger.class, "org.jboss.as"); /** * A logger with the category {@code org.jboss.as.config}. */ - ServerLogger CONFIG_LOGGER = Logger.getMessageLogger(ServerLogger.class, "org.jboss.as.config"); + ServerLogger CONFIG_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ServerLogger.class, "org.jboss.as.config"); /** * A logger with the category {@code org.jboss.as.warn.fd-limit}. */ - ServerLogger FD_LIMIT_LOGGER = Logger.getMessageLogger(ServerLogger.class, "org.jboss.as.warn.fd-limit"); + ServerLogger FD_LIMIT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ServerLogger.class, "org.jboss.as.warn.fd-limit"); /** * A logger with the category {@code org.jboss.as.server.deployment}. */ - ServerLogger DEPLOYMENT_LOGGER = Logger.getMessageLogger(ServerLogger.class, "org.jboss.as.server.deployment"); + ServerLogger DEPLOYMENT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ServerLogger.class, "org.jboss.as.server.deployment"); /** * Logger for private APIs. */ - ServerLogger PRIVATE_DEP_LOGGER = Logger.getMessageLogger(ServerLogger.class, "org.jboss.as.dependency.private"); + ServerLogger PRIVATE_DEP_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ServerLogger.class, "org.jboss.as.dependency.private"); /** * Logger for unsupported APIs. */ - ServerLogger UNSUPPORTED_DEP_LOGGER = Logger.getMessageLogger(ServerLogger.class, "org.jboss.as.dependency.unsupported"); + ServerLogger UNSUPPORTED_DEP_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ServerLogger.class, "org.jboss.as.dependency.unsupported"); /** * A logger with the category {@code org.jboss.as.server.moduleservice}. */ - ServerLogger MODULE_SERVICE_LOGGER = Logger.getMessageLogger(ServerLogger.class, "org.jboss.as.server.moduleservice"); + ServerLogger MODULE_SERVICE_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ServerLogger.class, "org.jboss.as.server.moduleservice"); /** * A logger with the category {@code org.jboss.as.server.net}. */ - ServerLogger NETWORK_LOGGER = Logger.getMessageLogger(ServerLogger.class, "org.jboss.as.server.net"); + ServerLogger NETWORK_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ServerLogger.class, "org.jboss.as.server.net"); /** * Logger for deprecated APIs */ - ServerLogger DEPRECATED_DEP_LOGGER = Logger.getMessageLogger(ServerLogger.class, "org.jboss.as.dependency.deprecated"); + ServerLogger DEPRECATED_DEP_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ServerLogger.class, "org.jboss.as.dependency.deprecated"); /** * Log message for when a jboss-deployment-structure.xml file is ignored diff --git a/testsuite/unstable-api-annotation/feature-pack/subsystem/src/main/java/org/wildfly/core/test/unstable/api/annotation/classes/_private/UnstableAnnotationApiTestLogger.java b/testsuite/unstable-api-annotation/feature-pack/subsystem/src/main/java/org/wildfly/core/test/unstable/api/annotation/classes/_private/UnstableAnnotationApiTestLogger.java index 49ea16e7d24..621419314b6 100644 --- a/testsuite/unstable-api-annotation/feature-pack/subsystem/src/main/java/org/wildfly/core/test/unstable/api/annotation/classes/_private/UnstableAnnotationApiTestLogger.java +++ b/testsuite/unstable-api-annotation/feature-pack/subsystem/src/main/java/org/wildfly/core/test/unstable/api/annotation/classes/_private/UnstableAnnotationApiTestLogger.java @@ -14,6 +14,8 @@ import static org.jboss.logging.Logger.Level.INFO; +import java.lang.invoke.MethodHandles; + /** * Log messages for our template subsystem. * @@ -24,7 +26,7 @@ // TODO Rename to something that makes sense for your subsystem. public interface UnstableAnnotationApiTestLogger extends BasicLogger { - UnstableAnnotationApiTestLogger LOGGER = Logger.getMessageLogger(UnstableAnnotationApiTestLogger.class, "org.wildfly.extension.galleon.pack.template.subsystem"); + UnstableAnnotationApiTestLogger LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), UnstableAnnotationApiTestLogger.class, "org.wildfly.extension.galleon.pack.template.subsystem"); /** * Logs an informational message indicating the subsystem is being activated. diff --git a/threads/src/main/java/org/jboss/as/threads/ThreadsLogger.java b/threads/src/main/java/org/jboss/as/threads/ThreadsLogger.java index b8f31e5f58f..fb099b98724 100644 --- a/threads/src/main/java/org/jboss/as/threads/ThreadsLogger.java +++ b/threads/src/main/java/org/jboss/as/threads/ThreadsLogger.java @@ -5,6 +5,7 @@ package org.jboss.as.threads; +import java.lang.invoke.MethodHandles; import java.math.BigDecimal; import java.util.List; import java.util.concurrent.TimeUnit; @@ -31,7 +32,7 @@ interface ThreadsLogger extends BasicLogger { /** * A logger with a category of the package name. */ - ThreadsLogger ROOT_LOGGER = Logger.getMessageLogger(ThreadsLogger.class, "org.jboss.as.threads"); + ThreadsLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ThreadsLogger.class, "org.jboss.as.threads"); @LogMessage(level = Logger.Level.WARN) @Message(id = 1, value = "The '%s' attribute is no longer supported. The value [%f] of the '%s' attribute " +