This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new a8db0d2e8c [INLONG-10589][Manager] Rename OfflineJobSubmitRequest and
remove log in controller (#10590)
a8db0d2e8c is described below
commit a8db0d2e8c2ef6b042598627f4ca0249ac566d42
Author: AloysZhang <[email protected]>
AuthorDate: Wed Jul 10 12:51:20 2024 +0800
[INLONG-10589][Manager] Rename OfflineJobSubmitRequest and remove log in
controller (#10590)
Co-authored-by: Aloys Zhang <[email protected]>
---
.../inlong/manager/client/api/inner/client/InlongGroupClient.java | 4 ++--
.../apache/inlong/manager/client/api/service/InlongGroupApi.java | 4 ++--
.../{OfflineJobSubmitRequest.java => OfflineJobRequest.java} | 2 +-
.../inlong/manager/schedule/quartz/QuartzOfflineSyncJob.java | 8 ++++----
.../apache/inlong/manager/service/group/InlongGroupService.java | 4 ++--
.../inlong/manager/service/group/InlongGroupServiceImpl.java | 4 ++--
.../inlong/manager/web/controller/InlongGroupController.java | 8 ++------
7 files changed, 15 insertions(+), 19 deletions(-)
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongGroupClient.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongGroupClient.java
index d053ea37a5..fadc650e2d 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongGroupClient.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongGroupClient.java
@@ -36,7 +36,7 @@ import
org.apache.inlong.manager.pojo.group.InlongGroupRequest;
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 class InlongGroupClient {
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/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongGroupApi.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongGroupApi.java
index 1761193644..4033765d0c 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongGroupApi.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongGroupApi.java
@@ -26,7 +26,7 @@ import
org.apache.inlong.manager.pojo.group.InlongGroupRequest;
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/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/OfflineJobSubmitRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/OfflineJobRequest.java
similarity index 97%
rename from
inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/OfflineJobSubmitRequest.java
rename to
inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/OfflineJobRequest.java
index 6e9dcc91e8..532a610ded 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/OfflineJobSubmitRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/OfflineJobRequest.java
@@ -23,7 +23,7 @@ import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
-public class OfflineJobSubmitRequest {
+public class OfflineJobRequest {
@ApiModelProperty("Inlong Group ID")
@NotNull
diff --git
a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/quartz/QuartzOfflineSyncJob.java
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/quartz/QuartzOfflineSyncJob.java
index 6e369c4c41..71de529261 100644
---
a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/quartz/QuartzOfflineSyncJob.java
+++
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/quartz/QuartzOfflineSyncJob.java
@@ -24,7 +24,7 @@ import
org.apache.inlong.manager.client.api.inner.client.ClientFactory;
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 class QuartzOfflineSyncJob implements Job {
}
- 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/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
index f8a943c7b4..382f402fd7 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
@@ -29,7 +29,7 @@ import
org.apache.inlong.manager.pojo.group.InlongGroupPageRequest;
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 @@ public interface InlongGroupService {
* @param request request to submit offline sync job
*
* */
- Boolean submitOfflineJob(OfflineJobSubmitRequest request);
+ Boolean submitOfflineJob(OfflineJobRequest request);
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
index 7ea4d001ee..40fd5e943d 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
@@ -61,7 +61,7 @@ import
org.apache.inlong.manager.pojo.group.InlongGroupPageRequest;
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 class InlongGroupServiceImpl implements
InlongGroupService {
}
@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/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
index caa4aa6c83..274abe99a9 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
@@ -33,7 +33,7 @@ import
org.apache.inlong.manager.pojo.group.InlongGroupRequest;
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.Api;
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 @@ import java.util.Map;
@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 class InlongGroupController {
@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));
}
}
\ No newline at end of file
