From ff3c4d376d682fd979076733f93d12b68bd7eba9 Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Wed, 27 Nov 2024 17:54:39 -0600
Subject: [PATCH] Use module-friendly bundle methods (#1255)
---
.../java/io/smallrye/config/inject/InjectionMessages.java | 3 ++-
.../main/java/io/smallrye/config/_private/ConfigMessages.java | 3 ++-
.../smallrye/config/source/zookeeper/ZooKeeperMessages.java | 4 +++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cdi/src/main/java/io/smallrye/config/inject/InjectionMessages.java b/cdi/src/main/java/io/smallrye/config/inject/InjectionMessages.java
index 085018bcc..7955d9495 100644
--- a/cdi/src/main/java/io/smallrye/config/inject/InjectionMessages.java
+++ b/cdi/src/main/java/io/smallrye/config/inject/InjectionMessages.java
@@ -1,5 +1,6 @@
package io.smallrye.config.inject;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.Field;
@@ -21,7 +22,7 @@
@MessageBundle(projectCode = "SRCFG", length = 5)
public interface InjectionMessages {
- InjectionMessages msg = Messages.getBundle(InjectionMessages.class);
+ InjectionMessages msg = Messages.getBundle(MethodHandles.lookup(), InjectionMessages.class);
@Message(id = 2000, value = "Failed to Inject @ConfigProperty for key %s into %s since the config property could not be found in any config source")
ConfigException noConfigValue(@Param @Pos(1) String configPropertyName, @Pos(2) String location);
diff --git a/implementation/src/main/java/io/smallrye/config/_private/ConfigMessages.java b/implementation/src/main/java/io/smallrye/config/_private/ConfigMessages.java
index 97b4084a8..9ba51e890 100644
--- a/implementation/src/main/java/io/smallrye/config/_private/ConfigMessages.java
+++ b/implementation/src/main/java/io/smallrye/config/_private/ConfigMessages.java
@@ -1,6 +1,7 @@
package io.smallrye.config._private;
import java.io.InvalidObjectException;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Type;
import java.util.NoSuchElementException;
import java.util.regex.Pattern;
@@ -13,7 +14,7 @@
@MessageBundle(projectCode = "SRCFG", length = 5)
public interface ConfigMessages {
- ConfigMessages msg = Messages.getBundle(ConfigMessages.class);
+ ConfigMessages msg = Messages.getBundle(MethodHandles.lookup(), ConfigMessages.class);
@Message(id = 0, value = "The file %s was not found")
IllegalStateException fileNotFound(String fileName);
diff --git a/sources/zookeeper/src/main/java/io/smallrye/config/source/zookeeper/ZooKeeperMessages.java b/sources/zookeeper/src/main/java/io/smallrye/config/source/zookeeper/ZooKeeperMessages.java
index 15af31486..79e7f1e2e 100644
--- a/sources/zookeeper/src/main/java/io/smallrye/config/source/zookeeper/ZooKeeperMessages.java
+++ b/sources/zookeeper/src/main/java/io/smallrye/config/source/zookeeper/ZooKeeperMessages.java
@@ -1,12 +1,14 @@
package io.smallrye.config.source.zookeeper;
+import java.lang.invoke.MethodHandles;
+
import org.jboss.logging.Messages;
import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageBundle;
@MessageBundle(projectCode = "SRCFG", length = 5)
interface ZooKeeperMessages {
- ZooKeeperMessages msg = Messages.getBundle(ZooKeeperMessages.class);
+ ZooKeeperMessages msg = Messages.getBundle(MethodHandles.lookup(), ZooKeeperMessages.class);
@Message(id = 4000, value = "Please set properties for \"" +
ZooKeeperConfigSource.ZOOKEEPER_URL_KEY + "\" and \"" +