use RegexFileFilter for sparkCoreScalaVersion

apache · Sep 21, 2023 · a7f387f · a7f387f
1 parent deb2010
commit a7f387f
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala
@@ -104,6 +104,13 @@ class SparkProcessBuilder(
     }
   }
 
+  private lazy val sparkCoreScalaVersion: String = {
+    Paths.get(sparkHome, "jars").toFile
+      .list(new RegexFileFilter("^spark-core_.*\\.jar$"))
+      .map { p => p.substring(p.indexOf("_") + 1, p.lastIndexOf("-")) }
+      .head
+  }
+
   override protected def engineScalaBinaryVersion: String =
     StringUtils.defaultIfBlank(System.getenv("SPARK_SCALA_VERSION"), sparkCoreScalaVersion)
 
@@ -115,14 +122,6 @@ class SparkProcessBuilder(
     new RegexFileFilter(pattern)
   }
 
-  private def sparkCoreScalaVersion: String = {
-    val sparkCoreJarPattern = Pattern.compile("^spark-core_.*\\.jar$")
-    Paths.get(sparkHome, "jars").toFile
-      .list((_, fileName) => sparkCoreJarPattern.matcher(fileName).matches())
-      .map { p => p.substring(p.indexOf("_") + 1, p.lastIndexOf("-")) }
-      .head
-  }
-
   override protected lazy val commands: Array[String] = {
     // complete `spark.master` if absent on kubernetes
     completeMasterUrl(conf)