diff --git 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 index 707ae026b..d83c32407 100644 --- 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 @@ -36,7 +36,6 @@ import com.tencent.supersonic.headless.server.web.service.ModelService; import com.tencent.supersonic.headless.server.web.service.TagMetaService; 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.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; @@ -438,7 +437,7 @@ public class DictUtils { } String dateFilter = generateDictDateFilter(dictItemResp); - if (Strings.isNotEmpty(dateFilter)) { + if (StringUtils.isNotEmpty(dateFilter)) { joiner.add(dateFilter); } return joiner.toString(); @@ -486,7 +485,7 @@ public class DictUtils { List timeDims = model.getTimeDimension(); if (!CollectionUtils.isEmpty(timeDims)) { String dateFormat = timeDims.get(0).getDateFormat(); - if (Strings.isEmpty(dateFormat)) { + if (StringUtils.isEmpty(dateFormat)) { dateFormat = itemValueDateFormat; } String start = LocalDate.now().minusDays(dictItemResp.getConfig().getDateConf().getUnit()) diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagQueryServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagQueryServiceImpl.java index 9096addbc..671fc1703 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagQueryServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagQueryServiceImpl.java @@ -19,10 +19,10 @@ import com.tencent.supersonic.headless.server.facade.service.SemanticLayerServic import com.tencent.supersonic.headless.server.web.service.TagMetaService; import com.tencent.supersonic.headless.server.web.service.TagQueryService; import lombok.extern.slf4j.Slf4j; -import org.apache.logging.log4j.util.Strings; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -124,7 +124,7 @@ public class TagQueryServiceImpl implements TagQueryService { List timeDims = model.getTimeDimension(); if (!CollectionUtils.isEmpty(timeDims)) { String dateFormat = timeDims.get(0).getDateFormat(); - if (Strings.isEmpty(dateFormat)) { + if (StringUtils.isEmpty(dateFormat)) { dateFormat = itemValueDateFormat; } String start = LocalDate.now().minusDays(itemValueReq.getDateConf().getUnit())