You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2022/03/30 11:38:38 UTC
[incubator-inlong] branch master updated: [INLONG-3454][Manager] Remove the nimbusds dependency, refactor log info for db collector (#3470)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang 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 6b266e7 [INLONG-3454][Manager] Remove the nimbusds dependency, refactor log info for db collector (#3470)
6b266e7 is described below
commit 6b266e7201bacc833c3a1e34b7aa09c29d14ff7e
Author: healchow <he...@gmail.com>
AuthorDate: Wed Mar 30 19:38:33 2022 +0800
[INLONG-3454][Manager] Remove the nimbusds dependency, refactor log info for db collector (#3470)
---
inlong-manager/manager-dao/pom.xml | 4 ++++
.../service/core/impl/DBCollectorTaskServiceImpl.java | 18 ++++++++----------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/inlong-manager/manager-dao/pom.xml b/inlong-manager/manager-dao/pom.xml
index 227774f..9453a0e 100644
--- a/inlong-manager/manager-dao/pom.xml
+++ b/inlong-manager/manager-dao/pom.xml
@@ -161,6 +161,10 @@
<artifactId>jdk.tools</artifactId>
<groupId>jdk.tools</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <groupId>com.nimbusds</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DBCollectorTaskServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DBCollectorTaskServiceImpl.java
index c0b02ed..51579cb 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DBCollectorTaskServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DBCollectorTaskServiceImpl.java
@@ -32,6 +32,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Objects;
+
@Service
@Slf4j
public class DBCollectorTaskServiceImpl implements DBCollectorTaskService {
@@ -43,28 +45,25 @@ public class DBCollectorTaskServiceImpl implements DBCollectorTaskService {
@Override
public DBCollectorTaskInfo getTask(DBCollectorTaskRequest req) {
- LOGGER.warn("DBCollectorTaskInfo ", req.toString());
+ LOGGER.debug("db collector task request: {}", req);
if (!DBCollectorTaskConstant.INTERFACE_VERSION.equals(req.getVersion())) {
- DBCollectorTaskInfo taskInfo = DBCollectorTaskInfo.builder()
+ return DBCollectorTaskInfo.builder()
.version(DBCollectorTaskConstant.INTERFACE_VERSION)
.returnCode(DBCollectorTaskReturnCode.INVALID_VERSION.getCode()).build();
- return taskInfo;
}
DBCollectorDetailTaskEntity entity = detailTaskMapper
.selectOneByState(DBCollectorDetailTaskEntityStatus.INIT.getCode());
if (entity == null) {
- DBCollectorTaskInfo taskInfo = DBCollectorTaskInfo.builder()
+ return DBCollectorTaskInfo.builder()
.version(DBCollectorTaskConstant.INTERFACE_VERSION)
.returnCode(DBCollectorTaskReturnCode.EMPTY.getCode()).build();
- return taskInfo;
}
int ret = detailTaskMapper.changeState(entity.getId(), 0, DBCollectorDetailTaskEntityStatus.INIT.getCode(),
DBCollectorDetailTaskEntityStatus.DISPATCHED.getCode());
if (ret == 0) {
- DBCollectorTaskInfo taskInfo = DBCollectorTaskInfo.builder()
+ return DBCollectorTaskInfo.builder()
.version(DBCollectorTaskConstant.INTERFACE_VERSION)
.returnCode(DBCollectorTaskReturnCode.EMPTY.getCode()).build();
- return taskInfo;
} else {
DBCollectorTaskInfo.TaskInfo task = new DBCollectorTaskInfo.TaskInfo();
task.setId(entity.getId());
@@ -82,17 +81,16 @@ public class DBCollectorTaskServiceImpl implements DBCollectorTaskService {
task.setRetryTimes(entity.getRetryTimes());
task.setInlongGroupId(entity.getGroupId());
task.setInlongStreamId(entity.getStreamId());
- DBCollectorTaskInfo taskInfo = DBCollectorTaskInfo.builder()
+ return DBCollectorTaskInfo.builder()
.version(DBCollectorTaskConstant.INTERFACE_VERSION)
.returnCode(DBCollectorTaskReturnCode.SUCC.getCode())
.data(task).build();
- return taskInfo;
}
}
@Override
public Integer reportTask(DBCollectorReportTaskRequest req) {
- if (req.getVersion() != DBCollectorTaskConstant.INTERFACE_VERSION) {
+ if (!Objects.equals(req.getVersion(), DBCollectorTaskConstant.INTERFACE_VERSION)) {
return DBCollectorTaskReturnCode.INVALID_VERSION.getCode();
}
DBCollectorDetailTaskEntity entity = detailTaskMapper