fix: Add classloader to i18n

Author: caoccao

hivemq-edge/src/main/java/com/hivemq/common/i18n/I18nErrorTemplate.java

@@ -45,9 +45,13 @@ public final class I18nErrorTemplate {
     private static final @NotNull Logger LOGGER = LoggerFactory.getLogger(I18nErrorTemplate.class);
     private final @NotNull Map<String, Configuration> configurationMap;
     private final @NotNull Function<Locale, String> resourceNameFunction;
+    private final @NotNull ClassLoader classLoader;
 
-    public I18nErrorTemplate(final @NotNull Function<Locale, String> resourceNameFunction) {
+    public I18nErrorTemplate(
+            final @NotNull Function<Locale, String> resourceNameFunction,
+            final @NotNull ClassLoader classLoader) {
         configurationMap = new ConcurrentHashMap<>();
+        this.classLoader = classLoader;
         this.resourceNameFunction = resourceNameFunction;
     }
 
@@ -60,7 +64,7 @@ private Configuration createConfiguration(final @NotNull Locale locale) throws I
         final Properties properties = new Properties();
         final String resourceName = resourceNameFunction.apply(locale);
         try (final StringReader stringReader = new StringReader(IOUtils.resourceToString(resourceName,
-                StandardCharsets.UTF_8))) {
+                StandardCharsets.UTF_8, classLoader))) {
             properties.load(stringReader);
         }
         for (final Map.Entry<Object, Object> entry : properties.entrySet()) {

hivemq-edge/src/main/java/com/hivemq/common/i18n/I18nHttpError.java

@@ -41,10 +41,11 @@ public enum I18nHttpError implements I18nError {
     HTTP_ERROR_507_TITLE,
     ;
 
-    private static final @NotNull String RESOURCE_NAME_PREFIX = "/templates/http-errors-";
+    private static final @NotNull String RESOURCE_NAME_PREFIX = "templates/http-errors-";
     private static final @NotNull String RESOURCE_NAME_SUFFIX = ".properties";
-    private static final I18nErrorTemplate TEMPLATE =
-            new I18nErrorTemplate(locale -> RESOURCE_NAME_PREFIX + locale + RESOURCE_NAME_SUFFIX);
+    private static final @NotNull I18nErrorTemplate TEMPLATE =
+            new I18nErrorTemplate(locale -> RESOURCE_NAME_PREFIX + locale + RESOURCE_NAME_SUFFIX,
+                    I18nHttpError.class.getClassLoader());
 
     private final @NotNull String key;
 

hivemq-edge/src/test/java/com/hivemq/common/i18n/I18nHttpErrorTest.java

@@ -24,12 +24,7 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -51,8 +46,9 @@ public void whenLocaleIsEnUS_thenErrorCountShouldMatch() throws IOException {
         assertThat(errors.size()).isGreaterThan(0);
         final Properties properties = new Properties();
         try (final StringReader stringReader = new StringReader(IOUtils.resourceToString(
-                "/templates/http-errors-en_US.properties",
-                StandardCharsets.UTF_8))) {
+                "templates/http-errors-en_US.properties",
+                StandardCharsets.UTF_8,
+                I18nHttpError.class.getClassLoader()))) {
             properties.load(stringReader);
         }
         final Set<Object> propertyKeySet = properties.keySet();