You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/03/06 11:22:38 UTC
[incubator-inlong] branch master updated: [INLONG-2941][Manager] Code optimization for InLong Manager (#2945)
This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 91afd45 [INLONG-2941][Manager] Code optimization for InLong Manager (#2945)
91afd45 is described below
commit 91afd450f128ccfd42bdff5b6f23f778fa81eb97
Author: ciscozhou <45...@users.noreply.github.com>
AuthorDate: Sun Mar 6 19:22:31 2022 +0800
[INLONG-2941][Manager] Code optimization for InLong Manager (#2945)
* [INLONG-2941][Manager] Code optimization for InLong Manager
* [INLONG-2941][Manager] Delete import statement "*"
---
.../apache/inlong/manager/client/api/impl/InlongGroupImpl.java | 6 ++----
.../manager/service/core/impl/CommonDBServerServiceImpl.java | 10 ++++------
.../manager/service/core/impl/CommonFileServerServiceImpl.java | 3 ++-
.../service/source/listener/AbstractSourceOperateListener.java | 5 ++---
.../apache/inlong/manager/web/controller/AuditController.java | 6 +++---
.../inlong/manager/web/controller/BasicInfoController.java | 4 ++--
.../workflow/processor/AbstractNextableElementProcessor.java | 2 +-
.../manager/workflow/processor/AbstractTaskProcessor.java | 2 +-
8 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java
index 9dbb4f3..388bef8 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongGroupImpl.java
@@ -190,7 +190,7 @@ public class InlongGroupImpl implements InlongGroup {
String inlongGroupId = currentGroupInfo.getInlongGroupId();
//Fetch stream in group
List<InlongStream> dataStreams = fetchDataStreams(inlongGroupId);
- dataStreams.stream().forEach(dataStream -> groupContext.setStream(dataStream));
+ dataStreams.forEach(dataStream -> groupContext.setStream(dataStream));
//Create group context
InlongGroupContext inlongGroupContext = new InlongGroupContext(groupContext, groupConf);
List<EventLogView> logViews = managerClient.getInlongGroupError(inlongGroupId);
@@ -202,8 +202,6 @@ public class InlongGroupImpl implements InlongGroup {
private List<InlongStream> fetchDataStreams(String groupId) {
List<FullStreamResponse> streamResponses = managerClient.listStreamInfo(groupId);
- List<InlongStream> streamList = streamResponses.stream()
- .map(fullStreamResponse -> new InlongStreamImpl(fullStreamResponse)).collect(Collectors.toList());
- return streamList;
+ return streamResponses.stream().map(InlongStreamImpl::new).collect(Collectors.toList());
}
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonDBServerServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonDBServerServiceImpl.java
index 424a468..a5bdf7e 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonDBServerServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonDBServerServiceImpl.java
@@ -41,6 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
@Slf4j
@Service
@@ -52,11 +53,8 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
private CommonDbServerEntityMapper commonDbServerMapper;
public static boolean checkStrLen(String text, int maxLength) {
- if (text != null && text.length() > maxLength) {
- // too large.
- return true;
- }
- return false;
+ // too large.
+ return text != null && text.length() > maxLength;
}
/**
@@ -91,7 +89,7 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
info.getDbType(),
info.getDbServerIp(),
info.getPort());
- if (entities != null && entities.size() > 0) {
+ if (!CollectionUtils.isEmpty(entities)) {
for (CommonDbServerEntity entry : entities) {
// Have the same normal entry
if (entry.getIsDeleted() == 0) {
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonFileServerServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonFileServerServiceImpl.java
index 75d94ba..9cf50b9 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonFileServerServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonFileServerServiceImpl.java
@@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
@Slf4j
@Service
@@ -82,7 +83,7 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
info.getUsername(),
info.getIp(),
info.getPort());
- if (entities != null && entities.size() > 0) {
+ if (!CollectionUtils.isEmpty(entities)) {
for (CommonFileServerEntity entry : entities) {
// Have the same normal entry
if (entry.getIsDeleted() == 0) {
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/AbstractSourceOperateListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/AbstractSourceOperateListener.java
index d5f3e4b..eec5fac 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/AbstractSourceOperateListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/AbstractSourceOperateListener.java
@@ -63,9 +63,8 @@ public abstract class AbstractSourceOperateListener implements DataSourceOperate
InlongGroupInfo groupInfo = getGroupInfo(context.getProcessForm());
final String groupId = groupInfo.getInlongGroupId();
List<StreamBriefResponse> streamBriefResponses = streamService.getBriefList(groupId);
- streamBriefResponses.forEach(streamBriefResponse -> {
- operateStreamSources(groupId, streamBriefResponse.getInlongStreamId(), context.getApplicant());
- });
+ streamBriefResponses.forEach(streamBriefResponse ->
+ operateStreamSources(groupId, streamBriefResponse.getInlongStreamId(), context.getApplicant()));
return ListenerResult.success();
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AuditController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AuditController.java
index 4a3c05d..e8f4791 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AuditController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AuditController.java
@@ -27,8 +27,8 @@ import org.apache.inlong.manager.common.pojo.audit.AuditRequest;
import org.apache.inlong.manager.common.pojo.audit.AuditVO;
import org.apache.inlong.manager.service.core.AuditService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@RestController
@@ -39,10 +39,10 @@ public class AuditController {
@Autowired
private AuditService auditService;
- @RequestMapping(value = "/list", method = RequestMethod.GET)
+ @GetMapping(value = "/list")
@ApiOperation(value = "Query audit list according to conditions")
public Response<List<AuditVO>> listByCondition(@Valid AuditRequest request) throws IOException {
return Response.success(auditService.listByCondition(request));
}
-
+
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/BasicInfoController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/BasicInfoController.java
index 1ab9864..c5fe85b 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/BasicInfoController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/BasicInfoController.java
@@ -23,8 +23,8 @@ import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.pojo.group.DataSchemaInfo;
import org.apache.inlong.manager.service.core.DataSchemaService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -42,7 +42,7 @@ public class BasicInfoController {
private DataSchemaService schemaService;
@ApiOperation(value = "Query data format list")
- @RequestMapping(value = "/schema/listAll", method = RequestMethod.GET)
+ @GetMapping(value = "/schema/listAll")
public Response<List<DataSchemaInfo>> dataSchemaList() {
return Response.success(schemaService.listAllDataSchema());
}
diff --git a/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/processor/AbstractNextableElementProcessor.java b/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/processor/AbstractNextableElementProcessor.java
index 9fefec4..c79a1fe 100644
--- a/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/processor/AbstractNextableElementProcessor.java
+++ b/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/processor/AbstractNextableElementProcessor.java
@@ -43,7 +43,7 @@ public abstract class AbstractNextableElementProcessor<T extends NextableElement
Element endEvent = nextElements
.stream()
- .filter(ele -> ele instanceof EndEvent)
+ .filter(EndEvent.class::isInstance)
.findFirst()
.orElse(null);
diff --git a/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/processor/AbstractTaskProcessor.java b/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/processor/AbstractTaskProcessor.java
index 30121de..6422988 100644
--- a/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/processor/AbstractTaskProcessor.java
+++ b/inlong-manager/manager-workflow/src/main/java/org/apache/inlong/manager/workflow/processor/AbstractTaskProcessor.java
@@ -37,7 +37,7 @@ public abstract class AbstractTaskProcessor<T extends WorkflowTask> extends
protected WorkflowTaskEntityMapper taskEntityMapper;
- public AbstractTaskProcessor(WorkflowTaskEntityMapper taskEntityMapper) {
+ protected AbstractTaskProcessor(WorkflowTaskEntityMapper taskEntityMapper) {
this.taskEntityMapper = taskEntityMapper;
}