Merge remote-tracking branch 'upstream/main' into feature_restTemplate

.github/workflows/junit_test.yml

@@ -5,28 +5,47 @@ name: Test with Junit
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - 2021.0
+      - 2020.0
+      - greenwich
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - 2021.0
+      - 2020.0
+      - greenwich
 
 jobs:
   build:
+    strategy:
+      matrix:
+        java: [ 8, 11, 17 ]
+        os: [ 'windows-latest', 'macos-latest', 'ubuntu-latest' ]
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     steps:
     - name: Checkout codes
-      uses: actions/checkout@v2
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
+      uses: actions/checkout@v3
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v3
       with:
-        java-version: '8'
-        distribution: 'adopt'
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+    - name: Cache local Maven repository
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
 #    - name: Build with Maven
 #      run: mvn -B package --file pom.xml
     - name: Test with Maven
       run: mvn -B test --file pom.xml
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v3
       with:
-        file: ${{ github.workspace }}/target/site/jacoco/jacoco.xml
+        file: '**/target/site/jacoco/jacoco.xml'

CHANGELOG.md

@@ -9,3 +9,7 @@
 - [Upgrade: fix third-party lib CVEs & upgrade core spring libs version](https://github.com/Tencent/spring-cloud-tencent/pull/237)
 - [change escape way into encode](https://github.com/Tencent/spring-cloud-tencent/pull/251)
 - [feat:support reading configuration from application.yml or application.properties.](https://github.com/Tencent/spring-cloud-tencent/pull/259)
+- [fix:fix ClassNotFoundException while not importing openfeign when using circuit-breaker module.](https://github.com/Tencent/spring-cloud-tencent/pull/269)
+- [Update GitHub Actions workflow](https://github.com/Tencent/spring-cloud-tencent/pull/273)
+- [fix:fix TypeNotPresentException in @ConditionalOnClass of router.](https://github.com/Tencent/spring-cloud-tencent/pull/276)
+- [fix:solve the chaos code problem on rejectTips.](https://github.com/Tencent/spring-cloud-tencent/pull/279)

pom.xml

@@ -95,7 +95,7 @@
 		<spring.framework.version>5.2.22.RELEASE</spring.framework.version>
 
 		<!-- Maven Plugin Versions -->
-		<jacoco.version>0.8.3</jacoco.version>
+		<jacoco.version>0.8.8</jacoco.version>
 		<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
 		<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
 		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>

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

@@ -25,6 +25,7 @@ import com.tencent.polaris.factory.api.DiscoveryAPIFactory;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -42,6 +43,7 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
 @ConditionalOnProperty(value = "spring.cloud.polaris.circuitbreaker.enabled",
 		havingValue = "true", matchIfMissing = true)
 @Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(name = "org.springframework.cloud.openfeign.FeignAutoConfiguration")
 @AutoConfigureAfter(PolarisContextAutoConfiguration.class)
 @AutoConfigureBefore(FeignAutoConfiguration.class)
 public class PolarisFeignClientAutoConfiguration {

spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/listener/ConfigChangeListenerTest.java

@@ -66,7 +66,7 @@ public class ConfigChangeListenerTest {
 				Sets.newHashSet("timeout"));
 
 		applicationEventPublisher.publishEvent(event);
-
+		Thread.sleep(200);
 		//after change
 		Assert.assertEquals(2, testConfig.getChangeCnt());
 		Assert.assertEquals(2000, testConfig.getTimeout());

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java

@@ -99,6 +99,7 @@ public class QuotaCheckServletFilter extends OncePerRequestFilter {
 
 			if (quotaResponse.getCode() == QuotaResultCode.QuotaResultLimited) {
 				response.setStatus(polarisRateLimitProperties.getRejectHttpCode());
+				response.setContentType("text/plain;charset=UTF-8");
 				response.getWriter().write(rejectTips);
 				return;
 			}

spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilterTest.java

@@ -118,7 +118,7 @@ public class QuotaCheckServletFilterTest {
 		});
 
 		PolarisRateLimitProperties polarisRateLimitProperties = new PolarisRateLimitProperties();
-		polarisRateLimitProperties.setRejectRequestTips("RejectRequestTips");
+		polarisRateLimitProperties.setRejectRequestTips("RejectRequestTips提示消息");
 		polarisRateLimitProperties.setRejectHttpCode(419);
 
 		RateLimitRuleLabelResolver rateLimitRuleLabelResolver = mock(RateLimitRuleLabelResolver.class);
@@ -133,7 +133,7 @@ public class QuotaCheckServletFilterTest {
 		try {
 			Field rejectTips = QuotaCheckServletFilter.class.getDeclaredField("rejectTips");
 			rejectTips.setAccessible(true);
-			assertThat(rejectTips.get(quotaCheckServletFilter)).isEqualTo("RejectRequestTips");
+			assertThat(rejectTips.get(quotaCheckServletFilter)).isEqualTo("RejectRequestTips提示消息");
 		}
 		catch (NoSuchFieldException | IllegalAccessException e) {
 			fail("Exception encountered.", e);
@@ -201,7 +201,7 @@ public class QuotaCheckServletFilterTest {
 			MetadataContext.LOCAL_SERVICE = "TestApp3";
 			quotaCheckServletFilter.doFilterInternal(request, response, filterChain);
 			assertThat(response.getStatus()).isEqualTo(419);
-			assertThat(response.getContentAsString()).isEqualTo("RejectRequestTips");
+			assertThat(response.getContentAsString()).isEqualTo("RejectRequestTips提示消息");
 
 
 			// Exception

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

@@ -27,8 +27,6 @@ import com.tencent.cloud.polaris.router.config.properties.PolarisNearByRouterPro
 import com.tencent.cloud.polaris.router.config.properties.PolarisRuleBasedRouterProperties;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
-import org.springframework.cloud.gateway.filter.LoadBalancerClientFilter;
 import org.springframework.cloud.netflix.ribbon.RibbonClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -49,14 +47,14 @@ public class RouterAutoConfiguration {
 
 	@Bean
 	@Order(HIGHEST_PRECEDENCE)
-	@ConditionalOnClass(LoadBalancerInterceptor.class)
+	@ConditionalOnClass(name = "org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor")
 	public LoadBalancerInterceptorBeanPostProcessor loadBalancerInterceptorBeanPostProcessor() {
 		return new LoadBalancerInterceptorBeanPostProcessor();
 	}
 
 	@Bean
 	@Order(HIGHEST_PRECEDENCE)
-	@ConditionalOnClass(LoadBalancerClientFilter.class)
+	@ConditionalOnClass(name = "org.springframework.cloud.gateway.filter.LoadBalancerClientFilter")
 	public LoadBalancerClientFilterBeanPostProcessor loadBalancerClientFilterBeanPostProcessor() {
 		return new LoadBalancerClientFilterBeanPostProcessor();
 	}

spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ResourceFileUtils.java

@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.util.StreamUtils;
 
 /**
  * Read file content from classpath resource.
@@ -35,20 +36,15 @@ public final class ResourceFileUtils {
 	}
 
 	public static String readFile(String path) throws IOException {
-		StringBuilder sb = new StringBuilder();
 
 		ClassPathResource classPathResource = new ClassPathResource(path);
 
 		if (classPathResource.exists() && classPathResource.isReadable()) {
 			try (InputStream inputStream = classPathResource.getInputStream()) {
-				byte[] buffer = new byte[1024 * 10];
-				int len;
-				while ((len = inputStream.read(buffer)) != -1) {
-					sb.append(new String(buffer, 0, len, StandardCharsets.UTF_8));
-				}
+				return StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8);
 			}
 		}
-		return sb.toString();
+		return "";
 	}
 
 }

spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/ResourceFileUtilsTest.java

@@ -35,7 +35,7 @@ public class ResourceFileUtilsTest {
 	@Test
 	public void testReadExistedFile() throws IOException {
 		String content = ResourceFileUtils.readFile("test.txt");
-		Assert.assertEquals("just for test\n", content);
+		Assert.assertEquals("just for test", content);
 	}
 
 	@Test

spring-cloud-tencent-commons/src/test/resources/test.txt

@@ -1 +1 @@
-just for test
+just for test