You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/09/03 06:23:05 UTC
[incubator-linkis] branch dev-1.3.1 updated: feat:Scala code format alarm clear in linkis-protocol (#3177)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 867fc449e feat:Scala code format alarm clear in linkis-protocol (#3177)
867fc449e is described below
commit 867fc449e72f63de36618d4a1c3c528e1cc032a4
Author: ruY <43...@users.noreply.github.com>
AuthorDate: Sat Sep 3 14:23:00 2022 +0800
feat:Scala code format alarm clear in linkis-protocol (#3177)
---
.../apache/linkis/protocol/utils/TaskUtils.scala | 34 ++++++++++++----------
.../linkis/protocol/utils/ZuulEntranceUtils.scala | 11 ++-----
2 files changed, 20 insertions(+), 25 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 fa0052885..ad518d61e 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
@@ -21,38 +21,38 @@ import org.apache.linkis.protocol.constants.TaskConstant
import java.util
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
object TaskUtils {
def getMap(params: util.Map[String, Any], key: String): util.Map[String, Any] =
- if (params != null && params.containsKey(key))
+ 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().foreach { k => resultMap.put(k, map.get(k)) }
+ map.keySet().asScala.foreach { k => resultMap.put(k, map.get(k)) }
resultMap
case _ => new util.HashMap[String, Any]()
}
- else new util.HashMap[String, Any]()
+ } else new util.HashMap[String, Any]()
private def addMap(
params: util.Map[String, Any],
waitToAdd: util.Map[String, Any],
key: String
): Unit =
- if (params != null && params.containsKey(key))
+ 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().foreach { k => resultMap.put(k, map.get(k)) }
+ map.keySet().asScala.foreach { k => resultMap.put(k, map.get(k)) }
resultMap.putAll(waitToAdd)
params.put(key, resultMap)
case _ => params.put(key, waitToAdd)
}
- else params.put(key, waitToAdd)
+ } else params.put(key, waitToAdd)
private def getConfigurationMap(params: util.Map[String, Any], key: String) = {
val configurationMap = getMap(params, TaskConstant.PARAMS_CONFIGURATION)
@@ -69,31 +69,33 @@ object TaskUtils {
addMap(configurationMap, waitToAdd, key)
}
- def getVariableMap(params: util.Map[String, Any]) = getMap(params, TaskConstant.PARAMS_VARIABLE)
+ def getVariableMap(params: util.Map[String, Any]): util.Map[String, Any] =
+ getMap(params, TaskConstant.PARAMS_VARIABLE)
- def getStartupMap(params: util.Map[String, Any]) =
+ def getStartupMap(params: util.Map[String, Any]): util.Map[String, Any] =
getConfigurationMap(params, TaskConstant.PARAMS_CONFIGURATION_STARTUP)
- def getRuntimeMap(params: util.Map[String, Any]) =
+ def getRuntimeMap(params: util.Map[String, Any]): util.Map[String, Any] =
getConfigurationMap(params, TaskConstant.PARAMS_CONFIGURATION_RUNTIME)
- def getSpecialMap(params: util.Map[String, Any]) =
+ def getSpecialMap(params: util.Map[String, Any]): util.Map[String, Any] =
getConfigurationMap(params, TaskConstant.PARAMS_CONFIGURATION_SPECIAL)
- def addVariableMap(params: util.Map[String, Any], variableMap: util.Map[String, Any]) =
+ def addVariableMap(params: util.Map[String, Any], variableMap: util.Map[String, Any]): Unit =
addMap(params, variableMap, TaskConstant.PARAMS_VARIABLE)
- def addStartupMap(params: util.Map[String, Any], startupMap: util.Map[String, Any]) =
+ def addStartupMap(params: util.Map[String, Any], startupMap: util.Map[String, Any]): Unit =
addConfigurationMap(params, startupMap, TaskConstant.PARAMS_CONFIGURATION_STARTUP)
- def addRuntimeMap(params: util.Map[String, Any], runtimeMap: util.Map[String, Any]) =
+ def addRuntimeMap(params: util.Map[String, Any], runtimeMap: util.Map[String, Any]): Unit =
addConfigurationMap(params, runtimeMap, TaskConstant.PARAMS_CONFIGURATION_RUNTIME)
- def addSpecialMap(params: util.Map[String, Any], specialMap: util.Map[String, Any]) =
+ def addSpecialMap(params: util.Map[String, Any], specialMap: util.Map[String, Any]): Unit =
addConfigurationMap(params, specialMap, TaskConstant.PARAMS_CONFIGURATION_SPECIAL)
// tdoo
- def getLabelsMap(params: util.Map[String, Any]) = getMap(params, TaskConstant.LABELS)
+ def getLabelsMap(params: util.Map[String, Any]): util.Map[String, Any] =
+ getMap(params, TaskConstant.LABELS)
def addLabelsMap(params: util.Map[String, Any], labels: util.Map[String, Any]): Unit =
addMap(params, labels, TaskConstant.LABELS)
diff --git a/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/utils/ZuulEntranceUtils.scala b/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/utils/ZuulEntranceUtils.scala
index be59d914c..95c7a8187 100644
--- a/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/utils/ZuulEntranceUtils.scala
+++ b/linkis-commons/linkis-protocol/src/main/scala/org/apache/linkis/protocol/utils/ZuulEntranceUtils.scala
@@ -60,7 +60,7 @@ object ZuulEntranceUtils {
}
}
- @Deprecated
+ @deprecated
def generateExecID(
shortExecID: String,
executeApplicationName: String,
@@ -87,7 +87,7 @@ object ZuulEntranceUtils {
* {dd}{dd}${executeApplicationName}${instance}${shortExecID}
* @return
*/
- @Deprecated
+ @deprecated
def generateExecID(
shortExecID: String,
executeApplicationName: String,
@@ -104,13 +104,6 @@ object ZuulEntranceUtils {
executeLength + instanceLength + executeApplicationName + instance + shortExecID
}
- def main(args: Array[String]): Unit = {
- val str =
- generateExecID("spark_test_01", "linkis-cg-entrance", Array[String]("127.0.0.1:8080"))
- val array = parseServiceInstanceByExecID(str)
- println(array(3))
- }
-
def parseServiceInstanceByExecID(longExecID: String): Array[ServiceInstance] = {
if (longExecID.startsWith(EXEC_ID)) {
val content = longExecID.replaceFirst(EXEC_ID, "")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org