You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/04/20 08:11:15 UTC
[incubator-linkis] 01/04: optimize code
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 10efd04da4231587573b8806acaf1a75684823e8
Author: peacewong <wp...@gmail.com>
AuthorDate: Wed Apr 20 11:55:41 2022 +0800
optimize code
---
.../service/ConfigurationService.scala | 22 +++++++---------------
.../configuration/util/LabelParameterParser.scala | 17 +++++++++++++++--
2 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
index 6b1713399..2e6d4b915 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
@@ -176,7 +176,10 @@ class ConfigurationService extends Logging {
if (setting.getId != null) {
key = configMapper.selectKeyByKeyID(setting.getId)
} else {
- key = configMapper.seleteKeyByKeyName(setting.getKey)
+ val keys = configMapper.seleteKeyByKeyName(setting.getKey)
+ if (null != keys && !keys.isEmpty) {
+ key = keys.get(0)
+ }
}
if (key == null) {
throw new ConfigurationException("config key is null, please check again!(配置信息为空，请重新检查key值)")
@@ -237,18 +240,7 @@ class ConfigurationService extends Logging {
}
- def labelCheck(labelList: java.util.List[Label[_]]): Boolean = {
- if (!CollectionUtils.isEmpty(labelList)) {
- labelList.asScala.foreach {
- case a: UserCreatorLabel => Unit
- case a: EngineTypeLabel => Unit
- case label => throw new ConfigurationException(s"this type of label is not supported:${label.getClass}")
- }
- true
- } else {
- throw new ConfigurationException("The label parameter is empty")
- }
- }
+
def replaceCreatorToEngine(defaultCreatorConfigs: util.List[ConfigKeyValue], defaultEngineConfigs: util.List[ConfigKeyValue]): Unit = {
defaultCreatorConfigs.asScala.foreach(creatorConfig => {
@@ -272,7 +264,7 @@ class ConfigurationService extends Logging {
* @return
*/
def getFullTreeByLabelList(labelList: java.util.List[Label[_]], useDefaultConfig: Boolean = true): util.ArrayList[ConfigTree] = {
- labelCheck(labelList)
+ LabelParameterParser.labelCheck(labelList)
val combinedLabel = combinedLabelBuilder.build("", labelList).asInstanceOf[CombinedLabelImpl]
val label = labelMapper.getLabelByKeyValue(combinedLabel.getLabelKey, combinedLabel.getStringValue)
var configs: util.List[ConfigKeyValue] = new util.ArrayList[ConfigKeyValue]()
@@ -337,7 +329,7 @@ class ConfigurationService extends Logging {
}
def queryConfigByLabel(labelList: java.util.List[Label[_]], isMerge: Boolean = true, filter: String = null): ResponseQueryConfig = {
- labelCheck(labelList)
+ LabelParameterParser.labelCheck(labelList)
val allGolbalUserConfig = getFullTreeByLabelList(labelList)
val defaultLabel = LabelParameterParser.changeUserToDefault(labelList)
val allGolbalDefaultConfig = getFullTreeByLabelList(defaultLabel)
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/LabelParameterParser.scala b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/LabelParameterParser.scala
index 5af302191..85ffd7c9b 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/LabelParameterParser.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/util/LabelParameterParser.scala
@@ -18,13 +18,13 @@
package org.apache.linkis.configuration.util
import java.util
-
import org.apache.linkis.common.conf.CommonVars
import org.apache.linkis.configuration.exception.ConfigurationException
import org.apache.linkis.governance.common.conf.GovernanceCommonConf
import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext
import org.apache.linkis.manager.label.entity.Label
-import org.apache.linkis.manager.label.entity.engine.{EngineType, UserCreatorLabel}
+import org.apache.linkis.manager.label.entity.engine.{EngineType, EngineTypeLabel, UserCreatorLabel}
+import org.springframework.util.CollectionUtils
import scala.collection.JavaConverters._
@@ -67,4 +67,17 @@ object LabelParameterParser {
}
newList
}
+
+ def labelCheck(labelList: java.util.List[Label[_]]): Boolean = {
+ if (!CollectionUtils.isEmpty(labelList)) {
+ labelList.asScala.foreach {
+ case a: UserCreatorLabel => Unit
+ case a: EngineTypeLabel => Unit
+ case label => throw new ConfigurationException(s"this type of label is not supported:${label.getClass}")
+ }
+ true
+ } else {
+ throw new ConfigurationException("The label parameter is empty")
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org