test: add Test for MessageSourceIntegrationTest

fix I18nEndpoint数据显示

microsphere-i18n-spring-boot/src/main/java/io/microsphere/i18n/spring/boot/actuate/I18nEndpoint.java

@@ -24,7 +24,6 @@
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -86,7 +85,10 @@ public Map<String, Map<String, String>> invoke() {
                 if (subServiceMessageSource instanceof AbstractResourceServiceMessageSource) {
                     AbstractResourceServiceMessageSource resourceServiceMessageSource = (AbstractResourceServiceMessageSource) subServiceMessageSource;
                     Map<String, Map<String, String>> localizedResourceMessages = resourceServiceMessageSource.getLocalizedResourceMessages();
-                    allLocalizedResourceMessages.putAll(localizedResourceMessages);
+//                    allLocalizedResourceMessages.putAll(localizedResourceMessages);
+                    localizedResourceMessages.forEach(
+                            (k, v) -> allLocalizedResourceMessages.merge(k, v, (oldValue, value) -> value.isEmpty() ? oldValue : value)
+                    );
                 }
             }
         }

microsphere-i18n-spring-cloud/src/test/java/io/microsphere/i18n/spring/cloud/integration/MessageSourceIntegrationTest.java

@@ -0,0 +1,64 @@
+package io.microsphere.i18n.spring.cloud.integration;
+
+import com.jayway.jsonpath.Configuration;
+import com.jayway.jsonpath.DocumentContext;
+import io.microsphere.i18n.ServiceMessageSource;
+import io.microsphere.i18n.spring.boot.actuate.I18nEndpoint;
+import io.microsphere.i18n.spring.boot.actuate.autoconfigure.I18nEndpointAutoConfiguration;
+import io.microsphere.i18n.spring.boot.autoconfigure.I18nAutoConfiguration;
+import io.microsphere.i18n.spring.cloud.event.ReloadableResourceServiceMessageSourceListener;
+import org.assertj.core.util.Maps;
+import org.assertj.core.util.Sets;
+import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+
+import java.util.Locale;
+
+import static com.jayway.jsonpath.JsonPath.using;
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+@SpringBootTest(classes = MessageSourceIntegrationTest.Config.class)
+class MessageSourceIntegrationTest {
+
+    @Test
+    void shouldGetMessageWhenChangeMessageSourceProperty(ApplicationContext applicationContext) {
+        String key = "common.i18n_messages_en.properties";
+        ServiceMessageSource serviceMessageSource = applicationContext.getBean("commonServiceMessageSource", ServiceMessageSource.class);
+
+        assertThat(serviceMessageSource.getMessage("common.a", Locale.ENGLISH))
+                .isEqualTo("a");
+        ConfigurableEnvironment environment = (ConfigurableEnvironment) applicationContext.getEnvironment();
+        environment.getPropertySources().addLast(new MapPropertySource("test", Maps.newHashMap(key, "common.a=a.2024")));
+
+        applicationContext.publishEvent(new EnvironmentChangeEvent(Sets.set(key)));
+
+
+        assertThat(serviceMessageSource.getMessage("common.a", Locale.ENGLISH))
+                .isEqualTo("a.2024");
+
+        DocumentContext parse = using(Configuration.defaultConfiguration()).parse(applicationContext.getBean(I18nEndpoint.class).invoke());
+        MatcherAssert.assertThat(parse, hasJsonPath("$.['common.i18n_messages_en.properties'].['common.a']", equalTo("a.2024")));
+    }
+
+    @ImportAutoConfiguration(classes = {
+            I18nAutoConfiguration.class,
+            I18nEndpointAutoConfiguration.class
+    })
+    static class Config {
+
+        @Bean
+        ReloadableResourceServiceMessageSourceListener reloadableResourceServiceMessageSourceListener() {
+            return new ReloadableResourceServiceMessageSourceListener();
+        }
+
+    }
+}