Skip to content

Commit 65c521e

Browse files
committed
[Chore] Use united variable name
1 parent 646095f commit 65c521e

5 files changed

Lines changed: 10 additions & 12 deletions

File tree

dolphinscheduler-task-plugin/dolphinscheduler-task-grpc/src/main/java/org/apache/dolphinscheduler/plugin/task/grpc/GrpcParameters.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.apache.dolphinscheduler.plugin.task.grpc;
1919

20+
import com.fasterxml.jackson.annotation.JsonProperty;
2021
import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
2122

2223
import org.apache.commons.lang3.StringUtils;
@@ -42,15 +43,12 @@ public class GrpcParameters extends AbstractParameters {
4243

4344
private String condition;
4445

45-
/**
46-
* Connect Timeout
47-
* Unit: ms
48-
*/
49-
private int connectTimeout = 0;
46+
@JsonProperty("connectTimeout")
47+
private long connectTimeoutMs = 0L;
5048

5149
@Override
5250
public boolean checkParameters() {
53-
if (StringUtils.isEmpty(url) || connectTimeout <= 0)
51+
if (StringUtils.isEmpty(url) || connectTimeoutMs <= 0)
5452
return false;
5553
return true;
5654
}

dolphinscheduler-task-plugin/dolphinscheduler-task-grpc/src/main/java/org/apache/dolphinscheduler/plugin/task/grpc/GrpcTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void handle(TaskCallBack taskCallBack) throws TaskException {
7676
JSONDescriptorHelper.FileDescFromJSON(grpcParameters.getGrpcServiceDefinitionJSON());
7777
GrpcDynamicService stubService = new GrpcDynamicService(channel, fileDesc);
7878
DynamicMessage message = stubService.call(grpcParameters.getMethodName(), grpcParameters.getMessage(),
79-
grpcParameters.getConnectTimeout());
79+
grpcParameters.getConnectTimeoutMs());
8080
Printer printer = JsonFormat.printer().omittingInsignificantWhitespace();
8181
addDefaultOutput(printer.print(message));
8282
} catch (StatusRuntimeException statusre) {

dolphinscheduler-task-plugin/dolphinscheduler-task-grpc/src/test/java/org/apache/dolphinscheduler/plugin/task/grpc/GrpcParametersTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void testGenerator() throws IOException {
4646
"\"connectTimeout\":\"10000\"" +
4747
"}";
4848
GrpcParameters grpcParameters = JSONUtils.parseObject(paramData, GrpcParameters.class);
49-
Assertions.assertEquals(10000, grpcParameters.getConnectTimeout());
49+
Assertions.assertEquals(10000, grpcParameters.getConnectTimeoutMs());
5050
Assertions.assertEquals("127.0.0.1:50010", grpcParameters.getUrl());
5151
Assertions.assertEquals("TaskTester/TestOK", grpcParameters.getMethodName());
5252
Assertions.assertEquals("{ \"username\":\"test username\" }", grpcParameters.getMessage());
@@ -70,7 +70,7 @@ public void testCheckParameters() throws IOException {
7070
"}";
7171
GrpcParameters grpcParameters = JSONUtils.parseObject(paramData, GrpcParameters.class);
7272
Assertions.assertTrue(grpcParameters.checkParameters());
73-
Assertions.assertEquals(10000, grpcParameters.getConnectTimeout());
73+
Assertions.assertEquals(10000, grpcParameters.getConnectTimeoutMs());
7474
Assertions.assertEquals("127.0.0.1:50010", grpcParameters.getUrl());
7575
Assertions.assertEquals("TaskTester/TestOK", grpcParameters.getMethodName());
7676
Assertions.assertEquals("{ \"username\":\"test username\" }", grpcParameters.getMessage());
@@ -93,7 +93,7 @@ public void testCheckValues() throws IOException {
9393
"\"connectTimeout\":\"10000\"" +
9494
"}";
9595
GrpcParameters grpcParameters = JSONUtils.parseObject(paramData, GrpcParameters.class);
96-
Assertions.assertEquals(10000, grpcParameters.getConnectTimeout());
96+
Assertions.assertEquals(10000, grpcParameters.getConnectTimeoutMs());
9797
Assertions.assertEquals("127.0.0.1:50010", grpcParameters.getUrl());
9898
Assertions.assertEquals("TaskTester/TestOK", grpcParameters.getMethodName());
9999
Assertions.assertEquals("{ \"username\":\"test username\" }", grpcParameters.getMessage());

dolphinscheduler-task-plugin/dolphinscheduler-task-grpc/src/test/java/org/apache/dolphinscheduler/plugin/task/grpc/GrpcParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ private String generateGrpcParameters(String url, String methodName, String requ
304304
grpcParameters.setMessage(requestMessage);
305305
grpcParameters.setGrpcCheckCondition(grpcCheckCondition);
306306
grpcParameters.setCondition(condition);
307-
grpcParameters.setConnectTimeout(10000);
307+
grpcParameters.setConnectTimeoutMs(10000);
308308
return mapper.writeValueAsString(grpcParameters);
309309
}
310310

dolphinscheduler-task-plugin/dolphinscheduler-task-grpc/src/test/java/org/apache/dolphinscheduler/plugin/task/grpc/GrpcTaskTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ private String generateGrpcParameters(String url, String methodName, String requ
215215
grpcParameters.setMessage(requestMessage);
216216
grpcParameters.setGrpcCheckCondition(grpcCheckCondition);
217217
grpcParameters.setCondition(condition);
218-
grpcParameters.setConnectTimeout(10000);
218+
grpcParameters.setConnectTimeoutMs(10000);
219219
return mapper.writeValueAsString(grpcParameters);
220220
}
221221

0 commit comments

Comments
 (0)