This is an automated email from the ASF dual-hosted git repository.
doleyzi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 0cad8fa3be [INLONG-11831][Audit] Optimize the packaging of the Audit
SDK (#11845)
0cad8fa3be is described below
commit 0cad8fa3be9063201db37fcf6ec3e62ead27bfb8
Author: doleyzi <[email protected]>
AuthorDate: Tue Apr 29 20:09:59 2025 +0800
[INLONG-11831][Audit] Optimize the packaging of the Audit SDK (#11845)
* [INLONG-11831] Optimize the packaging of the Audit-Sdk
---
inlong-audit/audit-common/pom.xml | 4 ++
inlong-audit/audit-proxy/pom.xml | 24 +++++++
inlong-audit/audit-service/pom.xml | 12 ++++
.../apache/inlong/audit/service/auditor/Audit.java | 2 +-
.../inlong/audit/service/source/JdbcSource.java | 2 +-
inlong-audit/pom.xml | 22 -------
.../schedule/airflow/AirflowScheduleEngine.java | 2 +-
.../schedule/airflow/config/AirflowConfig.java | 4 +-
.../schedule/airflow/util/ConcurrentHashSet.java | 77 ++++++++++++++++++++++
pom.xml | 1 +
10 files changed, 123 insertions(+), 27 deletions(-)
diff --git a/inlong-audit/audit-common/pom.xml
b/inlong-audit/audit-common/pom.xml
index 0e2157cb95..3de036aa07 100644
--- a/inlong-audit/audit-common/pom.xml
+++ b/inlong-audit/audit-common/pom.xml
@@ -46,6 +46,10 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/inlong-audit/audit-proxy/pom.xml b/inlong-audit/audit-proxy/pom.xml
index 1eed9086c9..0e3a41f7cd 100644
--- a/inlong-audit/audit-proxy/pom.xml
+++ b/inlong-audit/audit-proxy/pom.xml
@@ -140,5 +140,29 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-node</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-sdk</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-configuration</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/inlong-audit/audit-service/pom.xml
b/inlong-audit/audit-service/pom.xml
index 1252ab8ba4..e2613cf9c0 100644
--- a/inlong-audit/audit-service/pom.xml
+++ b/inlong-audit/audit-service/pom.xml
@@ -86,6 +86,18 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons.lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>${commons.dbcp}</version>
+ <scope>compile</scope>
+ </dependency>
+
</dependencies>
<build>
<resources>
diff --git
a/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/service/auditor/Audit.java
b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/service/auditor/Audit.java
index 8d1015a448..c12c781936 100644
---
a/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/service/auditor/Audit.java
+++
b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/service/auditor/Audit.java
@@ -30,7 +30,7 @@ import org.apache.inlong.audit.service.utils.AuditUtils;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/service/source/JdbcSource.java
b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/service/source/JdbcSource.java
index 9f76c7a4c6..72492031e6 100644
---
a/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/service/source/JdbcSource.java
+++
b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/service/source/JdbcSource.java
@@ -29,7 +29,7 @@ import org.apache.inlong.audit.service.utils.JdbcUtils;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import lombok.Data;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/inlong-audit/pom.xml b/inlong-audit/pom.xml
index 5dd4039e9a..8e77663d94 100644
--- a/inlong-audit/pom.xml
+++ b/inlong-audit/pom.xml
@@ -50,33 +50,11 @@
<artifactId>inlong-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-node</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${commons.text.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-sdk</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-configuration</artifactId>
- </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
diff --git
a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/AirflowScheduleEngine.java
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/AirflowScheduleEngine.java
index 80d67f2281..a03c46ed60 100644
---
a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/AirflowScheduleEngine.java
+++
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/AirflowScheduleEngine.java
@@ -34,12 +34,12 @@ import
org.apache.inlong.manager.schedule.airflow.api.dag.DAGDeletor;
import org.apache.inlong.manager.schedule.airflow.api.dag.DAGUpdater;
import org.apache.inlong.manager.schedule.airflow.api.dagruns.DAGRunsTrigger;
import org.apache.inlong.manager.schedule.airflow.config.AirflowConfig;
+import org.apache.inlong.manager.schedule.airflow.util.ConcurrentHashSet;
import org.apache.inlong.manager.schedule.airflow.util.DAGUtil;
import org.apache.inlong.manager.schedule.airflow.util.DateUtil;
import org.apache.inlong.manager.schedule.exception.AirflowScheduleException;
import com.google.common.collect.ImmutableMap;
-import org.apache.mina.util.ConcurrentHashSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
diff --git
a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/config/AirflowConfig.java
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/config/AirflowConfig.java
index 9e7ffbf9d0..966b432e28 100644
---
a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/config/AirflowConfig.java
+++
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/config/AirflowConfig.java
@@ -27,7 +27,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import okhttp3.OkHttpClient;
-import org.eclipse.jetty.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@@ -79,7 +79,7 @@ public class AirflowConfig extends ClientConfiguration {
@PostConstruct
public void init() {
try {
- if (StringUtil.isNotBlank(inlongManagerUrl)) {
+ if (StringUtils.isNotBlank(inlongManagerUrl)) {
URL url = new URL(inlongManagerUrl);
this.inlongManagerHost = url.getHost();
this.inlongManagerPort = url.getPort();
diff --git
a/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/util/ConcurrentHashSet.java
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/util/ConcurrentHashSet.java
new file mode 100644
index 0000000000..5de06d2696
--- /dev/null
+++
b/inlong-manager/manager-schedule/src/main/java/org/apache/inlong/manager/schedule/airflow/util/ConcurrentHashSet.java
@@ -0,0 +1,77 @@
+/*
+ * 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.schedule.airflow.util;
+
+import java.util.AbstractSet;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * ConcurrentHashSet, construct the set collection through ConcurrentHashMap
+ * to complete the operation management of the concurrent set
+ */
+public class ConcurrentHashSet<E> extends AbstractSet<E> {
+
+ private final ConcurrentHashMap<E, Long> keyValMap = new
ConcurrentHashMap<>();
+
+ public ConcurrentHashSet() {
+
+ }
+
+ @Override
+ public boolean add(E item) {
+ Long value =
+ keyValMap.putIfAbsent(item, System.currentTimeMillis());
+ return (value == null);
+ }
+
+ @Override
+ public boolean contains(Object item) {
+ return keyValMap.containsKey(item);
+ }
+
+ @Override
+ public boolean remove(Object item) {
+ return keyValMap.remove(item) != null;
+ }
+
+ @Override
+ public void clear() {
+ keyValMap.clear();
+ }
+
+ @Override
+ public int size() {
+ return keyValMap.size();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return keyValMap.isEmpty();
+ }
+
+ @Override
+ public Iterator<E> iterator() {
+ return new HashSet<>(keyValMap.keySet()).iterator();
+ }
+
+ public Long getItemAddTime(E item) {
+ return keyValMap.get(item);
+ }
+}
diff --git a/pom.xml b/pom.xml
index 50b53cce49..2f7f1e3041 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,6 +208,7 @@
<apache.thrift.version>0.14.1</apache.thrift.version>
<aircompressor.version>0.27</aircompressor.version>
<json.smart.version>2.5.2</json.smart.version>
+ <commons.dbcp>1.4</commons.dbcp>
</properties>
<dependencyManagement>
