You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/05/30 01:49:37 UTC
[incubator-inlong] branch master updated: [INLONG-4421][Manager] Remove unused tables, and remove extra spaces in the license header (#4422)
This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new b8e2cd9a7 [INLONG-4421][Manager] Remove unused tables, and remove extra spaces in the license header (#4422)
b8e2cd9a7 is described below
commit b8e2cd9a7db44b381d4d79e9f957845f9609e883
Author: healzhou <he...@gmail.com>
AuthorDate: Mon May 30 09:49:32 2022 +0800
[INLONG-4421][Manager] Remove unused tables, and remove extra spaces in the license header (#4422)
* [INLONG-4421][Manager] Remove unused classes and table structures
* [INLONG-4421][Manager] Remove extra spaces in the license header
---
.../common/pojo/dataproxy/CacheCluster.java | 16 +-
.../common/pojo/dataproxy/DataProxyClusterSet.java | 4 +-
.../common/pojo/dataproxy/InlongGroupId.java | 6 +-
.../common/pojo/dataproxy/InlongStreamId.java | 14 +-
.../common/pojo/dataproxy/ProxyCluster.java | 6 +-
.../manager/dao/config/JDBCSourceConfig.java | 3 +-
.../dao/entity/ProxyClusterToCacheCluster.java | 63 -------
.../manager/dao/mapper/ClusterSetMapper.java | 6 +-
.../src/main/resources/generatorConfig.xml | 6 +-
.../main/resources/mappers/AuditEntityMapper.xml | 10 +-
.../main/resources/mappers/ClusterSetMapper.xml | 45 ++---
.../mappers/CommonDbServerEntityMapper.xml | 6 +-
.../mappers/CommonFileServerEntityMapper.xml | 6 +-
.../resources/mappers/ConsumptionEntityMapper.xml | 9 +-
.../mappers/ConsumptionPulsarEntityMapper.xml | 7 +-
.../mappers/DBCollectorDetailTaskEntityMapper.xml | 9 +-
.../mappers/DataProxyClusterEntityMapper.xml | 6 +-
.../resources/mappers/DataSchemaEntityMapper.xml | 6 +-
.../mappers/DataSourceCmdConfigEntityMapper.xml | 6 +-
.../resources/mappers/InlongGroupEntityMapper.xml | 6 +-
.../mappers/InlongGroupExtEntityMapper.xml | 6 +-
.../resources/mappers/InlongStreamEntityMapper.xml | 6 +-
.../mappers/InlongStreamExtEntityMapper.xml | 6 +-
.../mappers/InlongStreamFieldEntityMapper.xml | 6 +-
.../resources/mappers/OperationLogEntityMapper.xml | 6 +-
.../main/resources/mappers/RoleEntityMapper.xml | 6 +-
.../mappers/SortClusterConfgiEntityMapper.xml | 7 +-
.../mappers/SortSourceConfigEntityMapper.xml | 7 +-
.../mappers/SortTaskIdParamEntityMapper.xml | 7 +-
.../mappers/SortTaskSinkParamEntityMapper.xml | 199 +++++++++++----------
.../mappers/StreamConfigLogEntityMapper.xml | 6 +-
.../resources/mappers/StreamSinkEntityMapper.xml | 9 +-
.../mappers/StreamSinkExtEntityMapper.xml | 6 +-
.../mappers/StreamSinkFieldEntityMapper.xml | 6 +-
.../resources/mappers/StreamSourceEntityMapper.xml | 9 +-
.../mappers/StreamSourceFieldEntityMapper.xml | 6 +-
.../mappers/StreamTransformEntityMapper.xml | 6 +-
.../mappers/StreamTransformFieldEntityMapper.xml | 6 +-
.../mappers/ThirdPartyClusterEntityMapper.xml | 6 +-
.../main/resources/mappers/UserEntityMapper.xml | 6 +-
.../resources/mappers/UserRoleEntityMapper.xml | 6 +-
.../mappers/WorkflowApproverEntityMapper.xml | 6 +-
.../mappers/WorkflowEventLogEntityMapper.xml | 6 +-
.../mappers/WorkflowProcessEntityMapper.xml | 6 +-
.../resources/mappers/WorkflowTaskEntityMapper.xml | 6 +-
inlong-manager/manager-docker/Dockerfile | 6 +-
inlong-manager/manager-docker/manager-docker.sh | 4 +-
inlong-manager/manager-docker/pom.xml | 6 +-
.../src/main/resources/META-INF/plugin.yaml | 6 +-
.../main/resources/flink-sort-plugin.properties | 6 +-
.../repository/DataProxyConfigRepository.java | 6 +-
.../service/resource/SinkResourceOperator.java | 4 +-
.../src/main/resources/application-test.properties | 6 +-
.../src/main/resources/log4j.properties | 4 +-
.../main/resources/sql/apache_inlong_manager.sql | 191 --------------------
inlong-manager/manager-web/assembly.xml | 6 +-
inlong-manager/manager-web/bin/managerctl | 6 +-
inlong-manager/manager-web/bin/restart.sh | 6 +-
inlong-manager/manager-web/bin/shutdown.sh | 6 +-
inlong-manager/manager-web/bin/startup.sh | 6 +-
.../src/main/resources/application-dev.properties | 6 +-
.../src/main/resources/application-prod.properties | 6 +-
.../src/main/resources/application-test.properties | 6 +-
.../src/main/resources/application.properties | 6 +-
.../manager-web/src/main/resources/log4j2.xml | 6 +-
65 files changed, 331 insertions(+), 560 deletions(-)
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/CacheCluster.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/CacheCluster.java
index c8281ae1e..8d71adc9b 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/CacheCluster.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/CacheCluster.java
@@ -1,10 +1,10 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -30,6 +30,7 @@ public class CacheCluster {
/**
* get clusterName
+ *
* @return the clusterName
*/
public String getClusterName() {
@@ -38,6 +39,7 @@ public class CacheCluster {
/**
* set clusterName
+ *
* @param clusterName the clusterName to set
*/
public void setClusterName(String clusterName) {
@@ -46,6 +48,7 @@ public class CacheCluster {
/**
* get type
+ *
* @return the type
*/
public String getType() {
@@ -54,6 +57,7 @@ public class CacheCluster {
/**
* set type
+ *
* @param type the type to set
*/
public void setType(String type) {
@@ -62,6 +66,7 @@ public class CacheCluster {
/**
* get clusterTag
+ *
* @return the clusterTag
*/
public String getClusterTag() {
@@ -70,6 +75,7 @@ public class CacheCluster {
/**
* set clusterTag
+ *
* @param clusterTag the clusterTag to set
*/
public void setClusterTag(String clusterTag) {
@@ -78,6 +84,7 @@ public class CacheCluster {
/**
* get extTag
+ *
* @return the extTag
*/
public String getExtTag() {
@@ -86,6 +93,7 @@ public class CacheCluster {
/**
* set extTag
+ *
* @param extTag the extTag to set
*/
public void setExtTag(String extTag) {
@@ -94,6 +102,7 @@ public class CacheCluster {
/**
* get extParams
+ *
* @return the extParams
*/
public String getExtParams() {
@@ -102,6 +111,7 @@ public class CacheCluster {
/**
* set extParams
+ *
* @param extParams the extParams to set
*/
public void setExtParams(String extParams) {
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/DataProxyClusterSet.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/DataProxyClusterSet.java
index 99939ffb0..8d132dfdb 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/DataProxyClusterSet.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/DataProxyClusterSet.java
@@ -1,10 +1,10 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/InlongGroupId.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/InlongGroupId.java
index c50c97b74..2a1973903 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/InlongGroupId.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/InlongGroupId.java
@@ -1,10 +1,10 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/InlongStreamId.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/InlongStreamId.java
index 3ac54690f..696476891 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/InlongStreamId.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/InlongStreamId.java
@@ -1,10 +1,10 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -29,6 +29,7 @@ public class InlongStreamId {
/**
* get inlongGroupId
+ *
* @return the inlongGroupId
*/
public String getInlongGroupId() {
@@ -37,6 +38,7 @@ public class InlongStreamId {
/**
* set inlongGroupId
+ *
* @param inlongGroupId the inlongGroupId to set
*/
public void setInlongGroupId(String inlongGroupId) {
@@ -45,6 +47,7 @@ public class InlongStreamId {
/**
* get inlongStreamId
+ *
* @return the inlongStreamId
*/
public String getInlongStreamId() {
@@ -53,6 +56,7 @@ public class InlongStreamId {
/**
* set inlongStreamId
+ *
* @param inlongStreamId the inlongStreamId to set
*/
public void setInlongStreamId(String inlongStreamId) {
@@ -61,6 +65,7 @@ public class InlongStreamId {
/**
* get topic
+ *
* @return the topic
*/
public String getTopic() {
@@ -69,6 +74,7 @@ public class InlongStreamId {
/**
* set topic
+ *
* @param topic the topic to set
*/
public void setTopic(String topic) {
@@ -77,6 +83,7 @@ public class InlongStreamId {
/**
* get extParams
+ *
* @return the extParams
*/
public String getExtParams() {
@@ -85,6 +92,7 @@ public class InlongStreamId {
/**
* set extParams
+ *
* @param extParams the extParams to set
*/
public void setExtParams(String extParams) {
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/ProxyCluster.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/ProxyCluster.java
index 5bdc069d9..0ffc10bc4 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/ProxyCluster.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/dataproxy/ProxyCluster.java
@@ -1,10 +1,10 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/config/JDBCSourceConfig.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/config/JDBCSourceConfig.java
index e16436168..be60a9139 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/config/JDBCSourceConfig.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/config/JDBCSourceConfig.java
@@ -29,6 +29,7 @@ import org.springframework.context.annotation.Primary;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import javax.sql.DataSource;
+import java.util.Objects;
/**
* Main data source config
@@ -53,7 +54,7 @@ public class JDBCSourceConfig {
bean.setDataSource(dataSource());
bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mappers/*.xml"));
- bean.getObject().getConfiguration().setMapUnderscoreToCamelCase(true);
+ Objects.requireNonNull(bean.getObject()).getConfiguration().setMapUnderscoreToCamelCase(true);
return bean.getObject();
}
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/ProxyClusterToCacheCluster.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/ProxyClusterToCacheCluster.java
deleted file mode 100644
index 73b71c78c..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/ProxyClusterToCacheCluster.java
+++ /dev/null
@@ -1,63 +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.dao.entity;
-
-/**
- * ProxyClusterToCacheCluster
- */
-public class ProxyClusterToCacheCluster {
- private String proxyClusterName;
- private String cacheClusterName;
-
- /**
- * get proxyClusterName
- *
- * @return the proxyClusterName
- */
- public String getProxyClusterName() {
- return proxyClusterName;
- }
-
- /**
- * set proxyClusterName
- *
- * @param proxyClusterName the proxyClusterName to set
- */
- public void setProxyClusterName(String proxyClusterName) {
- this.proxyClusterName = proxyClusterName;
- }
-
- /**
- * get cacheClusterName
- *
- * @return the cacheClusterName
- */
- public String getCacheClusterName() {
- return cacheClusterName;
- }
-
- /**
- * set cacheClusterName
- *
- * @param cacheClusterName the cacheClusterName to set
- */
- public void setCacheClusterName(String cacheClusterName) {
- this.cacheClusterName = cacheClusterName;
- }
-
-}
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ClusterSetMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ClusterSetMapper.java
index 090affdc6..712a48e3f 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ClusterSetMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ClusterSetMapper.java
@@ -1,10 +1,10 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml b/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml
index a1a977bb2..e2fe3d8ae 100644
--- a/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml
+++ b/inlong-manager/manager-dao/src/main/resources/generatorConfig.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/AuditEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/AuditEntityMapper.xml
index fe84bd6a3..1bc5d9ce8 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/AuditEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/AuditEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -17,8 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.AuditEntityMapper">
<resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.AuditEntity">
<result column="ip" jdbcType="VARCHAR" property="ip"/>
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/ClusterSetMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/ClusterSetMapper.xml
index a52f7dadc..775d8f21d 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/ClusterSetMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/ClusterSetMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -20,38 +20,41 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
- namespace="org.apache.inlong.manager.dao.mapper.ClusterSetMapper">
+ namespace="org.apache.inlong.manager.dao.mapper.ClusterSetMapper">
<select id="selectProxyCluster"
- resultType="org.apache.inlong.manager.common.pojo.dataproxy.ProxyCluster">
+ resultType="org.apache.inlong.manager.common.pojo.dataproxy.ProxyCluster">
select name as cluster_name, cluster_tag, ext_tag, ext_params
from inlong_cluster
- where type='DATA_PROXY'
- and is_deleted='0'
+ where type = 'DATA_PROXY'
+ and is_deleted = '0'
</select>
<select id="selectCacheCluster"
- resultType="org.apache.inlong.manager.common.pojo.dataproxy.CacheCluster">
- select name as cluster_name, type, cluster_tag, ext_tag,
- ext_params
+ resultType="org.apache.inlong.manager.common.pojo.dataproxy.CacheCluster">
+ select name as cluster_name,
+ type,
+ cluster_tag,
+ ext_tag,
+ ext_params
from inlong_cluster
- where type in ('PULSAR','KAFKA','TUBE')
- and is_deleted='0'
+ where type in ('PULSAR', 'KAFKA', 'TUBE')
+ and is_deleted = '0'
</select>
<select id="selectInlongGroupId"
- resultType="org.apache.inlong.manager.common.pojo.dataproxy.InlongGroupId">
+ resultType="org.apache.inlong.manager.common.pojo.dataproxy.InlongGroupId">
select inlong_group_id,
- inlong_cluster_tag as
- cluster_tag,
- mq_resource as topic,
- ext_params
+ inlong_cluster_tag as
+ cluster_tag,
+ mq_resource as topic,
+ ext_params
from inlong_group
where is_deleted = 0
</select>
<select id="selectInlongStreamId"
- resultType="org.apache.inlong.manager.common.pojo.dataproxy.InlongStreamId">
+ resultType="org.apache.inlong.manager.common.pojo.dataproxy.InlongStreamId">
select inlong_group_id,
- inlong_stream_id,
- mq_resource as topic,
- ext_params
+ inlong_stream_id,
+ mq_resource as topic,
+ ext_params
from inlong_stream
where is_deleted = 0
</select>
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/CommonDbServerEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/CommonDbServerEntityMapper.xml
index 119396166..fc58e616e 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/CommonDbServerEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/CommonDbServerEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/CommonFileServerEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/CommonFileServerEntityMapper.xml
index 581c7e563..5b43bb8c0 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/CommonFileServerEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/CommonFileServerEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
index 9b414a277..31e2cafe6 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -18,8 +18,7 @@
under the License.
-->
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.ConsumptionEntityMapper">
<resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.ConsumptionEntity">
<id column="id" jdbcType="INTEGER" property="id"/>
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionPulsarEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionPulsarEntityMapper.xml
index a74fdb333..badd33806 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionPulsarEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionPulsarEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -17,6 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.ConsumptionPulsarEntityMapper">
<resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.ConsumptionPulsarEntity">
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/DBCollectorDetailTaskEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/DBCollectorDetailTaskEntityMapper.xml
index de0096f2e..3b8c507a8 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/DBCollectorDetailTaskEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/DBCollectorDetailTaskEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -18,8 +18,7 @@
under the License.
-->
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.DBCollectorDetailTaskMapper">
<resultMap id="BaseResultMap"
type="org.apache.inlong.manager.dao.entity.DBCollectorDetailTaskEntity">
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/DataProxyClusterEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/DataProxyClusterEntityMapper.xml
index 10d28ffd2..790a4ba3c 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/DataProxyClusterEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/DataProxyClusterEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/DataSchemaEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/DataSchemaEntityMapper.xml
index bfd33e7a3..096faf0ee 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/DataSchemaEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/DataSchemaEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/DataSourceCmdConfigEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/DataSourceCmdConfigEntityMapper.xml
index bebd1f55f..fa9a65c05 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/DataSourceCmdConfigEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/DataSourceCmdConfigEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
index 29d94d782..22e90a54c 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupExtEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupExtEntityMapper.xml
index 6ac398e96..094991931 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupExtEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupExtEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
index 73db97a01..d5b85fbee 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamExtEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamExtEntityMapper.xml
index 747701721..cb20be255 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamExtEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamExtEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamFieldEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamFieldEntityMapper.xml
index 14b05512f..a335d932b 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamFieldEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamFieldEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/OperationLogEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/OperationLogEntityMapper.xml
index cfe7e4cf7..835359b33 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/OperationLogEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/OperationLogEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/RoleEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/RoleEntityMapper.xml
index 8b3d6d6cc..efc350779 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/RoleEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/RoleEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/SortClusterConfgiEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/SortClusterConfgiEntityMapper.xml
index 4064a51c1..5b9c8918a 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/SortClusterConfgiEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/SortClusterConfgiEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -17,6 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.SortClusterConfgiEntityMapper">
<resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.SortClusterConfigEntity">
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/SortSourceConfigEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/SortSourceConfigEntityMapper.xml
index d7b83b31f..330205ef6 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/SortSourceConfigEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/SortSourceConfigEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -17,6 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.SortSourceConfigEntityMapper">
<resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.SortSourceConfigEntity">
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskIdParamEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskIdParamEntityMapper.xml
index ff1e06d25..824704e6e 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskIdParamEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskIdParamEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -17,6 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.SortTaskIdParamEntityMapper">
<resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.SortTaskIdParamEntity">
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskSinkParamEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskSinkParamEntityMapper.xml
index ce8f1a74e..9c0410e52 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskSinkParamEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/SortTaskSinkParamEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -17,101 +17,104 @@
specific language governing permissions and limitations
under the License.
-->
+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.SortTaskSinkParamEntityMapper">
- <resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
- <id column="id" jdbcType="INTEGER" property="id" />
- <result column="task_name" jdbcType="VARCHAR" property="taskName" />
- <result column="sink_type" jdbcType="VARCHAR" property="sinkType" />
- <result column="param_key" jdbcType="VARCHAR" property="paramKey" />
- <result column="param_value" jdbcType="VARCHAR" property="paramValue" />
- </resultMap>
- <sql id="Base_Column_List">
- id, task_name, sink_type, param_key, param_value
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from sort_task_sink_param
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
- delete from sort_task_sink_param
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <insert id="insert" parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
- insert into sort_task_sink_param (id, task_name, sink_type,
- param_key, param_value)
- values (#{id,jdbcType=INTEGER}, #{taskName,jdbcType=VARCHAR}, #{sinkType,jdbcType=VARCHAR},
- #{paramKey,jdbcType=VARCHAR}, #{paramValue,jdbcType=VARCHAR})
- </insert>
- <insert id="insertSelective" parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
- insert into sort_task_sink_param
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="taskName != null">
- task_name,
- </if>
- <if test="sinkType != null">
- sink_type,
- </if>
- <if test="paramKey != null">
- param_key,
- </if>
- <if test="paramValue != null">
- param_value,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=INTEGER},
- </if>
- <if test="taskName != null">
- #{taskName,jdbcType=VARCHAR},
- </if>
- <if test="sinkType != null">
- #{sinkType,jdbcType=VARCHAR},
- </if>
- <if test="paramKey != null">
- #{paramKey,jdbcType=VARCHAR},
- </if>
- <if test="paramValue != null">
- #{paramValue,jdbcType=VARCHAR},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
- update sort_task_sink_param
- <set>
- <if test="taskName != null">
- task_name = #{taskName,jdbcType=VARCHAR},
- </if>
- <if test="sinkType != null">
- sink_type = #{sinkType,jdbcType=VARCHAR},
- </if>
- <if test="paramKey != null">
- param_key = #{paramKey,jdbcType=VARCHAR},
- </if>
- <if test="paramValue != null">
- param_value = #{paramValue,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
- update sort_task_sink_param
- set task_name = #{taskName,jdbcType=VARCHAR},
- sink_type = #{sinkType,jdbcType=VARCHAR},
- param_key = #{paramKey,jdbcType=VARCHAR},
- param_value = #{paramValue,jdbcType=VARCHAR}
- where id = #{id,jdbcType=INTEGER}
- </update>
- <select id="selectByTaskNameAndType" parameterType="java.lang.String" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from sort_task_sink_param
- where task_name = #{taskName,jdbcType=VARCHAR}
- </select>
+ <resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
+ <id column="id" jdbcType="INTEGER" property="id"/>
+ <result column="task_name" jdbcType="VARCHAR" property="taskName"/>
+ <result column="sink_type" jdbcType="VARCHAR" property="sinkType"/>
+ <result column="param_key" jdbcType="VARCHAR" property="paramKey"/>
+ <result column="param_value" jdbcType="VARCHAR" property="paramValue"/>
+ </resultMap>
+ <sql id="Base_Column_List">
+ id, task_name, sink_type, param_key, param_value
+ </sql>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from sort_task_sink_param
+ where id = #{id,jdbcType=INTEGER}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+ delete
+ from sort_task_sink_param
+ where id = #{id,jdbcType=INTEGER}
+ </delete>
+ <insert id="insert" parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
+ insert into sort_task_sink_param (id, task_name, sink_type,
+ param_key, param_value)
+ values (#{id,jdbcType=INTEGER}, #{taskName,jdbcType=VARCHAR}, #{sinkType,jdbcType=VARCHAR},
+ #{paramKey,jdbcType=VARCHAR}, #{paramValue,jdbcType=VARCHAR})
+ </insert>
+ <insert id="insertSelective" parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
+ insert into sort_task_sink_param
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="taskName != null">
+ task_name,
+ </if>
+ <if test="sinkType != null">
+ sink_type,
+ </if>
+ <if test="paramKey != null">
+ param_key,
+ </if>
+ <if test="paramValue != null">
+ param_value,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=INTEGER},
+ </if>
+ <if test="taskName != null">
+ #{taskName,jdbcType=VARCHAR},
+ </if>
+ <if test="sinkType != null">
+ #{sinkType,jdbcType=VARCHAR},
+ </if>
+ <if test="paramKey != null">
+ #{paramKey,jdbcType=VARCHAR},
+ </if>
+ <if test="paramValue != null">
+ #{paramValue,jdbcType=VARCHAR},
+ </if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKeySelective"
+ parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
+ update sort_task_sink_param
+ <set>
+ <if test="taskName != null">
+ task_name = #{taskName,jdbcType=VARCHAR},
+ </if>
+ <if test="sinkType != null">
+ sink_type = #{sinkType,jdbcType=VARCHAR},
+ </if>
+ <if test="paramKey != null">
+ param_key = #{paramKey,jdbcType=VARCHAR},
+ </if>
+ <if test="paramValue != null">
+ param_value = #{paramValue,jdbcType=VARCHAR},
+ </if>
+ </set>
+ where id = #{id,jdbcType=INTEGER}
+ </update>
+ <update id="updateByPrimaryKey" parameterType="org.apache.inlong.manager.dao.entity.SortTaskSinkParamEntity">
+ update sort_task_sink_param
+ set task_name = #{taskName,jdbcType=VARCHAR},
+ sink_type = #{sinkType,jdbcType=VARCHAR},
+ param_key = #{paramKey,jdbcType=VARCHAR},
+ param_value = #{paramValue,jdbcType=VARCHAR}
+ where id = #{id,jdbcType=INTEGER}
+ </update>
+ <select id="selectByTaskNameAndType" parameterType="java.lang.String" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from sort_task_sink_param
+ where task_name = #{taskName,jdbcType=VARCHAR}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StreamConfigLogEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StreamConfigLogEntityMapper.xml
index 6f281c5cb..a27065bd9 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StreamConfigLogEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/StreamConfigLogEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
index c0b233a26..3c9e6ce54 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -18,8 +18,7 @@
under the License.
-->
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.StreamSinkEntityMapper">
<resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.StreamSinkEntity">
<id column="id" jdbcType="INTEGER" property="id"/>
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkExtEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkExtEntityMapper.xml
index feed38630..a2bc0f96e 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkExtEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkExtEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkFieldEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkFieldEntityMapper.xml
index 5ed3a362f..73ae39791 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkFieldEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkFieldEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
index 7b860e5e6..251545e1c 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -18,8 +18,7 @@
under the License.
-->
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.StreamSourceEntityMapper">
<resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.StreamSourceEntity">
<id column="id" jdbcType="INTEGER" property="id"/>
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceFieldEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceFieldEntityMapper.xml
index 065bee1a1..97e60414c 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceFieldEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSourceFieldEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml
index 135f95704..bbeba3b1f 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformFieldEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformFieldEntityMapper.xml
index 2ea774647..015777dce 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformFieldEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/StreamTransformFieldEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/ThirdPartyClusterEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/ThirdPartyClusterEntityMapper.xml
index 389fa6533..5f1b067d1 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/ThirdPartyClusterEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/ThirdPartyClusterEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/UserEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/UserEntityMapper.xml
index a0c5b2402..3ecda201f 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/UserEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/UserEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/UserRoleEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/UserRoleEntityMapper.xml
index 373a785cf..d57c7b01e 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/UserRoleEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/UserRoleEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml
index 873240395..6c6158993 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowApproverEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowEventLogEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowEventLogEntityMapper.xml
index cbbdd3292..58b486fd0 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowEventLogEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowEventLogEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowProcessEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowProcessEntityMapper.xml
index 99cfa6de6..5e91d81b6 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowProcessEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowProcessEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowTaskEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowTaskEntityMapper.xml
index 29347e851..d2da90f90 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowTaskEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/WorkflowTaskEntityMapper.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-docker/Dockerfile b/inlong-manager/manager-docker/Dockerfile
index 4eb3f9bc1..99403b694 100644
--- a/inlong-manager/manager-docker/Dockerfile
+++ b/inlong-manager/manager-docker/Dockerfile
@@ -1,11 +1,11 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-docker/manager-docker.sh b/inlong-manager/manager-docker/manager-docker.sh
index 2263536c6..0fc74215a 100644
--- a/inlong-manager/manager-docker/manager-docker.sh
+++ b/inlong-manager/manager-docker/manager-docker.sh
@@ -1,11 +1,11 @@
#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
+# 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
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-docker/pom.xml b/inlong-manager/manager-docker/pom.xml
index 7d08c465b..b5138b507 100644
--- a/inlong-manager/manager-docker/pom.xml
+++ b/inlong-manager/manager-docker/pom.xml
@@ -1,12 +1,12 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-plugins/src/main/resources/META-INF/plugin.yaml b/inlong-manager/manager-plugins/src/main/resources/META-INF/plugin.yaml
index 0c140f8b0..31a71af27 100644
--- a/inlong-manager/manager-plugins/src/main/resources/META-INF/plugin.yaml
+++ b/inlong-manager/manager-plugins/src/main/resources/META-INF/plugin.yaml
@@ -1,11 +1,11 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-plugins/src/main/resources/flink-sort-plugin.properties b/inlong-manager/manager-plugins/src/main/resources/flink-sort-plugin.properties
index 246d80001..bef035205 100644
--- a/inlong-manager/manager-plugins/src/main/resources/flink-sort-plugin.properties
+++ b/inlong-manager/manager-plugins/src/main/resources/flink-sort-plugin.properties
@@ -1,11 +1,11 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java
index 60c4da500..7bc2f4dca 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/repository/DataProxyConfigRepository.java
@@ -1,10 +1,10 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/SinkResourceOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/SinkResourceOperator.java
index 35944645c..85d823106 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/SinkResourceOperator.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/SinkResourceOperator.java
@@ -1,10 +1,10 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/inlong-manager/manager-test/src/main/resources/application-test.properties b/inlong-manager/manager-test/src/main/resources/application-test.properties
index 10badf2bb..dd2c114ce 100644
--- a/inlong-manager/manager-test/src/main/resources/application-test.properties
+++ b/inlong-manager/manager-test/src/main/resources/application-test.properties
@@ -1,11 +1,11 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-test/src/main/resources/log4j.properties b/inlong-manager/manager-test/src/main/resources/log4j.properties
index 25675f6ed..9444dd169 100644
--- a/inlong-manager/manager-test/src/main/resources/log4j.properties
+++ b/inlong-manager/manager-test/src/main/resources/log4j.properties
@@ -1,10 +1,10 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
+# 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
+# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql b/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
index 2174e1b01..13ad0d454 100644
--- a/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
@@ -786,197 +786,6 @@ CREATE TABLE IF NOT EXISTS `workflow_task`
PRIMARY KEY (`id`)
);
--- ----------------------------
--- Table structure for cluster_set
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `cluster_set`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
- `cn_name` varchar(256) COMMENT 'Chinese display name',
- `description` varchar(256) COMMENT 'ClusterSet Introduction',
- `middleware_type` varchar(10) DEFAULT 'TUBE' COMMENT 'The middleware type of message queue, high throughput: TUBE, high consistency: PULSAR',
- `in_charges` varchar(512) COMMENT 'Name of responsible person, separated by commas',
- `followers` varchar(512) COMMENT 'Name of followers, separated by commas',
- `status` int(4) DEFAULT '21' COMMENT 'ClusterSet status',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
- `creator` varchar(64) NOT NULL COMMENT 'Creator name',
- `modifier` varchar(64) NULL COMMENT 'Modifier name',
- `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
- `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- PRIMARY KEY (`id`),
- UNIQUE KEY `unique_cluster_set` (`set_name`)
-);
-
--- ----------------------------
--- Table structure for cluster_set_inlongid
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `cluster_set_inlongid`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `set_name` varchar(256) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
- `inlong_group_id` varchar(256) NOT NULL COMMENT 'Inlong group id, filled in by the user, undeleted ones cannot be repeated',
- PRIMARY KEY (`id`),
- UNIQUE KEY `unique_cluster_set_inlongid` (`set_name`, `inlong_group_id`)
-);
-
--- ----------------------------
--- Table structure for cache_cluster
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `cache_cluster`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `cluster_name` varchar(128) NOT NULL COMMENT 'CacheCluster name, English, numbers and underscore',
- `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
- `zone` varchar(128) NOT NULL COMMENT 'Zone, sz/sh/tj',
- PRIMARY KEY (`id`),
- UNIQUE KEY `unique_cache_cluster` (`cluster_name`)
-);
-
--- ----------------------------
--- Table structure for cache_cluster_ext
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `cache_cluster_ext`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `cluster_name` varchar(128) NOT NULL COMMENT 'CacheCluster name, English, numbers and underscore',
- `key_name` varchar(256) NOT NULL COMMENT 'Configuration item name',
- `key_value` text NULL COMMENT 'The value of the configuration item',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
- `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- PRIMARY KEY (`id`),
- KEY `index_cache_cluster` (`cluster_name`)
-);
-
--- ----------------------------
--- Table structure for cache_topic
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `cache_topic`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `topic_name` varchar(128) NOT NULL COMMENT 'Topic name, English, numbers and underscore',
- `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
- `partition_num` int(11) NOT NULL COMMENT 'Partition number',
- PRIMARY KEY (`id`),
- UNIQUE KEY `unique_cache_topic` (`topic_name`, `set_name`)
-);
-
--- ----------------------------
--- Table structure for proxy_cluster
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `proxy_cluster`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `cluster_name` varchar(128) NOT NULL COMMENT 'ProxyCluster name, English, numbers and underscore',
- `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
- `zone` varchar(128) NOT NULL COMMENT 'Zone, sz/sh/tj',
- PRIMARY KEY (`id`),
- UNIQUE KEY `unique_proxy_cluster` (`cluster_name`, `set_name`)
-);
-
--- ----------------------------
--- Table structure for proxy_cluster_to_cache_cluster
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `proxy_cluster_to_cache_cluster`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `proxy_cluster_name` varchar(128) NOT NULL COMMENT 'ProxyCluster name, English, numbers and underscore',
- `cache_cluster_name` varchar(128) NOT NULL COMMENT 'CacheCluster name, English, numbers and underscore',
- PRIMARY KEY (`id`),
- UNIQUE KEY `unique_proxy_cluster_to_cache_cluster` (`proxy_cluster_name`, `cache_cluster_name`)
-);
-
--- ----------------------------
--- Table structure for flume_source
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `flume_source`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `source_name` varchar(128) NOT NULL COMMENT 'FlumeSource name, English, numbers and underscore',
- `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
- `type` varchar(128) NOT NULL COMMENT 'FlumeSource classname',
- `channels` varchar(128) NOT NULL COMMENT 'The channels of FlumeSource, separated by space',
- `selector_type` varchar(128) NOT NULL COMMENT 'FlumeSource channel selector classname',
- PRIMARY KEY (`id`),
- UNIQUE KEY `unique_flume_source` (`source_name`, `set_name`)
-);
-
--- ----------------------------
--- Table structure for flume_source_ext
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `flume_source_ext`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `parent_name` varchar(128) NOT NULL COMMENT 'FlumeSource name, English, numbers and underscore',
- `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
- `key_name` varchar(256) NOT NULL COMMENT 'Configuration item name',
- `key_value` text NULL COMMENT 'The value of the configuration item',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
- `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- PRIMARY KEY (`id`),
- KEY `index_flume_source_ext` (`parent_name`)
-);
-
--- ----------------------------
--- Table structure for flume_channel
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `flume_channel`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `channel_name` varchar(128) NOT NULL COMMENT 'FlumeChannel name, English, numbers and underscore',
- `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
- `type` varchar(128) NOT NULL COMMENT 'FlumeChannel classname',
- PRIMARY KEY (`id`),
- UNIQUE KEY `unique_flume_channel` (`channel_name`, `set_name`)
-);
-
--- ----------------------------
--- Table structure for flume_channel_ext
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `flume_channel_ext`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `parent_name` varchar(128) NOT NULL COMMENT 'FlumeChannel name, English, numbers and underscore',
- `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
- `key_name` varchar(256) NOT NULL COMMENT 'Configuration item name',
- `key_value` text NULL COMMENT 'The value of the configuration item',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
- `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- PRIMARY KEY (`id`),
- KEY `index_flume_channel_ext` (`parent_name`)
-);
-
--- ----------------------------
--- Table structure for flume_sink
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `flume_sink`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `sink_name` varchar(128) NOT NULL COMMENT 'FlumeSink name, English, numbers and underscore',
- `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
- `type` varchar(128) NOT NULL COMMENT 'FlumeSink classname',
- `channel` varchar(128) NOT NULL COMMENT 'FlumeSink channel',
- PRIMARY KEY (`id`),
- UNIQUE KEY `unique_flume_sink` (`sink_name`, `set_name`)
-);
-
--- ----------------------------
--- Table structure for flume_sink_ext
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `flume_sink_ext`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `parent_name` varchar(128) NOT NULL COMMENT 'FlumeSink name, English, numbers and underscore',
- `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
- `key_name` varchar(256) NOT NULL COMMENT 'Configuration item name',
- `key_value` text NULL COMMENT 'The value of the configuration item',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, > 0: deleted',
- `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- PRIMARY KEY (`id`),
- KEY `index_flume_sink_ext` (`parent_name`)
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8mb4 COMMENT ='FlumeSink extension table';
-
-- ----------------------------
-- Table structure for db_collector_detail_task
-- ----------------------------
diff --git a/inlong-manager/manager-web/assembly.xml b/inlong-manager/manager-web/assembly.xml
index 71a69a800..501f4e077 100755
--- a/inlong-manager/manager-web/assembly.xml
+++ b/inlong-manager/manager-web/assembly.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
diff --git a/inlong-manager/manager-web/bin/managerctl b/inlong-manager/manager-web/bin/managerctl
index b63edd031..9003a2b44 100644
--- a/inlong-manager/manager-web/bin/managerctl
+++ b/inlong-manager/manager-web/bin/managerctl
@@ -1,12 +1,12 @@
#! /bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-web/bin/restart.sh b/inlong-manager/manager-web/bin/restart.sh
index 3ed90a52b..b83383a3d 100755
--- a/inlong-manager/manager-web/bin/restart.sh
+++ b/inlong-manager/manager-web/bin/restart.sh
@@ -1,12 +1,12 @@
#! /bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-web/bin/shutdown.sh b/inlong-manager/manager-web/bin/shutdown.sh
index d79a843dc..646ee406e 100755
--- a/inlong-manager/manager-web/bin/shutdown.sh
+++ b/inlong-manager/manager-web/bin/shutdown.sh
@@ -1,12 +1,12 @@
#! /bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-web/bin/startup.sh b/inlong-manager/manager-web/bin/startup.sh
index 2a16bb991..9b4980841 100755
--- a/inlong-manager/manager-web/bin/startup.sh
+++ b/inlong-manager/manager-web/bin/startup.sh
@@ -1,12 +1,12 @@
#! /bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-web/src/main/resources/application-dev.properties b/inlong-manager/manager-web/src/main/resources/application-dev.properties
index 4390efde8..6a54477c7 100644
--- a/inlong-manager/manager-web/src/main/resources/application-dev.properties
+++ b/inlong-manager/manager-web/src/main/resources/application-dev.properties
@@ -1,11 +1,11 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-web/src/main/resources/application-prod.properties b/inlong-manager/manager-web/src/main/resources/application-prod.properties
index f1e12f25f..eb283a93b 100644
--- a/inlong-manager/manager-web/src/main/resources/application-prod.properties
+++ b/inlong-manager/manager-web/src/main/resources/application-prod.properties
@@ -1,11 +1,11 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-web/src/main/resources/application-test.properties b/inlong-manager/manager-web/src/main/resources/application-test.properties
index 7e78edcad..553da4140 100644
--- a/inlong-manager/manager-web/src/main/resources/application-test.properties
+++ b/inlong-manager/manager-web/src/main/resources/application-test.properties
@@ -1,11 +1,11 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-web/src/main/resources/application.properties b/inlong-manager/manager-web/src/main/resources/application.properties
index 731a80d70..6d01dc8cf 100644
--- a/inlong-manager/manager-web/src/main/resources/application.properties
+++ b/inlong-manager/manager-web/src/main/resources/application.properties
@@ -1,11 +1,11 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
+# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
+# 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
+# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
diff --git a/inlong-manager/manager-web/src/main/resources/log4j2.xml b/inlong-manager/manager-web/src/main/resources/log4j2.xml
index 7d27b425a..a2079bdd6 100644
--- a/inlong-manager/manager-web/src/main/resources/log4j2.xml
+++ b/inlong-manager/manager-web/src/main/resources/log4j2.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
+ or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
+ 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
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0