(incubator-streampark) branch classpaths updated: userClasspath minor improvement

[benjobs]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch classpaths
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/classpaths by this push:
     new d1846a869 userClasspath minor improvement
d1846a869 is described below

commit d1846a869428bdd0bffcfe2b7f32ccbe6bf37ca4
Author: benjobs <benj...@apache.org>
AuthorDate: Sun Nov 5 10:09:48 2023 +0800

    userClasspath minor improvement
---
 .../org/apache/streampark/flink/client/bean/SubmitRequest.scala      | 5 +++--
 .../org/apache/streampark/flink/client/trait/FlinkClientTrait.scala  | 5 +----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git 
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
 
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
index 1fe9f98c8..4d04f03e9 100644
--- 
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
+++ 
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/src/main/scala/org/apache/streampark/flink/client/bean/SubmitRequest.scala
@@ -70,9 +70,10 @@ case class SubmitRequest(
   lazy val effectiveAppName: String =
     if (this.appName == null) appProperties(KEY_FLINK_APP_NAME) else 
this.appName
 
-  lazy val localLibs: List[URL] = {
+  lazy val classPaths: List[URL] = {
     val path = s"${Workspace.local.APP_WORKSPACE}/$id/lib"
-    Try(new 
File(path).listFiles().map(_.toURI.toURL).toList).getOrElse(List.empty[URL])
+    val lib = Try(new 
File(path).listFiles().map(_.toURI.toURL).toList).getOrElse(List.empty[URL])
+    flinkVersion.flinkLibs ++ lib
   }
 
   lazy val flinkSQL: String = extraParameter.get(KEY_FLINK_SQL()).toString
diff --git 
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala
 
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala
index ffc6b47a8..020301b73 100644
--- 
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala
+++ 
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala
@@ -257,10 +257,7 @@ trait FlinkClientTrait extends Logger {
       flinkConfig: Configuration): (PackagedProgram, JobGraph) = {
 
     val pkgBuilder = PackagedProgram.newBuilder
-
-    val classPaths = submitRequest.flinkVersion.flinkLibs ++ 
submitRequest.localLibs
-    pkgBuilder
-      .setUserClassPaths(Lists.newArrayList(classPaths: _*))
+      .setUserClassPaths(Lists.newArrayList(submitRequest.classPaths: _*))
       .setEntryPointClassName(
         
flinkConfig.getOptional(ApplicationConfiguration.APPLICATION_MAIN_CLASS).get()
       )