diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/ParameterConfig.java b/common/src/main/java/com/tencent/supersonic/common/pojo/ParameterConfig.java index 57321cf74..bf695e74a 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/ParameterConfig.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/ParameterConfig.java @@ -1,7 +1,6 @@ package com.tencent.supersonic.common.pojo; import com.tencent.supersonic.common.service.SystemConfigService; -import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; @@ -10,7 +9,6 @@ import org.springframework.stereotype.Service; import java.util.List; @Service -@Slf4j public abstract class ParameterConfig { @Autowired @@ -19,29 +17,28 @@ public abstract class ParameterConfig { @Autowired private Environment environment; + /** + * @return system parameters to be set with user interface + */ protected abstract List getSysParameters(); /** - * Parameter value will be derived by following orders: + * Parameter value will be derived in the following order: * 1. `system config` set with user interface - * 2. `system property` set with application.yaml + * 2. `system property` set with application.yaml file * 3. `default value` set with parameter declaration - * @param parameter + * @param parameter instance * @return parameter value */ public String getParameterValue(Parameter parameter) { String paramName = parameter.getName(); String value = sysConfigService.getSystemConfig().getParameterByName(paramName); - try { - if (StringUtils.isBlank(value)) { - if (environment.containsProperty(paramName)) { - value = environment.getProperty(paramName); - } else { - value = parameter.getDefaultValue(); - } + if (StringUtils.isBlank(value)) { + if (environment.containsProperty(paramName)) { + value = environment.getProperty(paramName); + } else { + value = parameter.getDefaultValue(); } - } catch (Exception e) { - log.error("Failed to get parameter value for {} with exception: {}", paramName, e); } return value; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/mapper/BaseMapper.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/mapper/BaseMapper.java index fe297c1e8..a37518689 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/mapper/BaseMapper.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/mapper/BaseMapper.java @@ -159,7 +159,6 @@ public abstract class BaseMapper implements SchemaMapper { } SchemaElement elementDb = dataSetSchema.getElement(elementType, elementID); if (Objects.isNull(elementDb)) { - log.warn("element is null, elementType:{},elementID:{}", elementType, elementID); return null; } BeanUtils.copyProperties(elementDb, element); diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/parser/rule/RuleSqlParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/parser/rule/RuleSqlParser.java index b59fdf00c..cd948b37c 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/parser/rule/RuleSqlParser.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/parser/rule/RuleSqlParser.java @@ -26,7 +26,6 @@ public class RuleSqlParser implements SemanticParser { @Override public void parse(QueryContext queryContext, ChatContext chatContext) { if (!queryContext.getText2SQLType().enableRule()) { - log.info("not enable rule, skip"); return; } SchemaMapInfo mapInfo = queryContext.getMapInfo();