Skip to content

Commit 3586eb1

Browse files
wardseptemberwardseptember
authored
bugfix: upgrade protobuf to 3.25.5 version,upgrade commons-io to 2.15.1 version (#68)
1 parent eab49fc commit 3586eb1

File tree

2 files changed

+35
-34
lines changed

2 files changed

+35
-34
lines changed

‎trpc-code-generator/src/test/java/com/tencent/trpc/codegen/CodeGenerateTest.java

+33-32
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Tencent is pleased to support the open source community by making tRPC available.
33
*
4-
* Copyright (C) 2023 THL A29 Limited, a Tencent company.
4+
* Copyright (C) 2023 THL A29 Limited, a Tencent company.
55
* All rights reserved.
66
*
77
* If you have downloaded a copy of the tRPC source code from Tencent,
@@ -23,9 +23,6 @@
2323
import com.tencent.trpc.codegen.template.DefaultCodeTemplates;
2424
import com.tencent.trpc.codegen.template.FreeMarkerContextProvider;
2525
import com.tencent.trpc.codegen.template.FreeMarkerStringTemplateEngine;
26-
import org.apache.commons.codec.digest.DigestUtils;
27-
import org.junit.Assert;
28-
import org.junit.Test;
2926
import java.io.IOException;
3027
import java.nio.file.Files;
3128
import java.nio.file.Path;
@@ -34,8 +31,12 @@
3431
import java.util.Collections;
3532
import java.util.List;
3633
import java.util.Map;
34+
import org.apache.commons.codec.digest.DigestUtils;
35+
import org.junit.Assert;
36+
import org.junit.Test;
3737

3838
public class CodeGenerateTest {
39+
3940
private static final Path rootPath = CodegenTestHelper.TEST_ROOT;
4041
private static final String protocExecutable = CodegenTestHelper.PROTOC_EXECUTABLE;
4142
private static final String protocGenValidateExecutable = CodegenTestHelper.PROTOC_GEN_VALIDATE_EXECUTABLE;
@@ -53,7 +54,7 @@ public void testTRpcCase1() throws IOException {
5354
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java"))));
5455
Assert.assertEquals("23446b6413c80bf8a1aa6ee234c6fba9",
5556
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
56-
Assert.assertEquals("3e623a576d506dcd1cfc0b926fbf411c",
57+
Assert.assertEquals("9caa57d08d0b3fcb9d617ac8d8d135e5",
5758
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
5859
}
5960

@@ -70,7 +71,7 @@ public void testGRpcCase1() throws IOException {
7071
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java"))));
7172
Assert.assertEquals("23446b6413c80bf8a1aa6ee234c6fba9",
7273
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
73-
Assert.assertEquals("3e623a576d506dcd1cfc0b926fbf411c",
74+
Assert.assertEquals("9caa57d08d0b3fcb9d617ac8d8d135e5",
7475
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
7576
}
7677

@@ -89,7 +90,7 @@ public void testTRpcCase2() throws IOException {
8990
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
9091
Assert.assertEquals("285ef96d563b7b5f87472ebb218f1624",
9192
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java"))));
92-
Assert.assertEquals("499bd6e6e1f403d81e99fcd8387004cf",
93+
Assert.assertEquals("2eb8ad08c973e8cb107cc596db1709b1",
9394
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
9495
}
9596

@@ -108,7 +109,7 @@ public void testGRpcCase2() throws IOException {
108109
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
109110
Assert.assertEquals("be4038417c2098b60a7af42e73c1abf6",
110111
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java"))));
111-
Assert.assertEquals("499bd6e6e1f403d81e99fcd8387004cf",
112+
Assert.assertEquals("2eb8ad08c973e8cb107cc596db1709b1",
112113
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
113114
}
114115

@@ -127,9 +128,9 @@ public void testTRpcCase3() throws IOException {
127128
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
128129
Assert.assertEquals("926fcc803803125fc0910f4b7c309b26",
129130
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java"))));
130-
Assert.assertEquals("896df3723daf271602d65e43c73d4ef5",
131+
Assert.assertEquals("9feac2c00a6b5fb137e0347e9d3c57a9",
131132
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
132-
Assert.assertEquals("22c6d98108f8dc39f930f8858339b150",
133+
Assert.assertEquals("fa93e09f70c157d59019dd62610cb4f3",
133134
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("msg").resolve("Hello.java"))));
134135
}
135136

@@ -148,9 +149,9 @@ public void testGRpcCase3() throws IOException {
148149
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
149150
Assert.assertEquals("e8108341efbc3d36bf3dcc9ba8ea0b41",
150151
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java"))));
151-
Assert.assertEquals("896df3723daf271602d65e43c73d4ef5",
152+
Assert.assertEquals("9feac2c00a6b5fb137e0347e9d3c57a9",
152153
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
153-
Assert.assertEquals("22c6d98108f8dc39f930f8858339b150",
154+
Assert.assertEquals("fa93e09f70c157d59019dd62610cb4f3",
154155
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("msg").resolve("Hello.java"))));
155156
}
156157

@@ -167,15 +168,15 @@ public void testTRpcCase4() throws IOException {
167168
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java"))));
168169
Assert.assertEquals("b7640a2fe62a3464ad25d0be603d1966",
169170
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
170-
Assert.assertEquals("d90f08f0ebd5cecd449e411b2dac1783",
171+
Assert.assertEquals("608f0a195f7e542aa11be2ff5fb82199",
171172
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloRequest.java"))));
172-
Assert.assertEquals("a52dae5bc0e1b03a988246c2cb6a9977",
173+
Assert.assertEquals("01e5a8f2f794ee7c81873fc62c93c31a",
173174
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloRequestOrBuilder.java"))));
174-
Assert.assertEquals("ca83883609451fe9f4780c98fff28c21",
175+
Assert.assertEquals("d24f652118fcd17e03b65c7423b71fbf",
175176
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloReply.java"))));
176-
Assert.assertEquals("2e8a2d3f78269a5905e208e7e83a76a9",
177+
Assert.assertEquals("d0341d2cdbeaca4557c25e6f07c65458",
177178
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloReplyOrBuilder.java"))));
178-
Assert.assertEquals("61250eeb2890a5ebf57a99ff72678dad",
179+
Assert.assertEquals("cbea0bc31f8ce927120b77c4b26475d5",
179180
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloNext.java"))));
180181
}
181182

@@ -192,15 +193,15 @@ public void testGRpcCase4() throws IOException {
192193
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java"))));
193194
Assert.assertEquals("b7640a2fe62a3464ad25d0be603d1966",
194195
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
195-
Assert.assertEquals("d90f08f0ebd5cecd449e411b2dac1783",
196+
Assert.assertEquals("608f0a195f7e542aa11be2ff5fb82199",
196197
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloRequest.java"))));
197-
Assert.assertEquals("a52dae5bc0e1b03a988246c2cb6a9977",
198+
Assert.assertEquals("01e5a8f2f794ee7c81873fc62c93c31a",
198199
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloRequestOrBuilder.java"))));
199-
Assert.assertEquals("ca83883609451fe9f4780c98fff28c21",
200+
Assert.assertEquals("d24f652118fcd17e03b65c7423b71fbf",
200201
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloReply.java"))));
201-
Assert.assertEquals("2e8a2d3f78269a5905e208e7e83a76a9",
202+
Assert.assertEquals("d0341d2cdbeaca4557c25e6f07c65458",
202203
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloReplyOrBuilder.java"))));
203-
Assert.assertEquals("61250eeb2890a5ebf57a99ff72678dad",
204+
Assert.assertEquals("cbea0bc31f8ce927120b77c4b26475d5",
204205
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloNext.java"))));
205206
}
206207

@@ -217,7 +218,7 @@ public void testTRpcCase5() throws IOException {
217218
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java"))));
218219
Assert.assertEquals("3d0ff8da3ace15f1bd055164ec1da4b9",
219220
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
220-
Assert.assertEquals("a8842adf07bc0499035f6873b94a19f4",
221+
Assert.assertEquals("b23d158eedf9ea3912703f084ff72ec2",
221222
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
222223
Assert.assertEquals("9277fefe3ff6af9a95062d359db14ebe",
223224
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceValidator.java"))));
@@ -236,7 +237,7 @@ public void testGRpcCase5() throws IOException {
236237
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java"))));
237238
Assert.assertEquals("3d0ff8da3ace15f1bd055164ec1da4b9",
238239
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
239-
Assert.assertEquals("a8842adf07bc0499035f6873b94a19f4",
240+
Assert.assertEquals("b23d158eedf9ea3912703f084ff72ec2",
240241
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
241242
Assert.assertEquals("9277fefe3ff6af9a95062d359db14ebe",
242243
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceValidator.java"))));
@@ -257,7 +258,7 @@ public void testTRpcCase6() throws IOException {
257258
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
258259
Assert.assertEquals("2f519ad1efafb3d145c5847e7831b559",
259260
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java"))));
260-
Assert.assertEquals("bad82d6427f4def525e83bd900c445f5",
261+
Assert.assertEquals("62ed6dc1ad9883094281a4bc35416c56",
261262
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloCamelCase.java"))));
262263
}
263264

@@ -276,7 +277,7 @@ public void testGRpcCase6() throws IOException {
276277
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
277278
Assert.assertEquals("651a3065ac06e2b157ef7b8ba15bce6a",
278279
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java"))));
279-
Assert.assertEquals("bad82d6427f4def525e83bd900c445f5",
280+
Assert.assertEquals("62ed6dc1ad9883094281a4bc35416c56",
280281
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloCamelCase.java"))));
281282
}
282283

@@ -295,7 +296,7 @@ public void testTRpcCase7() throws IOException {
295296
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceAsyncAPI.java"))));
296297
Assert.assertEquals("777387facf2cbc71228c30de20ed2226",
297298
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceStreamAPI.java"))));
298-
Assert.assertEquals("7bc89a900c02959caadafdd48dcb7041",
299+
Assert.assertEquals("640d503c66e105c9776037895a406613",
299300
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
300301
}
301302

@@ -314,7 +315,7 @@ public void testGRpcCase7() throws IOException {
314315
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceAsyncAPI.java"))));
315316
Assert.assertEquals("a0c28a7babedf863e31740b320857b0f",
316317
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceStreamAPI.java"))));
317-
Assert.assertEquals("7bc89a900c02959caadafdd48dcb7041",
318+
Assert.assertEquals("640d503c66e105c9776037895a406613",
318319
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
319320
}
320321

@@ -333,7 +334,7 @@ public void testTRpcCase8() throws IOException {
333334
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloWorldServiceAsyncAPI.java"))));
334335
Assert.assertEquals("446ff8e1c7479bb3f7da2d2c61cdf004",
335336
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloWorldServiceStreamAPI.java"))));
336-
Assert.assertEquals("25701eeb32b07c8e1cd00ac26c1cfc58",
337+
Assert.assertEquals("639e78687054ee0ae8a88749fc3f36c3",
337338
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
338339
}
339340

@@ -352,7 +353,7 @@ public void testGRpcCase8() throws IOException {
352353
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloWorldServiceAsyncAPI.java"))));
353354
Assert.assertEquals("8e86f7527ddb01d27b574c6de39270d1",
354355
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloWorldServiceStreamAPI.java"))));
355-
Assert.assertEquals("25701eeb32b07c8e1cd00ac26c1cfc58",
356+
Assert.assertEquals("639e78687054ee0ae8a88749fc3f36c3",
356357
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
357358
}
358359

@@ -394,9 +395,9 @@ public Map<String, Object> getCustomVariables(List<FileDescriptor> fileDescripto
394395
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java"))));
395396
Assert.assertEquals("926fcc803803125fc0910f4b7c309b26",
396397
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java"))));
397-
Assert.assertEquals("896df3723daf271602d65e43c73d4ef5",
398+
Assert.assertEquals("9feac2c00a6b5fb137e0347e9d3c57a9",
398399
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java"))));
399-
Assert.assertEquals("22c6d98108f8dc39f930f8858339b150",
400+
Assert.assertEquals("fa93e09f70c157d59019dd62610cb4f3",
400401
DigestUtils.md5Hex(Files.readAllBytes(java.resolve("msg").resolve("Hello.java"))));
401402
}
402403

‎trpc-dependencies/trpc-dependencies-bom/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<commons.lang.version>2.6</commons.lang.version>
3333
<commons.lang3.version>3.12.0</commons.lang3.version>
3434
<commons.pool2.version>2.3</commons.pool2.version>
35-
<commons.io.version>2.12.0</commons.io.version>
35+
<commons.io.version>2.15.1</commons.io.version>
3636
<commons.text.version>1.10.0</commons.text.version>
3737
<commons.beanutils.version>1.9.4</commons.beanutils.version>
3838
<nacos.config.sdk.version>0.2.12</nacos.config.sdk.version>
@@ -86,7 +86,7 @@
8686
<okio.version>3.4.0</okio.version>
8787
<polaris.open.version>1.15.5</polaris.open.version>
8888
<powermock.version>1.7.4</powermock.version>
89-
<protobuf-bom.version>3.21.9</protobuf-bom.version>
89+
<protobuf-bom.version>3.25.5</protobuf-bom.version>
9090
<pgv.version>0.4.1</pgv.version>
9191
<pgv.bin.version>0.6.13</pgv.bin.version>
9292
<quasar.version>0.7.9</quasar.version>

0 commit comments

Comments
 (0)