fix not load application.yml bug & fix guava version conflict bug (#289)

CHANGELOG.md

@@ -1,5 +1,4 @@
 # Change Log
 ---
 
-- [Add metadata transfer example.](https://github.com/Tencent/spring-cloud-tencent/pull/211)
-- [feat:merge features from 1.5.x-Hoxton.SR9.](https://github.com/Tencent/spring-cloud-tencent/pull/250)
+- [fix: fix not load application.yml bug & fix guava version conflict bug.](https://github.com/Tencent/spring-cloud-tencent/pull/289)

changes/changes-1.5.2.md

@@ -0,0 +1,5 @@
+# Change Log
+---
+
+- [Add metadata transfer example.](https://github.com/Tencent/spring-cloud-tencent/pull/211)
+- [feat:merge features from 1.5.x-Hoxton.SR9.](https://github.com/Tencent/spring-cloud-tencent/pull/250)

pom.xml

@@ -38,18 +38,18 @@
 	</scm>
 
 	<modules>
-		<module>spring-cloud-tencent-polaris-context</module>
 		<module>spring-cloud-tencent-commons</module>
+		<module>spring-cloud-tencent-polaris-context</module>
+		<module>spring-cloud-tencent-polaris-loadbalancer</module>
 		<module>spring-cloud-starter-tencent-metadata-transfer</module>
+		<module>spring-cloud-starter-tencent-polaris-config</module>
 		<module>spring-cloud-starter-tencent-polaris-discovery</module>
 		<module>spring-cloud-starter-tencent-polaris-ratelimit</module>
 		<module>spring-cloud-starter-tencent-polaris-circuitbreaker</module>
 		<module>spring-cloud-starter-tencent-polaris-router</module>
 		<module>spring-cloud-tencent-dependencies</module>
 		<module>spring-cloud-tencent-examples</module>
 		<module>spring-cloud-tencent-coverage</module>
-		<module>spring-cloud-starter-tencent-polaris-config</module>
-		<module>spring-cloud-tencent-polaris-loadbalancer</module>
 	</modules>
 
 	<developers>
@@ -86,7 +86,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.5.2-2021.0.2</revision>
+		<revision>1.5.3-2021.0.2</revision>
 
 		<!-- Spring Cloud -->
 		<spring.cloud.version>2021.0.2</spring.cloud.version>

spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/EncodeTransferMedataFeignInterceptorTest.java

@@ -19,9 +19,10 @@
 package com.tencent.cloud.metadata.core.intercepter;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 
 import com.tencent.cloud.common.constant.MetadataConstant;
+import com.tencent.cloud.common.metadata.MetadataContext;
+import com.tencent.cloud.common.metadata.MetadataContextHolder;
 import com.tencent.cloud.common.metadata.config.MetadataLocalProperties;
 import com.tencent.cloud.metadata.core.EncodeTransferMedataFeignInterceptor;
 import feign.RequestInterceptor;
@@ -61,11 +62,13 @@ public class EncodeTransferMedataFeignInterceptorTest {
 	private TestApplication.TestFeign testFeign;
 
 	@Test
-	public void test1() {
+	public void testTransitiveMetadataFromApplicationConfig() {
 		String metadata = testFeign.test();
-		Assertions.assertThat(metadata).isEqualTo("{\"b\":\"2\"}");
-		Assertions.assertThat(metadataLocalProperties.getContent().get("a")).isEqualTo("1");
-		Assertions.assertThat(metadataLocalProperties.getContent().get("b")).isEqualTo("2");
+		Assertions.assertThat(metadata).isEqualTo("2");
+		Assertions.assertThat(metadataLocalProperties.getContent().get("a"))
+				.isEqualTo("1");
+		Assertions.assertThat(metadataLocalProperties.getContent().get("b"))
+				.isEqualTo("2");
 	}
 
 	@SpringBootApplication
@@ -77,16 +80,13 @@ protected static class TestApplication {
 		public String test(
 				@RequestHeader(MetadataConstant.HeaderName.CUSTOM_METADATA) String customMetadataStr)
 				throws UnsupportedEncodingException {
-			return URLDecoder.decode(customMetadataStr, "UTF-8");
+			return MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_TRANSITIVE, "b");
 		}
 
 		@FeignClient(name = "test-feign", url = "http://localhost:8081")
 		public interface TestFeign {
 
-			@RequestMapping(value = "/test",
-					headers = {"X-SCT-Metadata-Transitive-a=11",
-							"X-SCT-Metadata-Transitive-b=22",
-							"X-SCT-Metadata-Transitive-c=33"})
+			@RequestMapping("/test")
 			String test();
 
 		}

spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/intercepter/EncodeTransferMedataRestTemplateInterceptorTest.java

@@ -19,11 +19,12 @@
 package com.tencent.cloud.metadata.core.intercepter;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 
 import com.tencent.cloud.common.constant.MetadataConstant;
-import com.tencent.cloud.common.metadata.config.MetadataLocalProperties;
+import com.tencent.cloud.common.metadata.MetadataContext;
+import com.tencent.cloud.common.metadata.MetadataContextHolder;
 import com.tencent.cloud.metadata.core.EncodeTransferMedataRestTemplateInterceptor;
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -32,6 +33,9 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.context.annotation.Bean;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,40 +55,21 @@
 		properties = { "spring.config.location = classpath:application-test.yml" })
 public class EncodeTransferMedataRestTemplateInterceptorTest {
 
-	@Autowired
-	private MetadataLocalProperties metadataLocalProperties;
-
 	@Autowired
 	private RestTemplate restTemplate;
 
 	@LocalServerPort
 	private int localServerPort;
 
 	@Test
-	public void test1() {
-//		HttpHeaders httpHeaders = new HttpHeaders();
-//		httpHeaders.set(MetadataConstant.HeaderName.CUSTOM_METADATA,
-//				"{\"a\":\"11\",\"b\":\"22\",\"c\":\"33\"}");
-//		HttpEntity<String> httpEntity = new HttpEntity<>(httpHeaders);
-//		String metadata = restTemplate
-//				.exchange("http://localhost:" + localServerPort + "/test", HttpMethod.GET,
-//						httpEntity, String.class)
-//				.getBody();
-//		Assertions.assertThat(metadata)
-//				.isEqualTo("{\"a\":\"11\",\"b\":\"22\",\"c\":\"33\"}");
-//		Assertions.assertThat(metadataLocalProperties.getContent().get("a"))
-//				.isEqualTo("1");
-//		Assertions.assertThat(metadataLocalProperties.getContent().get("b"))
-//				.isEqualTo("2");
-//		Assertions
-//				.assertThat(MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_TRANSITIVE, "a"))
-//				.isEqualTo("11");
-//		Assertions
-//				.assertThat(MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_TRANSITIVE, "b"))
-//				.isEqualTo("22");
-//		Assertions
-//				.assertThat(MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_TRANSITIVE, "c"))
-//				.isEqualTo("33");
+	public void testTransitiveMetadataFromApplicationConfig() {
+		HttpHeaders httpHeaders = new HttpHeaders();
+		HttpEntity<String> httpEntity = new HttpEntity<>(httpHeaders);
+		String metadata = restTemplate
+				.exchange("http://localhost:" + localServerPort + "/test", HttpMethod.GET,
+						httpEntity, String.class)
+				.getBody();
+		Assertions.assertThat(metadata).isEqualTo("2");
 	}
 
 	@SpringBootApplication
@@ -100,7 +85,7 @@ public RestTemplate restTemplate() {
 		public String test(
 				@RequestHeader(MetadataConstant.HeaderName.CUSTOM_METADATA) String customMetadataStr)
 				throws UnsupportedEncodingException {
-			return URLDecoder.decode(customMetadataStr, "UTF-8");
+			return MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_TRANSITIVE, "b");
 		}
 
 	}

spring-cloud-starter-tencent-polaris-config/pom.xml

@@ -11,6 +11,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-starter-tencent-polaris-config</artifactId>
+	<name>Spring Cloud Starter Tencent Polaris Config</name>
 
 	<dependencies>
 		<!-- Spring Cloud Tencent dependencies start -->
@@ -64,5 +65,28 @@
 		</dependency>
 		<!-- Spring cloud dependencies start -->
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-inline</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>net.bytebuddy</groupId>
+			<artifactId>byte-buddy</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/ConditionalOnConnectRemoteServerEnabled.java

@@ -0,0 +1,37 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.config;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+/**
+ * Whether to connect to a remote server, suitable for local development mode.
+ *
+ * @author lepdou 2022-06-11
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@ConditionalOnProperty(value = "spring.cloud.polaris.config.connect-remote-server", matchIfMissing = true)
+public @interface ConditionalOnConnectRemoteServerEnabled {
+
+}

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/PolarisConfigBootstrapAutoConfiguration.java

@@ -50,24 +50,31 @@ public PolarisConfigProperties polarisProperties() {
 	}
 
 	@Bean
-	public ConfigFileService configFileService(SDKContext sdkContext) {
-		return ConfigFileServiceFactory.createConfigFileService(sdkContext);
+	public PolarisPropertySourceManager polarisPropertySourceManager() {
+		return new PolarisPropertySourceManager();
 	}
 
 	@Bean
-	public PolarisPropertySourceManager polarisPropertySourceManager() {
-		return new PolarisPropertySourceManager();
+	@ConditionalOnConnectRemoteServerEnabled
+	public ConfigFileService configFileService(SDKContext sdkContext) {
+		return ConfigFileServiceFactory.createConfigFileService(sdkContext);
 	}
 
 	@Bean
-	public PolarisConfigFileLocator polarisConfigFileLocator(PolarisConfigProperties polarisConfigProperties,
-			PolarisContextProperties polarisContextProperties, ConfigFileService configFileService,
-			PolarisPropertySourceManager polarisPropertySourceManager, Environment environment) {
-		return new PolarisConfigFileLocator(polarisConfigProperties, polarisContextProperties, configFileService,
+	@ConditionalOnConnectRemoteServerEnabled
+	public PolarisConfigFileLocator polarisConfigFileLocator(
+			PolarisConfigProperties polarisConfigProperties,
+			PolarisContextProperties polarisContextProperties,
+			ConfigFileService configFileService,
+			PolarisPropertySourceManager polarisPropertySourceManager,
+			Environment environment) {
+		return new PolarisConfigFileLocator(polarisConfigProperties,
+				polarisContextProperties, configFileService,
 				polarisPropertySourceManager, environment);
 	}
 
 	@Bean
+	@ConditionalOnConnectRemoteServerEnabled
 	public ConfigurationModifier configurationModifier(PolarisConfigProperties polarisConfigProperties,
 			PolarisContextProperties polarisContextProperties) {
 		return new ConfigurationModifier(polarisConfigProperties, polarisContextProperties);

spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocator.java

@@ -80,13 +80,14 @@ public PropertySource<?> locate(Environment environment) {
 		CompositePropertySource compositePropertySource = new CompositePropertySource(
 				POLARIS_CONFIG_PROPERTY_SOURCE_NAME);
 
+		// load spring boot default config files
+		initInternalConfigFiles(compositePropertySource);
+
+		// load custom config files
 		List<ConfigFileGroup> configFileGroups = polarisConfigProperties.getGroups();
 		if (CollectionUtils.isEmpty(configFileGroups)) {
 			return compositePropertySource;
 		}
-
-		initInternalConfigFiles(compositePropertySource);
-
 		initCustomPolarisConfigFiles(compositePropertySource, configFileGroups);
 
 		return compositePropertySource;
@@ -181,7 +182,8 @@ private void initCustomPolarisConfigFiles(CompositePropertySource compositePrope
 	private PolarisPropertySource loadPolarisPropertySource(String namespace, String group, String fileName) {
 		ConfigKVFile configKVFile;
 		// unknown extension is resolved as properties file
-		if (ConfigFileFormat.isPropertyFile(fileName) || ConfigFileFormat.isUnknownFile(fileName)) {
+		if (ConfigFileFormat.isPropertyFile(fileName)
+				|| ConfigFileFormat.isUnknownFile(fileName)) {
 			configKVFile = configFileService.getConfigPropertiesFile(namespace, group, fileName);
 		}
 		else if (ConfigFileFormat.isYamlFile(fileName)) {

spring-cloud-starter-tencent-polaris-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -34,6 +34,13 @@
       "defaultValue": "",
       "description": "List of imported config files.",
       "sourceType": "com.tencent.cloud.polaris.config.config.PolarisConfigProperties"
+    },
+    {
+      "name": "spring.cloud.polaris.config.connect-remote-server",
+      "type": "java.lang.Boolean",
+      "defaultValue": "true",
+      "description": "Whether to connect to a remote server, suitable for local development mode.",
+      "sourceType": "com.tencent.cloud.polaris.config.config.PolarisConfigProperties"
     }
   ]
 }