Polish alibaba#110 : remove application.properties and copy to META-I…

…NF/nacos-default.properties

config/pom.xml

@@ -158,9 +158,6 @@
                 <directory>src/main/resources</directory>
                 <excludes>
                     <exclude>application.properties</exclude>
-                    <exclude>banner.txt</exclude>
-                    <exclude>schema.sql</exclude>
-                    <exclude>nacos-db.sql</exclude>
                 </excludes>
             </resource>
         </resources>

console/src/main/resources/application.properties → console/src/main/resources/META-INF/nacos-default.properties

@@ -1,8 +1,5 @@
-# spring
-management.security.enabled=false
-server.contextPath=/nacos
-server.servlet.contextPath=/nacos
-server.port=8848
+# Console Default Properties
+
 spring.mvc.view.prefix=/jsp/
 # 响应页面默认后缀
 spring.mvc.view.suffix=.jsp

core/src/main/resources/META-INF/nacos-default.properties

@@ -1,7 +1,18 @@
 # Nacos Default Properties
 
-## Exclude Spring Boot Auto-Configuration class(es)
-spring.autoconfigure.exclude=\
-org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
+## Web Server
+server.servlet.context-path=/nacos
+server.port=8848
+server.tomcat.uri-encoding=UTF-8
+
+## HTTP Encoding
+spring.http.encoding.force=true
+spring.http.encoding.enabled=true
 
+## i18n
+spring.messages.encoding=UTF-8
 
+## Exclude Spring Boot Auto-Configuration class(es)
+spring.autoconfigure.exclude=\
+org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,\
+org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration

core/src/test/java/com/alibaba/nacos/core/env/NacosDefaultPropertySourceEnvironmentPostProcessorTest.java

@@ -21,12 +21,17 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.HashSet;
+
 import static com.alibaba.nacos.core.env.NacosDefaultPropertySourceEnvironmentPostProcessor.PROPERTY_SOURCE_NAME;
+import static com.alibaba.nacos.core.env.NacosDefaultPropertySourceEnvironmentPostProcessor.RESOURCE_LOCATION_PATTERN;
+import static java.util.Arrays.asList;
 
 /**
  * {@link NacosDefaultPropertySourceEnvironmentPostProcessor} Test
@@ -48,10 +53,61 @@ public void testNacosDefaultPropertySourcePresent() {
         // "nacos-default" must be present
         Assert.assertTrue(propertySources.contains("nacos-default"));
         // Get PropertySource via PROPERTY_SOURCE_NAME
-        PropertySource propertySource = propertySources.get(PROPERTY_SOURCE_NAME);
+        PropertySource propertySource = getNacosDefaultPropertySource();
         // "nacos-default" must be present
         Assert.assertNotNull(propertySource);
         // make sure propertySource is last one
         Assert.assertEquals(propertySources.size() - 1, propertySources.precedenceOf(propertySource));
     }
+
+    @Test
+    public void testDefaultProperties() {
+
+        // Web Server
+        assertPropertyEquals("server.servlet.context-path", "/nacos");
+        assertPropertyEquals("server.port", "8848");
+        assertPropertyEquals("server.tomcat.uri-encoding", "UTF-8");
+
+        // HTTP Encoding
+        assertPropertyEquals("spring.http.encoding.force", "true");
+        assertPropertyEquals("spring.http.encoding.enabled", "true");
+
+        // i18n
+        assertPropertyEquals("spring.messages.encoding", "UTF-8");
+    }
+
+    @Test
+    public void testDefaultPropertyNames() {
+
+        assertPropertyNames(
+                "server.servlet.context-path",
+                "server.port",
+                "server.tomcat.uri-encoding",
+                "spring.http.encoding.force",
+                "spring.http.encoding.enabled",
+                "spring.messages.encoding",
+                "spring.autoconfigure.exclude"
+        );
+    }
+
+    private void assertPropertyNames(String... propertyNames) {
+
+        CompositePropertySource propertySource = getNacosDefaultPropertySource();
+
+        Assert.assertEquals("Please Properties from resources[" + RESOURCE_LOCATION_PATTERN + "]",
+                new HashSet<String>(asList(propertyNames)),
+                new HashSet<String>(asList(propertySource.getPropertyNames())));
+    }
+
+    private void assertPropertyEquals(String propertyName, String expectedValue) {
+        PropertySource propertySource = getNacosDefaultPropertySource();
+        Assert.assertEquals(expectedValue, propertySource.getProperty(propertyName));
+    }
+
+    private CompositePropertySource getNacosDefaultPropertySource() {
+        MutablePropertySources propertySources = environment.getPropertySources();
+        // Get PropertySource via PROPERTY_SOURCE_NAME
+        CompositePropertySource propertySource = (CompositePropertySource) propertySources.get(PROPERTY_SOURCE_NAME);
+        return propertySource;
+    }
 }

distribution/conf/application.properties

@@ -1,5 +1,5 @@
 # spring
-management.security.enabled=false
+
 server.contextPath=/nacos
 server.servlet.contextPath=/nacos
 server.port=8848

distribution/conf/application.properties.example

@@ -1,5 +1,5 @@
 # spring
-management.security.enabled=false
+
 server.contextPath=/nacos
 server.servlet.contextPath=/nacos
 server.port=8848

naming/pom.xml

@@ -177,6 +177,15 @@
                 </configuration>
             </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>application.properties</exclude>
+                </excludes>
+            </resource>
+        </resources>
     </build>
     <reporting>
         <plugins>

test/src/test/resources/application.properties

@@ -1,5 +1,5 @@
 # spring
-management.security.enabled=false
+
 server.servlet.context-path=/nacos
 server.port=8848