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 2021/11/14 08:49:25 UTC
[incubator-inlong] branch master updated: [INLONG-1791][Feature][InLong-Manager] Some bid fields have not been modified (#1792)
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 f4d7cad [INLONG-1791][Feature][InLong-Manager] Some bid fields have not been modified (#1792)
f4d7cad is described below
commit f4d7cad4031dd6e89f713b6dec3cbbdb40d508c0
Author: healchow <he...@gmail.com>
AuthorDate: Sun Nov 14 16:49:20 2021 +0800
[INLONG-1791][Feature][InLong-Manager] Some bid fields have not been modified (#1792)
Co-authored-by: healchow <he...@gmail.com>
---
.../pojo/dataconsumption/ConsumptionInfo.java | 2 +-
.../pojo/datasource/SourceFileBasicInfo.java | 4 +--
.../common/pojo/datastorage/BaseStorageInfo.java | 2 +-
.../pojo/datastream/DataStreamApproveInfo.java | 2 +-
.../pojo/datastream/DataStreamFieldInfo.java | 2 +-
.../dao/mapper/BusinessExtEntityMapper.java | 2 +-
.../manager/dao/mapper/DataStreamEntityMapper.java | 2 +-
.../dao/mapper/DataStreamExtEntityMapper.java | 6 ++--
.../dao/mapper/DataStreamFieldEntityMapper.java | 4 +--
.../dao/mapper/SourceDbBasicEntityMapper.java | 4 +--
.../dao/mapper/SourceDbDetailEntityMapper.java | 6 ++--
.../dao/mapper/SourceFileBasicEntityMapper.java | 4 +--
.../dao/mapper/SourceFileDetailEntityMapper.java | 12 ++++----
.../dao/mapper/StorageHiveEntityMapper.java | 12 ++++----
.../mappers/SourceFileDetailEntityMapper.xml | 4 +--
.../test/resources/sql/apache_inlong_manager.sql | 2 +-
.../manager/service/core/BusinessService.java | 6 ++--
.../manager/service/core/DataStreamService.java | 2 +-
.../manager/service/core/SourceDbService.java | 11 ++++---
.../manager/service/core/SourceFileService.java | 35 ++++++++++------------
.../manager/service/core/StorageService.java | 10 +++----
.../service/core/impl/BusinessServiceImpl.java | 12 ++++----
.../service/core/impl/DataStreamServiceImpl.java | 2 +-
.../service/core/impl/StorageHiveOperation.java | 4 +--
24 files changed, 74 insertions(+), 78 deletions(-)
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataconsumption/ConsumptionInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataconsumption/ConsumptionInfo.java
index afd98d9..b4817a8 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataconsumption/ConsumptionInfo.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataconsumption/ConsumptionInfo.java
@@ -72,7 +72,7 @@ public class ConsumptionInfo {
@ApiModelProperty(value = "whether to filter consumption, 0: not filter, 1: filter")
private Integer filterEnabled = 0;
- @ApiModelProperty(value = "consumption target data stream identifier")
+ @ApiModelProperty(value = "consumption target data stream id")
private String inlongStreamId;
@ApiModelProperty(value = "status, 10: pending assigned, 11: pending approval, "
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datasource/SourceFileBasicInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datasource/SourceFileBasicInfo.java
index f683608..3e2d144 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datasource/SourceFileBasicInfo.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datasource/SourceFileBasicInfo.java
@@ -32,10 +32,10 @@ public class SourceFileBasicInfo {
private Integer id;
- @ApiModelProperty(value = "Business Identifier")
+ @ApiModelProperty(value = "Business group id")
private String inlongGroupId;
- @ApiModelProperty(value = "data flow identifier")
+ @ApiModelProperty(value = "Data stream id")
private String inlongStreamId;
@ApiModelProperty(value = "Is a hybrid data source, 0: no, 1: yes")
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastorage/BaseStorageInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastorage/BaseStorageInfo.java
index 8ba2dd7..1ebd915 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastorage/BaseStorageInfo.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastorage/BaseStorageInfo.java
@@ -41,7 +41,7 @@ public class BaseStorageInfo {
private Integer id;
- @ApiModelProperty("Business Identifier")
+ @ApiModelProperty("Business group id")
private String inlongGroupId;
@ApiModelProperty("Data stream id")
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastream/DataStreamApproveInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastream/DataStreamApproveInfo.java
index bf27b99..f237b7c 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastream/DataStreamApproveInfo.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastream/DataStreamApproveInfo.java
@@ -33,7 +33,7 @@ public class DataStreamApproveInfo {
@ApiModelProperty(value = "Primary key")
private Integer id;
- @ApiModelProperty(value = "Business Identifier")
+ @ApiModelProperty(value = "Business group id")
private String inlongGroupId;
@ApiModelProperty(value = "Data stream id")
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastream/DataStreamFieldInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastream/DataStreamFieldInfo.java
index 4210ba7..39f2dc2 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastream/DataStreamFieldInfo.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastream/DataStreamFieldInfo.java
@@ -33,7 +33,7 @@ public class DataStreamFieldInfo {
@ApiModelProperty(value = "business group id", required = true)
private String inlongGroupId;
- @ApiModelProperty(value = "data stream identifier", required = true)
+ @ApiModelProperty(value = "data stream id", required = true)
private String inlongStreamId;
@ApiModelProperty(value = "is predefined field, 1: ye, 0: no")
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/BusinessExtEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/BusinessExtEntityMapper.java
index e2e9c9a..f5385f7 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/BusinessExtEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/BusinessExtEntityMapper.java
@@ -49,7 +49,7 @@ public interface BusinessExtEntityMapper {
int insertAll(@Param("extList") List<BusinessExtEntity> extEntityList);
/**
- * Physically delete all extension fields based on the service identifier
+ * Physically delete all extension fields based on the business group id
*
* @return rows deleted
*/
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamEntityMapper.java
index cf9725c..e09f60b 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamEntityMapper.java
@@ -73,7 +73,7 @@ public interface DataStreamEntityMapper {
int selectCountByGroupId(@Param("groupId") String groupId);
/**
- * Physically delete all data streams of the specified service identifier
+ * Physically delete all data streams of the specified business group id
*
* @return rows deleted
*/
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamExtEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamExtEntityMapper.java
index 86c0c5e..1b65011 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamExtEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamExtEntityMapper.java
@@ -40,7 +40,7 @@ public interface DataStreamExtEntityMapper {
List<DataStreamExtEntity> selectByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
/**
- * Query the undeleted extended attributes based on the business group id, data stream identifier, and keyName
+ * Query the undeleted extended attributes based on the business group id, data stream id, and keyName
*
* @param keyName attribute name
* @return extended attribute
@@ -54,12 +54,12 @@ public interface DataStreamExtEntityMapper {
int insertAll(@Param("extList") List<DataStreamExtEntity> extEntityList);
/**
- * According to the business group id and data stream identifier, physically delete all extended fields
+ * According to the business group id and data stream id, physically delete all extended fields
*/
int deleteAllByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
/**
- * According to the business group id and data stream identifier, logically delete all extended fields
+ * According to the business group id and data stream id, logically delete all extended fields
*/
int logicDeleteAllByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamFieldEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamFieldEntityMapper.java
index ecb8331..4d54583 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamFieldEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/DataStreamFieldEntityMapper.java
@@ -46,12 +46,12 @@ public interface DataStreamFieldEntityMapper {
@Param("streamId") String streamId);
/**
- * According to the business group id and data stream identifier, physically delete all fields
+ * According to the business group id and data stream id, physically delete all fields
*/
int deleteAllByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
/**
- * According to the business group id and data stream identifier, logically delete all fields
+ * According to the business group id and data stream id, logically delete all fields
*/
int logicDeleteAllByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceDbBasicEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceDbBasicEntityMapper.java
index e49f8f7..f56f9de 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceDbBasicEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceDbBasicEntityMapper.java
@@ -39,7 +39,7 @@ public interface SourceDbBasicEntityMapper {
SourceDbBasicEntity selectByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
/**
- * According to the business group id and data stream identifier,
+ * According to the business group id and data stream id,
* physically delete the basic information of the DB data source
*
* @return rows deleted
@@ -47,7 +47,7 @@ public interface SourceDbBasicEntityMapper {
int deleteByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
/**
- * According to the business group id and data stream identifier,
+ * According to the business group id and data stream id,
* logically delete the basic information of the DB data source
*
* @return rows deleted
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceDbDetailEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceDbDetailEntityMapper.java
index ab00c23..dc8c290 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceDbDetailEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceDbDetailEntityMapper.java
@@ -43,17 +43,17 @@ public interface SourceDbDetailEntityMapper {
Integer selectDetailExist(String groupId, String streamId, String dbName, String connectionName);
/**
- * According to the business group id and data stream identifier, query data source details
+ * According to the business group id and data stream id, query data source details
*/
List<SourceDbDetailEntity> selectByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
/**
- * According to the business group id and data stream identifier, physically delete DB data source details
+ * According to the business group id and data stream id, physically delete DB data source details
*/
int deleteByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
/**
- * According to the business group id and data stream identifier, logically delete DB data source details
+ * According to the business group id and data stream id, logically delete DB data source details
*/
int logicDeleteByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId,
@Param("operator") String operator);
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileBasicEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileBasicEntityMapper.java
index 7dca694..9b437a8 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileBasicEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileBasicEntityMapper.java
@@ -39,13 +39,13 @@ public interface SourceFileBasicEntityMapper {
SourceFileBasicEntity selectByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
/**
- * According to the business group id and data stream identifier,
+ * According to the business group id and data stream id,
* physically delete the basic information of the file data source
*/
int deleteByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
/**
- * According to the business group id and data stream identifier,
+ * According to the business group id and data stream id,
* logical delete the basic information of the file data source
*/
int logicDeleteByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId,
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
index b0a1048..0475659 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/SourceFileDetailEntityMapper.java
@@ -45,9 +45,9 @@ public interface SourceFileDetailEntityMapper {
* Query whether the same file data source details exist
*
* @param groupId business group id
- * @param streamId data stream identifier
+ * @param streamId data stream id
* @param ip IP of file source
- * @param username user name corresponding to the data source IP
+ * @param username username corresponding to the data source IP
* @return number of eligible file sources
*/
Integer selectDetailExist(@Param("groupId") String groupId, @Param("streamId") String streamId,
@@ -58,24 +58,24 @@ public interface SourceFileDetailEntityMapper {
List<FileAgentTaskConfig> selectFileAgentTaskByIpForCheck(@Param("ip") String agentIp);
/**
- * According to business group id and data source identifier, query file source details
+ * According to business group id and data stream id, query file source details
*
* @param groupId business group id
- * @param streamId data stream identifier
+ * @param streamId data stream id
* @return file source list
*/
List<SourceFileDetailEntity> selectByIdentifier(@Param("groupId") String groupId,
@Param("streamId") String streamId);
/**
- * According to business group id and data stream identifier, physically delete file data source details
+ * According to business group id and data stream id, physically delete file data source details
*
* @return rows deleted
*/
int deleteByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
/**
- * According to business group id and data stream identifier, logically delete file data source details
+ * According to business group id and data stream id, logically delete file data source details
*
* @return rows updated
*/
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StorageHiveEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StorageHiveEntityMapper.java
index 31510d4..74a14e1 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StorageHiveEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StorageHiveEntityMapper.java
@@ -48,19 +48,19 @@ public interface StorageHiveEntityMapper {
List<StorageHiveEntity> selectByCondition(StoragePageRequest request);
/**
- * According to the business group id and data stream identifier, query valid storage information
+ * According to the business group id and data stream id, query valid storage information
*
* @param groupId business group id
- * @param streamId data stream identifier
+ * @param streamId data stream id
* @return Hive storage entity list
*/
List<StorageHiveEntity> selectByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
/**
- * According to the business group id and data stream identifier, query the number of valid Hive storage
+ * According to the business group id and data stream id, query the number of valid Hive storage
*
* @param groupId business group id
- * @param streamId data stream identifier
+ * @param streamId data stream id
* @return Hive storage entity size
*/
int selectCountByIdentifier(@Param("groupId") String groupId, @Param("streamId") String streamId);
@@ -71,14 +71,14 @@ public interface StorageHiveEntityMapper {
* Given a list of data stream ids, filter out data stream id list with Hive storage
*
* @param groupId business group id
- * @param streamIdList data stream identifier list
+ * @param streamIdList data stream id list
* @return a list of data stream ids with Hive storage
*/
List<String> selectDataStreamExists(@Param("groupId") String groupId,
@Param("streamIdList") List<String> streamIdList);
/**
- * According to the business group id and data stream identifier, query Hive storage summary information
+ * According to the business group id and data stream id, query Hive storage summary information
*/
List<StorageSummaryInfo> selectSummaryByIdentifier(@Param("groupId") String groupId,
@Param("streamId") String streamId);
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
index ce93553..30ad836 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/SourceFileDetailEntityMapper.xml
@@ -23,7 +23,7 @@
<resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.SourceFileDetailEntity">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="inlong_group_id" jdbcType="VARCHAR" property="inlongGroupId"/>
- <result column="inlong_stream_id" jdbcType="VARCHAR" property="streamId"/>
+ <result column="inlong_stream_id" jdbcType="VARCHAR" property="inlongStreamId"/>
<result column="access_type" jdbcType="VARCHAR" property="accessType"/>
<result column="server_name" jdbcType="VARCHAR" property="serverName"/>
<result column="ip" jdbcType="VARCHAR" property="ip"/>
@@ -45,7 +45,7 @@
<resultMap id="FileAgentTask" type="org.apache.inlong.manager.common.pojo.agent.FileAgentTaskConfig">
<result column="inlong_group_id" jdbcType="VARCHAR" property="inlongGroupId"/>
- <result column="inlong_stream_id" jdbcType="VARCHAR" property="streamId"/>
+ <result column="inlong_stream_id" jdbcType="VARCHAR" property="inlongStreamId"/>
<result column="ip" jdbcType="VARCHAR" property="ip"/>
<result column="file_path" jdbcType="VARCHAR" property="dataName"/>
<result column="op" jdbcType="VARCHAR" property="op"/>
diff --git a/inlong-manager/manager-dao/src/test/resources/sql/apache_inlong_manager.sql b/inlong-manager/manager-dao/src/test/resources/sql/apache_inlong_manager.sql
index ee7be6c..1a88f06 100644
--- a/inlong-manager/manager-dao/src/test/resources/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-dao/src/test/resources/sql/apache_inlong_manager.sql
@@ -445,7 +445,7 @@ CREATE TABLE `source_file_basic`
(
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id',
`inlong_group_id` varchar(128) NOT NULL COMMENT 'business group id',
- `inlong_stream_id` varchar(128) NOT NULL COMMENT 'data stream identifier',
+ `inlong_stream_id` varchar(128) NOT NULL COMMENT 'data stream id',
`is_hybrid_source` tinyint(1) DEFAULT '0' COMMENT 'Whether to mix data sources',
`is_table_mapping` tinyint(1) DEFAULT '0' COMMENT 'Is there a table name mapping',
`date_offset` int(4) DEFAULT '0' COMMENT 'Time offset\n',
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/BusinessService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/BusinessService.java
index 97d82d9..a37e3d7 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/BusinessService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/BusinessService.java
@@ -40,7 +40,7 @@ public interface BusinessService {
String save(BusinessInfo businessInfo, String operator);
/**
- * Query business information based on identifier
+ * Query business information based on group id
*
* @param groupId Business group id
* @return Business details
@@ -75,7 +75,7 @@ public interface BusinessService {
boolean updateStatus(String groupId, Integer status, String operator);
/**
- * Delete the business information of the specified identifier
+ * Delete the business information of the specified group id
*
* @param groupId The business group id that needs to be deleted
* @param operator Current operator
@@ -84,7 +84,7 @@ public interface BusinessService {
boolean delete(String groupId, String operator);
/**
- * Query whether the specified identifier exists
+ * Query whether the specified group id exists
*
* @param groupId The business group id to be queried
* @return does it exist
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataStreamService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataStreamService.java
index 093eab3..5aadf0e 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataStreamService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/DataStreamService.java
@@ -162,7 +162,7 @@ public interface DataStreamService {
boolean updateAll(FullPageUpdateInfo updateInfo, String operator);
/**
- * According to the service identifier, query the number of valid data streams belonging to this service
+ * According to the group id, query the number of valid data streams belonging to this service
*
* @param groupId Business group id
* @return Number of data streams
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SourceDbService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SourceDbService.java
index 0fb9368..3ce4184 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SourceDbService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SourceDbService.java
@@ -26,7 +26,6 @@ import org.apache.inlong.manager.common.pojo.datasource.SourceDbDetailPageReques
/**
* DB data source service layer interface
- *
*/
public interface SourceDbService {
@@ -34,13 +33,13 @@ public interface SourceDbService {
* Save the basic information of the DB data source
*
* @param basicInfo DB data source basic information
- * @param operator perator name
+ * @param operator operator name
* @return Primary key after saving
*/
Integer saveBasic(SourceDbBasicInfo basicInfo, String operator);
/**
- * Query the basic information of the data source based on the business group id and the data stream identifier
+ * Query the basic information of the data source based on the business group id and the data stream id
*
* @param groupId Business group id
* @param streamId Data stream id
@@ -83,7 +82,7 @@ public interface SourceDbService {
SourceDbDetailInfo getDetailById(Integer id);
/**
- * Query a detailed list of DB data sources based on business and data stream identifiers
+ * Query a detailed list of DB data sources based on business group id and data stream id
*
* @param groupId Business group id
* @param streamId Data stream id, can be null
@@ -121,7 +120,7 @@ public interface SourceDbService {
* Physically delete the basic and detailed information of the data source
*
* @param groupId The business group id to which the data source belongs
- * @param streamId The data stream identifier to which the data source belongs
+ * @param streamId The data stream id to which the data source belongs
* @return whether succeed
*/
boolean deleteAllByIdentifier(String groupId, String streamId);
@@ -130,7 +129,7 @@ public interface SourceDbService {
* Tombstone data source basic information and detailed information
*
* @param groupId The business group id to which the data source belongs
- * @param streamId The data stream identifier to which the data source belongs
+ * @param streamId The data stream id to which the data source belongs
* @param operator perator name
* @return whether succeed
*/
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SourceFileService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SourceFileService.java
index fcd4eec..bcd5afc 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SourceFileService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SourceFileService.java
@@ -18,17 +18,14 @@
package org.apache.inlong.manager.service.core;
import com.github.pagehelper.PageInfo;
-
+import java.util.List;
import org.apache.inlong.manager.common.pojo.datasource.SourceFileBasicInfo;
import org.apache.inlong.manager.common.pojo.datasource.SourceFileDetailInfo;
import org.apache.inlong.manager.common.pojo.datasource.SourceFileDetailListVO;
import org.apache.inlong.manager.common.pojo.datasource.SourceFileDetailPageRequest;
-import java.util.List;
-
/**
* File data source service layer interface
- *
*/
public interface SourceFileService {
@@ -36,15 +33,15 @@ public interface SourceFileService {
* Save the basic information of the file data source
*
* @param basicInfo Basic information of file data source
- * @param operator Operator name
+ * @param operator Operator name
* @return Primary key after saving
*/
Integer saveBasic(SourceFileBasicInfo basicInfo, String operator);
/**
- * Query the basic information of the data source based on the data stream identifier
+ * Query the basic information of the data source based on the data stream id
*
- * @param groupId Business group id
+ * @param groupId Business group id
* @param streamId Data stream id
* @return Basic data source information
*/
@@ -54,7 +51,7 @@ public interface SourceFileService {
* Modify the basic information of the data source
*
* @param basicInfo Data source information that needs to be modified
- * @param operator Operator name
+ * @param operator Operator name
* @return Whether succeed
*/
boolean updateBasic(SourceFileBasicInfo basicInfo, String operator);
@@ -62,7 +59,7 @@ public interface SourceFileService {
/**
* Tombstone data source basic information
*
- * @param id Data source basic information id
+ * @param id Data source basic information id
* @param operator Operator name
* @return Whether succeed
*/
@@ -72,7 +69,7 @@ public interface SourceFileService {
* Save file data source details
*
* @param detailInfo File data source details
- * @param operator Operator name
+ * @param operator Operator name
* @return Primary key after saving
*/
Integer saveDetail(SourceFileDetailInfo detailInfo, String operator);
@@ -86,9 +83,9 @@ public interface SourceFileService {
SourceFileDetailInfo getDetailById(Integer id);
/**
- * Query a detailed list of file data sources based on business and data stream identifiers
+ * Query a detailed list of file data sources based on business group id and data stream id
*
- * @param groupId Business group id
+ * @param groupId Business group id
* @param streamId Data stream id, can be null
* @return Data source details
*/
@@ -106,7 +103,7 @@ public interface SourceFileService {
* Modify data source details
*
* @param detailInfo Data source information that needs to be modified
- * @param operator Operator name
+ * @param operator Operator name
* @return Whether succeed
*/
boolean updateDetail(SourceFileDetailInfo detailInfo, String operator);
@@ -114,7 +111,7 @@ public interface SourceFileService {
/**
* Tombstone data source details
*
- * @param id Data source id
+ * @param id Data source id
* @param operator Operator name
* @return Whether succeed
*/
@@ -123,8 +120,8 @@ public interface SourceFileService {
/**
* Physically delete the basic and detailed information of the data source
*
- * @param groupId The business group id to which the data source belongs
- * @param streamId The data stream identifier to which the data source belongs
+ * @param groupId The business group id to which the data source belongs
+ * @param streamId The data stream id to which the data source belongs
* @return Whether succeed
*/
boolean deleteAllByIdentifier(String groupId, String streamId);
@@ -132,9 +129,9 @@ public interface SourceFileService {
/**
* Tombstone data source basic information and detailed information
*
- * @param groupId The business group id to which the data source belongs
- * @param streamId The data stream identifier to which the data source belongs
- * @param operator Operator name
+ * @param groupId The business group id to which the data source belongs
+ * @param streamId The data stream id to which the data source belongs
+ * @param operator Operator name
* @return Whether succeed
*/
boolean logicDeleteAllByIdentifier(String groupId, String streamId, String operator);
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/StorageService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/StorageService.java
index ac2d5be..4ec09bb 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/StorageService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/StorageService.java
@@ -49,7 +49,7 @@ public interface StorageService {
BaseStorageInfo getById(String storageType, Integer id);
/**
- * Query storage information based on business and data stream identifiers
+ * Query storage information based on business group id and data stream id
*
* @param groupId Business group id
* @param streamId Data stream id, can be null
@@ -59,7 +59,7 @@ public interface StorageService {
List<BaseStorageInfo> listByIdentifier(String groupId, String streamId);
/**
- * Query stored summary information based on business and data stream identifiers, including storage cluster
+ * Query stored summary information based on business group id and data stream id, including storage cluster
*
* @param groupId Business group id
* @param streamId Data stream id
@@ -69,7 +69,7 @@ public interface StorageService {
List<StorageSummaryInfo> listSummaryByIdentifier(String groupId, String streamId);
/**
- * Query the number of undeleted stored information based on business and data stream identifiers
+ * Query the number of undeleted stored information based on business and data stream id
*
* @param groupId Business group id
* @param streamId Data stream id
@@ -126,7 +126,7 @@ public interface StorageService {
* Tombstone data storage information
*
* @param groupId The business group id to which the data source belongs
- * @param streamId The data stream identifier to which the data source belongs
+ * @param streamId The data stream id to which the data source belongs
* @param operator Operator name
* @return whether succeed
*/
@@ -144,7 +144,7 @@ public interface StorageService {
List<String> filterStreamIdByStorageType(String groupId, String storageType, List<String> streamIdList);
/**
- * According to the data stream identifier, query the list of storage types owned by it
+ * According to the data stream id, query the list of storage types owned by it
*
* @param groupId Business group id
* @param streamId Data stream id
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/BusinessServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/BusinessServiceImpl.java
index f16567a..1a5b65b 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/BusinessServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/BusinessServiceImpl.java
@@ -109,17 +109,17 @@ public class BusinessServiceImpl implements BusinessService {
}
@Override
- public BusinessInfo get(String identifier) {
- LOGGER.debug("begin to get business info by groupId={}", identifier);
- Preconditions.checkNotNull(identifier, BizConstant.GROUP_ID_IS_EMPTY);
- BusinessEntity entity = businessMapper.selectByIdentifier(identifier);
+ public BusinessInfo get(String groupId) {
+ LOGGER.debug("begin to get business info by groupId={}", groupId);
+ Preconditions.checkNotNull(groupId, BizConstant.GROUP_ID_IS_EMPTY);
+ BusinessEntity entity = businessMapper.selectByIdentifier(groupId);
if (entity == null) {
- LOGGER.error("business not found by groupId={}", identifier);
+ LOGGER.error("business not found by groupId={}", groupId);
throw new BusinessException(BizErrorCodeEnum.BUSINESS_NOT_FOUND);
}
BusinessInfo businessInfo = CommonBeanUtils.copyProperties(entity, BusinessInfo::new);
- List<BusinessExtEntity> extEntityList = businessExtMapper.selectByGroupId(identifier);
+ List<BusinessExtEntity> extEntityList = businessExtMapper.selectByGroupId(groupId);
List<BusinessExtInfo> extInfoList = CommonBeanUtils
.copyListProperties(extEntityList, BusinessExtInfo::new);
businessInfo.setExtList(extInfoList);
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataStreamServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataStreamServiceImpl.java
index 41de82b..8080117 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataStreamServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/DataStreamServiceImpl.java
@@ -765,7 +765,7 @@ public class DataStreamServiceImpl implements DataStreamService {
String newDsid = streamInfo.getInlongStreamId();
if (newDsid != null && !newDsid.equals(streamEntity.getInlongStreamId())) {
- LOGGER.error("current status was not allowed to update data stream identifier");
+ LOGGER.error("current status was not allowed to update data stream id");
throw new BusinessException(BizErrorCodeEnum.DATA_STREAM_ID_UPDATE_NOT_ALLOWED);
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/StorageHiveOperation.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/StorageHiveOperation.java
index 031d25b..fa3e541 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/StorageHiveOperation.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/StorageHiveOperation.java
@@ -143,7 +143,7 @@ public class StorageHiveOperation extends StorageBaseOperation {
}
/**
- * Logically delete HIVE storage information based on service identifiers and data stream identifiers
+ * Logically delete HIVE storage information based on business group id and data stream id
*
* @param groupId Business group id
* @param streamId Data stream id
@@ -201,7 +201,7 @@ public class StorageHiveOperation extends StorageBaseOperation {
}
/**
- * Physically delete HIVE storage information of the specified identifier
+ * Physically delete HIVE storage information of the specified id
*
* @param groupId Business group id
* @param streamId Data stream id