You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2021/08/19 08:12:22 UTC
[incubator-inlong] branch master updated: [INLONG-772] Checkstyle
detected that many classes and methods miss Javadoc (#1446)
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/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new f2423b1 [INLONG-772] Checkstyle detected that many classes and methods miss Javadoc (#1446)
f2423b1 is described below
commit f2423b1a793becbf3017320aadf90fb52825aa22
Author: healchow <he...@gmail.com>
AuthorDate: Thu Aug 19 16:12:18 2021 +0800
[INLONG-772] Checkstyle detected that many classes and methods miss Javadoc (#1446)
Co-authored-by: healzhou <he...@tencent.com>
---
.../inlong/manager/common/beans/PageResult.java | 90 ---------------------
.../inlong/manager/common/util/PageUtils.java | 56 -------------
.../apache/inlong/manager/dao/HiveServerDao.java | 3 +
.../service/core/CommonDBServerService.java | 2 +-
.../service/core/CommonFileServerService.java | 6 +-
.../manager/service/core/ConsumptionService.java | 10 +--
.../manager/service/core/WorkflowEventService.java | 17 ++--
.../core/builder/CommonDBServerInfoBuilder.java | 55 -------------
.../core/builder/CommonFileServerInfoBuilder.java | 45 -----------
.../core/impl/AgentSysConfigServiceImpl.java | 64 ---------------
.../core/impl/CommonDBServerServiceImpl.java | 93 +++++++++-------------
.../core/impl/CommonFileServerServiceImpl.java | 55 +++++--------
.../service/core/impl/ConsumptionServiceImpl.java | 6 +-
.../service/core/impl/DataStorageServiceImpl.java | 80 -------------------
.../core/impl/WorkflowEventServiceImpl.java | 18 +++--
.../service/core/operationlog/OperationLog.java | 11 ++-
.../service/thirdpart/hive/HiveTableOperator.java | 6 +-
.../hive/builder/HiveDropTableSqlBuilder.java | 4 +-
.../service/thirdpart/mq/TubeMqOptService.java | 24 +++---
.../thirdpart/sort/SortFieldFormatUtils.java | 6 ++
.../manager/service/workflow/WorkflowService.java | 40 +++++-----
.../service/workflow/WorkflowServiceImpl.java | 15 ++--
.../web/controller/CommonDBServerController.java | 6 +-
.../web/controller/CommonFileServerController.java | 10 +--
.../web/controller/ConsumptionController.java | 4 +-
.../manager/web/controller/WorkflowController.java | 6 +-
.../web/controller/WorkflowEventController.java | 54 ++++++++-----
.../core/impl/WorkflowContextBuilderImpl.java | 21 +++--
.../inlong/manager/workflow/model/Action.java | 30 ++-----
.../manager/workflow/model/view/EventLogQuery.java | 5 +-
.../manager/workflow/model/view/EventLogView.java | 29 -------
.../manager/workflow/model/view/TaskListView.java | 40 ++--------
.../manager/workflow/model/view/TaskView.java | 43 +---------
33 files changed, 215 insertions(+), 739 deletions(-)
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/beans/PageResult.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/beans/PageResult.java
deleted file mode 100644
index 900160b..0000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/beans/PageResult.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.beans;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * Result of the pagination
- */
-@ApiModel(value = "Result of the pagination")
-public class PageResult<T> {
-
- @ApiModelProperty(value = "current page")
- private int pageNum;
-
- @ApiModelProperty(value = "page size")
- private int pageSize;
-
- @ApiModelProperty(value = "total record size")
- private long totalSize;
-
- @ApiModelProperty(value = "total pages")
- private int totalPages;
-
- @ApiModelProperty(value = "data module")
- private List<T> list;
-
- public int getPageNum() {
- return pageNum;
- }
-
- public PageResult<T> setPageNum(int pageNum) {
- this.pageNum = pageNum;
- return this;
- }
-
- public int getPageSize() {
- return pageSize;
- }
-
- public PageResult<T> setPageSize(int pageSize) {
- this.pageSize = pageSize;
- return this;
- }
-
- public long getTotalSize() {
- return totalSize;
- }
-
- public PageResult<T> setTotalSize(long totalSize) {
- this.totalSize = totalSize;
- return this;
- }
-
- public int getTotalPages() {
- return totalPages;
- }
-
- public PageResult<T> setTotalPages(int totalPages) {
- this.totalPages = totalPages;
- return this;
- }
-
- public List<T> getList() {
- return list;
- }
-
- public PageResult<T> setList(List<T> list) {
- this.list = list;
- return this;
- }
-}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/PageUtils.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/PageUtils.java
deleted file mode 100644
index 1fb60f8..0000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/PageUtils.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.util;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageInfo;
-import org.apache.inlong.manager.common.beans.PageResult;
-
-/**
- * Pagination utils
- */
-public class PageUtils {
-
- /**
- * Wrapping paging information
- *
- * @param pageInfo page info need to wrap
- * @return page result
- */
- public static <T> PageResult<T> getPageResult(PageInfo<T> pageInfo) {
- PageResult<T> pageResult = new PageResult<>();
- pageResult.setPageNum(pageInfo.getPageNum());
- pageResult.setPageSize(pageInfo.getPageSize());
- pageResult.setTotalSize(pageInfo.getTotal());
- pageResult.setTotalPages(pageInfo.getPages());
- pageResult.setList(pageInfo.getList());
- return pageResult;
- }
-
- public static <T, E> PageResult<T> getPageResult(Page<E> page, Page.Function<E, T> function) {
- PageInfo<T> pageInfo = page.toPageInfo(function);
- pageInfo.setTotal(page.getTotal());
- PageResult<T> pageResult = new PageResult<>();
- pageResult.setPageNum(pageInfo.getPageNum());
- pageResult.setPageSize(pageInfo.getPageSize());
- pageResult.setTotalSize(pageInfo.getTotal());
- pageResult.setTotalPages(pageInfo.getPages());
- pageResult.setList(pageInfo.getList());
- return pageResult;
- }
-}
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/HiveServerDao.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/HiveServerDao.java
index 2e290ba..1b40025 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/HiveServerDao.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/HiveServerDao.java
@@ -89,6 +89,9 @@ public class HiveServerDao {
return tables;
}
+ /**
+ * Get Hive connection from hive url and user
+ */
public Connection getHiveConnection(String hiveUrl, String user, String password) throws Exception {
Connection conn;
try {
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonDBServerService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonDBServerService.java
index 136f2db..bc9f894 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonDBServerService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonDBServerService.java
@@ -25,7 +25,7 @@ import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerPageRequ
public interface CommonDBServerService {
- int create(CommonDbServerInfo commonDbServerInfo) throws Exception;
+ int save(CommonDbServerInfo commonDbServerInfo) throws Exception;
CommonDbServerInfo get(int id) throws Exception;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonFileServerService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonFileServerService.java
index 8259b7f..725000c 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonFileServerService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonFileServerService.java
@@ -33,11 +33,11 @@ public interface CommonFileServerService {
CommonFileServerInfo update(CommonFileServerInfo commonFileServerInfo) throws Exception;
- CommonFileServerInfo freeze(int id) throws Exception;
+ CommonFileServerInfo freeze(int id);
- CommonFileServerInfo unfreeze(int id) throws Exception;
+ CommonFileServerInfo unfreeze(int id);
- List<CommonFileServerInfo> getByUser(String user) throws Exception;
+ List<CommonFileServerInfo> getByUser(String user);
CommonFileServerInfo addVisiblePerson(Integer id, String visiblePerson);
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/ConsumptionService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/ConsumptionService.java
index 6b0029b..a25042d 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/ConsumptionService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/ConsumptionService.java
@@ -17,7 +17,7 @@
package org.apache.inlong.manager.service.core;
-import org.apache.inlong.manager.common.beans.PageResult;
+import com.github.pagehelper.PageInfo;
import org.apache.inlong.manager.common.pojo.dataconsumption.ConsumptionInfo;
import org.apache.inlong.manager.common.pojo.dataconsumption.ConsumptionListVo;
import org.apache.inlong.manager.common.pojo.dataconsumption.ConsumptionQuery;
@@ -41,10 +41,10 @@ public interface ConsumptionService {
/**
* Get data consumption list according to query conditions
*
- * @param query
- * @return
+ * @param query Consumption info
+ * @return Consumption list
*/
- PageResult<ConsumptionListVo> list(ConsumptionQuery query);
+ PageInfo<ConsumptionListVo> list(ConsumptionQuery query);
/**
* Get data consumption details
@@ -58,7 +58,7 @@ public interface ConsumptionService {
* According to data consumption details
*
* @param consumerGroupId Consumer group ID
- * @return
+ * @return Consumption info
*/
ConsumptionInfo getInfo(String consumerGroupId);
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/WorkflowEventService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/WorkflowEventService.java
index 190c715..005c4ef 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/WorkflowEventService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/WorkflowEventService.java
@@ -17,7 +17,7 @@
package org.apache.inlong.manager.service.core;
-import org.apache.inlong.manager.common.beans.PageResult;
+import com.github.pagehelper.PageInfo;
import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
import org.apache.inlong.manager.workflow.model.view.EventLogQuery;
@@ -25,15 +25,14 @@ import org.apache.inlong.manager.workflow.model.view.EventLogView;
/**
* Workflow event related services
- *
*/
public interface WorkflowEventService {
/**
* Get event log based on ID
*
- * @param id
- * @return
+ * @param id ID of the event log
+ * @return Event log view
*/
EventLogView get(Integer id);
@@ -43,7 +42,7 @@ public interface WorkflowEventService {
* @param query Query conditions
* @return Log list
*/
- PageResult<EventLogView> list(EventLogQuery query);
+ PageInfo<EventLogView> list(EventLogQuery query);
/**
* Execute the listener based on the log ID
@@ -56,14 +55,14 @@ public interface WorkflowEventService {
* Re-execute the specified listener according to the process ID
*
* @param processInstId Process ID
- * @param listenerName Listener name
+ * @param listenerName Listener name
*/
void executeProcessEventListener(Integer processInstId, String listenerName);
/**
* Re-execute the specified listener based on the task ID
*
- * @param taskInstId Task ID
+ * @param taskInstId Task ID
* @param listenerName Listener name
*/
void executeTaskEventListener(Integer taskInstId, String listenerName);
@@ -72,7 +71,7 @@ public interface WorkflowEventService {
* Re-trigger the process event based on the process ID
*
* @param processInstId Process ID
- * @param processEvent Process event
+ * @param processEvent Process event
*/
void triggerProcessEvent(Integer processInstId, ProcessEvent processEvent);
@@ -80,7 +79,7 @@ public interface WorkflowEventService {
* Re-trigger task events based on task ID
*
* @param taskInstId Task ID
- * @param taskEvent Task event
+ * @param taskEvent Task event
*/
void triggerTaskEvent(Integer taskInstId, TaskEvent taskEvent);
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/builder/CommonDBServerInfoBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/builder/CommonDBServerInfoBuilder.java
deleted file mode 100644
index d528580..0000000
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/builder/CommonDBServerInfoBuilder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.service.core.builder;
-
-import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerInfo;
-import org.apache.inlong.manager.dao.entity.CommonDbServerEntity;
-
-public class CommonDBServerInfoBuilder {
-
- public static CommonDbServerInfo buildInfoFromEntity(CommonDbServerEntity entity) {
- return CommonDbServerInfo.builder()
- .id(entity.getId())
- .connectionName(entity.getConnectionName())
- .dbType(entity.getDbType())
- .dbServerIp(entity.getDbServerIp())
- .port(entity.getPort())
- .dbName(entity.getDbName())
- .username(entity.getUsername())
- .password(entity.getPassword())
- .hasSelect(entity.getHasSelect())
- .hasInsert(entity.getHasInsert())
- .hasUpdate(entity.getHasUpdate())
- .hasDelete(entity.getHasDelete())
- .inCharges(entity.getInCharges())
- .dbDescription(entity.getDbDescription())
- .backupDbServerIp(entity.getBackupDbServerIp())
- .backupDbPort(entity.getBackupDbPort())
- .creator(entity.getCreator())
- .modifier(entity.getModifier())
- .createTime(entity.getCreateTime())
- .modifyTime(entity.getModifyTime())
- .visiblePerson(entity.getVisiblePerson())
- .visibleGroup(entity.getVisibleGroup())
- .isDeleted(entity.getIsDeleted())
- .accessType(entity.getAccessType())
- .status(entity.getStatus())
- .build();
- }
-
-}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/builder/CommonFileServerInfoBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/builder/CommonFileServerInfoBuilder.java
deleted file mode 100644
index 52740b3..0000000
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/builder/CommonFileServerInfoBuilder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.service.core.builder;
-
-import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerInfo;
-import org.apache.inlong.manager.dao.entity.CommonFileServerEntity;
-
-public class CommonFileServerInfoBuilder {
-
- public static CommonFileServerInfo buildFileInfoFromEntity(CommonFileServerEntity entity) {
- return CommonFileServerInfo.builder()
- .id(entity.getId())
- .ip(entity.getIp())
- .port(entity.getPort())
- .accessType(entity.getAccessType())
- .issueType(entity.getIssueType())
- .username(entity.getUsername())
- .password(entity.getPassword())
- .status(entity.getStatus())
- .creator(entity.getCreator())
- .modifier(entity.getModifier())
- .createTime(entity.getCreateTime())
- .modifyTime(entity.getModifyTime())
- .visiblePerson(entity.getVisiblePerson())
- .visibleGroup(entity.getVisibleGroup())
- .isDeleted(entity.getIsDeleted())
- .build();
- }
-
-}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentSysConfigServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentSysConfigServiceImpl.java
index 2719e8c..e5cc5f5 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentSysConfigServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentSysConfigServiceImpl.java
@@ -80,68 +80,4 @@ public class AgentSysConfigServiceImpl implements AgentSysConfigService {
}
}
- public String calcMd5(AgentSysConfigEntity entity) {
- Map<String, String> propertiesMap = new TreeMap<>();
- propertiesMap.put(AgentConstants.NAME, "inlong_agent");
- propertiesMap.put(AgentConstants.IP, entity.getIp());
- propertiesMap.put(AgentConstants.DB_PATH, entity.getDbPath());
- propertiesMap.put(AgentConstants.SCAN_INTERVAL_SEC, "" + entity.getScanIntervalSec());
- propertiesMap.put(AgentConstants.BATCH_SIZE, "" + entity.getBatchSize());
- propertiesMap.put(AgentConstants.MSG_SIZE, "" + entity.getMsgSize());
- propertiesMap.put(AgentConstants.SEND_RUNNABLEC_SIZE, "" + entity.getSendRunnableSize());
- propertiesMap.put(AgentConstants.MSG_QUEUE_SIZE, "" + entity.getMsgQueueSize());
- propertiesMap.put(AgentConstants.ONELINE_SIZE, "" + entity.getOnelineSize());
- propertiesMap.put(AgentConstants.STAT_INTERVAL_SEC, "" + entity.getStatIntervalSec());
-
- propertiesMap.put(AgentConstants.MAX_READER_CNT, "" + entity.getMaxReaderCnt());
- // TODO
- propertiesMap.put(AgentConstants.COMPRESS, "" + (entity.getCompress() == 1));
- // TODO
- propertiesMap.put(AgentConstants.IS_SEND, "" + AgentConstants.DEFAULT_IS_SEND);
- // TODO
- propertiesMap.put(AgentConstants.IS_PACKAGE, "" + AgentConstants.DEFAULT_BPACKAGE);
- propertiesMap.put(AgentConstants.BUFFER_SIZE, "" + entity.getBuffersize());
- // TODO
- propertiesMap.put(AgentConstants.IS_WRITE, "" + AgentConstants.DEFAULT_IS_WRITE);
- // TODO
- propertiesMap.put(AgentConstants.IS_CALC_MD5, "" + (entity.getIsCalmd5() == 1));
- propertiesMap.put(AgentConstants.SEND_TIMEOUT_MILL_SEC,
- "" + entity.getSendTimeoutMillSec());
- propertiesMap.put(AgentConstants.FLUSH_EVENT_TIMEOUT_MILL_SEC,
- "" + entity.getFlushEventTimeoutMillSec());
- propertiesMap.put(AgentConstants.RPC_CLIENT_RECONNECT,
- "" + entity.getAgentRpcReconnectTime());
- propertiesMap.put(AgentConstants.FLOW_SIZE, "" + entity.getFlowSize());
- propertiesMap.put(AgentConstants.CLEAR_INTERVAL_SEC, "" + entity.getClearIntervalSec());
- propertiesMap.put(AgentConstants.CLEAR_DAY_OFFSET, "" + entity.getClearDayOffset());
- propertiesMap.put(AgentConstants.MIN_RETRY_THREADS, "" + entity.getMinRetryThreads());
- propertiesMap.put(AgentConstants.MAX_RETRY_THREADS, "" + entity.getMaxRetryThreads());
- propertiesMap.put(AgentConstants.EVENT_CHECK_INTERVAL,
- "" + entity.getEventCheckInterval());
- propertiesMap.put(AgentConstants.THREAD_MANAGER_SLEEP_INTERVAL,
- "" + entity.getThreadManagerSleepInterval());
- propertiesMap
- .put(AgentConstants.BUFFER_SIZE_IN_BYTES, "" + entity.getBufferSizeInBytes());
- propertiesMap.put(AgentConstants.CONF_REFRESH_INTERVAL_SECS, "" + entity.getConfRefreshIntervalSecs());
- MessageDigest md = null;
- try {
- md = MessageDigest.getInstance("MD5");
- } catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- }
- for (Map.Entry<String, String> entry : propertiesMap.entrySet()) {
- md.update(entry.getKey().getBytes(), 0, entry.getKey().length());
- md.update(entry.getValue().getBytes(), 0, entry.getValue().length());
- }
-
- /* Calculate md5. */
- byte[] mdbytes = md.digest();
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < mdbytes.length; i++) {
- sb.append(Integer.toString((mdbytes[i] & 0xff) + 0x100, 16)
- .substring(1));
- }
- //LOGGER.debug("conf md5 {}",sb.toString());
- return sb.toString();
- }
}
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 85aac6d..b729fa0 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
@@ -37,10 +37,8 @@ import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.entity.CommonDbServerEntity;
import org.apache.inlong.manager.dao.mapper.CommonDbServerEntityMapper;
import org.apache.inlong.manager.service.core.CommonDBServerService;
-import org.apache.inlong.manager.service.core.builder.CommonDBServerInfoBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -62,6 +60,12 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
return false;
}
+ /**
+ * Check if the IP string is valid
+ *
+ * @param text IP string
+ * @return true or false
+ */
public static boolean ipCheck(String text) {
if (text != null && !text.isEmpty()) {
// Define regular expression
@@ -70,19 +74,13 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
+ "(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
+ "(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$";
// Determine whether the ip address matches the regular expression
- if (text.matches(regex)) {
- // Return judgment information
- return true;
- } else {
- // Return judgment information
- return false;
- }
+ return text.matches(regex);
}
return false;
}
@Override
- public int create(CommonDbServerInfo info) throws Exception {
+ public int save(CommonDbServerInfo info) throws Exception {
LOGGER.debug("create CommonDbServer info=[{}]", info);
// Check validity
@@ -192,10 +190,9 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
Preconditions.checkNotNull(entity, "CommonDbServerEntity not found by id=" + id);
Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonDbServerEntity has been deleted, id=" + id);
- // TODO Check if it can be read
String userName = LoginUserUtil.getLoginUserDetail().getUserName();
if (checkVisible(userName, entity)) {
- return CommonDBServerInfoBuilder.buildInfoFromEntity(entity);
+ return CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new);
} else {
throw new IllegalArgumentException(userName + " has no right to get id=" + id
+ ", please contact " + entity.getCreator());
@@ -230,60 +227,50 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
}
@Override
- public CommonDbServerInfo update(CommonDbServerInfo commonDbServerInfo) throws Exception {
+ public CommonDbServerInfo update(CommonDbServerInfo serverInfo) throws Exception {
String userName = LoginUserUtil.getLoginUserDetail().getUserName();
- LOGGER.info("user={} update CommonDbServerInfo info=[{}]", userName, commonDbServerInfo);
- CommonDbServerEntity entity = commonDbServerMapper.selectByPrimaryKey(commonDbServerInfo.getId());
- Preconditions.checkNotNull(entity, "CommonDbServerEntity not found by id=" + commonDbServerInfo.getId());
+ LOGGER.info("user={} update CommonDbServerInfo info=[{}]", userName, serverInfo);
+ CommonDbServerEntity entity = commonDbServerMapper.selectByPrimaryKey(serverInfo.getId());
+ Preconditions.checkNotNull(entity, "CommonDbServerEntity not found by id=" + serverInfo.getId());
Preconditions.checkTrue(entity.getIsDeleted() == 0,
- "CommonDbServerEntity has been deleted, id=" + commonDbServerInfo.getId());
-
- // TODO Update permissions? Only those who own it can update
+ "CommonDbServerEntity has been deleted, id=" + serverInfo.getId());
// can not update username + dbType + dbServerIp + port?
- if (commonDbServerInfo.getUsername() != null && !commonDbServerInfo.getUsername()
+ if (serverInfo.getUsername() != null && !serverInfo.getUsername()
.equals(entity.getUsername())) {
throw new IllegalArgumentException(
entity.getId() + " username=" + entity.getUsername() + " can not be updated.");
}
- if (commonDbServerInfo.getDbType() != null && !commonDbServerInfo.getDbType()
+ if (serverInfo.getDbType() != null && !serverInfo.getDbType()
.equals(entity.getDbType())) {
throw new IllegalArgumentException(
entity.getId() + " dbType=" + entity.getDbType() + " can not be updated.");
}
- if (commonDbServerInfo.getDbServerIp() != null && !commonDbServerInfo.getDbServerIp()
+ if (serverInfo.getDbServerIp() != null && !serverInfo.getDbServerIp()
.equals(entity.getDbServerIp())) {
throw new IllegalArgumentException(
entity.getId() + " dbServerIp=" + entity.getDbServerIp() + " can not be updated.");
}
- if (commonDbServerInfo.getPort() != 0 && commonDbServerInfo.getPort() != entity.getPort()) {
+ if (serverInfo.getPort() != 0 && serverInfo.getPort() != entity.getPort()) {
throw new IllegalArgumentException(entity.getId() + " port = " + entity.getPort() + " can not be updated.");
}
- commonDbServerInfo.setPort(entity.getPort());
- checkStrFieldLength(commonDbServerInfo);
+ serverInfo.setPort(entity.getPort());
+ checkStrFieldLength(serverInfo);
if (!checkCreator(userName, entity)) {
throw new IllegalArgumentException(userName + " is not creator, has no right to update id=" + entity.getId()
+ ", please contact " + entity.getCreator());
}
- CommonDbServerEntity record = new CommonDbServerEntity();
- BeanUtils.copyProperties(commonDbServerInfo, record);
- // can not update this fields.
- record.setIsDeleted(null);
- //record.setCreator(null);
- record.setCreateTime(null);
-
- Date now = new Date();
+ CommonDbServerEntity record = CommonBeanUtils.copyProperties(serverInfo, CommonDbServerEntity::new);
record.setModifier(userName);
- record.setModifyTime(now);
+ record.setModifyTime(new Date());
int success = commonDbServerMapper.updateByPrimaryKeySelective(record);
Preconditions.checkTrue(success == 1, "Database update id = " + entity.getId() + " failed ");
LOGGER.info("user={} success update CommonDbServer id={}", userName, entity.getId());
- return CommonDBServerInfoBuilder.buildInfoFromEntity(
- commonDbServerMapper.selectByPrimaryKey(commonDbServerInfo.getId()));
+ return CommonBeanUtils.copyProperties(record, CommonDbServerInfo::new);
}
@Override
@@ -296,17 +283,17 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
List<CommonDbServerInfo> results = new ArrayList<>();
Splitter commaSplitter = Splitter.on(',');
- for (CommonDbServerEntity entry : all) {
- if (entry.getCreator().equals(user)) {
- results.add(CommonDBServerInfoBuilder.buildInfoFromEntity(entry));
+ for (CommonDbServerEntity entity : all) {
+ if (entity.getCreator().equals(user)) {
+ results.add(CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new));
continue;
}
// check user relative entry
- List<String> inChargeSplits = commaSplitter.splitToList(entry.getInCharges());
- List<String> vPersion = commaSplitter.splitToList(entry.getVisiblePerson());
- List<String> vGroup = commaSplitter.splitToList(entry.getVisibleGroup());
+ List<String> inChargeSplits = commaSplitter.splitToList(entity.getInCharges());
+ List<String> vPersion = commaSplitter.splitToList(entity.getVisiblePerson());
+ List<String> vGroup = commaSplitter.splitToList(entity.getVisibleGroup());
if (checkUserVisible(user, groups, inChargeSplits, vPersion, vGroup)) {
- results.add(CommonDBServerInfoBuilder.buildInfoFromEntity(entry));
+ results.add(CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new));
}
}
return results;
@@ -342,8 +329,7 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
String username = LoginUserUtil.getLoginUserDetail().getUserName();
LOGGER.info("user={}, add visible person, id={}, visible group={}", username, id, visiblePerson);
- CommonDbServerEntity entity =
- commonDbServerMapper.selectByPrimaryKey(id);
+ CommonDbServerEntity entity = commonDbServerMapper.selectByPrimaryKey(id);
Preconditions.checkNotNull(entity, "CommonDbServerEntity not found by id=" + id);
Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonDbServerEntity has been deleted, id=" + id);
@@ -378,7 +364,7 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
LOGGER.info("user={} success addVisiblePerson for CommonDbServer id={}", username, entity.getId());
- return CommonDBServerInfoBuilder.buildInfoFromEntity(commonDbServerMapper.selectByPrimaryKey(id));
+ return CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new);
}
@Override
@@ -414,8 +400,7 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
LOGGER.info("user={} success deleteVisiblePerson for CommonDbServer id={}", username, entity.getId());
- return CommonDBServerInfoBuilder.buildInfoFromEntity(
- commonDbServerMapper.selectByPrimaryKey(id));
+ return CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new);
}
@Override
@@ -458,8 +443,7 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
LOGGER.info("user={} success addVisibleGroup for CommonDbServer id={}", username, entity.getId());
- return CommonDBServerInfoBuilder.buildInfoFromEntity(
- commonDbServerMapper.selectByPrimaryKey(id));
+ return CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new);
}
@Override
@@ -496,8 +480,7 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
LOGGER.info("user={} success deleteVisibleGroup for CommonDbServer id={}", username, entity.getId());
- return CommonDBServerInfoBuilder
- .buildInfoFromEntity(commonDbServerMapper.selectByPrimaryKey(id));
+ return CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new);
}
@Override
@@ -531,13 +514,13 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
private boolean checkVisible(String userName, CommonDbServerEntity entity) {
boolean passed = false;
// check creator
- passed = passed || checkCreator(userName, entity);
+ passed = checkCreator(userName, entity);
if (!passed) {
// check visiblePerson
- passed = passed || checkVisiblePerson(userName, entity);
+ passed = checkVisiblePerson(userName, entity);
if (!passed) {
// check visibleGroup
- passed = passed || checkVisibleGroup(userName, entity);
+ passed = checkVisibleGroup(userName, entity);
}
}
return passed;
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 aff9cb5..a78c8a5 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
@@ -37,7 +37,6 @@ import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.entity.CommonFileServerEntity;
import org.apache.inlong.manager.dao.mapper.CommonFileServerEntityMapper;
import org.apache.inlong.manager.service.core.CommonFileServerService;
-import org.apache.inlong.manager.service.core.builder.CommonFileServerInfoBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -114,7 +113,7 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
return record.getId();
}
- private void checkValidity(CommonFileServerInfo commonFileServerInfo) throws Exception {
+ private void checkValidity(CommonFileServerInfo commonFileServerInfo) {
if (commonFileServerInfo.getId() > 0) {
throw new IllegalArgumentException("CommonFileServer id = [" + commonFileServerInfo.getId()
+ "] has already exists, please check");
@@ -167,10 +166,9 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + id);
Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonFileServerEntity has been deleted, id=" + id);
- // TODO Check if it can be read
String userName = LoginUserUtil.getLoginUserDetail().getUserName();
if (checkVisible(userName, entity)) {
- return CommonFileServerInfoBuilder.buildFileInfoFromEntity(entity);
+ return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
} else {
throw new IllegalArgumentException(userName + " has no right to get id=" + id
+ ", please contact " + entity.getCreator());
@@ -186,8 +184,6 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + id);
Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonFileServerEntity has been deleted, id=" + id);
- // TODO Check if it is quoted, only those that no one quotes can be deleted
-
if (!checkCreator(userName, entity)) {
throw new IllegalArgumentException(userName + " is not creator, has no right to delete id=" + id
+ ", please contact " + entity.getCreator());
@@ -215,8 +211,6 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
Preconditions.checkTrue(entity.getIsDeleted() == 0,
"CommonFileServerEntity has been deleted, id=" + commonFileServerInfo.getId());
- // TODO Update permissions? Only those who own it can update?
-
// can not update username + ip + port?
if (commonFileServerInfo.getUsername() != null && !commonFileServerInfo.getUsername()
.equals(entity.getUsername())) {
@@ -254,12 +248,11 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
Preconditions.checkTrue(success == 1, "Database update id = " + entity.getId() + " failed ");
LOGGER.info("user={} success update CommonFileServer id={}", userName, entity.getId());
- return CommonFileServerInfoBuilder.buildFileInfoFromEntity(
- commonFileServerMapper.selectByPrimaryKey(commonFileServerInfo.getId()));
+ return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
}
@Override
- public CommonFileServerInfo freeze(int id) throws Exception {
+ public CommonFileServerInfo freeze(int id) {
String userName = LoginUserUtil.getLoginUserDetail().getUserName();
LOGGER.info("user={} freeze CommonFileServer id=[{}].", userName, id);
@@ -267,8 +260,6 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + id);
Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonFileServerEntity has been deleted, id=" + id);
- // TODO There are other operations before freezing, such as stopping the agent
-
if (!checkCreator(userName, entity)) {
throw new IllegalArgumentException(userName + " is not creator, has no right to freeze id=" + id
+ ", please contact " + entity.getCreator());
@@ -284,12 +275,11 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
Preconditions.checkTrue(success == 1, "Database update id = " + entity.getId() + " failed ");
LOGGER.info("user={} success freeze CommonFileServer id={}", userName, entity.getId());
- return CommonFileServerInfoBuilder.buildFileInfoFromEntity(
- commonFileServerMapper.selectByPrimaryKey(id));
+ return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
}
@Override
- public CommonFileServerInfo unfreeze(int id) throws Exception {
+ public CommonFileServerInfo unfreeze(int id) {
String userName = LoginUserUtil.getLoginUserDetail().getUserName();
LOGGER.info("user={} unfreeze CommonFileServer id=[{}].", userName, id);
@@ -314,12 +304,11 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
Preconditions.checkTrue(success == 1, "DataBase update id = " + entity.getId() + " failed ");
LOGGER.info("user={} success unfreeze CommonFileServer id={}", userName, entity.getId());
- return CommonFileServerInfoBuilder.buildFileInfoFromEntity(
- commonFileServerMapper.selectByPrimaryKey(id));
+ return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
}
@Override
- public List<CommonFileServerInfo> getByUser(String user) throws Exception {
+ public List<CommonFileServerInfo> getByUser(String user) {
List<CommonFileServerEntity> all = commonFileServerMapper.selectAll();
// Get group information of user
@@ -329,16 +318,16 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
List<CommonFileServerInfo> results = new ArrayList<>();
Splitter commaSplitter = Splitter.on(',');
- for (CommonFileServerEntity entry : all) {
- if (entry.getCreator().equals(user)) {
- results.add(CommonFileServerInfoBuilder.buildFileInfoFromEntity(entry));
+ for (CommonFileServerEntity entity : all) {
+ if (entity.getCreator().equals(user)) {
+ results.add(CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new));
continue;
}
// check user relative entry
- List<String> vPersion = commaSplitter.splitToList(entry.getVisiblePerson());
- List<String> vGroup = commaSplitter.splitToList(entry.getVisibleGroup());
+ List<String> vPersion = commaSplitter.splitToList(entity.getVisiblePerson());
+ List<String> vGroup = commaSplitter.splitToList(entity.getVisibleGroup());
if (checkUserVisible(user, groups, vPersion, vGroup)) {
- results.add(CommonFileServerInfoBuilder.buildFileInfoFromEntity(entry));
+ results.add(CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new));
}
}
return results;
@@ -402,7 +391,7 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
LOGGER.info("user={} success addVisiblePerson for CommonFileServer id={}", username, entity.getId());
- return CommonFileServerInfoBuilder.buildFileInfoFromEntity(commonFileServerMapper.selectByPrimaryKey(id));
+ return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
}
@Override
@@ -440,8 +429,7 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
LOGGER.info("user={} success deleteVisiblePerson for CommonFileServer id={}", username, entity.getId());
- return CommonFileServerInfoBuilder.buildFileInfoFromEntity(
- commonFileServerMapper.selectByPrimaryKey(id));
+ return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
}
@Override
@@ -484,7 +472,7 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
LOGGER.info("user={} success addVisibleGroup for CommonFileServer id={}", username, entity.getId());
- return CommonFileServerInfoBuilder.buildFileInfoFromEntity(commonFileServerMapper.selectByPrimaryKey(id));
+ return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
}
@Override
@@ -521,8 +509,7 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
LOGGER.info("user={} success deleteVisibleGroup for CommonFileServer id={}", username, entity.getId());
- return CommonFileServerInfoBuilder.buildFileInfoFromEntity(
- commonFileServerMapper.selectByPrimaryKey(id));
+ return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
}
@Override
@@ -554,13 +541,13 @@ public class CommonFileServerServiceImpl implements CommonFileServerService {
private boolean checkVisible(String userName, CommonFileServerEntity entity) {
boolean passed = false;
// check creator
- passed = passed || checkCreator(userName, entity);
+ passed = checkCreator(userName, entity);
if (!passed) {
// check visiblePerson
- passed = passed || checkVisiblePerson(userName, entity);
+ passed = checkVisiblePerson(userName, entity);
if (!passed) {
// check visibleGroup
- passed = passed || checkVisibleGroup(userName, entity);
+ passed = checkVisibleGroup(userName, entity);
}
}
return passed;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
index fa6b0ac..b39f6b4 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.beans.ClusterBean;
-import org.apache.inlong.manager.common.beans.PageResult;
import org.apache.inlong.manager.common.enums.ConsumptionStatus;
import org.apache.inlong.manager.common.enums.EntityStatus;
import org.apache.inlong.manager.common.pojo.business.BusinessTopicVO;
@@ -37,7 +36,6 @@ import org.apache.inlong.manager.common.pojo.dataconsumption.ConsumptionQuery;
import org.apache.inlong.manager.common.pojo.dataconsumption.ConsumptionSummary;
import org.apache.inlong.manager.common.pojo.dataconsumption.ConsumptionUpdateInfo;
import org.apache.inlong.manager.common.util.CommonBeanUtils;
-import org.apache.inlong.manager.common.util.PageUtils;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.entity.ConsumptionEntity;
import org.apache.inlong.manager.dao.mapper.ConsumptionEntityMapper;
@@ -83,13 +81,13 @@ public class ConsumptionServiceImpl implements ConsumptionService {
}
@Override
- public PageResult<ConsumptionListVo> list(ConsumptionQuery query) {
+ public PageInfo<ConsumptionListVo> list(ConsumptionQuery query) {
PageHelper.startPage(query.getPageNum(), query.getPageSize());
Page<ConsumptionEntity> pageResult = (Page<ConsumptionEntity>) this.consumptionMapper.listByQuery(query);
PageInfo<ConsumptionListVo> pageInfo = pageResult
.toPageInfo(entity -> CommonBeanUtils.copyProperties(entity, ConsumptionListVo::new));
pageInfo.setTotal(pageResult.getTotal());
- return PageUtils.getPageResult(pageInfo);
+ return pageInfo;
}
@Override
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataStorageServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataStorageServiceImpl.java
deleted file mode 100644
index 6411f73..0000000
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataStorageServiceImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.service.core.impl;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-public class DataStorageServiceImpl {
-
- private static String driverName = "org.apache.hive.jdbc.HiveDriver";
-
- public static void main(String[] args) throws SQLException {
- try {
- Class.forName(driverName);
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- System.exit(1);
- }
-
- Connection con = DriverManager.getConnection("jdbc:hive2://127.0.0.1:10001/default");
- Statement stmt = con.createStatement();
- String tableName = "HiveTestByJava";
- stmt.execute("drop table if exists " + tableName);
- stmt.execute("create table " + tableName + " (key int, value string)");
- System.out.println("Create table success!");
-
- // show tables
- String sql = "show tables '" + tableName + "'";
- System.out.println("Running: " + sql);
- ResultSet res = stmt.executeQuery(sql);
- if (res.next()) {
- System.out.println(res.getString(1));
- }
-
- // describe table
- sql = "describe " + tableName;
- System.out.println("Running: " + sql);
- res = stmt.executeQuery(sql);
- while (res.next()) {
- System.out.println(res.getString(1) + "\t" + res.getString(2));
- }
-
- sql = "insert into " + tableName + " values (42,\"hello\"),(48,\"world\")";
- stmt.execute(sql);
-
- sql = "select * from " + tableName;
- System.out.println("Running: " + sql);
- res = stmt.executeQuery(sql);
- while (res.next()) {
- System.out.println(String.valueOf(res.getInt(1)) + "\t"
- + res.getString(2));
- }
-
- sql = "select count(1) from " + tableName;
- System.out.println("Running: " + sql);
- res = stmt.executeQuery(sql);
- while (res.next()) {
- System.out.println(res.getString(1));
- }
- }
-
-}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowEventServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowEventServiceImpl.java
index e53c186..15f66db 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowEventServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowEventServiceImpl.java
@@ -19,9 +19,9 @@ package org.apache.inlong.manager.service.core.impl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
-
-import org.apache.inlong.manager.common.beans.PageResult;
-import org.apache.inlong.manager.common.util.PageUtils;
+import com.github.pagehelper.PageInfo;
+import java.util.List;
+import org.apache.inlong.manager.common.util.CommonBeanUtils;
import org.apache.inlong.manager.service.core.WorkflowEventService;
import org.apache.inlong.manager.workflow.core.EventListenerService;
import org.apache.inlong.manager.workflow.core.QueryService;
@@ -35,7 +35,6 @@ import org.springframework.stereotype.Service;
/**
* Workflow event related services
- *
*/
@Service
public class WorkflowEventServiceImpl implements WorkflowEventService {
@@ -48,15 +47,20 @@ public class WorkflowEventServiceImpl implements WorkflowEventService {
@Override
public EventLogView get(Integer id) {
- return EventLogView.fromEventLog(queryService.getEventLog(id), true);
+ EventLog eventLog = queryService.getEventLog(id);
+ return CommonBeanUtils.copyProperties(eventLog, EventLogView::new);
}
@Override
- public PageResult<EventLogView> list(EventLogQuery query) {
+ public PageInfo<EventLogView> list(EventLogQuery query) {
PageHelper.startPage(query.getPageNum(), query.getPageSize());
Page<EventLog> page = (Page<EventLog>) queryService.listEventLog(query);
- return PageUtils.getPageResult(page, log -> EventLogView.fromEventLog(log, false));
+ List<EventLogView> viewList = CommonBeanUtils.copyListProperties(page, EventLogView::new);
+ PageInfo<EventLogView> pageInfo = new PageInfo<>(viewList);
+ pageInfo.setTotal(page.getTotal());
+
+ return pageInfo;
}
@Override
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operationlog/OperationLog.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operationlog/OperationLog.java
index b4fab75..32c1076 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operationlog/OperationLog.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operationlog/OperationLog.java
@@ -17,20 +17,23 @@
package org.apache.inlong.manager.service.core.operationlog;
-import org.apache.inlong.manager.common.enums.OperationType;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.inlong.manager.common.enums.OperationType;
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface OperationLog {
- // Operation type
+ /**
+ * Operation type
+ */
OperationType operation();
- // Whether to store in the database
+ /**
+ * Whether to store in the database
+ */
boolean db() default true;
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/HiveTableOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/HiveTableOperator.java
index d3313bc..0d1049b 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/HiveTableOperator.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/HiveTableOperator.java
@@ -33,7 +33,6 @@ import org.apache.inlong.manager.dao.mapper.StorageHiveFieldEntityMapper;
import org.apache.inlong.manager.service.core.DataSourceService;
import org.apache.inlong.manager.service.core.StorageService;
import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.sort.protocol.sink.HiveSinkInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -52,6 +51,9 @@ public class HiveTableOperator {
@Autowired
private StorageHiveFieldEntityMapper storageHiveFieldMapper;
+ /**
+ * Create hive table according to the bid and hive config
+ */
public void createHiveTable(String bid, DataStreamInfoToHiveConfig hiveConfig) {
if (log.isDebugEnabled()) {
log.debug("begin create hive table for business={}, hiveConfig={}", bid, hiveConfig);
@@ -110,7 +112,7 @@ public class HiveTableOperator {
HiveColumnQueryBean partColumn = new HiveColumnQueryBean();
partColumn.setPartition(true);
partColumn.setColumnName(partitionField);
- partColumn.setColumnType("string"); // currently only supports 'string' type
+ partColumn.setColumnType("string"); // currently, only supports 'string' type
columnQueryBeans.add(partColumn);
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/builder/HiveDropTableSqlBuilder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/builder/HiveDropTableSqlBuilder.java
index 84a9066..d1f5f6f 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/builder/HiveDropTableSqlBuilder.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/builder/HiveDropTableSqlBuilder.java
@@ -21,7 +21,7 @@ package org.apache.inlong.manager.service.thirdpart.hive.builder;
import org.apache.inlong.manager.common.pojo.query.hive.HiveTableQueryBean;
/**
- *
+ * Builder of drop Hive table ddl
*/
public class HiveDropTableSqlBuilder extends SqlBuilder<HiveTableQueryBean> {
@@ -35,6 +35,6 @@ public class HiveDropTableSqlBuilder extends SqlBuilder<HiveTableQueryBean> {
@Override
public String getOPT() {
- return "DROP_TABLE_HIVE";
+ return "DROP_TABLE_HIVE";
}
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/TubeMqOptService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/TubeMqOptService.java
index 4eae2f0..71bd01f 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/TubeMqOptService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/TubeMqOptService.java
@@ -19,7 +19,6 @@ package org.apache.inlong.manager.service.thirdpart.mq;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.beans.ClusterBean;
import org.apache.inlong.manager.common.enums.BizErrorCodeEnum;
@@ -27,7 +26,6 @@ import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.common.pojo.tubemq.AddTubeConsumeGroupRequest;
import org.apache.inlong.manager.common.pojo.tubemq.AddTubeMqTopicRequest;
import org.apache.inlong.manager.common.pojo.tubemq.QueryTubeTopicRequest;
-import org.apache.inlong.manager.common.pojo.tubemq.TubeClusterResponse;
import org.apache.inlong.manager.common.pojo.tubemq.TubeManagerResponse;
import org.apache.inlong.manager.common.util.HttpUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +45,9 @@ public class TubeMqOptService {
@Autowired
private HttpUtils httpUtils;
+ /**
+ * Create new topic
+ */
public String createNewTopic(AddTubeMqTopicRequest request) {
HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.add("Content-Type", "application/json");
@@ -80,6 +81,9 @@ public class TubeMqOptService {
return "";
}
+ /**
+ * Create new consumer group
+ */
public String createNewConsumerGroup(AddTubeConsumeGroupRequest request) throws Exception {
HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.add("Content-Type", "application/json");
@@ -98,19 +102,9 @@ public class TubeMqOptService {
return "";
}
- public List<TubeClusterResponse.DataBean> queryCluster() {
- HttpHeaders httpHeaders = new HttpHeaders();
- try {
- log.info(" query tube cluster {} ", clusterBean.getTubeManager() + "/v1/cluster");
- TubeClusterResponse rsp = httpUtils.request(clusterBean.getTubeManager() + "/v1/cluster",
- HttpMethod.GET, null, httpHeaders, TubeClusterResponse.class);
- return rsp.getData();
- } catch (Exception e) {
- log.error(" fail to query tube cluster ", e);
- }
- return null;
- }
-
+ /**
+ * Check if the topic is exists
+ */
public boolean queryTopicIsExist(QueryTubeTopicRequest queryTubeTopicRequest) {
HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.add("Content-Type", "application/json");
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/sort/SortFieldFormatUtils.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/sort/SortFieldFormatUtils.java
index e5a33f7..1df0d1c 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/sort/SortFieldFormatUtils.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/sort/SortFieldFormatUtils.java
@@ -33,6 +33,12 @@ import org.apache.inlong.sort.formats.common.StringFormatInfo;
*/
public class SortFieldFormatUtils {
+ /**
+ * Get the FieldFormat of Sort according to type string
+ *
+ * @param type type string
+ * @return Sort field format instance
+ */
public static FormatInfo convertFieldFormat(String type) {
FormatInfo formatInfo;
switch (type) {
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowService.java
index a52201a..1cd70fb 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowService.java
@@ -17,7 +17,8 @@
package org.apache.inlong.manager.service.workflow;
-import org.apache.inlong.manager.common.beans.PageResult;
+import com.github.pagehelper.PageInfo;
+import java.util.List;
import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
import org.apache.inlong.manager.workflow.model.definition.TaskForm;
import org.apache.inlong.manager.workflow.model.view.ProcessDetail;
@@ -30,20 +31,17 @@ import org.apache.inlong.manager.workflow.model.view.TaskQuery;
import org.apache.inlong.manager.workflow.model.view.TaskSummaryQuery;
import org.apache.inlong.manager.workflow.model.view.TaskSummaryView;
-import java.util.List;
-
/**
* Workflow service
- *
*/
public interface WorkflowService {
/**
* Initiation process
*
- * @param name Process name
+ * @param name Process name
* @param applicant Applicant
- * @param form Process form
+ * @param form Process form
* @return result
*/
WorkflowResult start(ProcessName name, String applicant, ProcessForm form);
@@ -52,8 +50,8 @@ public interface WorkflowService {
* Cancellation process application
*
* @param processInstId Process instance ID
- * @param operator Operator
- * @param remark Remarks information
+ * @param operator Operator
+ * @param remark Remarks information
* @return result
*/
WorkflowResult cancel(Integer processInstId, String operator, String remark);
@@ -61,8 +59,8 @@ public interface WorkflowService {
/**
* Approval and consent
*
- * @param taskId Task ID
- * @param form Form information
+ * @param taskId Task ID
+ * @param form Form information
* @param operator Operator
* @return result
*/
@@ -71,8 +69,8 @@ public interface WorkflowService {
/**
* reject
*
- * @param taskId Task ID
- * @param remark Remarks information
+ * @param taskId Task ID
+ * @param remark Remarks information
* @param operator Operator
* @return result
*/
@@ -81,9 +79,9 @@ public interface WorkflowService {
/**
* Change approver
*
- * @param taskId Task ID
- * @param remark Remarks
- * @param to Transfer to
+ * @param taskId Task ID
+ * @param remark Remarks
+ * @param to Transfer to
* @param operator Operator
* @return result
*/
@@ -92,10 +90,10 @@ public interface WorkflowService {
/**
* Complete task-true to automatic task
*
- * @param taskId System Task ID
- * @param remark Remarks
+ * @param taskId System Task ID
+ * @param remark Remarks
* @param operator Operator
- * @return
+ * @return result
*/
WorkflowResult complete(Integer taskId, String remark, String operator);
@@ -103,7 +101,7 @@ public interface WorkflowService {
* Query process details according to the tracking number
*
* @param processInstId Process form number
- * @param taskInstId Task ID of the operation-nullable
+ * @param taskInstId Task ID of the operation-nullable
* @return Detail
*/
ProcessDetail detail(Integer processInstId, Integer taskInstId);
@@ -114,7 +112,7 @@ public interface WorkflowService {
* @param query Query conditions
* @return List
*/
- PageResult<ProcessListView> listProcess(ProcessQuery query);
+ PageInfo<ProcessListView> listProcess(ProcessQuery query);
/**
* Get task list
@@ -122,7 +120,7 @@ public interface WorkflowService {
* @param query Query conditions
* @return List
*/
- PageResult<TaskListView> listTask(TaskQuery query);
+ PageInfo<TaskListView> listTask(TaskQuery query);
/**
* Get process statistics
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImpl.java
index debe025..cf61b6d 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImpl.java
@@ -28,8 +28,6 @@ import java.util.function.Consumer;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;
-import org.apache.inlong.manager.common.beans.PageResult;
-import org.apache.inlong.manager.common.util.PageUtils;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.service.workflow.WorkflowTaskExecuteLog.ListenerExecutorLog;
import org.apache.inlong.manager.service.workflow.WorkflowTaskExecuteLog.TaskExecutorLog;
@@ -127,7 +125,7 @@ public class WorkflowServiceImpl implements WorkflowService {
}
@Override
- public PageResult<ProcessListView> listProcess(ProcessQuery query) {
+ public PageInfo<ProcessListView> listProcess(ProcessQuery query) {
PageHelper.startPage(query.getPageNum(), query.getPageSize());
Page<ProcessInstance> result = (Page<ProcessInstance>) workflowEngine.queryService().listProcess(query);
PageInfo<ProcessListView> pageInfo = result.toPageInfo(processInstance -> {
@@ -148,17 +146,18 @@ public class WorkflowServiceImpl implements WorkflowService {
PageHelper.startPage(0, 100);
pageInfo.getList().forEach(addCurrentTask(baseTaskQuery));
}
- return PageUtils.getPageResult(pageInfo);
+ return pageInfo;
}
@Override
- public PageResult<TaskListView> listTask(TaskQuery query) {
+ public PageInfo<TaskListView> listTask(TaskQuery query) {
PageHelper.startPage(query.getPageNum(), query.getPageSize());
Page<TaskInstance> result = (Page<TaskInstance>) workflowEngine.queryService().listTask(query);
PageInfo<TaskListView> pageInfo = result.toPageInfo(TaskListView::fromTaskInstance);
addShowInListForEachTask(pageInfo.getList());
pageInfo.setTotal(result.getTotal());
- return PageUtils.getPageResult(pageInfo);
+
+ return pageInfo;
}
@Override
@@ -197,8 +196,8 @@ public class WorkflowServiceImpl implements WorkflowService {
private List<TaskExecutorLog> getTaskExecutorLogs(Integer processInstId, String taskType) {
return workflowEngine.queryService().listTask(TaskQuery.builder()
- .processInstId(processInstId).type(taskType)
- .build())
+ .processInstId(processInstId).type(taskType)
+ .build())
.stream()
.map(TaskExecutorLog::buildFromTaskInst)
.collect(Collectors.toList());
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonDBServerController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonDBServerController.java
index 16e9833..a6cca8f 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonDBServerController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonDBServerController.java
@@ -76,7 +76,7 @@ public class CommonDBServerController {
@RequestMapping(value = "/create", method = RequestMethod.POST)
@ApiOperation(value = "Create DB data source")
public Response<Integer> create(@RequestBody CommonDbServerInfo commonDbServerInfo) throws Exception {
- int id = commonDBServerService.create(commonDbServerInfo);
+ int id = commonDBServerService.save(commonDbServerInfo);
return Response.success(id);
}
@@ -173,7 +173,7 @@ public class CommonDBServerController {
*/
@RequestMapping(value = "/download", method = RequestMethod.GET)
@ApiOperation(value = "Download import template")
- public String download(HttpServletResponse response) throws Exception {
+ public String download(HttpServletResponse response) {
String fileName = "common_db_server_template.csv";
String realPath = new File("").getAbsolutePath();
File file = new File(realPath, fileName);
@@ -274,7 +274,7 @@ public class CommonDBServerController {
}
for (CommonDbServerInfo entry : dbServerInfos) {
- commonDBServerService.create(entry);
+ commonDBServerService.save(entry);
//System.out.println("entry = "+entry);
count++;
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonFileServerController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonFileServerController.java
index ebad1ba..629169e 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonFileServerController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonFileServerController.java
@@ -48,9 +48,9 @@ import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerInfo;
import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerListVo;
import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerPageRequest;
import org.apache.inlong.manager.common.util.LoginUserUtil;
+import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.common.util.SmallTools;
import org.apache.inlong.manager.service.core.CommonFileServerService;
-import org.apache.inlong.manager.common.util.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -84,16 +84,14 @@ public class CommonFileServerController {
@PostMapping("/freeze/{id}")
@ApiOperation(value = "Freeze file data source")
- public Response<CommonFileServerInfo> freeze(@RequestBody @PathVariable int id)
- throws Exception {
+ public Response<CommonFileServerInfo> freeze(@RequestBody @PathVariable int id) {
CommonFileServerInfo result = commonFileServerService.freeze(id);
return Response.success(result);
}
@PostMapping("/unfreeze/{id}")
@ApiOperation(value = "Unfreeze file data source")
- public Response<CommonFileServerInfo> unfreeze(@RequestBody @PathVariable int id)
- throws Exception {
+ public Response<CommonFileServerInfo> unfreeze(@RequestBody @PathVariable int id) {
CommonFileServerInfo result = commonFileServerService.unfreeze(id);
return Response.success(result);
}
@@ -126,7 +124,7 @@ public class CommonFileServerController {
@RequestMapping(value = "/getByUser/{username}", method = RequestMethod.GET)
@ApiOperation(value = "Get data source by user")
@ApiImplicitParam(name = "username", dataTypeClass = String.class, required = true)
- public Response<List<CommonFileServerInfo>> getByUser(@PathVariable String username) throws Exception {
+ public Response<List<CommonFileServerInfo>> getByUser(@PathVariable String username) {
List<CommonFileServerInfo> result = commonFileServerService.getByUser(username);
return Response.success(result);
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java
index fffaa10..09d4b09 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java
@@ -17,11 +17,11 @@
package org.apache.inlong.manager.web.controller;
+import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import org.apache.inlong.manager.common.beans.PageResult;
import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.enums.OperationType;
import org.apache.inlong.manager.common.pojo.dataconsumption.ConsumptionInfo;
@@ -67,7 +67,7 @@ public class ConsumptionController {
@GetMapping("list")
@ApiOperation(value = "List data consumptions")
- public Response<PageResult<ConsumptionListVo>> list(ConsumptionQuery query) {
+ public Response<PageInfo<ConsumptionListVo>> list(ConsumptionQuery query) {
query.setUserName(LoginUserUtil.getLoginUserDetail().getUserName());
return Response.success(consumptionService.list(query));
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
index 4f19168..1ecbc01 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
@@ -17,13 +17,13 @@
package org.apache.inlong.manager.web.controller;
+import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
-import org.apache.inlong.manager.common.beans.PageResult;
import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.enums.OperationType;
import org.apache.inlong.manager.common.util.LoginUserUtil;
@@ -134,14 +134,14 @@ public class WorkflowController {
@GetMapping("/listProcess")
@ApiOperation(value = "Get my list of process sheets")
- public Response<PageResult<ProcessListView>> listProcess(ProcessQuery query) {
+ public Response<PageInfo<ProcessListView>> listProcess(ProcessQuery query) {
query.setApplicant(LoginUserUtil.getLoginUserDetail().getUserName());
return Response.success(workflowService.listProcess(query));
}
@GetMapping("/listTask")
@ApiOperation(value = "Get my task list")
- public Response<PageResult<TaskListView>> listTask(TaskQuery query) {
+ public Response<PageInfo<TaskListView>> listTask(TaskQuery query) {
query.setApprover(LoginUserUtil.getLoginUserDetail().getUserName());
return Response.success(workflowService.listTask(query));
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
index 06772a2..39fbf51 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
@@ -17,7 +17,11 @@
package org.apache.inlong.manager.web.controller;
-import org.apache.inlong.manager.common.beans.PageResult;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.enums.OperationType;
import org.apache.inlong.manager.service.core.WorkflowEventService;
@@ -26,11 +30,6 @@ import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
import org.apache.inlong.manager.workflow.model.view.EventLogQuery;
import org.apache.inlong.manager.workflow.model.view.EventLogView;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -52,21 +51,22 @@ public class WorkflowEventController {
@GetMapping("/detail/{id}")
@ApiOperation(value = "Get event details")
- public Response<EventLogView> get(
- @ApiParam(value = "Event ID", required = true) @PathVariable Integer id) {
+ @ApiImplicitParam(name = "id", value = "event id", dataTypeClass = Integer.class, required = true)
+ public Response<EventLogView> get(@PathVariable Integer id) {
return Response.success(workflowEventService.get(id));
}
@GetMapping("/list")
@ApiOperation(value = "Query event list based on conditions")
- public Response<PageResult<EventLogView>> list(EventLogQuery query) {
+ public Response<PageInfo<EventLogView>> list(EventLogQuery query) {
return Response.success(workflowEventService.list(query));
}
@PostMapping("executeEventListener/{id}")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Execute the listener based on the log ID")
- public Response executeEventListener(@ApiParam(value = "Event ID", required = true) @PathVariable Integer id) {
+ @ApiImplicitParam(name = "id", value = "event id", dataTypeClass = Integer.class, required = true)
+ public Response<Object> executeEventListener(@PathVariable Integer id) {
workflowEventService.executeEventListener(id);
return Response.success();
}
@@ -74,9 +74,12 @@ public class WorkflowEventController {
@PostMapping("executeProcessEventListener")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Re-execute the specified listener according to the process ID")
- public Response executeProcessEventListener(
- @ApiParam(value = "Process ID", required = true) @RequestParam Integer processInstId,
- @ApiParam(value = "Listener name", required = true) @RequestParam String listenerName) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "processInstId", value = "process id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "listenerName", value = "listener name", dataTypeClass = String.class)
+ })
+ public Response<Object> executeProcessEventListener(@RequestParam Integer processInstId,
+ @RequestParam String listenerName) {
workflowEventService.executeProcessEventListener(processInstId, listenerName);
return Response.success();
}
@@ -84,9 +87,11 @@ public class WorkflowEventController {
@PostMapping("executeTaskEventListener")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Re-execute the specified listener based on the task ID")
- public Response executeTaskEventListener(
- @ApiParam(value = "Task ID", required = true) Integer taskInstId,
- @ApiParam(value = "Listener name", required = true) String listenerName) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "taskInstId", value = "task id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "listenerName", value = "listener name", dataTypeClass = String.class)
+ })
+ public Response<Object> executeTaskEventListener(Integer taskInstId, String listenerName) {
workflowEventService.executeTaskEventListener(taskInstId, listenerName);
return Response.success();
}
@@ -94,9 +99,11 @@ public class WorkflowEventController {
@PostMapping("triggerProcessEvent")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Re-trigger the process event based on the process ID")
- public Response triggerProcessEvent(
- @ApiParam(value = "Process ID", required = true) Integer processInstId,
- @ApiParam(value = "Process event", required = true) ProcessEvent processEvent) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "processInstId", value = "process id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "processEvent", value = "process event", dataTypeClass = ProcessEvent.class)
+ })
+ public Response<Object> triggerProcessEvent(Integer processInstId, ProcessEvent processEvent) {
workflowEventService.triggerProcessEvent(processInstId, processEvent);
return Response.success();
}
@@ -104,10 +111,13 @@ public class WorkflowEventController {
@PostMapping("triggerTaskEvent")
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Re-trigger the task event based on the task ID")
- public Response triggerTaskEvent(
- @ApiParam(value = "Task ID", required = true) Integer taskInstId,
- @ApiParam(value = "Task event", required = true) TaskEvent taskEvent) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "taskInstId", value = "task id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "taskEvent", value = "task event", dataTypeClass = TaskEvent.class)
+ })
+ public Response<Object> triggerTaskEvent(Integer taskInstId, TaskEvent taskEvent) {
workflowEventService.triggerTaskEvent(taskInstId, taskEvent);
return Response.success();
}
+
}
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowContextBuilderImpl.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowContextBuilderImpl.java
index a2cbf3a..e841835 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowContextBuilderImpl.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowContextBuilderImpl.java
@@ -18,7 +18,11 @@
package org.apache.inlong.manager.workflow.core.impl;
import com.google.common.collect.Lists;
-
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.inlong.manager.common.util.JsonUtils;
+import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.workflow.core.WorkflowContextBuilder;
import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
import org.apache.inlong.manager.workflow.model.Action;
@@ -29,21 +33,14 @@ import org.apache.inlong.manager.workflow.model.definition.Task;
import org.apache.inlong.manager.workflow.model.definition.TaskForm;
import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
-import org.apache.inlong.manager.common.util.JsonUtils;
-import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.workflow.util.WorkflowFormParserUtils;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-
/**
* Workflow context builder
*/
public class WorkflowContextBuilderImpl implements WorkflowContextBuilder {
- private WorkflowDataAccessor workflowDataAccessor;
+ private final WorkflowDataAccessor workflowDataAccessor;
public WorkflowContextBuilderImpl(WorkflowDataAccessor workflowDataAccessor) {
this.workflowDataAccessor = workflowDataAccessor;
@@ -82,13 +79,13 @@ public class WorkflowContextBuilderImpl implements WorkflowContextBuilder {
@Override
public WorkflowContext buildContextForTask(Integer taskInstId, Action action, TaskForm taskForm, String remark,
- String operator) {
+ String operator) {
return buildContextForTask(taskInstId, action, taskForm, null, remark, operator);
}
@Override
public WorkflowContext buildContextForTask(Integer taskInstId, Action action, List<String> transferToUsers,
- String remark, String operator) {
+ String remark, String operator) {
return buildContextForTask(taskInstId, action, null, transferToUsers, remark, operator);
}
@@ -103,7 +100,7 @@ public class WorkflowContextBuilderImpl implements WorkflowContextBuilder {
}
private WorkflowContext buildContextForTask(Integer taskInstId, Action action, TaskForm taskForm,
- List<String> transferToUsers, String remark, String operator) {
+ List<String> transferToUsers, String remark, String operator) {
TaskInstance taskInstance = workflowDataAccessor.taskInstanceStorage().get(taskInstId);
Preconditions.checkNotNull(taskInstance, "task not exist , taskId is " + taskInstId);
ProcessInstance processInstance = workflowDataAccessor.processInstanceStorage()
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/Action.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/Action.java
index 322baa2..2c5905b 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/Action.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/Action.java
@@ -59,15 +59,15 @@ public enum Action {
*/
COMPLETE("automatic completion");
- /**
- * Display name
- */
- private String displayName;
+ private final String displayName;
Action(String displayName) {
this.displayName = displayName;
}
+ /**
+ * Get Action from TaskEvent
+ */
public static Action fromTaskEvent(TaskEvent taskEvent) {
switch (taskEvent) {
case CREATE:
@@ -86,27 +86,7 @@ public enum Action {
case TERMINATE:
return Action.TERMINATE;
default:
- throw new WorkflowException("unknow taskEvent " + taskEvent);
- }
- }
-
- public static Action fromTaskState(TaskState state) {
- switch (state) {
- case APPROVED:
- return Action.APPROVE;
- case REJECTED:
- return Action.REJECT;
- case CANCELED:
- return Action.CANCEL;
- case TRANSFERED:
- return Action.TRANSFER;
- case TERMINATED:
- return Action.TERMINATE;
- case COMPLETED:
- case FAILED:
- return Action.COMPLETE;
- default:
- throw new WorkflowException("unknow state " + state);
+ throw new WorkflowException("unknown taskEvent " + taskEvent);
}
}
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogQuery.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogQuery.java
index 7729f89..9862cf4 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogQuery.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogQuery.java
@@ -19,20 +19,19 @@ package org.apache.inlong.manager.workflow.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
import java.util.Date;
-
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-
import org.springframework.format.annotation.DateTimeFormat;
/**
* Workflow log query
*/
@Data
+@EqualsAndHashCode(callSuper = false)
@Builder
@NoArgsConstructor
@AllArgsConstructor
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogView.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogView.java
index 28ce9cf..b985982 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogView.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogView.java
@@ -17,13 +17,9 @@
package org.apache.inlong.manager.workflow.model.view;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
import java.util.Date;
-
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -90,29 +86,4 @@ public class EventLogView {
@ApiModelProperty("exception")
private String exception;
- public static EventLogView fromEventLog(EventLog eventLog, boolean includeException) {
- if (eventLog == null) {
- return null;
- }
-
- return EventLogView.builder()
- .id(eventLog.getId())
- .processInstId(eventLog.getProcessInstId())
- .processName(eventLog.getProcessName())
- .processDisplayName(eventLog.getProcessDisplayName())
- .businessId(eventLog.getBusinessId())
- .taskInstId(eventLog.getTaskInstId())
- .elementName(eventLog.getElementName())
- .elementDisplayName(eventLog.getElementDisplayName())
- .eventType(eventLog.getEventType())
- .event(eventLog.getEvent())
- .listener(eventLog.getListener())
- .state(eventLog.getState())
- .async(eventLog.getAsync())
- .ip(eventLog.getIp())
- .startTime(eventLog.getStartTime())
- .endTime(eventLog.getEndTime())
- .exception(includeException ? eventLog.getException() : null)
- .build();
- }
}
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskListView.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskListView.java
index 14cf11c..51c8b1b 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskListView.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskListView.java
@@ -43,21 +43,12 @@ import lombok.NoArgsConstructor;
@ApiModel("Task list view")
public class TaskListView {
- /**
- * Task ID
- */
@ApiModelProperty(value = "Approval task ID")
private Integer id;
- /**
- * Task type
- */
@ApiModelProperty(value = "task type")
private String type;
- /**
- * Application form ID
- */
@ApiModelProperty(value = "application form ID")
private Integer processInstId;
@@ -67,60 +58,39 @@ public class TaskListView {
@ApiModelProperty(value = "process display name")
private String processDisplayName;
- /**
- * Task name
- */
@ApiModelProperty(value = "task name-english key")
private String name;
- /**
- * Chinese name of the task
- */
@ApiModelProperty(value = "Task display name")
private String displayName;
@ApiModelProperty(value = "applicant")
private String applicant;
- /**
- * Approver
- */
- @ApiModelProperty(value = "set approver")
+
+ @ApiModelProperty(value = "approver list")
private List<String> approvers;
- /**
- * Task operator
- */
@ApiModelProperty(value = "actual operation approver")
private String operator;
- /**
- * Task status
- */
@ApiModelProperty(value = "task status")
private TaskState state;
- /**
- * Remarks information
- */
@ApiModelProperty(value = "remarks information")
private String remark;
- /**
- * Start time
- */
@ApiModelProperty(value = "start time")
private Date startTime;
- /**
- * End time
- */
@ApiModelProperty(value = "end time")
private Date endTime;
@ApiModelProperty(value = "extra information shown in the list")
private Map<String, Object> showInList;
-
+ /**
+ * get task list view from task instance
+ */
public static TaskListView fromTaskInstance(TaskInstance taskInstance) {
return TaskListView.builder()
.id(taskInstance.getId())
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskView.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskView.java
index 07c5dd7..705228e 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskView.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskView.java
@@ -40,21 +40,12 @@ import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
@ApiModel("Approval task information")
public class TaskView {
- /**
- * Task ID
- */
@ApiModelProperty(value = "approval task ID")
private Integer id;
- /**
- * Task type
- */
@ApiModelProperty(value = "Task type")
private String type;
- /**
- * Application form ID
- */
@ApiModelProperty(value = "application form ID")
private Integer processInstId;
@@ -64,68 +55,42 @@ public class TaskView {
@ApiModelProperty(value = "process display name")
private String processDisplayName;
- /**
- * Task name
- */
@ApiModelProperty(value = "task name-english key")
private String name;
- /**
- * Chinese name of the task
- */
@ApiModelProperty(value = "task display name")
private String displayName;
@ApiModelProperty(value = "applicant")
private String applicant;
- /**
- * Approver
- */
+
@ApiModelProperty(value = "set approver")
private List<String> approvers;
- /**
- * Task operator
- */
@ApiModelProperty(value = "actual operation approver")
private String operator;
- /**
- * Task status
- */
@ApiModelProperty(value = "task status")
private TaskState state;
- /**
- * Remarks information
- */
@ApiModelProperty(value = "remarks information")
private String remark;
- /**
- * Form information
- */
@ApiModelProperty(value = "current task form information")
private Object formData;
- /**
- * Start time
- */
@ApiModelProperty(value = "start time")
private Date startTime;
- /**
- * End time
- */
@ApiModelProperty(value = "end time")
private Date endTime;
- /**
- * Extended Information
- */
@ApiModelProperty(value = "extended Information")
private Object ext;
+ /**
+ * Get task view from task instance
+ */
public static TaskView fromTaskInstance(TaskInstance taskInstance) {
return TaskView.builder()
.id(taskInstance.getId())