Merge branch 'main' into improve/pr-322

.github/workflows/codecov.yml

@@ -0,0 +1,32 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Codecov
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout codes
+        uses: actions/checkout@v3
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Test with Maven
+        run: mvn -B test --file pom.xml
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          file: ${{ github.workspace }}/target/site/jacoco/jacoco.xml

.github/workflows/junit_test.yml

@@ -41,11 +41,5 @@ jobs:
         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@v3
-      with:
-        file: '**/target/site/jacoco/jacoco.xml'

CHANGELOG.md

@@ -21,4 +21,7 @@
 - [Fix the current limiting effect is that other requests cannot be processed when queuing at a constant speed](https://github.com/Tencent/spring-cloud-tencent/pull/316)
 - [Fix config file format misspell](https://github.com/Tencent/spring-cloud-tencent/pull/319)
 - [UT: improve test coverage for load balancer unit test](https://github.com/Tencent/spring-cloud-tencent/pull/325)
+- [optimize polaris load balancer test code format](https://github.com/Tencent/spring-cloud-tencent/pull/333)
+- [feat:Add GitHub action of codecov.yml.](https://github.com/Tencent/spring-cloud-tencent/pull/328)
+- [Feature: add spring cloud tencent logo](https://github.com/Tencent/spring-cloud-tencent/pull/329)
 - [Optimize code style & unit test case](https://github.com/Tencent/spring-cloud-tencent/pull/336)

README-zh.md

@@ -1,4 +1,4 @@
-# Spring Cloud Tencent
+<img src="https://user-images.githubusercontent.com/4991116/176166888-9c8a4074-ba42-41b8-93db-d6e95b16656b.png" width="60%" height="60%"  alt="Spring-Cloud-Tencent-Logo"/>
 
 [![Wiki](https://badgen.net/badge/icon/wiki?icon=wiki&label)](https://github.com/Tencent/spring-cloud-tencent/wiki)
 [![Build Status](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml/badge.svg)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml)

README.md

@@ -1,4 +1,5 @@
-# Spring Cloud Tencent
+<img src="https://user-images.githubusercontent.com/4991116/176166888-9c8a4074-ba42-41b8-93db-d6e95b16656b.png" width="60%" height="60%"  alt="Spring-Cloud-Tencent-Logo"/>
+
 
 [![Wiki](https://badgen.net/badge/icon/wiki?icon=wiki&label)](https://github.com/Tencent/spring-cloud-tencent/wiki)
 [![Build Status](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml/badge.svg)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml)

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java

@@ -61,7 +61,7 @@ public class PolarisDiscoveryHandler {
 		GetHealthyInstancesRequest getHealthyInstancesRequest = new GetHealthyInstancesRequest();
 		getHealthyInstancesRequest.setNamespace(namespace);
 		getHealthyInstancesRequest.setService(service);
-		return polarisConsumer.getHealthyInstancesInstance(getHealthyInstancesRequest);
+		return polarisConsumer.getHealthyInstances(getHealthyInstancesRequest);
 	}
 
 	/**

spring-cloud-tencent-dependencies/pom.xml

@@ -71,7 +71,7 @@
 
 	<properties>
 		<revision>1.6.0-Hoxton.SR12-SNAPSHOT</revision>
-		<polaris.version>1.6.1</polaris.version>
+		<polaris.version>1.7.0-SNAPSHOT</polaris.version>
 		<logback.version>1.2.11</logback.version>
 		<mocktio.version>4.5.1</mocktio.version>
 		<byte-buddy.version>1.12.10</byte-buddy.version>

spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancer.java

@@ -134,7 +134,7 @@ public class PolarisLoadBalancer extends DynamicServerListLoadBalancer<Server> {
 		GetHealthyInstancesRequest request = new GetHealthyInstancesRequest();
 		request.setNamespace(namespace);
 		request.setService(serviceName);
-		return consumerAPI.getHealthyInstancesInstance(request);
+		return consumerAPI.getHealthyInstances(request);
 	}
 
 }

spring-cloud-tencent-polaris-loadbalancer/src/test/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerTest.java

@@ -60,8 +60,6 @@ import static org.mockito.Mockito.when;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class PolarisLoadBalancerTest {
-
-
 	private static final String CLIENT_NAME = "polaris-test-server";
 	private static final String NS = "testNamespace";
 	private static final String[] HOST_LIST = new String[] {
@@ -74,16 +72,13 @@ public class PolarisLoadBalancerTest {
 
 	@Mock
 	private RouterAPI routerAPI;
-
 	@Mock
 	private ConsumerAPI consumerAPI;
 
-
 	@Test
 	public void testPolarisLoadBalancer() {
-
 		//mock consumerAPI
-		when(consumerAPI.getHealthyInstancesInstance(any())).thenReturn(this.assembleInstanceResp());
+		when(consumerAPI.getHealthyInstances(any())).thenReturn(this.assembleInstanceResp());
 
 		//mock routerAPI for rule
 		when(routerAPI.processLoadBalance(any())).thenReturn(assembleProcessLoadBalanceResp());
@@ -108,19 +103,14 @@ public class PolarisLoadBalancerTest {
 					consumerAPI, properties);
 
 			String host = balancer.choose(null);
-			System.out.println(host);
 
 			Assert.assertNotNull(host);
 			Assert.assertEquals("127.0.0.1:8080", host);
 		}
-
 	}
 
-
 	@Test
 	public void testExtendDiscoveryServiceInstance() {
-
-
 		//mock routerAPI for rule
 		when(routerAPI.processLoadBalance(any())).thenReturn(assembleProcessLoadBalanceResp());
 		PolarisWeightedRule rule = new PolarisWeightedRule(routerAPI);
@@ -146,17 +136,14 @@ public class PolarisLoadBalancerTest {
 					consumerAPI, properties);
 
 			String host = balancer.choose(null);
-			System.out.println(host);
+			Assert.assertEquals("127.0.0.1:8080", host);
 		}
-
 	}
 
-
 	private ServerList<Server> assembleServerList() {
 		return new StaticServerList<>(Stream.of(HOST_LIST).map(this::convertServer).toArray(Server[]::new));
 	}
 
-
 	private ProcessLoadBalanceResponse assembleProcessLoadBalanceResp() {
 		ServiceInstances serviceInstances = assembleServiceInstances();
 		return new ProcessLoadBalanceResponse(serviceInstances.getInstances().get(0));
@@ -183,5 +170,4 @@ public class PolarisLoadBalancerTest {
 	private Server convertServer(String host) {
 		return new Server("http", host, 8080);
 	}
-
 }