This is an automated email from the ASF dual-hosted git repository.
gongzhongqiang 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 f77756157 [improvement] Minor improvement (#2964)
f77756157 is described below
commit f777561575ea2761a774897b42893c1f80f93ac0
Author: benjobs <[email protected]>
AuthorDate: Wed Aug 23 15:29:05 2023 +0800
[improvement] Minor improvement (#2964)
Co-authored-by: benjobs <[email protected]>
---
.../org/apache/streampark/common/util/CURLBuilder.scala | 15 ++++++---------
.../org/apache/streampark/common/util/DateUtils.scala | 2 --
.../flink/client/impl/YarnApplicationClient.scala | 7 +++----
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/util/CURLBuilder.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/util/CURLBuilder.scala
index 10c5b80ef..6eb35e103 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/util/CURLBuilder.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/util/CURLBuilder.scala
@@ -22,9 +22,9 @@ import scala.collection.convert.ImplicitConversions._
class CURLBuilder(val url: String) {
- val headers: util.Map[String, String] = new util.HashMap[String, String]
+ private[this] val headers: util.Map[String, String] = new
util.HashMap[String, String]
- val formDatas: util.Map[String, String] = new util.HashMap[String, String]
+ private[this] val formData: util.Map[String, String] = new
util.HashMap[String, String]
def addHeader(k: String, v: String): CURLBuilder = {
this.headers.put(k, v)
@@ -32,7 +32,7 @@ class CURLBuilder(val url: String) {
}
def addFormData(k: String, v: String): CURLBuilder = {
- this.formDatas.put(k, v)
+ this.formData.put(k, v)
this
}
@@ -40,12 +40,9 @@ class CURLBuilder(val url: String) {
require(url != null, "[StreamPark] CURL build failed, url must not be
null")
val cURL = new StringBuilder("curl -X POST ")
cURL.append(String.format("'%s' \\\n", url))
- for (headerKey <- headers.keySet) {
- cURL.append(String.format("-H \'%s: %s\' \\\n", headerKey,
headers.get(headerKey)))
- }
- for (field <- formDatas.keySet) {
- cURL.append(String.format("--data-urlencode \'%s=%s\' \\\n", field,
formDatas.get(field)))
- }
+ headers.keySet.foreach(h => cURL.append(String.format("-H \'%s: %s\'
\\\n", h, headers.get(h))))
+ formData.foreach(
+ k => cURL.append(String.format("--data-urlencode \'%s=%s\' \\\n", k,
formData.get(k))))
cURL.append("-i")
cURL.toString
}
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/util/DateUtils.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/util/DateUtils.scala
index 8c62eebe1..584252545 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/util/DateUtils.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/util/DateUtils.scala
@@ -31,8 +31,6 @@ object DateUtils {
val format_yyyyMMdd = "yyyyMMdd"
- val fullCompact = "yyyyMMddHHmmss"
-
def parse(
date: String,
format: String = fullFormat,
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnApplicationClient.scala
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnApplicationClient.scala
index 2b981b305..304735e2d 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnApplicationClient.scala
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/YarnApplicationClient.scala
@@ -104,8 +104,8 @@ object YarnApplicationClient extends YarnClientTrait {
submitRequest: SubmitRequest,
flinkConfig: Configuration): SubmitResponse = {
SecurityUtils.install(new SecurityConfiguration(flinkConfig))
- SecurityUtils.getInstalledContext.runSecured(new Callable[SubmitResponse] {
- override def call(): SubmitResponse = {
+ SecurityUtils.getInstalledContext.runSecured(
+ () => {
val clusterClientServiceLoader = new DefaultClusterClientServiceLoader
val clientFactory =
clusterClientServiceLoader.getClusterClientFactory[ApplicationId](flinkConfig)
@@ -137,8 +137,7 @@ object YarnApplicationClient extends YarnClientTrait {
} finally {
Utils.close(clusterDescriptor, clusterClient)
}
- }
- })
+ })
}
}