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 6f028d51e [Improve] rename checkJarFile method in Utils.scala (#3422)
6f028d51e is described below
commit 6f028d51ee319c8e4a885721cdfff59d4ec76d30
Author: zhengkezhou <[email protected]>
AuthorDate: Fri Dec 22 22:56:54 2023 +0800
[Improve] rename checkJarFile method in Utils.scala (#3422)
---
.../scala/org/apache/streampark/common/util/ClassLoaderUtils.scala | 2 +-
.../src/main/scala/org/apache/streampark/common/util/Utils.scala | 4 ++--
.../streampark/console/core/controller/ApplicationController.java | 2 +-
.../org/apache/streampark/console/core/task/ProjectBuildTask.java | 2 +-
.../scala/org/apache/streampark/flink/packer/maven/MavenTool.scala | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/util/ClassLoaderUtils.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/util/ClassLoaderUtils.scala
index 466674767..7f3953edf 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/util/ClassLoaderUtils.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/util/ClassLoaderUtils.scala
@@ -129,7 +129,7 @@ object ClassLoaderUtils extends Logger {
if (ext.isEmpty) {
addURL(file)
} else if (ext.exists(x => file.getName.endsWith(x))) {
- Utils.checkJarFile(file.toURI.toURL)
+ Utils.requireCheckJarFile(file.toURI.toURL)
addURL(file)
}
}
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 e5bc05121..be09b29b4 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
@@ -73,7 +73,7 @@ object Utils extends Logger {
def uuid(): String = UUID.randomUUID().toString.replaceAll("-", "")
@throws[IOException]
- def checkJarFile(jar: URL): Unit = {
+ def requireCheckJarFile(jar: URL): Unit = {
val jarFile: File = Try(new File(jar.toURI)) match {
case Success(x) => x
case Failure(_) => throw new IOException(s"JAR file path is invalid
$jar")
@@ -92,7 +92,7 @@ object Utils extends Logger {
}
def getJarManifest(jarFile: File): jar.Manifest = {
- checkJarFile(jarFile.toURL)
+ requireCheckJarFile(jarFile.toURL)
new JarInputStream(new BufferedInputStream(new
FileInputStream(jarFile))).getManifest
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
index 3d178ac64..605914361 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
@@ -361,7 +361,7 @@ public class ApplicationController {
public RestResponse checkjar(String jar) {
File file = new File(jar);
try {
- Utils.checkJarFile(file.toURI().toURL());
+ Utils.requireCheckJarFile(file.toURI().toURL());
return RestResponse.success(true);
} catch (IOException e) {
return RestResponse.success(file).message(e.getLocalizedMessage());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java
index b860f49db..45c950efd 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ProjectBuildTask.java
@@ -181,7 +181,7 @@ public class ProjectBuildTask extends AbstractLogFileTask {
}
} else {
// 2) .jar file(normal or official standard flink project)
- Utils.checkJarFile(app.toURI().toURL());
+ Utils.requireCheckJarFile(app.toURI().toURL());
String moduleName = app.getName().replace(Constant.JAR_SUFFIX, "");
File distHome = project.getDistHome();
File targetDir = new File(distHome, moduleName);
diff --git
a/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/maven/MavenTool.scala
b/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/maven/MavenTool.scala
index bd4648151..c424b3beb 100644
---
a/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/maven/MavenTool.scala
+++
b/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/maven/MavenTool.scala
@@ -82,7 +82,7 @@ object MavenTool extends Logger {
}
private val isJarFile = (file: File) =>
- file.isFile && Try(Utils.checkJarFile(file.toURI.toURL)).isSuccess
+ file.isFile && Try(Utils.requireCheckJarFile(file.toURI.toURL)).isSuccess
/**
* Build a fat-jar with custom jar libraries.