Polish alibaba/spring-cloud-alibaba#1758 : [CodeBase] Sync the source code from greenwich to finichley

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java

@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -487,8 +486,7 @@ public class NacosConfigProperties {
 		List<Config> result = new ArrayList<>();
 		configList.stream()
 				.collect(Collectors.groupingBy(cfg -> (cfg.getGroup() + cfg.getDataId()),
-						() -> new ConcurrentHashMap<>(new LinkedHashMap<>()),
+						LinkedHashMap::new, Collectors.toList()))
-						Collectors.toList()))
 				.forEach((key, list) -> {
 					list.stream()
 							.reduce((a, b) -> new Config(a.getDataId(), a.getGroup(),

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataPropertiesParser.java

@@ -55,7 +55,9 @@ public class NacosDataPropertiesParser extends AbstractNacosDataParser {
 					log.warn("the config data is invalid {}", dataLine);
 					continue;
 				}
-				result.put(dataLine.substring(0, index), dataLine.substring(index + 1));
+				String key = dataLine.substring(0, index);
+				String value = dataLine.substring(index + 1);
+				result.put(key.trim(), value.trim());
 			}
 		}
 		return result;

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosConfigPropertiesServerAddressBothLevelTests.java

@@ -34,9 +34,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
  * @author <a href="mailto:lyuzb@lyuzb.com">lyuzb</a>
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(
+@SpringBootTest(classes = NacosConfigPropertiesServerAddressBothLevelTests.TestConfig.class, properties = {
-		classes = NacosConfigPropertiesServerAddressBothLevelTests.TestConfig.class,
+		"spring.cloud.nacos.config.server-addr=321,321,321,321:8848",
-		properties = { "spring.cloud.nacos.config.server-addr=321,321,321,321:8848",
 				"spring.cloud.nacos.server-addr=123.123.123.123:8848" },
 		webEnvironment = RANDOM_PORT)
 public class NacosConfigPropertiesServerAddressBothLevelTests {

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosConfigPropertiesServerAddressTopLevelTests.java

@@ -34,10 +34,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
  * @author <a href="mailto:lyuzb@lyuzb.com">lyuzb</a>
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(
+@SpringBootTest(classes = NacosConfigPropertiesServerAddressTopLevelTests.TestConfig.class, properties = {
-		classes = NacosConfigPropertiesServerAddressTopLevelTests.TestConfig.class,
+		"spring.cloud.nacos.server-addr=123.123.123.123:8848" }, webEnvironment = RANDOM_PORT)
-		properties = { "spring.cloud.nacos.server-addr=123.123.123.123:8848" },
-		webEnvironment = RANDOM_PORT)
 public class NacosConfigPropertiesServerAddressTopLevelTests {
 
 	@Autowired

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java

@@ -50,9 +50,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 @PowerMockIgnore("javax.management.*")
 @PowerMockRunnerDelegate(SpringRunner.class)
 @PrepareForTest({ NacosConfigService.class })
-@SpringBootTest(classes = NacosConfigurationExtConfigTests.TestConfig.class,
+@SpringBootTest(classes = NacosConfigurationExtConfigTests.TestConfig.class, properties = {
-		properties = { "spring.application.name=myTestService1",
+		"spring.application.name=myTestService1", "spring.profiles.active=dev,test",
-				"spring.profiles.active=dev,test",
 				"spring.cloud.nacos.config.server-addr=127.0.0.1:8848",
 				"spring.cloud.nacos.config.encode=utf-8",
 				"spring.cloud.nacos.config.timeout=1000",

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosFileExtensionTest.java

@@ -49,8 +49,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 @PowerMockIgnore("javax.management.*")
 @PowerMockRunnerDelegate(SpringRunner.class)
 @PrepareForTest({ NacosConfigService.class })
-@SpringBootTest(classes = NacosFileExtensionTest.TestConfig.class,
+@SpringBootTest(classes = NacosFileExtensionTest.TestConfig.class, properties = {
-		properties = { "spring.application.name=test-name",
+		"spring.application.name=test-name",
 				"spring.cloud.nacos.config.server-addr=127.0.0.1:8848",
 				"spring.cloud.nacos.config.file-extension=yaml" },
 		webEnvironment = NONE)

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java

@@ -51,8 +51,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 @PowerMockIgnore("javax.management.*")
 @PowerMockRunnerDelegate(SpringRunner.class)
 @PrepareForTest({ NacosConfigService.class })
-@SpringBootTest(classes = NacosConfigEndpointTests.TestConfig.class,
+@SpringBootTest(classes = NacosConfigEndpointTests.TestConfig.class, properties = {
-		properties = { "spring.application.name=test-name",
+		"spring.application.name=test-name",
 				"spring.cloud.nacos.config.server-addr=127.0.0.1:8848",
 				"spring.cloud.nacos.config.file-extension=properties" },
 		webEnvironment = NONE)