Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[INLONG-10589][Manager] Rename OfflineJobSubmitRequest and remove log in controller #10590

Merged
merged 1 commit into from
Jul 10, 2024
Merged

[INLONG-10589][Manager] Rename OfflineJobSubmitRequest and remove log in controller #10590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...nt/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongGroupClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions ...ger-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongGroupApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion ...ojo/schedule/OfflineJobSubmitRequest.java → ...ager/pojo/schedule/OfflineJobRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import javax.validation.constraints.NotNull;

@Data
public class OfflineJobSubmitRequest {
public class OfflineJobRequest {

@ApiModelProperty("Inlong Group ID")
@NotNull
Expand Down
8 changes: 4 additions & 4 deletions ...chedule/src/main/java/org/apache/inlong/manager/schedule/quartz/QuartzOfflineSyncJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...ger-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -224,6 +224,6 @@ void updateAfterApprove(
* @param request request to submit offline sync job
*
* */
Boolean submitOfflineJob(OfflineJobSubmitRequest request);
Boolean submitOfflineJob(OfflineJobRequest request);

}
4 changes: 2 additions & 2 deletions ...service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 2 additions & 6 deletions ...ger-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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));
}
}
Loading