remove unused parameters

apache · Jun 11, 2024 · c107f11 · c107f11
1 parent 09cb730
commit c107f11
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/...scheduler/plugin/datasource/aliyunserverlessspark/AliyunServerlessSparkClientWrapper.java b/...scheduler/plugin/datasource/aliyunserverlessspark/AliyunServerlessSparkClientWrapper.java
@@ -44,6 +44,7 @@ public AliyunServerlessSparkClientWrapper(
         aliyunServerlessSparkClient = new Client(config);
     }
 
+    // TODO: update checkConnect when aliyun serverless spark service support the service connection check
     public boolean checkConnect(String accessKeyId, String accessKeySecret, String regionId) {
         try {
             // If the login fails, an exception will be thrown directly

diff --git a/.../apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java b/.../apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java
@@ -122,7 +122,7 @@ public void handle(TaskCallBack taskCallBack) throws TaskException {
             log.info("Successfully submitted serverless spark job, jobRunId - {}", jobRunId);
 
             while (!RunState.isFinal(currentState)) {
-                GetJobRunRequest getJobRunRequest = buildGetJobRunRequest(aliyunServerlessSparkParameters);
+                GetJobRunRequest getJobRunRequest = buildGetJobRunRequest();
                 GetJobRunResponse getJobRunResponse = aliyunServerlessSparkClient
                         .getJobRun(aliyunServerlessSparkParameters.getWorkspaceId(), jobRunId, getJobRunRequest);
                 currentState = RunState.valueOf(getJobRunResponse.getBody().getJobRun().getState());
@@ -166,7 +166,7 @@ public AbstractParameters getParameters() {
 
     @Override
     public void cancelApplication() throws TaskException {
-        CancelJobRunRequest cancelJobRunRequest = buildCancelJobRunRequest(aliyunServerlessSparkParameters);
+        CancelJobRunRequest cancelJobRunRequest = buildCancelJobRunRequest();
         try {
             aliyunServerlessSparkClient.cancelJobRun(aliyunServerlessSparkParameters.getWorkspaceId(), jobRunId,
                     cancelJobRunRequest);
@@ -222,13 +222,13 @@ protected StartJobRunRequest buildStartJobRunRequest(AliyunServerlessSparkParame
         return startJobRunRequest;
     }
 
-    protected GetJobRunRequest buildGetJobRunRequest(AliyunServerlessSparkParameters aliyunServerlessSparkParameters) {
+    protected GetJobRunRequest buildGetJobRunRequest() {
         GetJobRunRequest getJobRunRequest = new GetJobRunRequest();
         getJobRunRequest.setRegionId(regionId);
         return getJobRunRequest;
     }
 
-    protected CancelJobRunRequest buildCancelJobRunRequest(AliyunServerlessSparkParameters aliyunServerlessSparkParameters) {
+    protected CancelJobRunRequest buildCancelJobRunRequest() {
         CancelJobRunRequest cancelJobRunRequest = new CancelJobRunRequest();
         cancelJobRunRequest.setRegionId(regionId);
         return cancelJobRunRequest;

diff --git a/...che/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTaskTest.java b/...che/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTaskTest.java
@@ -153,7 +153,7 @@ public void testHandle() {
                 () -> doReturn(mockStartJobRunResponse).when(mockAliyunServerlessSparkClient)
                         .startJobRunWithOptions(any(), any(), any(), any()));
 
-        doReturn(mockGetJobRunRequest).when(aliyunServerlessSparkTask).buildGetJobRunRequest(any());
+        doReturn(mockGetJobRunRequest).when(aliyunServerlessSparkTask).buildGetJobRunRequest();
         GetJobRunResponseBody getJobRunResponseBody = new GetJobRunResponseBody();
         GetJobRunResponseBody.GetJobRunResponseBodyJobRun jobRun =
                 new GetJobRunResponseBody.GetJobRunResponseBodyJobRun();
@@ -172,14 +172,14 @@ public void testHandle() {
 
     @Test
     public void testCancelApplication() throws Exception {
-        doReturn(mockCancelJobRunRequest).when(aliyunServerlessSparkTask).buildCancelJobRunRequest(any());
+        doReturn(mockCancelJobRunRequest).when(aliyunServerlessSparkTask).buildCancelJobRunRequest();
         Assertions.assertDoesNotThrow(
                 () -> doReturn(mockCancelJobRunResponse).when(mockAliyunServerlessSparkClient).cancelJobRun(any(),
                         any(), any()));
 
         aliyunServerlessSparkTask.init();
         aliyunServerlessSparkTask.cancelApplication();
-        verify(aliyunServerlessSparkTask).buildCancelJobRunRequest(any());
+        verify(aliyunServerlessSparkTask).buildCancelJobRunRequest();
         verify(mockAliyunServerlessSparkClient).cancelJobRun(eq(mockWorkspaceId), any(), eq(mockCancelJobRunRequest));
     }