From 8b8852893858dd0d0bd82db0bc2cc17a900d41c7 Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Thu, 27 Jun 2024 15:39:52 +0800 Subject: [PATCH] (improvement)(common)Opt package structure --- .../common/{util => config}/ThreadContextConfig.java | 3 ++- .../supersonic/common/{util => config}/WebMvcConfig.java | 2 +- .../supersonic/common/jsqlparser/DateFunctionHelper.java | 2 +- .../common/jsqlparser/FieldAndValueAcquireVisitor.java | 2 +- .../supersonic/common/{util => pojo/enums}/DatePeriodEnum.java | 2 +- .../java/com/tencent/supersonic/common/util/DateUtils.java | 1 + .../test/java/com/tencent/supersonic/common/DateUtilsTest.java | 2 +- .../supersonic/headless/chat/utils/S2SqlDateHelper.java | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) rename common/src/main/java/com/tencent/supersonic/common/{util => config}/ThreadContextConfig.java (71%) rename common/src/main/java/com/tencent/supersonic/common/{util => config}/WebMvcConfig.java (91%) rename common/src/main/java/com/tencent/supersonic/common/{util => pojo/enums}/DatePeriodEnum.java (91%) diff --git a/common/src/main/java/com/tencent/supersonic/common/util/ThreadContextConfig.java b/common/src/main/java/com/tencent/supersonic/common/config/ThreadContextConfig.java similarity index 71% rename from common/src/main/java/com/tencent/supersonic/common/util/ThreadContextConfig.java rename to common/src/main/java/com/tencent/supersonic/common/config/ThreadContextConfig.java index 5b47dfc2b..54af52630 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/ThreadContextConfig.java +++ b/common/src/main/java/com/tencent/supersonic/common/config/ThreadContextConfig.java @@ -1,5 +1,6 @@ -package com.tencent.supersonic.common.util; +package com.tencent.supersonic.common.config; +import com.tencent.supersonic.common.util.S2ThreadContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/WebMvcConfig.java b/common/src/main/java/com/tencent/supersonic/common/config/WebMvcConfig.java similarity index 91% rename from common/src/main/java/com/tencent/supersonic/common/util/WebMvcConfig.java rename to common/src/main/java/com/tencent/supersonic/common/config/WebMvcConfig.java index 80bdf7cb5..39ba053c7 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/WebMvcConfig.java +++ b/common/src/main/java/com/tencent/supersonic/common/config/WebMvcConfig.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util; +package com.tencent.supersonic.common.config; import com.tencent.supersonic.common.interceptor.LogInterceptor; import org.springframework.context.annotation.Configuration; diff --git a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateFunctionHelper.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateFunctionHelper.java index eb6e439e2..6f6aacb01 100644 --- a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateFunctionHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateFunctionHelper.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.common.jsqlparser; -import com.tencent.supersonic.common.util.DatePeriodEnum; +import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum; import com.tencent.supersonic.common.util.DateUtils; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.DoubleValue; diff --git a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAndValueAcquireVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAndValueAcquireVisitor.java index 4894d29d7..532740455 100644 --- a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAndValueAcquireVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAndValueAcquireVisitor.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.common.jsqlparser; -import com.tencent.supersonic.common.util.DatePeriodEnum; +import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/DatePeriodEnum.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/DatePeriodEnum.java similarity index 91% rename from common/src/main/java/com/tencent/supersonic/common/util/DatePeriodEnum.java rename to common/src/main/java/com/tencent/supersonic/common/pojo/enums/DatePeriodEnum.java index 9879d5397..e7dc34989 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/DatePeriodEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/DatePeriodEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util; +package com.tencent.supersonic.common.pojo.enums; public enum DatePeriodEnum { DAY("日"), diff --git a/common/src/main/java/com/tencent/supersonic/common/util/DateUtils.java b/common/src/main/java/com/tencent/supersonic/common/util/DateUtils.java index 6e828a69f..c445eef37 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/DateUtils.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/DateUtils.java @@ -2,6 +2,7 @@ package com.tencent.supersonic.common.util; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.Constants; +import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum; import lombok.extern.slf4j.Slf4j; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/common/src/test/java/com/tencent/supersonic/common/DateUtilsTest.java b/common/src/test/java/com/tencent/supersonic/common/DateUtilsTest.java index 0823a18e6..0dd80f6a9 100644 --- a/common/src/test/java/com/tencent/supersonic/common/DateUtilsTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/DateUtilsTest.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.common; import com.tencent.supersonic.common.pojo.Constants; -import com.tencent.supersonic.common.util.DatePeriodEnum; +import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum; import com.tencent.supersonic.common.util.DateUtils; import org.assertj.core.util.Lists; import org.junit.Assert; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/utils/S2SqlDateHelper.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/utils/S2SqlDateHelper.java index 82b92c161..0e990f31c 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/utils/S2SqlDateHelper.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/utils/S2SqlDateHelper.java @@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.chat.utils; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.TimeMode; -import com.tencent.supersonic.common.util.DatePeriodEnum; +import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum; import com.tencent.supersonic.common.util.DateUtils; import com.tencent.supersonic.headless.api.pojo.DataSetSchema; import com.tencent.supersonic.headless.api.pojo.TimeDefaultConfig;