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

CHANGELOG.md

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

changes/changes-1.5.2.md

@@ -0,0 +1,5 @@
+# Change Log
+---
+
+- [fix:use 1.6.1 version of polaris-java.](https://github.com/Tencent/spring-cloud-tencent/pull/209)
+- [fix:use 1.6.1 version of polaris-java and fix some bug.](https://github.com/Tencent/spring-cloud-tencent/pull/223)

pom.xml

@@ -38,9 +38,11 @@
 	</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>
@@ -48,8 +50,6 @@
 		<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-Greenwich.SR6</revision>
+		<revision>1.5.3-Greenwich.SR6</revision>
 
 		<!-- Spring Cloud -->
 		<spring.cloud.version>Greenwich.SR6</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;
@@ -62,10 +63,9 @@ public class EncodeTransferMedataFeignInterceptorTest {
 	private TestApplication.TestFeign testFeign;
 
 	@Test
-	public void test1() {
+	public void testTransitiveMetadataFromApplicationConfig() {
 		String metadata = testFeign.test();
-		Assertions.assertThat(metadata)
+		Assertions.assertThat(metadata).isEqualTo("2");
-				.isEqualTo("{\"b\":\"2\"}");
 		Assertions.assertThat(metadataLocalProperties.getContent().get("a"))
 				.isEqualTo("1");
 		Assertions.assertThat(metadataLocalProperties.getContent().get("b"))
@@ -81,16 +81,13 @@ public class EncodeTransferMedataFeignInterceptorTest {
 		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",
+			@RequestMapping("/test")
-					headers = {"X-SCT-Metadata-Transitive-a=11",
-							"X-SCT-Metadata-Transitive-b=22",
-							"X-SCT-Metadata-Transitive-c=33"})
 			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.autoconfigure.SpringBootApplication;
 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,9 +55,6 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 		properties = { "spring.config.location = classpath:application-test.yml" })
 public class EncodeTransferMedataRestTemplateInterceptorTest {
 
-	@Autowired
-	private MetadataLocalProperties metadataLocalProperties;
-
 	@Autowired
 	private RestTemplate restTemplate;
 
@@ -61,30 +62,14 @@ public class EncodeTransferMedataRestTemplateInterceptorTest {
 	private int localServerPort;
 
 	@Test
-	public void test1() {
+	public void testTransitiveMetadataFromApplicationConfig() {
-//		HttpHeaders httpHeaders = new HttpHeaders();
+		HttpHeaders httpHeaders = new HttpHeaders();
-//		httpHeaders.set(MetadataConstant.HeaderName.CUSTOM_METADATA,
+		HttpEntity<String> httpEntity = new HttpEntity<>(httpHeaders);
-//				"{\"a\":\"11\",\"b\":\"22\",\"c\":\"33\"}");
+		String metadata = restTemplate
-//		HttpEntity<String> httpEntity = new HttpEntity<>(httpHeaders);
+				.exchange("http://localhost:" + localServerPort + "/test", HttpMethod.GET,
-//		String metadata = restTemplate
+						httpEntity, String.class)
-//				.exchange("http://localhost:" + localServerPort + "/test", HttpMethod.GET,
+				.getBody();
-//						httpEntity, String.class)
+		Assertions.assertThat(metadata).isEqualTo("2");
-//				.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");
 	}
 
 	@SpringBootApplication
@@ -100,7 +85,7 @@ public class EncodeTransferMedataRestTemplateInterceptorTest {
 		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/PolarisConfigBootstrapAutoConfiguration.java

@@ -51,16 +51,18 @@ public class PolarisConfigBootstrapAutoConfiguration {
 	}
 
 	@Bean
-	public ConfigFileService configFileService(SDKContext sdkContext) {
+	public PolarisPropertySourceManager polarisPropertySourceManager() {
-		return ConfigFileServiceFactory.createConfigFileService(sdkContext);
+		return new PolarisPropertySourceManager();
 	}
 
 	@Bean
-	public PolarisPropertySourceManager polarisPropertySourceManager() {
+	@ConditionalOnConnectRemoteServerEnabled
-		return new PolarisPropertySourceManager();
+	public ConfigFileService configFileService(SDKContext sdkContext) {
+		return ConfigFileServiceFactory.createConfigFileService(sdkContext);
 	}
 
 	@Bean
+	@ConditionalOnConnectRemoteServerEnabled
 	public PolarisConfigFileLocator polarisConfigFileLocator(
 			PolarisConfigProperties polarisConfigProperties,
 			PolarisContextProperties polarisContextProperties,
@@ -73,6 +75,7 @@ public class PolarisConfigBootstrapAutoConfiguration {
 	}
 
 	@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

@@ -84,13 +84,14 @@ public class PolarisConfigFileLocator implements PropertySourceLocator {
 		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;
@@ -190,12 +191,10 @@ public class PolarisConfigFileLocator implements PropertySourceLocator {
 		// unknown extension is resolved as properties file
 		if (ConfigFileFormat.isPropertyFile(fileName)
 				|| ConfigFileFormat.isUnknownFile(fileName)) {
-			configKVFile = configFileService.getConfigPropertiesFile(namespace, group,
+			configKVFile = configFileService.getConfigPropertiesFile(namespace, group, fileName);
-					fileName);
 		}
 		else if (ConfigFileFormat.isYamlFile(fileName)) {
-			configKVFile = configFileService.getConfigYamlFile(namespace, group,
+			configKVFile = configFileService.getConfigYamlFile(namespace, group, fileName);
-					fileName);
 		}
 		else {
 			LOGGER.warn(

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"
     }
   ]
 }

spring-cloud-starter-tencent-polaris-config/src/test/resources/application-test.yml

@@ -0,0 +1,9 @@
+spring:
+  application:
+    name: test
+  cloud:
+    polaris:
+      address: grpc://127.0.0.1:8091
+      namespace: default
+      config:
+        connect-remote-server: false

spring-cloud-tencent-coverage/pom.xml

@@ -24,6 +24,16 @@
             <artifactId>spring-cloud-tencent-commons</artifactId>
         </dependency>
 
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-tencent-polaris-context</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-tencent-polaris-loadbalancer</artifactId>
+		</dependency>
+
         <dependency>
             <groupId>com.tencent.cloud</groupId>
             <artifactId>spring-cloud-starter-tencent-polaris-discovery</artifactId>
@@ -49,10 +59,10 @@
             <artifactId>spring-cloud-starter-tencent-polaris-router</artifactId>
         </dependency>
 
-        <dependency>
+		<dependency>
-            <groupId>com.tencent.cloud</groupId>
+			<groupId>com.tencent.cloud</groupId>
-            <artifactId>spring-cloud-tencent-polaris-context</artifactId>
+			<artifactId>spring-cloud-starter-tencent-polaris-config</artifactId>
-        </dependency>
+		</dependency>
     </dependencies>
 
     <build>
@@ -75,4 +85,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

spring-cloud-tencent-dependencies/pom.xml

@@ -70,7 +70,7 @@
 	</developers>
 
 	<properties>
-		<revision>1.5.2-Greenwich.SR6</revision>
+		<revision>1.5.3-Greenwich.SR6</revision>
 		<polaris.version>1.6.1</polaris.version>
 
 		<!-- Dependencies -->
@@ -80,7 +80,7 @@
 		<openfeign.version>2.2.6.RELEASE</openfeign.version>
 		<mocktio.version>4.5.1</mocktio.version>
 		<byte-buddy.version>1.12.10</byte-buddy.version>
-
+		<guava.version>31.0.1-jre</guava.version>
 		<!-- Maven Plugin Versions -->
 		<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
 		<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
@@ -184,6 +184,32 @@
 				<version>${revision}</version>
 			</dependency>
 
+			<!-- third part framework dependencies -->
+			<dependency>
+				<groupId>com.google.guava</groupId>
+				<artifactId>guava</artifactId>
+				<version>${guava.version}</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>jsr305</artifactId>
+						<groupId>com.google.code.findbugs</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>animal-sniffer-annotations</artifactId>
+						<groupId>org.codehaus.mojo</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>error_prone_annotations</artifactId>
+						<groupId>com.google.errorprone</groupId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+
+			<dependency>
+				<groupId>ch.qos.logback</groupId>
+				<artifactId>logback-classic</artifactId>
+				<version>${logback.version}</version>
+			</dependency>
 
 			<dependency>
 				<groupId>org.mockito</groupId>