Skip to content

Commit b67b1bc

Browse files
committed
Logging: Remove usages of deprecated JBoss Logging API to using MethodHandles
1 parent 2ba727a commit b67b1bc

14 files changed

Lines changed: 49 additions & 17 deletions

File tree

smallrye-reactive-messaging-amqp/src/main/java/io/smallrye/reactive/messaging/amqp/i18n/AMQPLogging.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.smallrye.reactive.messaging.amqp.i18n;
22

3+
import java.lang.invoke.MethodHandles;
4+
35
import org.jboss.logging.BasicLogger;
46
import org.jboss.logging.Logger;
57
import org.jboss.logging.annotations.Cause;
@@ -14,7 +16,8 @@
1416
@MessageLogger(projectCode = "SRMSG", length = 5)
1517
public interface AMQPLogging extends BasicLogger {
1618

17-
AMQPLogging log = Logger.getMessageLogger(AMQPLogging.class, "io.smallrye.reactive.messaging.amqp");
19+
AMQPLogging log = Logger.getMessageLogger(MethodHandles.lookup(), AMQPLogging.class,
20+
"io.smallrye.reactive.messaging.amqp");
1821

1922
@LogMessage(level = Logger.Level.DEBUG)
2023
@Message(id = 16200, value = "Creating AMQP client from bean named '%s'")

smallrye-reactive-messaging-aws-sqs/src/main/java/io/smallrye/reactive/messaging/aws/sqs/i18n/AwsSqsLogging.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.smallrye.reactive.messaging.aws.sqs.i18n;
22

3+
import java.lang.invoke.MethodHandles;
4+
35
import org.jboss.logging.BasicLogger;
46
import org.jboss.logging.Logger;
57
import org.jboss.logging.Logger.Level;
@@ -14,7 +16,9 @@
1416
*/
1517
@MessageLogger(projectCode = "SRMSG", length = 5)
1618
public interface AwsSqsLogging extends BasicLogger {
17-
AwsSqsLogging log = Logger.getMessageLogger(AwsSqsLogging.class, "io.smallrye.reactive.messaging.aws.sqs");
19+
20+
AwsSqsLogging log = Logger.getMessageLogger(MethodHandles.lookup(), AwsSqsLogging.class,
21+
"io.smallrye.reactive.messaging.aws.sqs");
1822

1923
@LogMessage(level = Level.TRACE)
2024
@Message(id = 19300, value = "Received Aws Sqs message %s")

smallrye-reactive-messaging-camel/src/main/java/io/smallrye/reactive/messaging/camel/i18n/CamelLogging.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.smallrye.reactive.messaging.camel.i18n;
22

3+
import java.lang.invoke.MethodHandles;
4+
35
import org.jboss.logging.BasicLogger;
46
import org.jboss.logging.Logger;
57
import org.jboss.logging.annotations.Cause;
@@ -14,7 +16,8 @@
1416
@MessageLogger(projectCode = "SRMSG", length = 5)
1517
public interface CamelLogging extends BasicLogger {
1618

17-
CamelLogging log = Logger.getMessageLogger(CamelLogging.class, "io.smallrye.reactive.messaging.camel");
19+
CamelLogging log = Logger.getMessageLogger(MethodHandles.lookup(), CamelLogging.class,
20+
"io.smallrye.reactive.messaging.camel");
1821

1922
@LogMessage(level = Logger.Level.INFO)
2023
@Message(id = 17800, value = "Creating publisher from Camel stream named %s")

smallrye-reactive-messaging-gcp-pubsub/src/main/java/io/smallrye/reactive/messaging/gcp/pubsub/i18n/PubSubLogging.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.smallrye.reactive.messaging.gcp.pubsub.i18n;
22

3+
import java.lang.invoke.MethodHandles;
4+
35
import org.jboss.logging.BasicLogger;
46
import org.jboss.logging.Logger;
57
import org.jboss.logging.annotations.Cause;
@@ -17,7 +19,8 @@
1719
@MessageLogger(projectCode = "SRMSG", length = 5)
1820
public interface PubSubLogging extends BasicLogger {
1921

20-
PubSubLogging log = Logger.getMessageLogger(PubSubLogging.class, "io.smallrye.reactive.messaging.gcp.pubsub");
22+
PubSubLogging log = Logger.getMessageLogger(MethodHandles.lookup(), PubSubLogging.class,
23+
"io.smallrye.reactive.messaging.gcp.pubsub");
2124

2225
@LogMessage(level = Logger.Level.TRACE)
2326
@Message(id = 14800, value = "Topic %s already exists")

smallrye-reactive-messaging-in-memory/src/main/java/io/smallrye/reactive/messaging/memory/i18n/InMemoryLogging.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.smallrye.reactive.messaging.memory.i18n;
22

3+
import java.lang.invoke.MethodHandles;
4+
35
import org.jboss.logging.BasicLogger;
46
import org.jboss.logging.Logger;
57
import org.jboss.logging.annotations.MessageLogger;
@@ -11,5 +13,6 @@
1113
@MessageLogger(projectCode = "SRMSG", length = 5)
1214
public interface InMemoryLogging extends BasicLogger {
1315

14-
InMemoryLogging log = Logger.getMessageLogger(InMemoryLogging.class, "io.smallrye.reactive.messaging.in-memory");
16+
InMemoryLogging log = Logger.getMessageLogger(MethodHandles.lookup(), InMemoryLogging.class,
17+
"io.smallrye.reactive.messaging.in-memory");
1518
}

smallrye-reactive-messaging-jms/src/main/java/io/smallrye/reactive/messaging/jms/i18n/JmsLogging.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.smallrye.reactive.messaging.jms.i18n;
22

3+
import java.lang.invoke.MethodHandles;
4+
35
import org.jboss.logging.BasicLogger;
46
import org.jboss.logging.Logger;
57
import org.jboss.logging.annotations.Cause;
@@ -14,7 +16,8 @@
1416
@MessageLogger(projectCode = "SRMSG", length = 5)
1517
public interface JmsLogging extends BasicLogger {
1618

17-
JmsLogging log = Logger.getMessageLogger(JmsLogging.class, "io.smallrye.reactive.messaging.jms");
19+
JmsLogging log = Logger.getMessageLogger(MethodHandles.lookup(), JmsLogging.class,
20+
"io.smallrye.reactive.messaging.jms");
1821

1922
@LogMessage(level = Logger.Level.ERROR)
2023
@Message(id = 15800, value = "Unable to send message to JMS")

smallrye-reactive-messaging-kafka/src/main/java/io/smallrye/reactive/messaging/kafka/i18n/KafkaLogging.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.smallrye.reactive.messaging.kafka.i18n;
22

3+
import java.lang.invoke.MethodHandles;
34
import java.util.Collection;
45
import java.util.Map;
56
import java.util.Set;
@@ -20,7 +21,8 @@
2021
@MessageLogger(projectCode = "SRMSG", length = 5)
2122
public interface KafkaLogging extends BasicLogger {
2223

23-
KafkaLogging log = Logger.getMessageLogger(KafkaLogging.class, "io.smallrye.reactive.messaging.kafka");
24+
KafkaLogging log = Logger.getMessageLogger(MethodHandles.lookup(), KafkaLogging.class,
25+
"io.smallrye.reactive.messaging.kafka");
2426

2527
@LogMessage(level = Logger.Level.DEBUG)
2628
@Message(id = 18201, value = "Dead queue letter configured with: topic: `%s`, key serializer: `%s`, value serializer: `%s`")

smallrye-reactive-messaging-mqtt/src/main/java/io/smallrye/reactive/messaging/mqtt/i18n/MqttLogging.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.smallrye.reactive.messaging.mqtt.i18n;
22

3+
import java.lang.invoke.MethodHandles;
4+
35
import org.jboss.logging.BasicLogger;
46
import org.jboss.logging.Logger;
57
import org.jboss.logging.annotations.Cause;
@@ -16,7 +18,7 @@ public interface MqttLogging extends BasicLogger {
1618

1719
// 17100-17199 (logging)
1820

19-
MqttLogging log = Logger.getMessageLogger(MqttLogging.class, "io.smallrye.reactive.messaging.mqtt");
21+
MqttLogging log = Logger.getMessageLogger(MethodHandles.lookup(), MqttLogging.class, "io.smallrye.reactive.messaging.mqtt");
2022

2123
@LogMessage(level = Logger.Level.ERROR)
2224
@Message(id = 17100, value = "A message sent to channel `%s` has been nacked, fail-stop")

smallrye-reactive-messaging-provider/src/main/java/io/smallrye/reactive/messaging/providers/i18n/ProviderLogging.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.smallrye.reactive.messaging.providers.i18n;
22

3+
import java.lang.invoke.MethodHandles;
34
import java.util.Set;
45

56
import jakarta.enterprise.inject.spi.Bean;
@@ -19,7 +20,8 @@ public interface ProviderLogging extends BasicLogger {
1920

2021
// 00200-00299 (logging)
2122

22-
ProviderLogging log = Logger.getMessageLogger(ProviderLogging.class, "io.smallrye.reactive.messaging.provider");
23+
ProviderLogging log = Logger.getMessageLogger(MethodHandles.lookup(), ProviderLogging.class,
24+
"io.smallrye.reactive.messaging.provider");
2325

2426
@LogMessage(level = Logger.Level.ERROR)
2527
@Message(id = 200, value = "The method %s has thrown an exception")

smallrye-reactive-messaging-pulsar/src/main/java/io/smallrye/reactive/messaging/pulsar/i18n/PulsarLogging.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.smallrye.reactive.messaging.pulsar.i18n;
22

3+
import java.lang.invoke.MethodHandles;
4+
35
import org.jboss.logging.BasicLogger;
46
import org.jboss.logging.Logger;
57
import org.jboss.logging.annotations.Cause;
@@ -14,7 +16,8 @@
1416
@MessageLogger(projectCode = "SRMSG", length = 5)
1517
public interface PulsarLogging extends BasicLogger {
1618

17-
PulsarLogging log = Logger.getMessageLogger(PulsarLogging.class, "io.smallrye.reactive.messaging.pulsar");
19+
PulsarLogging log = Logger.getMessageLogger(MethodHandles.lookup(), PulsarLogging.class,
20+
"io.smallrye.reactive.messaging.pulsar");
1821

1922
@LogMessage(level = Logger.Level.WARN)
2023
@Message(id = 19000, value = "Unable to close Pulsar consumer")

0 commit comments

Comments
 (0)