Refactor

microsphere-projects · Apr 22, 2024 · 3af6528 · 3af6528
1 parent d695fc7
commit 3af6528
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ere-i18n-core/src/main/java/io/microsphere/i18n/AbstractResourceServiceMessageSource.java b/...ere-i18n-core/src/main/java/io/microsphere/i18n/AbstractResourceServiceMessageSource.java
@@ -141,6 +141,7 @@ protected String buildResourceName(Locale locale) {
 
     protected abstract String getResource(String resourceName);
 
+    @Nullable
     protected abstract Map<String, String> loadMessages(String resource);
 
     @Nullable

diff --git a/...e-i18n-core/src/main/java/io/microsphere/i18n/PropertiesResourceServiceMessageSource.java b/...e-i18n-core/src/main/java/io/microsphere/i18n/PropertiesResourceServiceMessageSource.java
@@ -11,7 +11,6 @@
 
 import static io.microsphere.collection.CollectionUtils.isEmpty;
 import static io.microsphere.text.FormatUtils.format;
-import static java.util.Collections.emptyMap;
 import static java.util.Collections.unmodifiableMap;
 
 /**
@@ -28,7 +27,7 @@ public PropertiesResourceServiceMessageSource(String source) {
 
     @Override
     protected final Map<String, String> loadMessages(String resource) {
-        Map<String, String> messages = emptyMap();
+        Map<String, String> messages = null;
         try {
             Properties properties = loadAllProperties(resource);
             if (!MapUtils.isEmpty(properties)) {
@@ -38,7 +37,7 @@ protected final Map<String, String> loadMessages(String resource) {
         } catch (IOException e) {
             throw new RuntimeException(format("Source '{}' Messages Properties Resource[name : {}] loading is failed", source, resource), e);
         }
-        return unmodifiableMap(messages);
+        return messages == null ? null : unmodifiableMap(messages);
     }
 
     private Properties loadAllProperties(String resource) throws IOException {