From 55485df63e0d574a920e8f3b6d4dfa7f5c44f392 Mon Sep 17 00:00:00 2001
From: Mingyuan Wu <my.wu@outlook.com>
Date: Wed, 22 Jun 2022 13:28:50 +0800
Subject: [PATCH] Update GitHub Actions workflow (#265)

---
 .github/workflows/junit_test.yml              | 51 ++++++++++++++-----
 pom.xml                                       |  2 +-
 .../cloud/common/util/ResourceFileUtils.java  | 10 ++--
 .../common/util/ResourceFileUtilsTest.java    |  2 +-
 .../src/test/resources/test.txt               |  2 +-
 5 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/junit_test.yml b/.github/workflows/junit_test.yml
index c9f9046f0..51e9cce15 100644
--- a/.github/workflows/junit_test.yml
+++ b/.github/workflows/junit_test.yml
@@ -5,24 +5,47 @@ name: Test with Junit
 
 on:
   push:
-    branches: [ greenwich ]
+    branches:
+      - main
+      - 2021.0
+      - 2020.0
+      - greenwich
   pull_request:
-    branches: [ greenwich ]
+    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
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-      #    - name: Build with Maven
-      #      run: mvn -B package --file pom.xml
-      - name: Test with Maven
-        run: mvn -B test --file pom.xml
+    - name: Checkout codes
+      uses: actions/checkout@v3
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        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@v3
+      with:
+        file: '**/target/site/jacoco/jacoco.xml'
diff --git a/pom.xml b/pom.xml
index 946a94933..4b39d66fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
 		<spring.cloud.version>Greenwich.SR6</spring.cloud.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>
diff --git a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ResourceFileUtils.java b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ResourceFileUtils.java
index d79bfce8b..b5ea45d5d 100644
--- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/ResourceFileUtils.java
+++ b/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 "";
 	}
 
 }
diff --git a/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/ResourceFileUtilsTest.java b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/ResourceFileUtilsTest.java
index 334cd4e20..769d99ce7 100644
--- a/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/ResourceFileUtilsTest.java
+++ b/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
diff --git a/spring-cloud-tencent-commons/src/test/resources/test.txt b/spring-cloud-tencent-commons/src/test/resources/test.txt
index 63d3c2d75..e18c37483 100644
--- a/spring-cloud-tencent-commons/src/test/resources/test.txt
+++ b/spring-cloud-tencent-commons/src/test/resources/test.txt
@@ -1 +1 @@
-just for test
+just for test
\ No newline at end of file