This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new e25e27553 refactor: change the java.util.Map[String, Any] to
Map[String, AnyRef] (#4076)
e25e27553 is described below
commit e25e275534cfe90171b643035f83e6896bd5742e
Author: Jack Xu <[email protected]>
AuthorDate: Thu Dec 29 17:24:58 2022 +0800
refactor: change the java.util.Map[String, Any] to Map[String, AnyRef]
(#4076)
---
.../apache/linkis/protocol/utils/TaskUtils.scala | 55 ++++++++++------------
.../computation/client/LinkisJobBuilder.scala | 54 +++++++++++----------
.../client/once/simple/SimpleOnceJobBuilder.scala | 13 ++---
.../impl/EngineConnDiagnosisOperator.scala | 4 +-
.../operator/impl/EngineConnMetricsOperator.scala | 4 +-
.../operator/impl/EngineConnProgressOperator.scala | 2 +-
.../ujes/client/request/JobExecuteAction.scala | 38 +++++++--------
.../ujes/client/request/JobSubmitAction.scala | 52 ++++++++++----------
.../ujes/client/response/EmsListResult.scala | 2 +-
.../ujes/client/response/GetColumnsResult.scala | 2 +-
.../client/response/GetTableBaseInfoResult.scala | 3 +-
.../ujes/client/response/GetTablesResult.scala | 2 +-
.../ujes/client/response/JobListResult.scala | 2 +-
.../ujes/client/response/ResultSetListResult.scala | 8 ++--
.../server/operator/EngineConnLogOperator.scala | 1 -
.../engineplugin/common/EngineConnPlugin.scala | 2 +-
.../linkis/entrance/job/EntranceExecutionJob.java | 2 +-
.../apache/linkis/entrance/EntranceParser.scala | 3 +-
.../apache/linkis/entrance/EntranceServer.scala | 4 +-
.../linkis/entrance/EntranceWebSocketService.scala | 5 +-
.../linkis/entrance/cs/CSEntranceHelper.scala | 25 ++++------
.../entrance/execute/DefaultEntranceExecutor.scala | 2 +-
.../linkis/entrance/execute/EntranceJob.scala | 2 +-
.../entrance/execute/JobLockExecuteRequest.scala | 2 +-
.../entrance/interceptor/EntranceInterceptor.scala | 6 +--
.../entrance/interceptor/OnceJobInterceptor.scala | 16 +++----
.../interceptor/impl/CompatibleInterceptor.scala | 4 +-
.../interceptor/impl/CustomVariableUtils.scala | 9 ++--
.../impl/ParserVarLabelInterceptor.scala | 2 +-
.../impl/StorePathEntranceInterceptor.scala | 17 ++++---
.../entrance/parser/CommonEntranceParser.scala | 31 ++++++------
.../entrance/scheduler/EntranceGroupFactory.scala | 9 ++--
.../scheduler/cache/ReadCacheConsumer.scala | 8 ++--
.../linkis/entrance/utils/JobHistoryHelper.scala | 14 +++---
.../linkis/ujes/jdbc/UJESSQLConnection.scala | 2 +-
.../apache/linkis/ujes/jdbc/UJESSQLStatement.scala | 7 +--
.../label/entity/engine/EngineConnModeLabel.scala | 14 +++---
.../manager/common/protocol/OperateRequest.scala | 4 +-
.../common/protocol/em/ECMOperateRequest.scala | 7 +--
.../protocol/engine/EngineOperateRequest.scala | 9 +---
.../ElasticSearchEngineConnPlugin.scala | 2 +-
.../flink/FlinkEngineConnPlugin.scala | 2 +-
.../engineplugin/hive/HiveEngineConnPlugin.scala | 4 +-
.../engineplugin/io/IoEngineConnPlugin.scala | 2 +-
.../engineplugin/jdbc/JDBCEngineConnPlugin.scala | 2 +-
.../openlookeng/OpenLooKengECPlugin.scala | 2 +-
.../pipeline/PipelineEngineConnPlugin.scala | 2 +-
.../presto/PrestoEngineConnPlugin.scala | 2 +-
.../python/PythonEngineConnPlugin.scala | 4 +-
.../seatunnel/SeatunnelEngineConnPlugin.scala | 2 +-
.../engineplugin/shell/ShellEngineConnPlugin.scala | 4 +-
.../engineplugin/spark/SparkEngineConnPlugin.scala | 2 +-
.../sqoop/SqoopEngineConnPlugin.scala | 2 +-
.../engineplugin/trino/TrinoEngineConnPlugin.scala | 2 +-
.../linkis/storage/io/client/DefaultIOClient.scala | 6 +--
.../linkis/storage/io/utils/IOClientUtils.scala | 15 +++---
.../orchestrator/converter/ASTContextImpl.scala | 2 +-
.../apache/linkis/orchestrator/domain/JobReq.scala | 8 ++--
.../orchestrator/listener/task/TaskInfoEvent.scala | 2 +-
.../orchestrator/plans/ast/AbstractJob.scala | 6 +--
.../orchestrator/plans/ast/QueryParams.scala | 34 +++----------
.../orchestrator/plans/ast/RuntimeParams.scala | 11 ++---
62 files changed, 253 insertions(+), 313 deletions(-)
diff --git
a/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/utils/TaskUtils.scala
b/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/utils/TaskUtils.scala
index ad518d61e..3b94bbdc1 100644
---
a/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/utils/TaskUtils.scala
+++
b/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/utils/TaskUtils.scala
@@ -25,43 +25,37 @@ import scala.collection.JavaConverters._
object TaskUtils {
- def getMap(params: util.Map[String, Any], key: String): util.Map[String,
Any] =
+ def getMap(params: util.Map[String, AnyRef], key: String): util.Map[String,
AnyRef] =
if (params != null && params.containsKey(key)) {
params.get(key) match {
- case map: util.Map[String, Any] => map
- case map: util.Map[String, Object] =>
- val resultMap = new util.HashMap[String, Any]
- map.keySet().asScala.foreach { k => resultMap.put(k, map.get(k)) }
- resultMap
- case _ => new util.HashMap[String, Any]()
+ case map: util.Map[String, AnyRef] => map
+ case _ => new util.HashMap[String, AnyRef]()
}
- } else new util.HashMap[String, Any]()
+ } else new util.HashMap[String, AnyRef]()
private def addMap(
- params: util.Map[String, Any],
- waitToAdd: util.Map[String, Any],
+ params: util.Map[String, AnyRef],
+ waitToAdd: util.Map[String, AnyRef],
key: String
): Unit =
if (params != null && params.containsKey(key)) {
params.get(key) match {
- case map: util.Map[String, Any] => map.putAll(waitToAdd)
- case map: util.Map[String, _] =>
- val resultMap = new util.HashMap[String, Any]
- map.keySet().asScala.foreach { k => resultMap.put(k, map.get(k)) }
- resultMap.putAll(waitToAdd)
- params.put(key, resultMap)
+ case map: util.Map[String, AnyRef] => map.putAll(waitToAdd)
case _ => params.put(key, waitToAdd)
}
} else params.put(key, waitToAdd)
- private def getConfigurationMap(params: util.Map[String, Any], key: String)
= {
+ private def getConfigurationMap(
+ params: util.Map[String, AnyRef],
+ key: String
+ ): util.Map[String, AnyRef] = {
val configurationMap = getMap(params, TaskConstant.PARAMS_CONFIGURATION)
getMap(configurationMap, key)
}
def addConfigurationMap(
- params: util.Map[String, Any],
- waitToAdd: util.Map[String, Any],
+ params: util.Map[String, AnyRef],
+ waitToAdd: util.Map[String, AnyRef],
key: String
): Unit = {
val configurationMap = getMap(params, TaskConstant.PARAMS_CONFIGURATION)
@@ -69,35 +63,38 @@ object TaskUtils {
addMap(configurationMap, waitToAdd, key)
}
- def getVariableMap(params: util.Map[String, Any]): util.Map[String, Any] =
+ def getVariableMap(params: util.Map[String, AnyRef]): util.Map[String,
AnyRef] =
getMap(params, TaskConstant.PARAMS_VARIABLE)
- def getStartupMap(params: util.Map[String, Any]): util.Map[String, Any] =
+ def getStartupMap(params: util.Map[String, AnyRef]): util.Map[String,
AnyRef] =
getConfigurationMap(params, TaskConstant.PARAMS_CONFIGURATION_STARTUP)
- def getRuntimeMap(params: util.Map[String, Any]): util.Map[String, Any] =
+ def getRuntimeMap(params: util.Map[String, AnyRef]): util.Map[String,
AnyRef] =
getConfigurationMap(params, TaskConstant.PARAMS_CONFIGURATION_RUNTIME)
- def getSpecialMap(params: util.Map[String, Any]): util.Map[String, Any] =
+ def getSpecialMap(params: util.Map[String, AnyRef]): util.Map[String,
AnyRef] =
getConfigurationMap(params, TaskConstant.PARAMS_CONFIGURATION_SPECIAL)
- def addVariableMap(params: util.Map[String, Any], variableMap:
util.Map[String, Any]): Unit =
+ def addVariableMap(
+ params: util.Map[String, AnyRef],
+ variableMap: util.Map[String, AnyRef]
+ ): Unit =
addMap(params, variableMap, TaskConstant.PARAMS_VARIABLE)
- def addStartupMap(params: util.Map[String, Any], startupMap:
util.Map[String, Any]): Unit =
+ def addStartupMap(params: util.Map[String, AnyRef], startupMap:
util.Map[String, AnyRef]): Unit =
addConfigurationMap(params, startupMap,
TaskConstant.PARAMS_CONFIGURATION_STARTUP)
- def addRuntimeMap(params: util.Map[String, Any], runtimeMap:
util.Map[String, Any]): Unit =
+ def addRuntimeMap(params: util.Map[String, AnyRef], runtimeMap:
util.Map[String, AnyRef]): Unit =
addConfigurationMap(params, runtimeMap,
TaskConstant.PARAMS_CONFIGURATION_RUNTIME)
- def addSpecialMap(params: util.Map[String, Any], specialMap:
util.Map[String, Any]): Unit =
+ def addSpecialMap(params: util.Map[String, AnyRef], specialMap:
util.Map[String, AnyRef]): Unit =
addConfigurationMap(params, specialMap,
TaskConstant.PARAMS_CONFIGURATION_SPECIAL)
// tdoo
- def getLabelsMap(params: util.Map[String, Any]): util.Map[String, Any] =
+ def getLabelsMap(params: util.Map[String, AnyRef]): util.Map[String, AnyRef]
=
getMap(params, TaskConstant.LABELS)
- def addLabelsMap(params: util.Map[String, Any], labels: util.Map[String,
Any]): Unit =
+ def addLabelsMap(params: util.Map[String, AnyRef], labels: util.Map[String,
AnyRef]): Unit =
addMap(params, labels, TaskConstant.LABELS)
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala
index 25c10ff6f..3daba1941 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala
@@ -35,10 +35,10 @@ import java.util.concurrent.{ScheduledThreadPoolExecutor,
TimeUnit}
trait LinkisJobBuilder[Job <: LinkisJob] {
protected var executeUser: String = _
- protected var jobContent: util.Map[String, Any] = _
- protected var labels: util.Map[String, Any] = _
- protected var params: util.Map[String, Any] = _
- protected var source: util.Map[String, Any] = _
+ protected var jobContent: util.Map[String, AnyRef] = _
+ protected var labels: util.Map[String, AnyRef] = _
+ protected var params: util.Map[String, AnyRef] = _
+ protected var source: util.Map[String, AnyRef] = _
protected def ensureNotNull(obj: Any, errorMsg: String): Unit = if (obj ==
null) {
throw new UJESJobException(s"$errorMsg cannot be null.")
@@ -51,80 +51,82 @@ trait LinkisJobBuilder[Job <: LinkisJob] {
this
}
- def setJobContent(jobContent: util.Map[String, Any]): this.type = {
+ def setJobContent(jobContent: util.Map[String, AnyRef]): this.type = {
this.jobContent = jobContent
this
}
- def addJobContent(key: String, value: Any): this.type = {
- if (jobContent == null) jobContent = new util.HashMap[String, Any]
+ def addJobContent(key: String, value: AnyRef): this.type = {
+ if (jobContent == null) jobContent = new util.HashMap[String, AnyRef]
jobContent.put(key, value)
this
}
- def setLabels(labels: util.Map[String, Any]): this.type = {
+ def setLabels(labels: util.Map[String, AnyRef]): this.type = {
this.labels = labels
this
}
- def addLabel(key: String, value: Any): this.type = {
- if (labels == null) labels = new util.HashMap[String, Any]
+ def addLabel(key: String, value: AnyRef): this.type = {
+ if (labels == null) labels = new util.HashMap[String, AnyRef]
labels.put(key, value)
this
}
- def setParams(params: util.Map[String, Any]): this.type = {
+ def setParams(params: util.Map[String, AnyRef]): this.type = {
this.synchronized(this.params = params)
this
}
- def setSource(source: util.Map[String, Any]): this.type = {
+ def setSource(source: util.Map[String, AnyRef]): this.type = {
this.synchronized(this.source = source)
this
}
- def addSource(key: String, value: Any): this.type = {
- if (source == null) source = new util.HashMap[String, Any]
+ def addSource(key: String, value: AnyRef): this.type = {
+ if (source == null) source = new util.HashMap[String, AnyRef]
source.put(key, value)
this
}
- def setStartupParams(startupMap: util.Map[String, Any]): this.type = {
+ def setStartupParams(startupMap: util.Map[String, AnyRef]): this.type = {
if (this.params == null) this synchronized {
- if (this.params == null) this.params = new util.HashMap[String, Any]
+ if (this.params == null) this.params = new util.HashMap[String, AnyRef]
}
TaskUtils.addStartupMap(this.params, startupMap)
this
}
- def addStartupParam(key: String, value: Any): this.type = addToMap(key,
value, setStartupParams)
+ def addStartupParam(key: String, value: AnyRef): this.type =
+ addToMap(key, value, setStartupParams)
- def setRuntimeParams(runtimeMap: util.Map[String, Any]): this.type = {
+ def setRuntimeParams(runtimeMap: util.Map[String, AnyRef]): this.type = {
if (this.params == null) this synchronized {
- if (this.params == null) this.params = new util.HashMap[String, Any]
+ if (this.params == null) this.params = new util.HashMap[String, AnyRef]
}
TaskUtils.addRuntimeMap(this.params, runtimeMap)
this
}
- def addRuntimeParam(key: String, value: Any): this.type = addToMap(key,
value, setRuntimeParams)
+ def addRuntimeParam(key: String, value: AnyRef): this.type =
+ addToMap(key, value, setRuntimeParams)
- def setVariableMap(variableMap: util.Map[String, Any]): this.type = {
+ def setVariableMap(variableMap: util.Map[String, AnyRef]): this.type = {
if (this.params == null) this synchronized {
- if (this.params == null) this.params = new util.HashMap[String, Any]
+ if (this.params == null) this.params = new util.HashMap[String, AnyRef]
}
TaskUtils.addVariableMap(this.params, variableMap)
this
}
- def addVariable(key: String, value: Any): this.type = addToMap(key, value,
setVariableMap)
+ def addVariable(key: String, value: AnyRef): this.type = addToMap(key,
value, setVariableMap)
protected def addToMap(
key: String,
- value: Any,
- op: util.Map[String, Any] => this.type
+ value: AnyRef,
+ op: util.Map[String, AnyRef] => this.type
): this.type = {
- val map = new util.HashMap[String, Any]
+ val map = new util.HashMap[String, AnyRef]
map.put(key, value)
op(map)
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJobBuilder.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJobBuilder.scala
index 103437ccc..dc4451ff0 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJobBuilder.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJobBuilder.scala
@@ -60,15 +60,12 @@ class SimpleOnceJobBuilder private[simple] () extends
LinkisJobBuilder[Submittab
}
protected def getOnceExecutorContent: String = {
- implicit def toMap(map: util.Map[String, Any]): util.Map[String, Object] =
map.map {
- case (k, v) => k -> v.asInstanceOf[Object]
- }
val onceExecutorContent = new OnceExecutorContent
- onceExecutorContent.setSourceMap(source.map { case (k, v) => k ->
v.asInstanceOf[Object] })
+ onceExecutorContent.setSourceMap(source.map { case (k, v) => k -> v })
onceExecutorContent.setVariableMap(TaskUtils.getVariableMap(params))
onceExecutorContent.setRuntimeMap(TaskUtils.getRuntimeMap(params))
onceExecutorContent.setJobContent(jobContent)
- onceExecutorContent.setExtraLabels(new util.HashMap[String, Object]) //
TODO Set it if needed
+ onceExecutorContent.setExtraLabels(new util.HashMap[String, AnyRef]) //
TODO Set it if needed
val contentMap = OnceExecutorContentUtils.contentToMap(onceExecutorContent)
val bytes = DWSHttpClient.jacksonJson.writeValueAsBytes(contentMap)
val response =
@@ -80,10 +77,10 @@ class SimpleOnceJobBuilder private[simple] () extends
LinkisJobBuilder[Submittab
ensureNotNull(labels, "labels")
ensureNotNull(jobContent, "jobContent")
nullThenSet(params) {
- params = new util.HashMap[String, Any]
+ params = new util.HashMap[String, AnyRef]
}
nullThenSet(source) {
- source = new util.HashMap[String, Any]()
+ source = new util.HashMap[String, AnyRef]()
}
addStartupParam("label." + LabelKeyConstant.CODE_TYPE_KEY,
jobContent.get("runType"))
if
(!labels.containsKey(SimpleOnceJobBuilder.ONCE_ENGINE_CONN_MODE_LABEL_KEY)) {
@@ -91,7 +88,7 @@ class SimpleOnceJobBuilder private[simple] () extends
LinkisJobBuilder[Submittab
}
val properties = new util.HashMap[String, String]
properties.put(OnceExecutorContentUtils.ONCE_EXECUTOR_CONTENT_KEY,
getOnceExecutorContent)
- properties.putAll(TaskUtils.getStartupMap(params))
+
properties.putAll(TaskUtils.getStartupMap(params).asInstanceOf[util.Map[String,
String]])
val createEngineConnAction = CreateEngineConnAction
.newBuilder()
.setCreateService(createService)
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnDiagnosisOperator.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnDiagnosisOperator.scala
index 02d875aa9..e0907864d 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnDiagnosisOperator.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnDiagnosisOperator.scala
@@ -22,9 +22,9 @@ import
org.apache.linkis.computation.client.operator.OnceJobOperator
import java.util
-class EngineConnDiagnosisOperator extends OnceJobOperator[util.Map[String,
Object]] {
+class EngineConnDiagnosisOperator extends OnceJobOperator[util.Map[String,
AnyRef]] {
- override protected def resultToObject(result: EngineConnOperateResult):
util.Map[String, Object] =
+ override protected def resultToObject(result: EngineConnOperateResult):
util.Map[String, AnyRef] =
result.getAs("diagnosis")
override def getName: String = EngineConnDiagnosisOperator.OPERATOR_NAME
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnMetricsOperator.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnMetricsOperator.scala
index 82af7f6ad..1e873dfd4 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnMetricsOperator.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnMetricsOperator.scala
@@ -22,11 +22,11 @@ import
org.apache.linkis.computation.client.operator.OnceJobOperator
import java.util
-class EngineConnMetricsOperator extends OnceJobOperator[util.Map[String,
Object]] {
+class EngineConnMetricsOperator extends OnceJobOperator[util.Map[String,
AnyRef]] {
override protected def resultToObject(
result: EngineConnOperateResult
- ): util.Map[String, Object] = {
+ ): util.Map[String, AnyRef] = {
result.getAs("metrics")
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnProgressOperator.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnProgressOperator.scala
index bc5ec87f5..e89c583ff 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnProgressOperator.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/operator/impl/EngineConnProgressOperator.scala
@@ -30,7 +30,7 @@ class EngineConnProgressOperator extends
OnceJobOperator[EngineConnProgressInfo]
override def getName: String = EngineConnProgressOperator.OPERATOR_NAME
override protected def resultToObject(result: EngineConnOperateResult):
EngineConnProgressInfo = {
- val progressInfoList: util.ArrayList[util.Map[String, Object]] =
result.getAs("progressInfo")
+ val progressInfoList: util.ArrayList[util.Map[String, AnyRef]] =
result.getAs("progressInfo")
val progressInfo = progressInfoList.asScala
.map(map =>
JobProgressInfo(
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala
index 16acb5d92..a5c55a6e0 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobExecuteAction.scala
@@ -51,9 +51,9 @@ object JobExecuteAction {
private var runTypeStr: String = _
private var scriptPath: String = _
- private var params: util.Map[String, Any] = _
+ private var params: util.Map[String, AnyRef] = _
- private var source: util.Map[String, Any] = _
+ private var source: util.Map[String, AnyRef] = _
def setUser(user: String): Builder = {
this.user = user
@@ -100,44 +100,42 @@ object JobExecuteAction {
this
}
- def setParams(params: util.Map[String, Any]): Builder = {
+ def setParams(params: util.Map[String, AnyRef]): Builder = {
this.synchronized(this.params = params)
this
}
- def setSource(source: util.Map[String, Any]): Builder = {
+ def setSource(source: util.Map[String, AnyRef]): Builder = {
this.synchronized(this.source = source)
this
}
- def setStartupParams(startupMap: util.Map[String, Any]): Builder = {
- if (this.params == null) this synchronized {
- if (this.params == null) this.params = new util.HashMap[String, Any]
- }
+ def setStartupParams(startupMap: util.Map[String, AnyRef]): Builder = {
+ initParams
TaskUtils.addStartupMap(this.params, startupMap)
this
}
- def setRuntimeParams(runtimeMap: util.Map[String, Any]): Builder = {
+ private def initParams(): Unit = {
if (this.params == null) this synchronized {
- if (this.params == null) this.params = new util.HashMap[String, Any]
+ if (this.params == null) this.params = new util.HashMap[String, AnyRef]
}
+ }
+
+ def setRuntimeParams(runtimeMap: util.Map[String, AnyRef]): Builder = {
+ initParams
TaskUtils.addRuntimeMap(this.params, runtimeMap)
this
}
- def setSpecialParams(specialMap: util.Map[String, Any]): Builder = {
- if (this.params == null) this synchronized {
- if (this.params == null) this.params = new util.HashMap[String, Any]
- }
+ def setSpecialParams(specialMap: util.Map[String, AnyRef]): Builder = {
+ initParams
TaskUtils.addSpecialMap(this.params, specialMap)
this
}
- def setVariableMap(variableMap: util.Map[String, Any]): Builder = {
- if (this.params == null) this synchronized {
- if (this.params == null) this.params = new util.HashMap[String, Any]
- }
+ def setVariableMap(variableMap: util.Map[String, AnyRef]): Builder = {
+ initParams
TaskUtils.addVariableMap(this.params, variableMap)
this
}
@@ -173,9 +171,9 @@ object JobExecuteAction {
}
executeAction.addRequestPayload(TaskConstant.EXECUTIONCODE, executeCode)
executeAction.addRequestPayload(TaskConstant.SCRIPTPATH, scriptPath)
- if (params == null) params = new util.HashMap[String, Any]()
+ initParams
executeAction.addRequestPayload(TaskConstant.PARAMS, params)
- if (this.source == null) this.source = new util.HashMap[String, Any]()
+ if (this.source == null) this.source = new util.HashMap[String, AnyRef]()
executeAction.addRequestPayload(TaskConstant.SOURCE, this.source)
executeAction
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala
index a42273f8c..f96c6227f 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/JobSubmitAction.scala
@@ -42,24 +42,24 @@ object JobSubmitAction {
// TODO: remove executeUser in the future
private var executeUser: String = _
- private var executionContent: util.Map[String, Any] = _
+ private var executionContent: util.Map[String, AnyRef] = _
private var formatCode: Boolean = false
- private var labels: util.Map[String, Any] = _
+ private var labels: util.Map[String, AnyRef] = _
- private var params: util.Map[String, Any] = _
+ private var params: util.Map[String, AnyRef] = _
- private var source: util.Map[String, Any] = _
+ private var source: util.Map[String, AnyRef] = _
def addExecuteCode(executeCode: String): Builder = {
- if (null == executionContent) executionContent = new
util.HashMap[String, Any]()
+ if (null == executionContent) executionContent = new
util.HashMap[String, AnyRef]()
executionContent.put("code", executeCode)
this
}
def setRunTypeStr(runTypeStr: String): Builder = {
- if (null == executionContent) executionContent = new
util.HashMap[String, Any]()
+ if (null == executionContent) executionContent = new
util.HashMap[String, AnyRef]()
executionContent.put("runType", runTypeStr)
this
}
@@ -79,54 +79,52 @@ object JobSubmitAction {
this
}
- def setExecutionContent(executionContent: util.Map[String, Any]): Builder
= {
+ def setExecutionContent(executionContent: util.Map[String, AnyRef]):
Builder = {
this.executionContent = executionContent
this
}
- def setLabels(labels: util.Map[String, Any]): Builder = {
+ def setLabels(labels: util.Map[String, AnyRef]): Builder = {
this.labels = labels
this
}
- def setParams(params: util.Map[String, Any]): Builder = {
+ def setParams(params: util.Map[String, AnyRef]): Builder = {
this.synchronized(this.params = params)
this
}
- def setSource(source: util.Map[String, Any]): Builder = {
+ def setSource(source: util.Map[String, AnyRef]): Builder = {
this.synchronized(this.source = source)
this
}
- def setStartupParams(startupMap: util.Map[String, Any]): Builder = {
- if (this.params == null) this synchronized {
- if (this.params == null) this.params = new util.HashMap[String, Any]
- }
+ def setStartupParams(startupMap: util.Map[String, AnyRef]): Builder = {
+ initParams
TaskUtils.addStartupMap(this.params, startupMap)
this
}
- def setRuntimeParams(runtimeMap: util.Map[String, Any]): Builder = {
+ private def initParams(): Unit = {
if (this.params == null) this synchronized {
- if (this.params == null) this.params = new util.HashMap[String, Any]
+ if (this.params == null) this.params = new util.HashMap[String, AnyRef]
}
+ }
+
+ def setRuntimeParams(runtimeMap: util.Map[String, AnyRef]): Builder = {
+ initParams
TaskUtils.addRuntimeMap(this.params, runtimeMap)
this
}
- def setSpecialParams(specialMap: util.Map[String, Any]): Builder = {
- if (this.params == null) this synchronized {
- if (this.params == null) this.params = new util.HashMap[String, Any]
- }
+ def setSpecialParams(specialMap: util.Map[String, AnyRef]): Builder = {
+ initParams
TaskUtils.addSpecialMap(this.params, specialMap)
this
}
- def setVariableMap(variableMap: util.Map[String, Any]): Builder = {
- if (this.params == null) this synchronized {
- if (this.params == null) this.params = new util.HashMap[String, Any]
- }
+ def setVariableMap(variableMap: util.Map[String, AnyRef]): Builder = {
+ initParams
TaskUtils.addVariableMap(this.params, variableMap)
this
}
@@ -140,12 +138,12 @@ object JobSubmitAction {
throw new UJESClientBuilderException("executionContent is needed!")
}
submitAction.addRequestPayload(TaskConstant.EXECUTION_CONTENT,
executionContent)
- if (params == null) params = new util.HashMap[String, Any]()
+ if (params == null) params = new util.HashMap[String, AnyRef]()
submitAction.addRequestPayload(TaskConstant.PARAMS, params)
- if (this.source == null) this.source = new util.HashMap[String, Any]()
+ if (this.source == null) this.source = new util.HashMap[String, AnyRef]()
submitAction.addRequestPayload(TaskConstant.SOURCE, this.source)
- if (this.labels == null) this.labels = new util.HashMap[String, Any]()
+ if (this.labels == null) this.labels = new util.HashMap[String, AnyRef]()
submitAction.addRequestPayload(TaskConstant.LABELS, this.labels)
submitAction
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/EmsListResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/EmsListResult.scala
index fcc6925cd..7a42fc6e7 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/EmsListResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/EmsListResult.scala
@@ -28,7 +28,7 @@ import scala.beans.BeanProperty
class EmsListResult extends DWSResult {
@BeanProperty
- var tasks: util.ArrayList[util.Map[String, Object]] = _
+ var tasks: util.ArrayList[util.Map[String, AnyRef]] = _
@BeanProperty
var totalPage: Int = _
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetColumnsResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetColumnsResult.scala
index 3ef024bf0..92a428210 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetColumnsResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetColumnsResult.scala
@@ -27,5 +27,5 @@ import scala.beans.BeanProperty
@DWSHttpMessageResult("/api/rest_j/v\\d+/datasource/columns")
class GetColumnsResult extends DWSResult with UserAction {
- @BeanProperty var columns: util.List[util.Map[String, Object]] = _
+ @BeanProperty var columns: util.List[util.Map[String, AnyRef]] = _
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetTableBaseInfoResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetTableBaseInfoResult.scala
index 6d4008206..f10f664b3 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetTableBaseInfoResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetTableBaseInfoResult.scala
@@ -19,7 +19,6 @@ package org.apache.linkis.ujes.client.request
import org.apache.linkis.httpclient.dws.annotation.DWSHttpMessageResult
import org.apache.linkis.httpclient.dws.response.DWSResult
-import org.apache.linkis.ujes.client.request.UserAction
import java.util
@@ -27,5 +26,5 @@ import scala.beans.BeanProperty
@DWSHttpMessageResult("/api/rest_j/v\\d+/datasource/getTableBaseInfo")
class GetTableBaseInfoResult extends DWSResult with UserAction {
- @BeanProperty var tableBaseInfo: util.Map[String, Object] = _
+ @BeanProperty var tableBaseInfo: util.Map[String, AnyRef] = _
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetTablesResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetTablesResult.scala
index 9a1c22772..33fdc8396 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetTablesResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/GetTablesResult.scala
@@ -27,5 +27,5 @@ import scala.beans.BeanProperty
@DWSHttpMessageResult("/api/rest_j/v\\d+/datasource/tables")
class GetTablesResult extends DWSResult with UserAction {
- @BeanProperty var tables: util.List[util.Map[String, Object]] = _
+ @BeanProperty var tables: util.List[util.Map[String, AnyRef]] = _
}
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobListResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobListResult.scala
index f228bf1ca..3ee06de98 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobListResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/JobListResult.scala
@@ -28,7 +28,7 @@ import scala.beans.BeanProperty
class JobListResult extends DWSResult {
@BeanProperty
- var tasks: util.ArrayList[util.Map[String, Object]] = _
+ var tasks: util.ArrayList[util.Map[String, AnyRef]] = _
@BeanProperty
var totalPage: Int = _
diff --git
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetListResult.scala
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetListResult.scala
index f6fc94456..9fcbb9323 100644
---
a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetListResult.scala
+++
b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/ResultSetListResult.scala
@@ -29,14 +29,14 @@ import scala.collection.JavaConverters._
@DWSHttpMessageResult("/api/rest_j/v\\d+/filesystem/getDirFileTrees")
class ResultSetListResult extends DWSResult with UserAction {
- @BeanProperty var dirFileTrees: util.Map[String, Object] = _
+ @BeanProperty var dirFileTrees: util.Map[String, AnyRef] = _
- def getResultSetList: Array[String] = if (dirFileTrees != null)
+ def getResultSetList: Array[String] = if (dirFileTrees != null) {
dirFileTrees.get("children") match {
- case list: util.List[util.Map[String, Object]] =>
+ case list: util.List[util.Map[_, _]] =>
list.asScala.map(_.get("path").asInstanceOf[String]).toArray
case _ => Array.empty[String]
}
- else Array.empty[String]
+ } else Array.empty[String]
}
diff --git
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala
index b76629a22..6c8c876c3 100644
---
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala
+++
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.scala
@@ -20,7 +20,6 @@ package org.apache.linkis.ecm.server.operator
import org.apache.linkis.DataWorkCloudApplication
import org.apache.linkis.common.conf.CommonVars
import org.apache.linkis.common.utils.{Logging, Utils}
-import org.apache.linkis.ecm.core.conf.ECMErrorCode
import org.apache.linkis.ecm.errorcode.EngineconnServerErrorCodeSummary._
import org.apache.linkis.ecm.server.conf.ECMConfiguration
import org.apache.linkis.ecm.server.exception.ECMErrorException
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/EngineConnPlugin.scala
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/EngineConnPlugin.scala
index 6511a7624..d8562c9d1 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/EngineConnPlugin.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/EngineConnPlugin.scala
@@ -26,7 +26,7 @@ import java.util
trait EngineConnPlugin {
- def init(params: util.Map[String, Any])
+ def init(params: util.Map[String, AnyRef])
def getEngineResourceFactory: EngineResourceFactory
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/job/EntranceExecutionJob.java
b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/job/EntranceExecutionJob.java
index 1f5babec9..ad9c698a4 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/job/EntranceExecutionJob.java
+++
b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/job/EntranceExecutionJob.java
@@ -118,7 +118,7 @@ public class EntranceExecutionJob extends EntranceJob
implements LogHandler {
@Override
public ExecuteRequest jobToExecuteRequest() throws EntranceErrorException {
// add resultSet path root
- Map<String, String> starupMapTmp = new HashMap<String, String>();
+ Map<String, String> starupMapTmp = new HashMap<>();
Map<String, Object> starupMapOri = TaskUtils.getStartupMap(getParams());
if (starupMapOri.isEmpty()) {
TaskUtils.addStartupMap(getParams(), starupMapOri);
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceParser.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceParser.scala
index 311b2f132..234399879 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceParser.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceParser.scala
@@ -18,7 +18,6 @@
package org.apache.linkis.entrance
import org.apache.linkis.common.exception.ErrorException
-import org.apache.linkis.entrance.execute.EntranceJob
import org.apache.linkis.governance.common.entity.job.JobRequest
import org.apache.linkis.scheduler.queue.Job
@@ -28,7 +27,7 @@ abstract class EntranceParser {
def setEntranceContext(entranceContext: EntranceContext): Unit
@throws[ErrorException]
- def parseToTask(params: java.util.Map[String, Any]): JobRequest
+ def parseToTask(params: java.util.Map[String, AnyRef]): JobRequest
@throws[ErrorException]
def parseToJob(jobReq: JobRequest): Job
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
index 2b3a75377..8b7d0d301 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
@@ -56,7 +56,7 @@ abstract class EntranceServer extends Logging {
* @param params
* @return
*/
- def execute(params: java.util.Map[String, Any]): Job = {
+ def execute(params: java.util.Map[String, AnyRef]): Job = {
if (!params.containsKey(EntranceServer.DO_NOT_PRINT_PARAMS_LOG)) {
logger.debug("received a request: " + params)
} else params.remove(EntranceServer.DO_NOT_PRINT_PARAMS_LOG)
@@ -111,7 +111,7 @@ abstract class EntranceServer extends Logging {
t.setErrorDesc(error.getDesc)
t.setStatus(SchedulerEventState.Failed.toString)
t.setProgress(EntranceJob.JOB_COMPLETED_PROGRESS.toString)
- val infoMap = new util.HashMap[String, Object]
+ val infoMap = new util.HashMap[String, AnyRef]
infoMap.put(TaskConstant.ENGINE_INSTANCE, "NULL")
infoMap.put("message", "Task interception failed and cannot be
retried")
JobHistoryHelper.updateJobRequestMetrics(jobRequest, null, infoMap)
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala
index 59dc42475..714b9f0cc 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala
@@ -175,9 +175,8 @@ class EntranceWebSocketService
}
def dealExecute(event: ServerEvent): Message = {
- val params = event.getData.map { case (k, v) =>
- k -> v.asInstanceOf[Any]
- } // TODO Convert to a suitable Map(转换成合适的Map)
+ // TODO Convert to a suitable Map(转换成合适的Map)
+ val params = event.getData
val websocketTag = event.getWebsocketTag
params.put(TaskConstant.EXECUTE_USER, event.getUser)
val job = entranceServer.execute(params)
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/cs/CSEntranceHelper.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/cs/CSEntranceHelper.scala
index 5eca0a139..3fc384844 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/cs/CSEntranceHelper.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/cs/CSEntranceHelper.scala
@@ -47,7 +47,7 @@ import scala.collection.JavaConverters._
object CSEntranceHelper extends Logging {
- def getContextInfo(params: util.Map[String, Any]): (String, String) = {
+ def getContextInfo(params: util.Map[String, AnyRef]): (String, String) = {
val runtimeMap = params.get(TaskConstant.PARAMS_CONFIGURATION) match {
case map: util.Map[String, AnyRef] =>
map.get(TaskConstant.PARAMS_CONFIGURATION_RUNTIME)
@@ -65,7 +65,7 @@ object CSEntranceHelper extends Logging {
(null, null)
}
- def setContextInfo(params: util.Map[String, Any], copyMap: util.Map[String,
String]): Unit = {
+ def setContextInfo(params: util.Map[String, AnyRef], copyMap:
util.Map[String, String]): Unit = {
val (contextIDValueStr, nodeNameStr) = getContextInfo(params)
if (StringUtils.isNotBlank(contextIDValueStr)) {
copyMap.put(CSCommonUtils.CONTEXT_ID_STR, contextIDValueStr)
@@ -117,9 +117,7 @@ object CSEntranceHelper extends Logging {
*/
def initNodeCSInfo(requestPersistTask: JobRequest): Unit = {
- val (contextIDValueStr, nodeNameStr) = getContextInfo(
- requestPersistTask.getParams.asInstanceOf[util.Map[String, Any]]
- )
+ val (contextIDValueStr, nodeNameStr) =
getContextInfo(requestPersistTask.getParams)
if (StringUtils.isNotBlank(contextIDValueStr) &&
StringUtils.isNotBlank(nodeNameStr)) {
logger.info("init node({}) cs info", nodeNameStr)
@@ -136,9 +134,7 @@ object CSEntranceHelper extends Logging {
*/
def resetCreator(requestPersistTask: JobRequest): Unit = {
- val (contextIDValueStr, nodeNameStr) = getContextInfo(
- requestPersistTask.getParams.asInstanceOf[util.Map[String, Any]]
- )
+ val (contextIDValueStr, nodeNameStr) =
getContextInfo(requestPersistTask.getParams)
if (StringUtils.isNotBlank(contextIDValueStr) &&
StringUtils.isNotBlank(nodeNameStr)) {
val userCreatorLabel =
LabelUtil.getUserCreatorLabel(requestPersistTask.getLabels)
@@ -177,10 +173,8 @@ object CSEntranceHelper extends Logging {
* @return
*/
def addCSVariable(requestPersistTask: JobRequest): Unit = {
- val variableMap = new util.HashMap[String, Any]()
- val (contextIDValueStr, nodeNameStr) = getContextInfo(
- requestPersistTask.getParams.asInstanceOf[util.Map[String, Any]]
- )
+ val variableMap = new util.HashMap[String, AnyRef]()
+ val (contextIDValueStr, nodeNameStr) =
getContextInfo(requestPersistTask.getParams)
if (StringUtils.isNotBlank(contextIDValueStr)) {
logger.info("parse variable nodeName: {}", nodeNameStr)
@@ -194,16 +188,13 @@ object CSEntranceHelper extends Logging {
if (!variableMap.isEmpty) {
// 1.cs priority is low, the same ones are not added
val varMap =
-
TaskUtils.getVariableMap(requestPersistTask.getParams.asInstanceOf[util.Map[String,
Any]])
+ TaskUtils.getVariableMap(requestPersistTask.getParams)
variableMap.asScala.foreach { keyAndValue =>
if (!varMap.containsKey(keyAndValue._1)) {
varMap.put(keyAndValue._1, keyAndValue._2)
}
}
- TaskUtils.addVariableMap(
- requestPersistTask.getParams.asInstanceOf[util.Map[String, Any]],
- varMap
- )
+ TaskUtils.addVariableMap(requestPersistTask.getParams, varMap)
}
logger.info("parse variable end nodeName: {}", nodeNameStr)
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala
index 739ed2d0b..d2b6d0efc 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala
@@ -199,7 +199,7 @@ class DefaultEntranceExecutor(id: Long)
jobReqBuilder.setCodeLogicalUnit(codeLogicalUnit)
jobReqBuilder.setLabels(entranceExecuteRequest.getLabels)
jobReqBuilder.setExecuteUser(entranceExecuteRequest.executeUser())
-
jobReqBuilder.setParams(entranceExecuteRequest.properties().asInstanceOf[util.Map[String,
Any]])
+ jobReqBuilder.setParams(entranceExecuteRequest.properties())
jobReqBuilder.build()
}
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceJob.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceJob.scala
index ae414c3c8..5246ead4f 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceJob.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceJob.scala
@@ -50,7 +50,7 @@ abstract class EntranceJob extends Job {
var user: String = _
@BeanProperty
- var params: util.Map[String, Any] = new util.HashMap[String, Any](1)
+ var params: util.Map[String, AnyRef] = new util.HashMap[String, AnyRef](4)
@BeanProperty
var jobRequest: JobRequest = _
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/JobLockExecuteRequest.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/JobLockExecuteRequest.scala
index 482d76bd4..7a2439b02 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/JobLockExecuteRequest.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/JobLockExecuteRequest.scala
@@ -32,7 +32,7 @@ trait StorePathExecuteRequest {
}
trait RuntimePropertiesExecuteRequest {
- val properties: java.util.Map[String, Object]
+ val properties: java.util.Map[String, AnyRef]
}
trait UserExecuteRequest {
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/EntranceInterceptor.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/EntranceInterceptor.scala
index 19c142149..1cfc89b3e 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/EntranceInterceptor.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/EntranceInterceptor.scala
@@ -19,16 +19,14 @@ package org.apache.linkis.entrance.interceptor
import org.apache.linkis.common.exception.ErrorException
import org.apache.linkis.governance.common.entity.job.JobRequest
-import org.apache.linkis.governance.common.protocol.job.JobReq
-import org.apache.linkis.protocol.task.Task
trait EntranceInterceptor {
/**
* The apply function is to supplement the information of the incoming
parameter task, making the
- * content of this task more complete. * Additional information includes:
database information
+ * content of this task more complete. Additional information includes:
database information
* supplement, custom variable substitution, code check, limit limit, etc.
- * apply函数是对传入参数task进行信息的补充，使得这个task的内容更加完整。 补充的信息包括:
数据库信息补充、自定义变量替换、代码检查、limit限制等
+ * apply函数是对传入参数task进行信息的补充，使得这个task的内容更加完整。 补充的信息包括:
数据库信息补充、自定义变量替换、代码检查、limit限制等。
*
* @param task
* @param logAppender
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/OnceJobInterceptor.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/OnceJobInterceptor.scala
index 2f8953c34..1291a8566 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/OnceJobInterceptor.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/OnceJobInterceptor.scala
@@ -45,7 +45,7 @@ class OnceJobInterceptor extends EntranceInterceptor {
/**
* The apply function is to supplement the information of the incoming
parameter task, making the
- * content of this task more complete. * Additional information includes:
database information
+ * content of this task more complete. Additional information includes:
database information
* supplement, custom variable substitution, code check, limit limit, etc.
* apply函数是对传入参数task进行信息的补充，使得这个task的内容更加完整。 补充的信息包括:
数据库信息补充、自定义变量替换、代码检查、limit限制等
*
@@ -65,17 +65,15 @@ class OnceJobInterceptor extends EntranceInterceptor {
jobLabel.setJobId(task.getId.toString)
task.getLabels.add(jobLabel)
val onceExecutorContent = new OnceExecutorContent
- val params = task.getParams.map { case (k, v) => k -> v.asInstanceOf[Any] }
- implicit def toMap(map: util.Map[String, Any]): util.Map[String, Object] =
map.map {
- case (k, v) => k -> v.asInstanceOf[Object]
- }
+ val params = task.getParams
+
onceExecutorContent.setSourceMap(task.getSource.map { case (k, v) =>
k -> v.asInstanceOf[Object]
})
onceExecutorContent.setVariableMap(TaskUtils.getVariableMap(params))
onceExecutorContent.setRuntimeMap(TaskUtils.getRuntimeMap(params))
onceExecutorContent.setJobContent(getJobContent(task))
- onceExecutorContent.setExtraLabels(new util.HashMap[String, Object]) //
TODO Set it if needed
+ onceExecutorContent.setExtraLabels(new util.HashMap[String, AnyRef]) //
TODO Set it if needed
val contentMap = OnceExecutorContentUtils.contentToMap(onceExecutorContent)
val bytes = BDPJettyServerHelper.jacksonJson.writeValueAsBytes(contentMap)
val response = bmlClient.uploadResource(
@@ -87,7 +85,7 @@ class OnceJobInterceptor extends EntranceInterceptor {
OnceExecutorContentUtils.resourceToValue(BmlResource(response.resourceId,
response.version))
TaskUtils.addStartupMap(
params,
- Map(OnceExecutorContentUtils.ONCE_EXECUTOR_CONTENT_KEY ->
value.asInstanceOf[Any])
+ Map(OnceExecutorContentUtils.ONCE_EXECUTOR_CONTENT_KEY ->
value.asInstanceOf[Object])
)
task
}
@@ -95,9 +93,9 @@ class OnceJobInterceptor extends EntranceInterceptor {
protected def getFilePath(task: JobRequest): String =
s"/tmp/${task.getExecuteUser}/${task.getId}"
- protected def getJobContent(task: JobRequest): util.Map[String, Object] = {
+ protected def getJobContent(task: JobRequest): util.Map[String, AnyRef] = {
// TODO Wait for optimizing since the class `JobRequest` is waiting for
optimizing .
- val jobContent = new util.HashMap[String, Object]
+ val jobContent = new util.HashMap[String, AnyRef]
jobContent.put(TaskConstant.CODE, task.getExecutionCode)
task.getLabels.foreach {
case label: CodeLanguageLabel =>
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CompatibleInterceptor.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CompatibleInterceptor.scala
index c86039f05..74638772c 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CompatibleInterceptor.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CompatibleInterceptor.scala
@@ -22,7 +22,7 @@ import
org.apache.linkis.entrance.interceptor.EntranceInterceptor
import org.apache.linkis.governance.common.entity.job.JobRequest
import org.apache.linkis.protocol.utils.TaskUtils
-import java.{lang, util}
+import java.lang
/**
* Compatible with linkis 0.X client
@@ -33,7 +33,7 @@ class CompatibleInterceptor extends EntranceInterceptor with
Logging {
private val newQueueKey = "wds.linkis.rm.yarnqueue"
override def apply(task: JobRequest, logAppender: lang.StringBuilder):
JobRequest = {
- val startMap =
TaskUtils.getStartupMap(task.getParams.asInstanceOf[util.Map[String, Any]])
+ val startMap = TaskUtils.getStartupMap(task.getParams)
if (null != startMap && startMap.containsKey(oldQueueKey)) {
logger.info(
s"Compatible with queue parameters, the queue $newQueueKey will be set
to ${startMap.get(oldQueueKey)}"
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala
index 61ba81664..7a7cb7463 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/CustomVariableUtils.scala
@@ -31,8 +31,6 @@ import org.apache.linkis.rpc.Sender
import java.util
-import scala.collection.JavaConverters._
-
object CustomVariableUtils extends Logging {
/**
@@ -64,10 +62,9 @@ object CustomVariableUtils extends Logging {
variables.putAll(keyAndValue)
}
val variableMap = TaskUtils
- .getVariableMap(jobRequest.getParams.asInstanceOf[util.Map[String, Any]])
- .asScala
- .map { case (k, v) => k -> v.asInstanceOf[String] }
- variables.putAll(variableMap.asJava)
+ .getVariableMap(jobRequest.getParams)
+ .asInstanceOf[util.HashMap[String, String]]
+ variables.putAll(variableMap)
if (!variables.containsKey("user")) {
variables.put("user", jobRequest.getExecuteUser)
}
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/ParserVarLabelInterceptor.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/ParserVarLabelInterceptor.scala
index b0f4b2db3..020a0659f 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/ParserVarLabelInterceptor.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/ParserVarLabelInterceptor.scala
@@ -38,7 +38,7 @@ class ParserVarLabelInterceptor extends EntranceInterceptor {
tenantLabel.setTenant(variableMap.get(LabelKeyConstant.TENANT_KEY).toString)
labels.add(tenantLabel)
}
- case _ => jobRequest
+ case _ =>
}
jobRequest
}
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala
index bbd63daa4..d05dce4bc 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala
@@ -61,21 +61,20 @@ class StorePathEntranceInterceptor extends
EntranceInterceptor with Logging {
// multi linkis cluster should not use same root folder , in which case
result file may be overwrite
parentPath += DateFormatUtils.format(System.currentTimeMillis,
"yyyy-MM-dd/HHmmss") + "/" +
userCreator._2 + "/" + jobReq.getId
- val paramsMap = {
- val map = new util.HashMap[String, Any]()
- if (null != jobReq.getParams) {
- jobReq.getParams.asScala.foreach(kv => map.put(kv._1,
kv._2.asInstanceOf[Any]))
- }
- map
+ val paramsMap = if (null != jobReq.getParams) {
+ jobReq.getParams
+ } else {
+ new util.HashMap[String, AnyRef]()
}
+
var runtimeMap = TaskUtils.getRuntimeMap(paramsMap)
if (null == runtimeMap || runtimeMap.isEmpty) {
- runtimeMap = new util.HashMap[String, Any]()
+ runtimeMap = new util.HashMap[String, AnyRef]()
}
runtimeMap.put(GovernanceCommonConf.RESULT_SET_STORE_PATH.key, parentPath)
TaskUtils.addRuntimeMap(paramsMap, runtimeMap)
- val params = new util.HashMap[String, Object]()
- paramsMap.asScala.foreach(kv => params.put(kv._1,
kv._2.asInstanceOf[Object]))
+ val params = new util.HashMap[String, AnyRef]()
+ paramsMap.asScala.foreach(kv => params.put(kv._1, kv._2))
jobReq.setResultLocation(parentPath)
jobReq.setParams(params)
jobReq
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/parser/CommonEntranceParser.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/parser/CommonEntranceParser.scala
index e230bbc78..5108a7bf4 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/parser/CommonEntranceParser.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/parser/CommonEntranceParser.scala
@@ -54,7 +54,7 @@ class CommonEntranceParser(val persistenceManager:
PersistenceManager)
/**
* parse params to be a task params json data from frontend
*/
- override def parseToTask(params: util.Map[String, Any]): JobRequest = {
+ override def parseToTask(params: util.Map[String, AnyRef]): JobRequest = {
if (!params.containsKey(TaskConstant.EXECUTION_CONTENT)) {
return parseToOldTask(params)
}
@@ -73,13 +73,13 @@ class CommonEntranceParser(val persistenceManager:
PersistenceManager)
// 2. parse params
val executionContent = params
.getOrDefault(TaskConstant.EXECUTION_CONTENT, new util.HashMap[String,
String]())
- .asInstanceOf[util.Map[String, Object]]
+ .asInstanceOf[util.Map[String, AnyRef]]
val configMap = params
- .getOrDefault(TaskConstant.PARAMS, new util.HashMap[String, Object]())
- .asInstanceOf[util.Map[String, Object]]
+ .getOrDefault(TaskConstant.PARAMS, new util.HashMap[String, AnyRef]())
+ .asInstanceOf[util.Map[String, AnyRef]]
val labelMap = params
- .getOrDefault(TaskConstant.LABELS, new util.HashMap[String, String]())
- .asInstanceOf[util.Map[String, Object]]
+ .getOrDefault(TaskConstant.LABELS, new util.HashMap[String, AnyRef]())
+ .asInstanceOf[util.Map[String, AnyRef]]
val source = params
.getOrDefault(TaskConstant.SOURCE, new util.HashMap[String, String]())
.asInstanceOf[util.Map[String, String]]
@@ -122,7 +122,7 @@ class CommonEntranceParser(val persistenceManager:
PersistenceManager)
jobRequest.setSource(source)
jobRequest.setStatus(SchedulerEventState.Inited.toString)
// Entry indicator: task submission time
- jobRequest.setMetrics(new util.HashMap[String, Object]())
+ jobRequest.setMetrics(new util.HashMap[String, AnyRef]())
jobRequest.getMetrics.put(
TaskConstant.ENTRANCEJOB_SUBMIT_TIME,
new Date(System.currentTimeMillis)
@@ -190,7 +190,7 @@ class CommonEntranceParser(val persistenceManager:
PersistenceManager)
}
}
- private def parseToOldTask(params: util.Map[String, Any]): JobRequest = {
+ private def parseToOldTask(params: util.Map[String, AnyRef]): JobRequest = {
val jobReq = new JobRequest
jobReq.setCreatedTime(new Date(System.currentTimeMillis))
@@ -210,7 +210,7 @@ class CommonEntranceParser(val persistenceManager:
PersistenceManager)
var executionCode =
params.get(TaskConstant.EXECUTIONCODE).asInstanceOf[String]
val _params = params.get(TaskConstant.PARAMS)
_params match {
- case mapParams: java.util.Map[String, Object] =>
jobReq.setParams(mapParams)
+ case mapParams: java.util.Map[String, AnyRef] =>
jobReq.setParams(mapParams)
case _ =>
}
val formatCode = params.get(TaskConstant.FORMATCODE).asInstanceOf[Boolean]
@@ -238,8 +238,9 @@ class CommonEntranceParser(val persistenceManager:
PersistenceManager)
var runType: String = null
if (StringUtils.isNotEmpty(executionCode)) {
runType = params.get(TaskConstant.RUNTYPE).asInstanceOf[String]
- if (StringUtils.isEmpty(runType))
+ if (StringUtils.isEmpty(runType)) {
runType = EntranceConfiguration.DEFAULT_RUN_TYPE.getHotValue()
+ }
// If formatCode is not empty, we need to format it(如果formatCode
不为空的话，我们需要将其进行格式化)
if (formatCode) executionCode = format(executionCode)
jobReq.setExecutionCode(executionCode)
@@ -256,8 +257,8 @@ class CommonEntranceParser(val persistenceManager:
PersistenceManager)
labelList.add(userCreatorLabel)
if (jobReq.getParams != null) {
val labelMap = params
- .getOrDefault(TaskConstant.LABELS, new util.HashMap[String, String]())
- .asInstanceOf[util.Map[String, Object]]
+ .getOrDefault(TaskConstant.LABELS, new util.HashMap[String, AnyRef]())
+ .asInstanceOf[util.Map[String, AnyRef]]
if (null != labelMap && !labelMap.isEmpty) {
val list: util.List[Label[_]] =
labelBuilderFactory.getLabels(labelMap)
@@ -270,16 +271,16 @@ class CommonEntranceParser(val persistenceManager:
PersistenceManager)
jobReq.setStatus(SchedulerEventState.Inited.toString)
// Package labels
jobReq.setLabels(labelList)
- jobReq.setMetrics(new util.HashMap[String, Object]())
+ jobReq.setMetrics(new util.HashMap[String, AnyRef]())
jobReq.getMetrics.put(TaskConstant.ENTRANCEJOB_SUBMIT_TIME, new
Date(System.currentTimeMillis))
jobReq
}
- private def buildLabel(labelMap: util.Map[String, Object]): util.Map[String,
Label[_]] = {
+ private def buildLabel(labelMap: util.Map[String, AnyRef]): util.Map[String,
Label[_]] = {
val labelKeyValueMap = new util.HashMap[String, Label[_]]()
if (null != labelMap && !labelMap.isEmpty) {
val list: util.List[Label[_]] =
- labelBuilderFactory.getLabels(labelMap.asInstanceOf[util.Map[String,
AnyRef]])
+ labelBuilderFactory.getLabels(labelMap)
if (null != list) {
list.asScala.filter(_ != null).foreach { label =>
labelKeyValueMap.put(label.getLabelKey, label)
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceGroupFactory.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceGroupFactory.scala
index 313275074..7f16dd246 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceGroupFactory.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/EntranceGroupFactory.scala
@@ -83,10 +83,7 @@ class EntranceGroupFactory extends GroupFactory with Logging
{
override def getOrCreateGroup(event: SchedulerEvent): Group = {
val (labels, params) = event match {
case job: EntranceJob =>
- (
- job.getJobRequest.getLabels,
- job.getJobRequest.getParams.asInstanceOf[util.Map[String, Any]]
- )
+ (job.getJobRequest.getLabels, job.getJobRequest.getParams)
}
val groupName = EntranceGroupFactory.getGroupNameByLabels(labels, params)
val cacheGroup = groupNameToGroups.getIfPresent(groupName)
@@ -207,7 +204,7 @@ object EntranceGroupFactory {
def getGroupName(
creator: String,
user: String,
- params: util.Map[String, Any] = new util.HashMap[String, Any]
+ params: util.Map[String, AnyRef] = new util.HashMap[String, AnyRef]
): String = {
val runtime = TaskUtils.getRuntimeMap(params)
val cache =
@@ -224,7 +221,7 @@ object EntranceGroupFactory {
def getGroupNameByLabels(
labels: java.util.List[Label[_]],
- params: util.Map[String, Any] = new util.HashMap[String, Any]
+ params: util.Map[String, AnyRef] = new util.HashMap[String, AnyRef]
): String = {
val userCreator = labels.asScala.find(_.isInstanceOf[UserCreatorLabel])
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/cache/ReadCacheConsumer.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/cache/ReadCacheConsumer.scala
index 8cbfc9a98..65bbbd39b 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/cache/ReadCacheConsumer.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/scheduler/cache/ReadCacheConsumer.scala
@@ -78,9 +78,9 @@ class ReadCacheConsumer(
INVALID_ENGINETYPE_NULL.getErrorDesc
)
}
- val readCacheBefore = TaskUtils
+ val readCacheBefore: Long = TaskUtils
.getRuntimeMap(job.getParams)
- .getOrDefault(TaskConstant.READ_CACHE_BEFORE, 300L)
+ .getOrDefault(TaskConstant.READ_CACHE_BEFORE, 300L:
java.lang.Long)
.asInstanceOf[Long]
val cacheResult = JobHistoryHelper.getCache(
jobRequest.getExecutionCode,
@@ -109,7 +109,7 @@ class ReadCacheConsumer(
// persistenceManager.onResultSizeCreated(job,
resultSets.size())
}
val runtime = TaskUtils.getRuntimeMap(job.getParams)
- runtime.put(TaskConstant.CACHE, false)
+ runtime.put(TaskConstant.CACHE, java.lang.Boolean.FALSE)
TaskUtils.addRuntimeMap(job.getParams, runtime)
job.transitionCompleted(SuccessExecuteResponse(), "Result
found in cache")
} else {
@@ -141,7 +141,7 @@ class ReadCacheConsumer(
private def submitToExecute(job: EntranceJob): Unit = {
val runtime = TaskUtils.getRuntimeMap(job.getParams)
- runtime.put(TaskConstant.READ_FROM_CACHE, false)
+ runtime.put(TaskConstant.READ_FROM_CACHE, java.lang.Boolean.FALSE)
TaskUtils.addRuntimeMap(job.getParams, runtime)
val groupName =
schedulerContext.getOrCreateGroupFactory.getOrCreateGroup(job).getGroupName
val consumer =
schedulerContext.getOrCreateConsumerManager.getOrCreateConsumer(groupName)
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
index 8b3cbb574..fa13d683b 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
@@ -165,11 +165,11 @@ object JobHistoryHelper extends Logging {
def updateJobRequestMetrics(
jobRequest: JobRequest,
resourceInfo: util.Map[String, ResourceWithStatus],
- ecInfo: util.Map[String, Object]
+ ecInfo: util.Map[String, AnyRef]
): Unit = {
// update resource
if (jobRequest.getMetrics == null) {
- jobRequest.setMetrics(new util.HashMap[String, Object]())
+ jobRequest.setMetrics(new util.HashMap[String, AnyRef]())
}
val metricsMap = jobRequest.getMetrics
val resourceMap = metricsMap.get(TaskConstant.ENTRANCEJOB_YARNRESOURCE)
@@ -180,21 +180,21 @@ object JobHistoryHelper extends Logging {
} else {
metricsMap.put(TaskConstant.ENTRANCEJOB_YARNRESOURCE, ecResourceMap)
}
- var engineInstanceMap: util.HashMap[String, Object] = null
+ var engineInstanceMap: util.HashMap[String, AnyRef] = null
if (metricsMap.containsKey(TaskConstant.ENTRANCEJOB_ENGINECONN_MAP)) {
engineInstanceMap = metricsMap
.get(TaskConstant.ENTRANCEJOB_ENGINECONN_MAP)
- .asInstanceOf[util.HashMap[String, Object]]
+ .asInstanceOf[util.HashMap[String, AnyRef]]
} else {
- engineInstanceMap = new util.HashMap[String, Object]()
+ engineInstanceMap = new util.HashMap[String, AnyRef]()
metricsMap.put(TaskConstant.ENTRANCEJOB_ENGINECONN_MAP,
engineInstanceMap)
}
val infoMap = ecInfo
if (null != infoMap && infoMap.containsKey(TaskConstant.ENGINE_INSTANCE)) {
val instance =
infoMap.get(TaskConstant.ENGINE_INSTANCE).asInstanceOf[String]
val engineExtraInfoMap = engineInstanceMap
- .getOrDefault(instance, new util.HashMap[String, Object])
- .asInstanceOf[util.HashMap[String, Object]]
+ .getOrDefault(instance, new util.HashMap[String, AnyRef])
+ .asInstanceOf[util.HashMap[String, AnyRef]]
engineExtraInfoMap.putAll(infoMap)
engineInstanceMap.put(instance, engineExtraInfoMap)
} else {
diff --git
a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLConnection.scala
b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLConnection.scala
index 16ba276d2..0d8403c27 100644
---
a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLConnection.scala
+++
b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLConnection.scala
@@ -53,7 +53,7 @@ class UJESSQLConnection(private[jdbc] val ujesClient:
UJESClient, props: Propert
private[jdbc] val variableMap = {
val params = props.getProperty(PARAMS)
- val map = new mutable.HashMap[String, Any]
+ val map = new mutable.HashMap[String, AnyRef]
if (params != null) {
params.split(PARAM_SPLIT).map(_.split(KV_SPLIT)).foreach {
case Array(k, v) if k.startsWith(VARIABLE_HEADER) =>
diff --git
a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLStatement.scala
b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLStatement.scala
index d61efcc04..916bdbaa9 100644
---
a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLStatement.scala
+++
b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/UJESSQLStatement.scala
@@ -27,7 +27,7 @@ import
org.apache.linkis.ujes.jdbc.hook.JDBCDriverPreExecutionHook
import java.sql.{Connection, ResultSet, SQLWarning, Statement}
import java.util.concurrent.TimeUnit
-import scala.collection.JavaConversions
+import scala.collection.JavaConverters.mapAsJavaMapConverter
import scala.concurrent.TimeoutException
import scala.concurrent.duration.Duration
@@ -120,8 +120,9 @@ class UJESSQLStatement(private[jdbc] val ujesSQLConnection:
UJESSQLConnection)
.addExecuteCode(parsedSQL)
.setCreator(ujesSQLConnection.creator)
.setUser(ujesSQLConnection.user)
- if (ujesSQLConnection.variableMap.nonEmpty)
-
action.setVariableMap(JavaConversions.mapAsJavaMap(ujesSQLConnection.variableMap))
+ if (ujesSQLConnection.variableMap.nonEmpty) {
+ action.setVariableMap(ujesSQLConnection.variableMap.asJava)
+ }
jobExecuteResult =
Utils.tryCatch(ujesSQLConnection.ujesClient.execute(action.build())) {
t: Throwable =>
logger.error("UJESClient failed to get result", t)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineConnModeLabel.scala
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineConnModeLabel.scala
index b1880bc8e..f896542c3 100644
---
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineConnModeLabel.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineConnModeLabel.scala
@@ -5,29 +5,28 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.manager.label.entity.engine
-import org.apache.linkis.manager.label.entity.annon.ValueSerialNum
import org.apache.linkis.manager.label.entity.{EngineNodeLabel, Feature,
GenericLabel}
+import org.apache.linkis.manager.label.entity.annon.ValueSerialNum
import java.util
-
class EngineConnModeLabel extends GenericLabel with EngineNodeLabel {
setLabelKey("engineConnMode")
- override def getFeature = Feature.CORE
+ override def getFeature: Feature = Feature.CORE
@ValueSerialNum(0)
def setEngineConnMode(engineConnMode: String): Unit = {
@@ -65,4 +64,5 @@ object EngineConnMode extends Enumeration {
def isOnceMode(ecMode: String): Boolean = {
ONCE_MODES.contains(toEngineConnMode(ecMode))
}
-}
\ No newline at end of file
+
+}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/OperateRequest.scala
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/OperateRequest.scala
index be24f8c48..a3a49272a 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/OperateRequest.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/OperateRequest.scala
@@ -21,7 +21,7 @@ import
org.apache.linkis.governance.common.exception.GovernanceErrorException
trait OperateRequest {
val user: String
- val parameters: java.util.Map[String, Object]
+ val parameters: java.util.Map[String, AnyRef]
}
object OperateRequest {
@@ -36,7 +36,7 @@ object OperateRequest {
)
.asInstanceOf[String]
- def getOperationName(parameters: java.util.Map[String, Any]): String =
+ def getOperationName(parameters: java.util.Map[String, AnyRef]): String =
parameters.get(OperateRequest.OPERATOR_NAME_KEY) match {
case v: String => v
case _ => throw new GovernanceErrorException(20031, s"$OPERATOR_NAME_KEY
does not exist.")
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/em/ECMOperateRequest.scala
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/em/ECMOperateRequest.scala
index fe6044d1e..dca2e31f2 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/em/ECMOperateRequest.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/em/ECMOperateRequest.scala
@@ -24,14 +24,11 @@ import java.util
import scala.collection.JavaConverters.mapAsJavaMapConverter
-case class ECMOperateRequest(user: String, parameters: util.Map[String,
Object])
+case class ECMOperateRequest(user: String, parameters: util.Map[String,
AnyRef])
extends OperateRequest
with RequestProtocol {
- def this(user: String, parameters: Map[String, Any]) = this(
- user,
- new util.HashMap[String, Object](parameters.map { case (k, v: Object) =>
(k, v) }.asJava)
- )
+ def this(user: String, parameters: Map[String, AnyRef]) = this(user,
parameters.asJava)
}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/engine/EngineOperateRequest.scala
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/engine/EngineOperateRequest.scala
index ac8abd02c..1a9a5dbff 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/engine/EngineOperateRequest.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/engine/EngineOperateRequest.scala
@@ -20,17 +20,12 @@ package org.apache.linkis.manager.common.protocol.engine
import org.apache.linkis.manager.common.protocol.OperateRequest
import org.apache.linkis.protocol.message.RequestProtocol
-import java.util
-
import scala.collection.JavaConverters.mapAsJavaMapConverter
-case class EngineOperateRequest(user: String, parameters:
java.util.Map[String, Object])
+case class EngineOperateRequest(user: String, parameters:
java.util.Map[String, AnyRef])
extends OperateRequest
with RequestProtocol {
- def this(user: String, parameters: Map[String, Any]) = this(
- user,
- new util.HashMap[String, Object](parameters.map { case (k, v: Object) =>
(k, v) }.asJava)
- )
+ def this(user: String, parameters: Map[String, AnyRef]) = this(user,
parameters.asJava)
}
diff --git
a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/ElasticSearchEngineConnPlugin.scala
b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/ElasticSearchEngineConnPlugin.scala
index 762453e76..67e2d39ce 100644
---
a/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/ElasticSearchEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/elasticsearch/src/main/scala/org/apache/linkis/engineplugin/elasticsearch/ElasticSearchEngineConnPlugin.scala
@@ -44,7 +44,7 @@ class ElasticSearchEngineConnPlugin extends EngineConnPlugin {
private val engineFactoryLocker = new Array[Byte](0)
- override def init(params: util.Map[String, Any]): Unit = {
+ override def init(params: util.Map[String, AnyRef]): Unit = {
val typeLabel = new EngineTypeLabel()
typeLabel.setEngineType(EngineType.ELASTICSEARCH.toString)
typeLabel.setVersion(ElasticSearchConfiguration.DEFAULT_VERSION.getValue)
diff --git
a/linkis-engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/FlinkEngineConnPlugin.scala
b/linkis-engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/FlinkEngineConnPlugin.scala
index 46a210932..f0867c5eb 100644
---
a/linkis-engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/FlinkEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/FlinkEngineConnPlugin.scala
@@ -36,7 +36,7 @@ class FlinkEngineConnPlugin extends EngineConnPlugin {
private val engineFactoryLocker = new Array[Byte](0)
- override def init(params: java.util.Map[String, Any]): Unit = {}
+ override def init(params: java.util.Map[String, AnyRef]): Unit = {}
override def getEngineResourceFactory: EngineResourceFactory = {
if (null == engineResourceFactory) resourceLocker.synchronized {
diff --git
a/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/HiveEngineConnPlugin.scala
b/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/HiveEngineConnPlugin.scala
index aa8716cc5..ba1c85ae3 100644
---
a/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/HiveEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/HiveEngineConnPlugin.scala
@@ -27,7 +27,7 @@ import
org.apache.linkis.manager.engineplugin.common.resource.{
GenericEngineResourceFactory
}
import org.apache.linkis.manager.label.entity.Label
-import org.apache.linkis.manager.label.entity.engine.{EngineType,
EngineTypeLabel}
+import org.apache.linkis.manager.label.entity.engine.EngineType
import org.apache.linkis.manager.label.utils.EngineTypeLabelCreator
import java.util
@@ -49,7 +49,7 @@ class HiveEngineConnPlugin extends EngineConnPlugin {
private val defaultLabels: List[Label[_]] = new util.ArrayList[Label[_]]()
- override def init(params: util.Map[String, Any]): Unit = {
+ override def init(params: util.Map[String, AnyRef]): Unit = {
val engineTypeLabel =
EngineTypeLabelCreator.createEngineTypeLabel(EngineType.HIVE.toString)
this.defaultLabels.add(engineTypeLabel)
}
diff --git
a/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/IoEngineConnPlugin.scala
b/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/IoEngineConnPlugin.scala
index 60f0f1fb9..bb29e3f75 100644
---
a/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/IoEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/io_file/src/main/scala/org/apache/linkis/manager/engineplugin/io/IoEngineConnPlugin.scala
@@ -46,7 +46,7 @@ class IoEngineConnPlugin extends EngineConnPlugin {
private val defaultLabels: util.List[Label[_]] = new
util.ArrayList[Label[_]]()
- override def init(params: util.Map[String, Any]): Unit = {}
+ override def init(params: util.Map[String, AnyRef]): Unit = {}
override def getEngineResourceFactory: EngineResourceFactory = {
if (null == engineResourceFactory) resourceLocker synchronized {
diff --git
a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/JDBCEngineConnPlugin.scala
b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/JDBCEngineConnPlugin.scala
index d10ebf54c..3f4d320cc 100644
---
a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/JDBCEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/JDBCEngineConnPlugin.scala
@@ -46,7 +46,7 @@ class JDBCEngineConnPlugin extends EngineConnPlugin {
private val defaultLabels: util.List[Label[_]] = new
util.ArrayList[Label[_]]()
- override def init(params: util.Map[String, Any]): Unit = {
+ override def init(params: util.Map[String, AnyRef]): Unit = {
/* val engineTypeLabel = new EngineTypeLabel()
engineTypeLabel.setEngineType(EngineType.IO_ENGINE.toString)
engineTypeLabel.setVersion(IOEngineConnConfiguration.DEFAULT_VERSION.getValue)
diff --git
a/linkis-engineconn-plugins/openlookeng/src/main/scala/org/apache/linkis/engineplugin/openlookeng/OpenLooKengECPlugin.scala
b/linkis-engineconn-plugins/openlookeng/src/main/scala/org/apache/linkis/engineplugin/openlookeng/OpenLooKengECPlugin.scala
index da827e8b8..dc3197bd7 100644
---
a/linkis-engineconn-plugins/openlookeng/src/main/scala/org/apache/linkis/engineplugin/openlookeng/OpenLooKengECPlugin.scala
+++
b/linkis-engineconn-plugins/openlookeng/src/main/scala/org/apache/linkis/engineplugin/openlookeng/OpenLooKengECPlugin.scala
@@ -49,7 +49,7 @@ class OpenLooKengECPlugin extends EngineConnPlugin {
private val defaultLabels: List[Label[_]] = new util.ArrayList[Label[_]]()
- override def init(params: util.Map[String, Any]): Unit = {
+ override def init(params: util.Map[String, AnyRef]): Unit = {
val engineTypeLabel =
EngineTypeLabelCreator.createEngineTypeLabel(EngineType.OPENLOOKENG.toString)
this.defaultLabels.add(engineTypeLabel)
diff --git
a/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/PipelineEngineConnPlugin.scala
b/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/PipelineEngineConnPlugin.scala
index a369fb745..06c5dde6f 100644
---
a/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/PipelineEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/PipelineEngineConnPlugin.scala
@@ -46,7 +46,7 @@ class PipelineEngineConnPlugin extends EngineConnPlugin {
private val defaultLabels: util.List[Label[_]] = new
util.ArrayList[Label[_]]()
- override def init(params: util.Map[String, Any]): Unit = {}
+ override def init(params: util.Map[String, AnyRef]): Unit = {}
override def getEngineResourceFactory: EngineResourceFactory = {
if (null == engineResourceFactory) resourceLocker synchronized {
diff --git
a/linkis-engineconn-plugins/presto/src/main/scala/org/apache/linkis/engineplugin/presto/PrestoEngineConnPlugin.scala
b/linkis-engineconn-plugins/presto/src/main/scala/org/apache/linkis/engineplugin/presto/PrestoEngineConnPlugin.scala
index fe82624be..f86dfa73b 100644
---
a/linkis-engineconn-plugins/presto/src/main/scala/org/apache/linkis/engineplugin/presto/PrestoEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/presto/src/main/scala/org/apache/linkis/engineplugin/presto/PrestoEngineConnPlugin.scala
@@ -46,7 +46,7 @@ class PrestoEngineConnPlugin extends EngineConnPlugin {
private val defaultLabels: util.List[Label[_]] = new
util.ArrayList[Label[_]]()
- override def init(params: util.Map[String, Any]): Unit = {}
+ override def init(params: util.Map[String, AnyRef]): Unit = {}
override def getEngineResourceFactory: EngineResourceFactory = {
if (null == engineResourceFactory) resourceLocker synchronized {
diff --git
a/linkis-engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/PythonEngineConnPlugin.scala
b/linkis-engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/PythonEngineConnPlugin.scala
index cc613679a..2eb284ea1 100644
---
a/linkis-engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/PythonEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/PythonEngineConnPlugin.scala
@@ -27,7 +27,7 @@ import
org.apache.linkis.manager.engineplugin.common.resource.{
import
org.apache.linkis.manager.engineplugin.python.factory.PythonEngineConnFactory
import
org.apache.linkis.manager.engineplugin.python.launch.PythonProcessEngineConnLaunchBuilder
import org.apache.linkis.manager.label.entity.Label
-import org.apache.linkis.manager.label.entity.engine.{EngineType,
EngineTypeLabel}
+import org.apache.linkis.manager.label.entity.engine.EngineType
import org.apache.linkis.manager.label.utils.EngineTypeLabelCreator
import java.util
@@ -48,7 +48,7 @@ class PythonEngineConnPlugin extends EngineConnPlugin {
private val defaultLabels: util.List[Label[_]] = new
util.ArrayList[Label[_]]()
- override def init(params: util.Map[String, Any]): Unit = {
+ override def init(params: util.Map[String, AnyRef]): Unit = {
val engineTypeLabel =
EngineTypeLabelCreator.createEngineTypeLabel(EngineType.PYTHON.toString)
this.defaultLabels.add(engineTypeLabel)
}
diff --git
a/linkis-engineconn-plugins/seatunnel/src/main/scala/org/apache/linkis/engineconnplugin/seatunnel/SeatunnelEngineConnPlugin.scala
b/linkis-engineconn-plugins/seatunnel/src/main/scala/org/apache/linkis/engineconnplugin/seatunnel/SeatunnelEngineConnPlugin.scala
index 3736f0ef0..c0a08c77c 100644
---
a/linkis-engineconn-plugins/seatunnel/src/main/scala/org/apache/linkis/engineconnplugin/seatunnel/SeatunnelEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/seatunnel/src/main/scala/org/apache/linkis/engineconnplugin/seatunnel/SeatunnelEngineConnPlugin.scala
@@ -38,7 +38,7 @@ class SeatunnelEngineConnPlugin extends EngineConnPlugin {
private var engineResourceFactory: EngineResourceFactory = _
private var engineConnLaunchBuilder: EngineConnLaunchBuilder = _
private var engineConnFactory: EngineConnFactory = _
- override def init(params: java.util.Map[String, Any]): Unit = {}
+ override def init(params: java.util.Map[String, AnyRef]): Unit = {}
override def getEngineResourceFactory: EngineResourceFactory = {
diff --git
a/linkis-engineconn-plugins/shell/src/main/scala/org/apache/linkis/manager/engineplugin/shell/ShellEngineConnPlugin.scala
b/linkis-engineconn-plugins/shell/src/main/scala/org/apache/linkis/manager/engineplugin/shell/ShellEngineConnPlugin.scala
index 9329cb43d..115b4763e 100644
---
a/linkis-engineconn-plugins/shell/src/main/scala/org/apache/linkis/manager/engineplugin/shell/ShellEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/shell/src/main/scala/org/apache/linkis/manager/engineplugin/shell/ShellEngineConnPlugin.scala
@@ -27,7 +27,7 @@ import
org.apache.linkis.manager.engineplugin.common.resource.{
import
org.apache.linkis.manager.engineplugin.shell.builder.ShellProcessEngineConnLaunchBuilder
import
org.apache.linkis.manager.engineplugin.shell.factory.ShellEngineConnFactory
import org.apache.linkis.manager.label.entity.Label
-import org.apache.linkis.manager.label.entity.engine.{EngineType,
EngineTypeLabel}
+import org.apache.linkis.manager.label.entity.engine.EngineType
import org.apache.linkis.manager.label.utils.EngineTypeLabelCreator
import java.util
@@ -48,7 +48,7 @@ class ShellEngineConnPlugin extends EngineConnPlugin {
private val defaultLabels: util.List[Label[_]] = new
util.ArrayList[Label[_]]()
- override def init(params: util.Map[String, Any]): Unit = {
+ override def init(params: util.Map[String, AnyRef]): Unit = {
val engineTypeLabel =
EngineTypeLabelCreator.createEngineTypeLabel(EngineType.SHELL.toString)
this.defaultLabels.add(engineTypeLabel)
}
diff --git
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/SparkEngineConnPlugin.scala
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/SparkEngineConnPlugin.scala
index 0ef8ba81b..ea8c61eed 100644
---
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/SparkEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/SparkEngineConnPlugin.scala
@@ -48,7 +48,7 @@ class SparkEngineConnPlugin extends EngineConnPlugin {
private var engineFactory: EngineConnFactory = _
- override def init(params: util.Map[String, Any]): Unit = {
+ override def init(params: util.Map[String, AnyRef]): Unit = {
val engineTypeLabel =
EngineTypeLabelCreator.createEngineTypeLabel(EngineType.SPARK.toString)
this.defaultLabels.add(engineTypeLabel)
}
diff --git
a/linkis-engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/SqoopEngineConnPlugin.scala
b/linkis-engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/SqoopEngineConnPlugin.scala
index 5aea274df..974091f5f 100644
---
a/linkis-engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/SqoopEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/SqoopEngineConnPlugin.scala
@@ -33,7 +33,7 @@ class SqoopEngineConnPlugin extends EngineConnPlugin {
private var engineResourceFactory: EngineResourceFactory = _
private var engineConnLaunchBuilder: EngineConnLaunchBuilder = _
private var engineConnFactory: EngineConnFactory = _
- override def init(params: java.util.Map[String, Any]): Unit = {}
+ override def init(params: java.util.Map[String, AnyRef]): Unit = {}
override def getEngineResourceFactory: EngineResourceFactory = {
diff --git
a/linkis-engineconn-plugins/trino/src/main/scala/org/apache/linkis/engineplugin/trino/TrinoEngineConnPlugin.scala
b/linkis-engineconn-plugins/trino/src/main/scala/org/apache/linkis/engineplugin/trino/TrinoEngineConnPlugin.scala
index 5e3331ee0..5de4194b2 100644
---
a/linkis-engineconn-plugins/trino/src/main/scala/org/apache/linkis/engineplugin/trino/TrinoEngineConnPlugin.scala
+++
b/linkis-engineconn-plugins/trino/src/main/scala/org/apache/linkis/engineplugin/trino/TrinoEngineConnPlugin.scala
@@ -41,7 +41,7 @@ class TrinoEngineConnPlugin extends EngineConnPlugin {
private val defaultLabels: util.List[Label[_]] = new
util.ArrayList[Label[_]]()
- override def init(params: util.Map[String, Any]): Unit = {}
+ override def init(params: util.Map[String, AnyRef]): Unit = {}
override def getEngineResourceFactory: EngineResourceFactory = {
if (null == engineResourceFactory) resourceLocker synchronized {
diff --git
a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/client/DefaultIOClient.scala
b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/client/DefaultIOClient.scala
index 0a72c1f41..1383c4fb7 100644
---
a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/client/DefaultIOClient.scala
+++
b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/client/DefaultIOClient.scala
@@ -59,7 +59,7 @@ class DefaultIOClient extends IOClient with Logging {
methodEntity: MethodEntity,
bindEngineLabel: BindEngineLabel
): String = {
- val params = new util.HashMap[String, Any]()
+ val params = new util.HashMap[String, AnyRef]()
if (null != bindEngineLabel) {
IOClientUtils.addLabelToParams(bindEngineLabel, params)
}
@@ -69,7 +69,7 @@ class DefaultIOClient extends IOClient with Logging {
def executeResult(
user: String,
methodEntity: MethodEntity,
- params: java.util.Map[String, Any],
+ params: java.util.Map[String, AnyRef],
retryLimit: Int = 0
): String = {
val engineTypeLabel = EngineTypeLabelCreator.createEngineTypeLabel(
@@ -164,7 +164,7 @@ class DefaultIOClient extends IOClient with Logging {
bindEngineLabel: BindEngineLabel,
reTryLimit: Int = defaultRetry
): String = {
- val params = new util.HashMap[String, Any]()
+ val params = new util.HashMap[String, AnyRef]()
if (null != bindEngineLabel) {
IOClientUtils.addLabelToParams(bindEngineLabel, params)
}
diff --git
a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/utils/IOClientUtils.scala
b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/utils/IOClientUtils.scala
index a1958ccc4..7ec048cf5 100644
---
a/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/utils/IOClientUtils.scala
+++
b/linkis-extensions/linkis-io-file-client/src/main/scala/org/apache/linkis/storage/io/utils/IOClientUtils.scala
@@ -17,7 +17,10 @@
package org.apache.linkis.storage.io.utils
-import
org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext
+import org.apache.linkis.manager.label.builder.factory.{
+ LabelBuilderFactory,
+ LabelBuilderFactoryContext
+}
import org.apache.linkis.manager.label.constant.LabelKeyConstant
import org.apache.linkis.manager.label.entity.Label
import org.apache.linkis.manager.label.entity.engine.{
@@ -84,7 +87,7 @@ object IOClientUtils {
"io_jobGrup_" + jobGroupIDGenerator.getAndIncrement()
}
- def getLabelBuilderFactory = labelBuilderFactory
+ def getLabelBuilderFactory: LabelBuilderFactory = labelBuilderFactory
def getDefaultLoadBalanceLabel: LoadBalanceLabel = {
loadBalanceLabel
@@ -94,14 +97,14 @@ object IOClientUtils {
val labelJson = IOFileClientConf.IO_EXTRA_LABELS.getValue
if (StringUtils.isNotBlank(labelJson)) {
val labelMap =
- BDPJettyServerHelper.gson.fromJson(labelJson,
classOf[java.util.Map[String, Object]])
+ BDPJettyServerHelper.gson.fromJson(labelJson,
classOf[java.util.Map[String, AnyRef]])
labelBuilderFactory.getLabels(labelMap).asScala.toArray
} else {
Array.empty[Label[_]]
}
}
- def addLabelToParams(label: Label[_], params: util.Map[String, Any]): Unit =
{
+ def addLabelToParams(label: Label[_], params: util.Map[String, AnyRef]):
Unit = {
val labelMap = TaskUtils.getLabelsMap(params)
labelMap.put(label.getLabelKey, label.getStringValue)
TaskUtils.addLabelsMap(params, labelMap)
@@ -110,12 +113,12 @@ object IOClientUtils {
def buildJobReq(
user: String,
methodEntity: MethodEntity,
- params: java.util.Map[String, Any]
+ params: java.util.Map[String, AnyRef]
): JobReq = {
val labelMap = TaskUtils.getLabelsMap(params)
val labels: util.List[Label[_]] =
-
labelBuilderFactory.getLabels(labelMap.asInstanceOf[java.util.Map[String,
Object]])
+ labelBuilderFactory.getLabels(labelMap)
labels.add(codeTypeLabel)
labels.add(conCurrentLabel)
diff --git
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/converter/ASTContextImpl.scala
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/converter/ASTContextImpl.scala
index d1a046339..2a0b50470 100644
---
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/converter/ASTContextImpl.scala
+++
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/converter/ASTContextImpl.scala
@@ -61,7 +61,7 @@ object ASTContextImpl {
this
}
- def setParams(params: java.util.Map[String, Any]): Builder = {
+ def setParams(params: java.util.Map[String, AnyRef]): Builder = {
astContext.params = new QueryParamsImpl(params)
diff --git
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/domain/JobReq.scala
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/domain/JobReq.scala
index a2dbaa54f..e9a5dcd03 100644
---
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/domain/JobReq.scala
+++
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/domain/JobReq.scala
@@ -29,7 +29,7 @@ trait JobReq extends Node {
def getLabels: util.List[Label[_]]
- def getParams: java.util.Map[String, Any]
+ def getParams: java.util.Map[String, AnyRef]
def getPriority: Int
@@ -39,14 +39,14 @@ abstract class AbstractJobReq extends JobReq {
private var executeUser: String = _
private var labels: util.List[Label[_]] = _
- private var params: util.Map[String, Any] = _
+ private var params: util.Map[String, AnyRef] = _
private var priority: Int = _
override def getExecuteUser: String = executeUser
override def getLabels: util.List[Label[_]] = labels
- override def getParams: util.Map[String, Any] = params
+ override def getParams: util.Map[String, AnyRef] = params
override def getPriority: Int = priority
@@ -75,7 +75,7 @@ object AbstractJobReq {
this
}
- def setParams(params: util.Map[String, Any]): AbstractJobReqBuilder = {
+ def setParams(params: util.Map[String, AnyRef]): AbstractJobReqBuilder = {
jobReq.params = params
this
}
diff --git
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/listener/task/TaskInfoEvent.scala
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/listener/task/TaskInfoEvent.scala
index 2e1d82473..3ae70d76a 100644
---
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/listener/task/TaskInfoEvent.scala
+++
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/listener/task/TaskInfoEvent.scala
@@ -95,7 +95,7 @@ case class TaskRunningInfoEvent(
progress: Float,
progressInfo: Array[JobProgressInfo],
resourceMap: util.HashMap[String, ResourceWithStatus],
- infoMap: util.HashMap[String, Object]
+ infoMap: util.HashMap[String, AnyRef]
) extends TaskInfoEvent
with OrchestratorAsyncEvent {
diff --git
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/AbstractJob.scala
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/AbstractJob.scala
index cab994ef8..992a50cea 100644
---
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/AbstractJob.scala
+++
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/AbstractJob.scala
@@ -25,15 +25,15 @@ abstract class AbstractJob extends Job {
private var labels: util.List[Label[_]] = _
- private var params: util.Map[String, Any] = _
+ private var params: util.Map[String, AnyRef] = _
private var priority: Int = _
private var executeUser: String = _
- def getParams: util.Map[String, Any] = params
+ def getParams: util.Map[String, AnyRef] = params
- def setParams(params: util.Map[String, Any]): Unit = this.params = params
+ def setParams(params: util.Map[String, AnyRef]): Unit = this.params = params
def getExecuteUser: String = executeUser
diff --git
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/QueryParams.scala
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/QueryParams.scala
index b7dae98d8..0362832e5 100644
---
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/QueryParams.scala
+++
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/QueryParams.scala
@@ -22,8 +22,6 @@ import org.apache.linkis.protocol.utils.TaskUtils
import java.util
-import scala.collection.JavaConverters.mapAsScalaMapConverter
-
/**
*/
trait QueryParams {
@@ -36,7 +34,7 @@ trait QueryParams {
}
-class QueryParamsImpl(params: java.util.Map[String, Any]) extends QueryParams {
+class QueryParamsImpl(params: java.util.Map[String, AnyRef]) extends
QueryParams {
private var startupParams: StartupParams = _
@@ -45,33 +43,13 @@ class QueryParamsImpl(params: java.util.Map[String, Any])
extends QueryParams {
def init(): Unit = {
var paramMap = params
if (null == params) {
- paramMap = new util.HashMap[String, Any]()
- }
- val startUp = {
- val mapOri = TaskUtils.getStartupMap(paramMap)
- val map = new util.HashMap[String, AnyRef]()
- mapOri.asScala.foreach(kv => map.put(kv._1, kv._2.asInstanceOf[AnyRef]))
- map
+ paramMap = new util.HashMap[String, AnyRef]()
}
+ val startUp = TaskUtils.getStartupMap(paramMap)
startupParams = new StartupParamsImpl(startUp)
- val runtime = {
- val mapOri = TaskUtils.getRuntimeMap(paramMap)
- val map = new util.HashMap[String, AnyRef]()
- mapOri.asScala.foreach(kv => map.put(kv._1, kv._2.asInstanceOf[AnyRef]))
- map
- }
- val variable = {
- val mapOri = TaskUtils.getVariableMap(paramMap)
- val map = new util.HashMap[String, AnyRef]()
- mapOri.asScala.foreach(kv => map.put(kv._1, kv._2.asInstanceOf[AnyRef]))
- map
- }
- val special = {
- val mapOri = TaskUtils.getSpecialMap(paramMap)
- val map = new util.HashMap[String, AnyRef]()
- mapOri.asScala.foreach(kv => map.put(kv._1, kv._2.asInstanceOf[AnyRef]))
- map
- }
+ val runtime = TaskUtils.getRuntimeMap(paramMap)
+ val variable = TaskUtils.getVariableMap(paramMap)
+ val special = TaskUtils.getSpecialMap(paramMap)
runtimeParams = new RuntimeParamsImpl(runtime, variable, special)
}
diff --git
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/RuntimeParams.scala
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/RuntimeParams.scala
index da5623014..c900fbbdc 100644
---
a/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/RuntimeParams.scala
+++
b/linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/ast/RuntimeParams.scala
@@ -53,11 +53,10 @@ class RuntimeParamsImpl(
private var jobs: util.Map[String, AnyRef] = _
def init(): Unit = {
- dataSources =
- getSubMap(runtimeMap.asInstanceOf[util.Map[String, Any]],
QueryParams.DATA_SOURCE_KEY)
- context = getSubMap(runtimeMap.asInstanceOf[util.Map[String, Any]],
QueryParams.CONTEXT_KEY)
+ dataSources = getSubMap(runtimeMap, QueryParams.DATA_SOURCE_KEY)
+ context = getSubMap(runtimeMap, QueryParams.CONTEXT_KEY)
initContextMap(runtimeMap, context) // just for compatible with old usage.
- jobs = getSubMap(runtimeMap.asInstanceOf[util.Map[String, Any]],
QueryParams.JOB_KEY)
+ jobs = getSubMap(runtimeMap, QueryParams.JOB_KEY)
}
init()
@@ -78,7 +77,7 @@ class RuntimeParamsImpl(
}
}
- private def getSubMap(params: util.Map[String, Any], key: String):
util.Map[String, AnyRef] = {
+ private def getSubMap(params: util.Map[String, AnyRef], key: String):
util.Map[String, AnyRef] = {
if (null != params.get(key)) {
params.get(key).asInstanceOf[util.Map[String, AnyRef]]
} else {
@@ -98,8 +97,6 @@ class RuntimeParamsImpl(
override def getMap(key: String): util.Map[String, AnyRef] =
runtimeMap.get(key) match {
case map: util.Map[String, AnyRef] => map
- case map: util.Map[String, Any] => map.asInstanceOf[util.Map[String,
AnyRef]]
- case map: util.Map[String, Object] => map
case _ => new util.HashMap[String, AnyRef]
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
