(incubator-streampark) branch dev-2.1.5 updated: [Improve] parse flink version minor improvement (#3867)

[benjobs]

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

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


The following commit(s) were added to refs/heads/dev-2.1.5 by this push:
     new d13d412ff [Improve] parse flink version minor improvement (#3867)
d13d412ff is described below

commit d13d412ff5c6a97646f382d4f6b77240480e4951
Author: benjobs <benj...@apache.org>
AuthorDate: Mon Jul 15 23:24:56 2024 +0800

    [Improve] parse flink version minor improvement (#3867)
    
    * [Improve] parse flink version minor improvement
    
    ---------
    
    Co-authored-by: benjobs <benj...@gmail.com>
---
 .../streampark/common/conf/FlinkVersion.scala      | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git 
a/streampark-common/src/main/scala/org/apache/streampark/common/conf/FlinkVersion.scala
 
b/streampark-common/src/main/scala/org/apache/streampark/common/conf/FlinkVersion.scala
index 2b4ab6a9c..8be2ca8c1 100644
--- 
a/streampark-common/src/main/scala/org/apache/streampark/common/conf/FlinkVersion.scala
+++ 
b/streampark-common/src/main/scala/org/apache/streampark/common/conf/FlinkVersion.scala
@@ -20,7 +20,6 @@ import org.apache.streampark.common.util.{CommandUtils, 
Logger}
 
 import java.io.File
 import java.net.{URL => NetURL}
-import java.util.concurrent.atomic.{AtomicBoolean, AtomicReference}
 import java.util.function.Consumer
 import java.util.regex.Pattern
 
@@ -44,7 +43,7 @@ class FlinkVersion(val flinkHome: String) extends 
java.io.Serializable with Logg
   lazy val scalaVersion: String = {
     val matcher = FLINK_SCALA_VERSION_PATTERN.matcher(flinkDistJar.getName)
     if (matcher.matches()) {
-      matcher.group(1);
+      matcher.group(1)
     } else {
       // flink 1.15 + on support scala 2.12
       "2.12"
@@ -66,11 +65,10 @@ class FlinkVersion(val flinkHome: String) extends 
java.io.Serializable with Logg
   lazy val flinkLibs: List[NetURL] = 
flinkLib.listFiles().map(_.toURI.toURL).toList
 
   lazy val version: String = {
-    val flinkVersion = new AtomicReference[String]
-
     val cmd = List(
-      s"java -classpath ${flinkDistJar.getName} 
org.apache.flink.client.cli.CliFrontend --version")
-    val success = new AtomicBoolean(false)
+      s"java -classpath ${flinkDistJar.getName} 
org.apache.flink.client.cli.CliFrontend --version"
+    )
+    var (flinkVersion: String, success: Boolean) = ("", false)
     val buffer = new mutable.StringBuilder
     CommandUtils.execute(
       flinkLib.getAbsolutePath,
@@ -83,13 +81,13 @@ class FlinkVersion(val flinkHome: String) extends 
java.io.Serializable with Logg
             val version = matcher.group(1)
             val matcher1 = APACHE_FLINK_VERSION_PATTERN.matcher(version)
             if (matcher1.find) {
-              success.set(true)
-              flinkVersion.set(version)
+              success = true
+              flinkVersion = version
             } else {
               val matcher2 = OTHER_FLINK_VERSION_PATTERN.matcher(version)
               if (matcher2.find) {
-                success.set(true)
-                flinkVersion.set(s"${matcher2.group(1)}.0")
+                success = true
+                flinkVersion = version
               }
             }
           }
@@ -97,11 +95,11 @@ class FlinkVersion(val flinkHome: String) extends 
java.io.Serializable with Logg
       }
     )
     logInfo(buffer.toString())
-    if (!success.get()) {
+    if (!success) {
       throw new IllegalStateException(s"[StreamPark] parse flink version 
failed. $buffer")
     }
     buffer.clear()
-    flinkVersion.get
+    flinkVersion
   }
 
   // flink major version, like "1.13", "1.14"