This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 3891d2492 [Improve] rename notEmpty method in Utils.scala (#3421)
3891d2492 is described below
commit 3891d24929a8c28c9566176168a3c2270bdda8d7
Author: zhengkezhou <[email protected]>
AuthorDate: Fri Dec 22 22:57:07 2023 +0800
[Improve] rename notEmpty method in Utils.scala (#3421)
---
.../src/main/scala/org/apache/streampark/common/fs/LfsOperator.scala | 4 ++--
.../src/main/scala/org/apache/streampark/common/util/FileUtils.scala | 2 +-
.../scala/org/apache/streampark/common/util/PropertiesUtils.scala | 2 +-
.../src/main/scala/org/apache/streampark/common/util/Utils.scala | 4 ++--
.../main/java/org/apache/streampark/console/core/bean/Dependency.java | 2 +-
.../org/apache/streampark/flink/packer/docker/DockerRetriever.scala | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
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
index ca6d50b25..8e4263591 100644
---
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, notEmpty}
+import org.apache.streampark.common.util.Utils.{isAnyBank, requireNotEmpty}
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 (notEmpty(path)) {
+ if (requireNotEmpty(path)) {
val file = new File(path)
if (file.exists()) {
FileUtils.forceDelete(file)
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/util/FileUtils.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/util/FileUtils.scala
index b2d6c7449..57cf5e55a 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/util/FileUtils.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/util/FileUtils.scala
@@ -93,7 +93,7 @@ object FileUtils {
def getPathFromEnv(env: String): String = {
val path = Option(System.getenv(env)).getOrElse(System.getProperty(env))
require(
- Utils.notEmpty(path),
+ Utils.requireNotEmpty(path),
s"[StreamPark] FileUtils.getPathFromEnv: $env is not set on system env")
val file = new File(path)
require(file.exists(), s"[StreamPark] FileUtils.getPathFromEnv: $env is
not exist!")
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/util/PropertiesUtils.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/util/PropertiesUtils.scala
index b0db39578..541f57f1b 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/util/PropertiesUtils.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/util/PropertiesUtils.scala
@@ -281,7 +281,7 @@ object PropertiesUtils extends Logger {
val map = mutable.Map[String, String]()
val simple = properties.replaceAll(MULTI_PROPERTY_REGEXP, "")
simple.split("\\s?-D") match {
- case d if Utils.notEmpty(d) =>
+ case d if Utils.requireNotEmpty(d) =>
d.foreach(
x => {
if (x.nonEmpty) {
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/util/Utils.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/util/Utils.scala
index be09b29b4..30d001ae3 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/util/Utils.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/util/Utils.scala
@@ -43,7 +43,7 @@ object Utils extends Logger {
notNull(obj, "this argument must not be null")
}
- def notEmpty(elem: Any): Boolean = {
+ def requireNotEmpty(elem: Any): Boolean = {
elem match {
case null => false
case x if x.isInstanceOf[Array[_]] =>
elem.asInstanceOf[Array[_]].nonEmpty
@@ -56,7 +56,7 @@ object Utils extends Logger {
}
}
- def isEmpty(elem: Any): Boolean = !notEmpty(elem)
+ def isEmpty(elem: Any): Boolean = !requireNotEmpty(elem)
def required(expression: Boolean): Unit = {
if (!expression) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
index dae11e870..1e20117a5 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
@@ -43,7 +43,7 @@ public class Dependency {
@SneakyThrows
public static Dependency toDependency(String dependency) {
- if (Utils.notEmpty(dependency)) {
+ if (Utils.requireNotEmpty(dependency)) {
return JacksonUtils.read(dependency, new TypeReference<Dependency>() {});
}
return new Dependency();
diff --git
a/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/docker/DockerRetriever.scala
b/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/docker/DockerRetriever.scala
index 795db7d09..e06a9a1b1 100644
---
a/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/docker/DockerRetriever.scala
+++
b/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/docker/DockerRetriever.scala
@@ -61,7 +61,7 @@ object DockerRetriever {
/** set docker-host for kata */
def setDockerHost(): Unit = {
val dockerhost: String = InternalConfigHolder.get(CommonConfig.DOCKER_HOST)
- if (Utils.notEmpty(dockerhost)) {
+ if (Utils.requireNotEmpty(dockerhost)) {
val dockerHostUri: URI = new URI(dockerhost)
dockerHttpClientBuilder.dockerHost(dockerHostUri)
}
