Merge branch 'apache:dev' into dev

ChengJie1053 · Mar 25, 2024 · 76e5ad8 · 76e5ad8
2 parents 6dd17b2 + 9ca669a
commit 76e5ad8
Show file tree

Hide file tree

Showing 121 changed files with 3,561 additions and 1,220 deletions.
diff --git a/README.md b/README.md
@@ -98,6 +98,9 @@ You can submit any ideas as [pull requests](https://github.com/apache/incubator-
 
 We welcome your suggestions, comments (including criticisms), comments and contributions. See [How to Contribute](https://streampark.apache.org/community/submit_guide/submit_code) and [Code Submission Guide](https://streampark.apache.org/community/submit_guide/code_style_and_quality_guide)
 
+### 📤 Subscribe Mailing Lists
+Mail List is the most recognized form of communication in Apache community. See how to [Join the Mailing Lists](https://streampark.apache.org/community/contribution_guide/mailing_lists)
+
 Thank you to all the people who already contributed to StreamPark!
 
 [![contrib graph](https://contrib.rocks/image?repo=apache/streampark)](https://github.com/apache/incubator-streampark/graphs/contributors)

diff --git a/SECURITY.md b/SECURITY.md
diff --git a/pom.xml b/pom.xml
@@ -146,6 +146,7 @@
         <lombok.version>1.18.24</lombok.version>
         <jupiter.version>5.9.1</jupiter.version>
         <mockito.version>3.4.6</mockito.version>
+        <mockito-scala.version>1.17.14</mockito-scala.version>
         <assertj.version>3.23.1</assertj.version>
 
         <PermGen>64m</PermGen>

diff --git a/streampark-common/pom.xml b/streampark-common/pom.xml
@@ -30,6 +30,20 @@
     <dependencies>
 
         <!-- test -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-scala_${scala.binary.version}</artifactId>
+            <version>${mockito-scala.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.scalatest</groupId>
+            <artifactId>scalatest_${scala.binary.version}</artifactId>
+            <version>${scalatest.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

diff --git a/streampark-common/src/main/java/org/apache/streampark/common/util/ExceptionUtils.java b/streampark-common/src/main/java/org/apache/streampark/common/util/ExceptionUtils.java
diff --git a/...ampark-common/src/main/scala/org/apache/streampark/common/conf/InternalConfigHolder.scala b/...ampark-common/src/main/scala/org/apache/streampark/common/conf/InternalConfigHolder.scala
@@ -44,9 +44,7 @@ object InternalConfigHolder extends Logger {
   private val confOptions = new ConcurrentHashMap[String, InternalOption](initialCapacity)
 
   /** Initialize the ConfigHub. */
-  {
-    Seq(CommonConfig, K8sFlinkConfig)
-  }
+  Seq(CommonConfig, K8sFlinkConfig)
 
   /** Register the ConfigOption */
   private[conf] def register(@Nonnull conf: InternalOption): Unit = {

diff --git a/streampark-common/src/main/scala/org/apache/streampark/common/fs/LfsOperator.scala b/streampark-common/src/main/scala/org/apache/streampark/common/fs/LfsOperator.scala
@@ -18,7 +18,7 @@
 package org.apache.streampark.common.fs
 
 import org.apache.streampark.common.util.Logger
-import org.apache.streampark.common.util.Utils.{isAnyBank, requireNotEmpty}
+import org.apache.streampark.common.util.Utils.{isAnyBank, isNotEmpty}
 
 import org.apache.commons.codec.digest.DigestUtils
 import org.apache.commons.io.{FileUtils, IOUtils}
@@ -41,7 +41,7 @@ object LfsOperator extends FsOperator with Logger {
   }
 
   override def delete(path: String): Unit = {
-    if (requireNotEmpty(path)) {
+    if (isNotEmpty(path)) {
       val file = new File(path)
       if (file.exists()) {
         FileUtils.forceDelete(file)