[INLONG-10589][Manager] Rename OfflineJobSubmitRequest and remove log…

… in controller (#10590) Co-authored-by: Aloys Zhang <[email protected]>
apache · Jul 10, 2024 · a8db0d2 · a8db0d2
1 parent 7e2897c
commit a8db0d2
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 19 deletions.
diff --git a/...nt/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongGroupClient.java b/...nt/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongGroupClient.java
@@ -36,7 +36,7 @@
 import org.apache.inlong.manager.pojo.group.InlongGroupResetRequest;
 import org.apache.inlong.manager.pojo.group.InlongGroupTopicInfo;
 import org.apache.inlong.manager.pojo.group.InlongGroupTopicRequest;
-import org.apache.inlong.manager.pojo.schedule.OfflineJobSubmitRequest;
+import org.apache.inlong.manager.pojo.schedule.OfflineJobRequest;
 import org.apache.inlong.manager.pojo.sort.SortStatusInfo;
 import org.apache.inlong.manager.pojo.sort.SortStatusRequest;
 import org.apache.inlong.manager.pojo.workflow.WorkflowResult;
@@ -321,7 +321,7 @@ public Boolean finishTagSwitch(String groupId) {
         return response.getData();
     }
 
-    public Boolean submitOfflineJob(OfflineJobSubmitRequest request) {
+    public Boolean submitOfflineJob(OfflineJobRequest request) {
         Response<Boolean> responseBody = ClientUtils.executeHttpCall(inlongGroupApi.submitOfflineJob(request));
         ClientUtils.assertRespSuccess(responseBody);
         return responseBody.getData();

diff --git a/...ger-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongGroupApi.java b/...ger-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongGroupApi.java
@@ -26,7 +26,7 @@
 import org.apache.inlong.manager.pojo.group.InlongGroupResetRequest;
 import org.apache.inlong.manager.pojo.group.InlongGroupTopicInfo;
 import org.apache.inlong.manager.pojo.group.InlongGroupTopicRequest;
-import org.apache.inlong.manager.pojo.schedule.OfflineJobSubmitRequest;
+import org.apache.inlong.manager.pojo.schedule.OfflineJobRequest;
 import org.apache.inlong.manager.pojo.workflow.WorkflowResult;
 
 import retrofit2.Call;
@@ -101,5 +101,5 @@ public interface InlongGroupApi {
     Call<Response<Boolean>> finishTagSwitch(@Path("groupId") String groupId);
 
     @POST("group/submitOfflineJob")
-    Call<Response<Boolean>> submitOfflineJob(@Body OfflineJobSubmitRequest request);
+    Call<Response<Boolean>> submitOfflineJob(@Body OfflineJobRequest request);
 }
diff --git a/...ojo/schedule/OfflineJobSubmitRequest.java → ...ager/pojo/schedule/OfflineJobRequest.java b/...ojo/schedule/OfflineJobSubmitRequest.java → ...ager/pojo/schedule/OfflineJobRequest.java
@@ -23,7 +23,7 @@
 import javax.validation.constraints.NotNull;
 
 @Data
-public class OfflineJobSubmitRequest {
+public class OfflineJobRequest {
 
     @ApiModelProperty("Inlong Group ID")
     @NotNull

diff --git a/...chedule/src/main/java/org/apache/inlong/manager/schedule/quartz/QuartzOfflineSyncJob.java b/...chedule/src/main/java/org/apache/inlong/manager/schedule/quartz/QuartzOfflineSyncJob.java
@@ -24,7 +24,7 @@
 import org.apache.inlong.manager.client.api.inner.client.InlongGroupClient;
 import org.apache.inlong.manager.client.api.util.ClientUtils;
 import org.apache.inlong.manager.common.auth.DefaultAuthentication;
-import org.apache.inlong.manager.pojo.schedule.OfflineJobSubmitRequest;
+import org.apache.inlong.manager.pojo.schedule.OfflineJobRequest;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -58,13 +58,13 @@ public class QuartzOfflineSyncJob implements Job {
     public void execute(JobExecutionContext context) throws JobExecutionException {
         LOGGER.info("QuartzOfflineSyncJob run once");
         JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
-        initGroupClientIfNeeded(jobDataMap);
+        initGroupClient(jobDataMap);
 
         String inlongGroupId = context.getJobDetail().getKey().getName();
         long lowerBoundary = context.getScheduledFireTime().getTime();
         long upperBoundary = context.getNextFireTime() == null ? endTime : context.getNextFireTime().getTime();
 
-        OfflineJobSubmitRequest request = new OfflineJobSubmitRequest();
+        OfflineJobRequest request = new OfflineJobRequest();
         request.setGroupId(inlongGroupId);
         request.setBoundaryType(BoundaryType.TIME.getType());
         request.setLowerBoundary(String.valueOf(lowerBoundary));
@@ -84,7 +84,7 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
 
     }
 
-    private void initGroupClientIfNeeded(JobDataMap jobDataMap) {
+    private void initGroupClient(JobDataMap jobDataMap) {
         if (groupClient == null) {
             String host = (String) jobDataMap.get(MANAGER_HOST);
             int port = (int) jobDataMap.get(MANAGER_PORT);

diff --git a/...ger-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java b/...ger-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
@@ -29,7 +29,7 @@
 import org.apache.inlong.manager.pojo.group.InlongGroupRequest;
 import org.apache.inlong.manager.pojo.group.InlongGroupTopicInfo;
 import org.apache.inlong.manager.pojo.group.InlongGroupTopicRequest;
-import org.apache.inlong.manager.pojo.schedule.OfflineJobSubmitRequest;
+import org.apache.inlong.manager.pojo.schedule.OfflineJobRequest;
 import org.apache.inlong.manager.pojo.user.UserInfo;
 
 import javax.validation.Valid;
@@ -224,6 +224,6 @@ void updateAfterApprove(
      * @param request request to submit offline sync job
      *
      * */
-    Boolean submitOfflineJob(OfflineJobSubmitRequest request);
+    Boolean submitOfflineJob(OfflineJobRequest request);
 
 }
diff --git a/...service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java b/...service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
@@ -61,7 +61,7 @@
 import org.apache.inlong.manager.pojo.group.InlongGroupRequest;
 import org.apache.inlong.manager.pojo.group.InlongGroupTopicInfo;
 import org.apache.inlong.manager.pojo.group.InlongGroupTopicRequest;
-import org.apache.inlong.manager.pojo.schedule.OfflineJobSubmitRequest;
+import org.apache.inlong.manager.pojo.schedule.OfflineJobRequest;
 import org.apache.inlong.manager.pojo.schedule.ScheduleInfo;
 import org.apache.inlong.manager.pojo.schedule.ScheduleInfoRequest;
 import org.apache.inlong.manager.pojo.sink.StreamSink;
@@ -936,7 +936,7 @@ public List<GroupFullInfo> getGroupByBackUpClusterTag(String clusterTag) {
     }
 
     @Override
-    public Boolean submitOfflineJob(OfflineJobSubmitRequest request) {
+    public Boolean submitOfflineJob(OfflineJobRequest request) {
         // 1. get stream info list
         String groupId = request.getGroupId();
         InlongGroupInfo groupInfo = get(groupId);

diff --git a/...ger-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java b/...ger-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
@@ -33,7 +33,7 @@
 import org.apache.inlong.manager.pojo.group.InlongGroupResetRequest;
 import org.apache.inlong.manager.pojo.group.InlongGroupTopicInfo;
 import org.apache.inlong.manager.pojo.group.InlongGroupTopicRequest;
-import org.apache.inlong.manager.pojo.schedule.OfflineJobSubmitRequest;
+import org.apache.inlong.manager.pojo.schedule.OfflineJobRequest;
 import org.apache.inlong.manager.pojo.user.LoginUserUtils;
 import org.apache.inlong.manager.pojo.workflow.WorkflowResult;
 import org.apache.inlong.manager.service.group.InlongGroupProcessService;
@@ -44,8 +44,6 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -68,7 +66,6 @@
 @Api(tags = "Inlong-Group-API")
 public class InlongGroupController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(InlongGroupController.class);
     @Autowired
     private InlongGroupService groupService;
     @Autowired
@@ -258,8 +255,7 @@ public Response<Boolean> finishTagSwitch(@PathVariable String groupId) {
 
     @RequestMapping(value = "/group/submitOfflineJob", method = RequestMethod.POST)
     @ApiOperation(value = "Submitting inlong offline job process")
-    public Response<Boolean> submitOfflineJob(@RequestBody OfflineJobSubmitRequest request) {
-        LOGGER.info("Received offline job submit request {}", request);
+    public Response<Boolean> submitOfflineJob(@RequestBody OfflineJobRequest request) {
         return Response.success(groupService.submitOfflineJob(request));
     }
 }