(improvement)(project) Remove additional logging dependencies and use logback as the primary logging framework. (#1235)

2025-12-24 10:27:28 +08:00 · 2024-06-27 09:39:26 +08:00
parent 24674fe0be
commit 7c711f6105
35 changed files with 210 additions and 221 deletions
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java
@@ -2,6 +2,7 @@ package com.tencent.supersonic.headless.api.pojo.request;


 import com.google.common.collect.Lists;
+import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
 import com.tencent.supersonic.common.pojo.Aggregator;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.DateConf;
@@ -12,11 +13,6 @@ import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.DateModeUtils;
 import com.tencent.supersonic.common.util.SqlFilterUtils;
-import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.JSQLParserException;
@@ -36,9 +32,13 @@ import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.SelectItem;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.util.CollectionUtils;

+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+

@Data
@Slf4j
@@ -56,7 +56,7 @@ public class QueryStructReq extends SemanticQueryReq {

    public List<String> getGroups() {
        if (!CollectionUtils.isEmpty(this.groups)) {
-            this.groups = groups.stream().filter(group -> !Strings.isEmpty(group)).collect(Collectors.toList());
+            this.groups = groups.stream().filter(group -> !StringUtils.isEmpty(group)).collect(Collectors.toList());
        }

        if (CollectionUtils.isEmpty(this.groups)) {
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/WhereCorrector.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/WhereCorrector.java
@@ -16,7 +16,6 @@ import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.util.CollectionUtils;

 import java.util.HashMap;
@@ -95,7 +94,7 @@ public class WhereCorrector extends BaseSemanticCorrector {

        for (SchemaElement dimension : dimensions) {
            if (Objects.isNull(dimension)
-                    || Strings.isEmpty(dimension.getName())
+                    || StringUtils.isEmpty(dimension.getName())
                    || CollectionUtils.isEmpty(dimension.getSchemaValueMaps())) {
                continue;
            }
@@ -104,15 +103,15 @@ public class WhereCorrector extends BaseSemanticCorrector {
            Map<String, String> aliasAndBizNameToTechName = new HashMap<>();

            for (SchemaValueMap valueMap : dimension.getSchemaValueMaps()) {
-                if (Objects.isNull(valueMap) || Strings.isEmpty(valueMap.getTechName())) {
+                if (Objects.isNull(valueMap) || StringUtils.isEmpty(valueMap.getTechName())) {
                    continue;
                }
-                if (Strings.isNotEmpty(valueMap.getBizName())) {
+                if (StringUtils.isNotEmpty(valueMap.getBizName())) {
                    aliasAndBizNameToTechName.put(valueMap.getBizName(), valueMap.getTechName());
                }
                if (!CollectionUtils.isEmpty(valueMap.getAlias())) {
                    valueMap.getAlias().stream().forEach(alias -> {
-                        if (Strings.isNotEmpty(alias)) {
+                        if (StringUtils.isNotEmpty(alias)) {
                            aliasAndBizNameToTechName.put(alias, valueMap.getTechName());
                        }
                    });
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/file/FileHandlerImpl.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/file/FileHandlerImpl.java
@@ -4,7 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.tencent.supersonic.headless.api.pojo.request.DictValueReq;
 import com.tencent.supersonic.headless.api.pojo.response.DictValueResp;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;

@@ -125,7 +125,7 @@ public class FileHandlerImpl implements FileHandler {

    private DictValueResp convert2Resp(String lineStr) {
        DictValueResp dictValueResp = new DictValueResp();
-        if (Strings.isNotEmpty(lineStr)) {
+        if (StringUtils.isNotEmpty(lineStr)) {
            String[] itemArray = lineStr.split("\\s+");
            if (Objects.nonNull(itemArray) && itemArray.length >= 3) {
                dictValueResp.setValue(itemArray[0].replace("#", " "));
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/rule/TimeRangeParser.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/rule/TimeRangeParser.java
@@ -2,16 +2,16 @@ package com.tencent.supersonic.headless.chat.parser.rule;

 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.DateConf;
+import com.tencent.supersonic.headless.chat.ChatContext;
+import com.tencent.supersonic.headless.chat.QueryContext;
+import com.tencent.supersonic.headless.chat.parser.SemanticParser;
 import com.tencent.supersonic.headless.chat.query.QueryManager;
 import com.tencent.supersonic.headless.chat.query.SemanticQuery;
 import com.tencent.supersonic.headless.chat.query.rule.RuleSemanticQuery;
-import com.tencent.supersonic.headless.chat.parser.SemanticParser;
-import com.tencent.supersonic.headless.chat.ChatContext;
-import com.tencent.supersonic.headless.chat.QueryContext;
 import com.xkzhangsan.time.nlp.TimeNLP;
 import com.xkzhangsan.time.nlp.TimeNLPUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.StringUtils;

 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,6 +23,8 @@ import java.util.Stack;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

+;
+
 /**
 * TimeRangeParser extracts time range specified in the user query
 * based on keyword matching.
@@ -155,7 +157,7 @@ public class TimeRangeParser implements SemanticParser {
                days = days * num;
                info.setDateMode(DateConf.DateMode.RECENT);
                String detectWord = "近" + num + zhPeriod;
-                if (Strings.isNotEmpty(m.group("periodStr"))) {
+                if (StringUtils.isNotEmpty(m.group("periodStr"))) {
                    detectWord = m.group("periodStr");
                }
                info.setDetectWord(detectWord);
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/utils/QueryReqBuilder.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/utils/QueryReqBuilder.java
@@ -20,7 +20,6 @@ import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import com.tencent.supersonic.headless.chat.query.QueryManager;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;

@@ -73,7 +72,7 @@ public class QueryReqBuilder {

    private static List<Filter> getFilters(Set<QueryFilter> queryFilters) {
        List<Filter> dimensionFilters = queryFilters.stream()
-                .filter(chatFilter -> Strings.isNotEmpty(chatFilter.getBizName()))
+                .filter(chatFilter -> StringUtils.isNotEmpty(chatFilter.getBizName()))
                .map(chatFilter -> new Filter(chatFilter.getBizName(), chatFilter.getOperator(), chatFilter.getValue()))
                .collect(Collectors.toList());
        return dimensionFilters;
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/cache/CaffeineCacheManager.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/cache/CaffeineCacheManager.java
@@ -4,7 +4,7 @@ package com.tencent.supersonic.headless.core.cache;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.google.common.base.Joiner;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -36,7 +36,7 @@ public class CaffeineCacheManager implements CacheManager {

    @Override
    public String generateCacheKey(String prefix, String body) {
-        if (Strings.isEmpty(prefix)) {
+        if (StringUtils.isEmpty(prefix)) {
            prefix = "-1";
        }
        return Joiner.on(":").join(cacheCommonConfig.getCacheCommonApp(), cacheCommonConfig.getCacheCommonEnv(),
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/JdbcExecutor.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/JdbcExecutor.java
@@ -7,11 +7,13 @@ import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 import com.tencent.supersonic.headless.core.utils.ComponentFactory;
 import com.tencent.supersonic.headless.core.utils.SqlUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;

 import java.util.Objects;

+;
+
@Component("JdbcExecutor")
@Slf4j
 public class JdbcExecutor implements QueryExecutor {
@@ -34,7 +36,7 @@ public class JdbcExecutor implements QueryExecutor {
        }

        SqlUtils sqlUtils = ContextUtils.getBean(SqlUtils.class);
-        if (Strings.isEmpty(queryStatement.getSourceId())) {
+        if (StringUtils.isEmpty(queryStatement.getSourceId())) {
            log.warn("data base id is empty");
            return null;
        }
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/DefaultSemanticTranslator.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/DefaultSemanticTranslator.java
@@ -1,6 +1,5 @@
 package com.tencent.supersonic.headless.core.translator;

-import com.google.common.base.Strings;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.common.util.StringUtil;
 import com.tencent.supersonic.headless.api.pojo.MetricTable;
@@ -64,8 +63,8 @@ public class DefaultSemanticTranslator implements SemanticTranslator {
            queryStatement.getMetricQueryParam().setNativeQuery(queryParam.getQueryType().isNativeAggQuery());
            doParse(queryStatement);
        }
-        if (Strings.isNullOrEmpty(queryStatement.getSql())
-                || Strings.isNullOrEmpty(queryStatement.getSourceId())) {
+        if (StringUtils.isEmpty(queryStatement.getSql())
+                || StringUtils.isEmpty(queryStatement.getSourceId())) {
            throw new RuntimeException("parse Exception: " + queryStatement.getErrMsg());
        }
        if (StringUtils.isNotBlank(queryStatement.getSql())
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/DetailQueryOptimizer.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/DetailQueryOptimizer.java
@@ -1,14 +1,15 @@
 package com.tencent.supersonic.headless.core.translator;

-import com.google.common.base.Strings;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
-import java.util.Objects;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;

+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
 * Remove the default metric added by the system when the query only has dimensions
 */
@@ -20,7 +21,7 @@ public class DetailQueryOptimizer implements QueryOptimizer {
    public void rewrite(QueryStatement queryStatement) {
        QueryParam queryParam = queryStatement.getQueryParam();
        String sqlRaw = queryStatement.getSql().trim();
-        if (Strings.isNullOrEmpty(sqlRaw)) {
+        if (StringUtils.isEmpty(sqlRaw)) {
            throw new RuntimeException("sql is empty or null");
        }
        log.debug("before handleNoMetric, sql:{}", sqlRaw);
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java
@@ -1,12 +1,7 @@
 package com.tencent.supersonic.headless.core.utils;

-import static com.tencent.supersonic.common.pojo.Constants.DAY;
-import static com.tencent.supersonic.common.pojo.Constants.DAY_FORMAT;
-import static com.tencent.supersonic.common.pojo.Constants.JOIN_UNDERLINE;
-import static com.tencent.supersonic.common.pojo.Constants.MONTH;
-import static com.tencent.supersonic.common.pojo.Constants.UNDERLINE;
-import static com.tencent.supersonic.common.pojo.Constants.WEEK;
-
+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.common.pojo.Aggregator;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.common.pojo.ItemDateResp;
@@ -15,8 +10,6 @@ import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.util.DateModeUtils;
 import com.tencent.supersonic.common.util.SqlFilterUtils;
 import com.tencent.supersonic.common.util.StringUtil;
-import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.Measure;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
@@ -27,6 +20,13 @@ import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp;
 import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
 import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp;
 import com.tencent.supersonic.headless.core.config.ExecutorConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Triple;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Collections;
@@ -38,13 +38,15 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Triple;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
+
+import static com.tencent.supersonic.common.pojo.Constants.DAY;
+import static com.tencent.supersonic.common.pojo.Constants.DAY_FORMAT;
+import static com.tencent.supersonic.common.pojo.Constants.JOIN_UNDERLINE;
+import static com.tencent.supersonic.common.pojo.Constants.MONTH;
+import static com.tencent.supersonic.common.pojo.Constants.UNDERLINE;
+import static com.tencent.supersonic.common.pojo.Constants.WEEK;
+
+;

 /**
 * tools functions to analyze queryStructReq
@@ -167,13 +169,13 @@ public class SqlGenerateUtils {

    private String mergeDateWhereClause(QueryParam queryParam, String whereClauseFromFilter,
            String whereFromDate) {
-        if (Strings.isNotEmpty(whereFromDate) && Strings.isNotEmpty(whereClauseFromFilter)) {
+        if (StringUtils.isNotEmpty(whereFromDate) && StringUtils.isNotEmpty(whereClauseFromFilter)) {
            return String.format("%s AND (%s)", whereFromDate, whereClauseFromFilter);
-        } else if (Strings.isEmpty(whereFromDate) && Strings.isNotEmpty(whereClauseFromFilter)) {
+        } else if (StringUtils.isEmpty(whereFromDate) && StringUtils.isNotEmpty(whereClauseFromFilter)) {
            return whereClauseFromFilter;
-        } else if (Strings.isNotEmpty(whereFromDate) && Strings.isEmpty(whereClauseFromFilter)) {
+        } else if (StringUtils.isNotEmpty(whereFromDate) && StringUtils.isEmpty(whereClauseFromFilter)) {
            return whereFromDate;
-        } else if (Objects.isNull(whereFromDate) && Strings.isEmpty(whereClauseFromFilter)) {
+        } else if (Objects.isNull(whereFromDate) && StringUtils.isEmpty(whereClauseFromFilter)) {
            log.info("the current date information is empty, enter the date initialization logic");
            return dateModeUtils.defaultRecentDateInfo(queryParam.getDateInfo());
        }
@@ -182,8 +184,8 @@ public class SqlGenerateUtils {

    public String getDateWhereClause(DateConf dateInfo, ItemDateResp dateDate) {
        if (Objects.isNull(dateDate)
-                || Strings.isEmpty(dateDate.getStartDate())
-                && Strings.isEmpty(dateDate.getEndDate())) {
+                || StringUtils.isEmpty(dateDate.getStartDate())
+                && StringUtils.isEmpty(dateDate.getEndDate())) {
            if (dateInfo.getDateMode().equals(DateConf.DateMode.LIST)) {
                return dateModeUtils.listDateStr(dateDate, dateInfo);
            }
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java
@@ -1,14 +1,14 @@
 package com.tencent.supersonic.headless.server.aspect;

 import com.google.common.collect.Lists;
+import com.tencent.supersonic.common.jsqlparser.FieldExpression;
+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.common.pojo.Filter;
 import com.tencent.supersonic.common.pojo.QueryColumn;
 import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.common.jsqlparser.FieldExpression;
-import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.DimValueMap;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
@@ -18,16 +18,8 @@ import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.server.pojo.MetaFilter;
 import com.tencent.supersonic.headless.server.web.service.DimensionService;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -36,6 +28,14 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;

+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
@Aspect
@Component
@Slf4j
@@ -176,7 +176,7 @@ public class DimValueAspect {
                    Map<String, String> techAndBizPair = dimAndTechNameAndBizNamePair.get(bizName);
                    if (!CollectionUtils.isEmpty(techAndBizPair) && techAndBizPair.containsKey(techName)) {
                        String bizValueName = techAndBizPair.get(techName);
-                        if (Strings.isNotEmpty(bizValueName)) {
+                        if (StringUtils.isNotEmpty(bizValueName)) {
                            line.put(bizName, bizValueName);
                        }
                    }
@@ -255,12 +255,12 @@ public class DimValueAspect {
                if (needSkipDimValue(dimValueMap)) {
                    continue;
                }
-                if (Strings.isNotEmpty(dimValueMap.getBizName())) {
+                if (StringUtils.isNotEmpty(dimValueMap.getBizName())) {
                    aliasAndBizNameToTechName.put(dimValueMap.getBizName(), dimValueMap.getTechName());
                }
                if (!CollectionUtils.isEmpty(dimValueMap.getAlias())) {
                    dimValueMap.getAlias().stream().forEach(alias -> {
-                        if (Strings.isNotEmpty(alias)) {
+                        if (StringUtils.isNotEmpty(alias)) {
                            aliasAndBizNameToTechName.put(alias, dimValueMap.getTechName());
                        }
                    });
@@ -275,7 +275,7 @@ public class DimValueAspect {
    }

    private boolean needSkipDimValue(DimValueMap dimValueMap) {
-        return Objects.isNull(dimValueMap) || Strings.isEmpty(dimValueMap.getTechName());
+        return Objects.isNull(dimValueMap) || StringUtils.isEmpty(dimValueMap.getTechName());
    }

    private Map<String, Map<String, String>> getTechNameToBizName(List<DimensionResp> dimensions) {
@@ -308,7 +308,7 @@ public class DimValueAspect {
    }

    private boolean needSkipDimension(DimensionResp dimension) {
-        return Objects.isNull(dimension) || Strings.isEmpty(dimension.getBizName()) || CollectionUtils.isEmpty(
+        return Objects.isNull(dimension) || StringUtils.isEmpty(dimension.getBizName()) || CollectionUtils.isEmpty(
                dimension.getDimValueMaps());
    }
 }
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java
@@ -2,7 +2,6 @@ package com.tencent.supersonic.headless.server.aspect;

 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
@@ -101,7 +100,7 @@ public class S2DataPermissionAspect {
            return joinPoint.proceed();
        }
        User user = (User) objects[1];
-        if (Objects.isNull(user) || Strings.isNullOrEmpty(user.getName())) {
+        if (Objects.isNull(user) || StringUtils.isEmpty(user.getName())) {
            throw new RuntimeException("please provide user information");
        }
        List<Long> modelIds = getModelsInDataSet(queryReq);
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/ClassRepositoryImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/ClassRepositoryImpl.java
@@ -6,7 +6,7 @@ import com.tencent.supersonic.headless.server.persistence.mapper.ClassMapper;
 import com.tencent.supersonic.headless.server.persistence.repository.ClassRepository;
 import com.tencent.supersonic.headless.server.pojo.ClassFilter;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;

 import java.util.List;
@@ -52,7 +52,7 @@ public class ClassRepositoryImpl implements ClassRepository {
        if (Objects.nonNull(filter.getDataSetId())) {
            wrapper.lambda().eq(ClassDO::getDataSetId, filter.getDataSetId());
        }
-        if (Strings.isNotEmpty(filter.getType())) {
+        if (StringUtils.isNotEmpty(filter.getType())) {
            wrapper.lambda().eq(ClassDO::getType, filter.getType());
        }
        if (CollectionUtils.isNotEmpty(filter.getIds())) {
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/StatRepositoryImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/StatRepositoryImpl.java
@@ -10,7 +10,7 @@ import com.tencent.supersonic.headless.server.persistence.mapper.StatMapper;
 import com.tencent.supersonic.headless.server.persistence.repository.StatRepository;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;

 import java.util.ArrayList;
@@ -70,7 +70,7 @@ public class StatRepositoryImpl implements StatRepository {
    }

    private void updateStatMapInfo(Map<String, Long> map, String dimensions, String type, Long dataSetId) {
-        if (Strings.isNotEmpty(dimensions)) {
+        if (StringUtils.isNotEmpty(dimensions)) {
            try {
                List<String> dimensionList = mapper.readValue(dimensions, new TypeReference<List<String>>() {
                });
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java
@@ -13,7 +13,7 @@ import com.tencent.supersonic.headless.api.pojo.response.DataSetSchemaResp;
 import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp;
 import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp;
 import com.tencent.supersonic.headless.api.pojo.response.TermResp;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;

@@ -180,7 +180,7 @@ public class DataSetSchemaBuilder {
            List<DimValueMap> dimValueMaps = dim.getDimValueMaps();
            if (!CollectionUtils.isEmpty(dimValueMaps)) {
                for (DimValueMap dimValueMap : dimValueMaps) {
-                    if (Strings.isNotEmpty(dimValueMap.getBizName())) {
+                    if (StringUtils.isNotEmpty(dimValueMap.getBizName())) {
                        dimValueAlias.add(dimValueMap.getBizName());
                    }
                    if (!CollectionUtils.isEmpty(dimValueMap.getAlias())) {
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java
@@ -1,12 +1,5 @@
 package com.tencent.supersonic.headless.server.utils;

-import static com.tencent.supersonic.common.pojo.Constants.AND_UPPER;
-import static com.tencent.supersonic.common.pojo.Constants.APOSTROPHE;
-import static com.tencent.supersonic.common.pojo.Constants.COMMA;
-import static com.tencent.supersonic.common.pojo.Constants.POUND;
-import static com.tencent.supersonic.common.pojo.Constants.SPACE;
-
-import com.google.common.base.Strings;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.Aggregator;
 import com.tencent.supersonic.common.pojo.Constants;
@@ -33,13 +26,21 @@ import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
 import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.api.pojo.response.TagResp;
+import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
 import com.tencent.supersonic.headless.server.persistence.dataobject.DictConfDO;
 import com.tencent.supersonic.headless.server.persistence.dataobject.DictTaskDO;
 import com.tencent.supersonic.headless.server.web.service.DimensionService;
 import com.tencent.supersonic.headless.server.web.service.MetricService;
 import com.tencent.supersonic.headless.server.web.service.ModelService;
-import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
 import com.tencent.supersonic.headless.server.web.service.TagMetaService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -52,12 +53,12 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.StringJoiner;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
+
+import static com.tencent.supersonic.common.pojo.Constants.AND_UPPER;
+import static com.tencent.supersonic.common.pojo.Constants.APOSTROPHE;
+import static com.tencent.supersonic.common.pojo.Constants.COMMA;
+import static com.tencent.supersonic.common.pojo.Constants.POUND;
+import static com.tencent.supersonic.common.pojo.Constants.SPACE;

@Slf4j
@Component
@@ -112,7 +113,7 @@ public class DictUtils {
        taskDO.setConfig(JsonUtil.toString(dictItemResp.getConfig()));
        taskDO.setStatus(status.getStatus());
        taskDO.setCreatedAt(createAt);
-        String creator = (Objects.isNull(user) || Strings.isNullOrEmpty(user.getName())) ? "" : user.getName();
+        String creator = (Objects.isNull(user) || StringUtils.isEmpty(user.getName())) ? "" : user.getName();
        taskDO.setCreatedBy(creator);
        return taskDO;
    }
@@ -124,7 +125,7 @@ public class DictUtils {
        confDO.setConfig(JsonUtil.toString(itemValueReq.getConfig()));
        Date createAt = new Date();
        confDO.setCreatedAt(createAt);
-        String creator = Strings.isNullOrEmpty(user.getName()) ? "" : user.getName();
+        String creator = StringUtils.isEmpty(user.getName()) ? "" : user.getName();
        confDO.setCreatedBy(creator);
        confDO.setStatus(itemValueReq.getStatus().name());
        return confDO;
@@ -180,7 +181,7 @@ public class DictUtils {
                        metricObject = line.get(key);
                    }
                }
-                if (!Strings.isNullOrEmpty(dimValue) && Objects.nonNull(metricObject)) {
+                if (!StringUtils.isEmpty(dimValue) && Objects.nonNull(metricObject)) {
                    Long metric = Math.round(Double.parseDouble(metricObject.toString()));
                    mergeMultivaluedValue(valueAndFrequencyPair, dimValue, metric);
                }
@@ -201,7 +202,7 @@ public class DictUtils {
        }
        List<String> whiteList = dictItemResp.getConfig().getWhiteList();
        whiteList.forEach(white -> {
-            if (!Strings.isNullOrEmpty(white)) {
+            if (!StringUtils.isEmpty(white)) {
                white = white.replace(SPACE, POUND);
            }
            lines.add(String.format("%s %s %s", white, nature, itemValueWhiteFrequency));
@@ -214,7 +215,7 @@ public class DictUtils {
        }

        valueAndFrequencyPair.forEach((value, frequency) -> {
-            if (!Strings.isNullOrEmpty(value)) {
+            if (!StringUtils.isEmpty(value)) {
                value = value.replace(SPACE, POUND);
            }
            lines.add(String.format("%s %s %s", value, nature, frequency));
@@ -222,7 +223,7 @@ public class DictUtils {
    }

    private void mergeMultivaluedValue(Map<String, Long> valueAndFrequencyPair, String dimValue, Long metric) {
-        if (org.apache.logging.log4j.util.Strings.isEmpty(dimValue)) {
+        if (StringUtils.isEmpty(dimValue)) {
            return;
        }
        Map<String, Long> tmp = new HashMap<>();
@@ -252,7 +253,7 @@ public class DictUtils {
        String sqlPattern = "select %s, %s from tbl %s group by %s order by %s desc limit %d";
        String bizName = dictItemResp.getBizName();
        String whereStr = generateWhereStr(dictItemResp);
-        String where = Strings.isNullOrEmpty(whereStr) ? "" : "WHERE" + whereStr;
+        String where = StringUtils.isEmpty(whereStr) ? "" : "WHERE" + whereStr;
        ItemValueConfig config = dictItemResp.getConfig();
        Long limit = (Objects.isNull(config) || Objects.isNull(config.getLimit())) ? itemValueMaxCount :
                dictItemResp.getConfig().getLimit();
@@ -293,7 +294,7 @@ public class DictUtils {
        String sqlPattern = "select %s,count(1) from tbl %s group by %s order by count(1) desc limit %d";
        String bizName = dictItemResp.getBizName();
        String whereStr = generateWhereStr(dictItemResp);
-        String where = Strings.isNullOrEmpty(whereStr) ? "" : "WHERE" + whereStr;
+        String where = StringUtils.isEmpty(whereStr) ? "" : "WHERE" + whereStr;
        ItemValueConfig config = dictItemResp.getConfig();
        Long limit = (Objects.isNull(config) || Objects.isNull(config.getLimit())) ? itemValueMaxCount :
                dictItemResp.getConfig().getLimit();
@@ -365,7 +366,7 @@ public class DictUtils {
            return new ArrayList<>();
        }
        String whereStr = generateWhereStr(dictItemResp);
-        if (Strings.isNullOrEmpty(whereStr)) {
+        if (StringUtils.isEmpty(whereStr)) {
            return new ArrayList<>();
        }
        Filter filter = new Filter("", FilterOperatorEnum.SQL_PART, whereStr);
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DimensionConverter.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DimensionConverter.java
@@ -12,7 +12,7 @@ import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
 import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
 import com.tencent.supersonic.headless.api.pojo.response.DataSetResp;
 import com.tencent.supersonic.headless.server.persistence.dataobject.DimensionDO;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;

@@ -76,10 +76,10 @@ public class DimensionConverter {
        }
        dimensionResp.setModelFilterSql(
                modelRespMap.getOrDefault(dimensionResp.getModelId(), new ModelResp()).getFilterSql());
-        if (Strings.isNotEmpty(dimensionDO.getDimValueMaps())) {
+        if (StringUtils.isNotEmpty(dimensionDO.getDimValueMaps())) {
            dimensionResp.setDimValueMaps(JsonUtil.toList(dimensionDO.getDimValueMaps(), DimValueMap.class));
        }
-        if (Strings.isNotEmpty(dimensionDO.getDataType())) {
+        if (StringUtils.isNotEmpty(dimensionDO.getDataType())) {
            dimensionResp.setDataType(DataTypeEnums.of(dimensionDO.getDataType()));
        }
        if (dimensionDO.getExt() != null) {
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java
@@ -1,14 +1,14 @@
 package com.tencent.supersonic.headless.server.utils;


+import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.common.pojo.Aggregator;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper;
-import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.Measure;
 import com.tencent.supersonic.headless.api.pojo.MetricTable;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;
@@ -31,7 +31,6 @@ import com.tencent.supersonic.headless.core.utils.SqlGenerateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -160,7 +159,7 @@ public class QueryReqConverter {
            return AggOption.OUTER;
        }
        long defaultAggNullCnt = metricSchemas.stream()
-                .filter(m -> Objects.isNull(m.getDefaultAgg()) || Strings.isBlank(m.getDefaultAgg())).count();
+                .filter(m -> Objects.isNull(m.getDefaultAgg()) || StringUtils.isBlank(m.getDefaultAgg())).count();
        if (defaultAggNullCnt > 0) {
            log.info("getAggOption find null defaultAgg metric set to NATIVE");
            return AggOption.OUTER;
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryRuleConverter.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryRuleConverter.java
@@ -7,7 +7,7 @@ import com.tencent.supersonic.headless.api.pojo.enums.QueryRuleType;
 import com.tencent.supersonic.headless.api.pojo.request.QueryRuleReq;
 import com.tencent.supersonic.headless.api.pojo.response.QueryRuleResp;
 import com.tencent.supersonic.headless.server.persistence.dataobject.QueryRuleDO;
-import org.apache.directory.api.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

 import java.util.ArrayList;
@@ -33,7 +33,7 @@ public class QueryRuleConverter {
        BeanUtils.copyProperties(queryRuleDO, queryRuleResp);
        queryRuleResp.setRuleType(QueryRuleType.valueOf(queryRuleDO.getRuleType()));
        queryRuleResp.setRule(JsonUtil.toObject(queryRuleDO.getRule(), RuleInfo.class));
-        queryRuleResp.setAction(Strings.isEmpty(queryRuleDO.getAction()) ? new ActionInfo() :
+        queryRuleResp.setAction(StringUtils.isEmpty(queryRuleDO.getAction()) ? new ActionInfo() :
                JsonUtil.toObject(queryRuleDO.getAction(), ActionInfo.class));
        queryRuleResp.setExt(JsonUtil.toMap(queryRuleDO.getExt(), String.class, String.class));

--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java
@@ -4,13 +4,13 @@ import com.alibaba.ttl.TransmittableThreadLocal;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;
 import com.tencent.supersonic.common.util.SqlFilterUtils;
-import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.QueryStat;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
-import com.tencent.supersonic.headless.api.pojo.enums.QueryOptMode;
 import com.tencent.supersonic.headless.api.pojo.enums.QueryMethod;
+import com.tencent.supersonic.headless.api.pojo.enums.QueryOptMode;
 import com.tencent.supersonic.headless.api.pojo.enums.QueryTypeBack;
 import com.tencent.supersonic.headless.api.pojo.request.ItemUseReq;
 import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq;
@@ -22,7 +22,7 @@ import com.tencent.supersonic.headless.api.pojo.response.ItemUseResp;
 import com.tencent.supersonic.headless.server.persistence.repository.StatRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;

@@ -33,6 +33,8 @@ import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;

+;
+

@Component
@Slf4j
@@ -217,7 +219,7 @@ public class StatUtils {
    }

    private String getUserName(User facadeUser) {
-        return (Objects.nonNull(facadeUser) && Strings.isNotEmpty(facadeUser.getName())) ? facadeUser.getName()
+        return (Objects.nonNull(facadeUser) && StringUtils.isNotEmpty(facadeUser.getName())) ? facadeUser.getName()
                : "Admin";
    }

--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/TagObjectConverter.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/TagObjectConverter.java
@@ -4,7 +4,7 @@ import com.tencent.supersonic.common.util.JsonUtil;
 import com.tencent.supersonic.headless.api.pojo.request.TagObjectReq;
 import com.tencent.supersonic.headless.api.pojo.response.TagObjectResp;
 import com.tencent.supersonic.headless.server.persistence.dataobject.TagObjectDO;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;

@@ -24,7 +24,7 @@ public class TagObjectConverter {
    public static TagObjectResp convert2Resp(TagObjectDO tagObjectDO) {
        TagObjectResp tagObjectResp = new TagObjectResp();
        BeanUtils.copyProperties(tagObjectDO, tagObjectResp);
-        if (Strings.isNotEmpty(tagObjectDO.getExt())) {
+        if (StringUtils.isNotEmpty(tagObjectDO.getExt())) {
            tagObjectResp.setExt(JsonUtil.objectToMapString(tagObjectDO.getExt()));
        }
        return tagObjectResp;
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CollectServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CollectServiceImpl.java
@@ -8,7 +8,6 @@ import com.tencent.supersonic.headless.server.persistence.mapper.CollectMapper;
 import com.tencent.supersonic.headless.server.web.service.CollectService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;

 import javax.annotation.Resource;
@@ -26,7 +25,7 @@ public class CollectServiceImpl implements CollectService {
    @Override
    public Boolean collect(User user, CollectDO collectReq) {
        CollectDO collect = new CollectDO();
-        collect.setType(Strings.isEmpty(collectReq.getType()) ? type : collectReq.getType());
+        collect.setType(StringUtils.isEmpty(collectReq.getType()) ? type : collectReq.getType());
        collect.setUsername(user.getName());
        collect.setCollectId(collectReq.getCollectId());
        collectMapper.insert(collect);
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java
@@ -42,7 +42,6 @@ import com.tencent.supersonic.headless.server.utils.ModelConverter;
 import com.tencent.supersonic.headless.server.utils.NameCheckUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -264,10 +263,10 @@ public class ModelServiceImpl implements ModelService {
            String startDate1 = item.getStartDate();
            String endDate1 = item.getEndDate();
            List<String> unavailableDateList1 = item.getUnavailableDateList();
-            if (Strings.isNotEmpty(startDate1) && startDate1.compareTo(startDate) > 0) {
+            if (StringUtils.isNotEmpty(startDate1) && startDate1.compareTo(startDate) > 0) {
                startDate = startDate1;
            }
-            if (Strings.isNotEmpty(endDate1) && endDate1.compareTo(endDate) < 0) {
+            if (StringUtils.isNotEmpty(endDate1) && endDate1.compareTo(endDate) < 0) {
                endDate = endDate1;
            }
            if (!CollectionUtils.isEmpty(unavailableDateList1)) {