From e469c449b4656782848e28cb7a1f27b83c4bb405 Mon Sep 17 00:00:00 2001 From: mainmain <57514971+mainmainer@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:41:55 +0800 Subject: [PATCH] [improvement] supersonic adapt checkstyle (#451) --- .../interceptor/AuthenticationInterceptor.java | 2 -- .../DefaultAuthenticationInterceptor.java | 1 - .../repository/Impl/UserRepositoryImpl.java | 2 -- .../auth/authentication/rest/UserController.java | 2 -- .../authentication/service/UserServiceImpl.java | 1 - .../strategy/FakeUserStrategy.java | 1 - .../authentication/utils/UserTokenUtils.java | 2 -- .../application/AuthServiceImpl.java | 1 - .../chat/corrector/BaseSemanticCorrector.java | 1 - .../chat/corrector/HavingCorrector.java | 1 - .../chat/corrector/SchemaCorrector.java | 1 - .../supersonic/chat/mapper/BaseMapper.java | 1 - .../chat/mapper/BaseMatchStrategy.java | 1 - .../chat/mapper/EmbeddingMatchStrategy.java | 1 - .../chat/mapper/FuzzyNameMatchStrategy.java | 2 -- .../supersonic/chat/mapper/HanlpDictMapper.java | 2 -- .../supersonic/chat/mapper/MapperHelper.java | 1 - .../chat/parser/plugin/PluginParser.java | 1 - .../parser/sql/llm/HeuristicModelResolver.java | 2 -- .../chat/parser/sql/llm/LLMRequestService.java | 4 ---- .../chat/parser/sql/llm/LLMSqlParser.java | 1 - .../impl/ChatContextRepositoryImpl.java | 1 - .../repository/impl/ChatQueryRepositoryImpl.java | 1 - .../repository/impl/ChatRepositoryImpl.java | 1 - .../impl/StatisticsRepositoryImpl.java | 1 - .../supersonic/chat/plugin/PluginManager.java | 1 - .../chat/processor/MetricCheckProcessor.java | 1 - .../chat/processor/TimeCostProcessor.java | 2 -- .../query/llm/analytics/MetricAnalyzeQuery.java | 3 --- .../chat/query/rule/RuleSemanticQuery.java | 2 -- .../chat/rest/ChatConfigController.java | 4 ---- .../chat/rest/ChatQueryController.java | 1 - .../chat/service/impl/ChatServiceImpl.java | 3 --- .../chat/service/impl/ConfigServiceImpl.java | 4 ---- .../chat/service/impl/PluginServiceImpl.java | 2 -- .../chat/service/impl/QueryServiceImpl.java | 1 - .../supersonic/chat/utils/ChatConfigHelper.java | 1 - .../supersonic/chat/utils/DictQueryHelper.java | 3 +-- .../supersonic/chat/utils/QueryReqBuilder.java | 1 - .../chat/mapper/LoadRemoveServiceTest.java | 1 - .../knowledge/dictionary/FileHandler.java | 1 - .../knowledge/dictionary/LocalFileHandler.java | 1 - .../dictionary/builder/DimensionWordBuilder.java | 1 - .../repository/DictRepositoryImpl.java | 1 - .../knowledge/service/KnowledgeServiceImpl.java | 1 - .../knowledge/service/LoadRemoveService.java | 3 +-- .../knowledge/service/SearchService.java | 1 - .../supersonic/knowledge/utils/NatureHelper.java | 1 - .../supersonic/common/config/DataBaseConfig.java | 1 + .../supersonic/common/pojo/PageBaseReq.java | 1 - .../supersonic/common/pojo/RecordInfo.java | 1 - .../supersonic/common/pojo/ReturnCode.java | 3 +-- .../common/pojo/enums/AggOperatorEnum.java | 3 +-- .../common/pojo/enums/AggregateTypeEnum.java | 1 - .../common/pojo/enums/DictWordType.java | 1 - .../common/pojo/enums/FilterOperatorEnum.java | 2 -- .../common/pojo/enums/SensitiveLevelEnum.java | 1 - .../common/rest/SysParameterController.java | 1 - .../supersonic/common/util/BeanMapper.java | 1 - .../supersonic/common/util/ChatGptHelper.java | 5 ----- .../supersonic/common/util/ContextUtils.java | 3 +-- .../supersonic/common/util/DateModeUtils.java | 4 +--- .../supersonic/common/util/DatePeriodEnum.java | 1 - .../supersonic/common/util/DateUtils.java | 3 --- .../supersonic/common/util/HttpClientUtils.java | 4 ---- .../tencent/supersonic/common/util/JsonUtil.java | 5 +---- .../supersonic/common/util/SqlFilterUtils.java | 4 +--- .../supersonic/common/util/YamlUtils.java | 1 - .../common/util/embedding/Retrieval.java | 1 - .../util/jsqlparser/DateFunctionHelper.java | 1 - .../jsqlparser/FieldAndValueAcquireVisitor.java | 2 -- .../jsqlparser/FiledFilterReplaceVisitor.java | 4 +--- .../util/jsqlparser/FiledNameReplaceVisitor.java | 3 +-- .../util/jsqlparser/FilterRemoveVisitor.java | 4 +--- .../util/jsqlparser/FunctionReplaceVisitor.java | 2 -- .../util/jsqlparser/SqlParserAddHelper.java | 1 - .../util/jsqlparser/SqlParserRemoveHelper.java | 1 + .../util/jsqlparser/SqlParserSelectHelper.java | 1 - .../common/util/calcite/SqlParseUtilsTest.java | 2 -- .../util/jsqlparser/SqlParserAddHelperTest.java | 4 ---- .../jsqlparser/SqlParserReplaceHelperTest.java | 2 -- .../SqlParserSelectFunctionHelperTest.java | 1 - .../jsqlparser/SqlParserSelectHelperTest.java | 2 -- .../com/tencent/supersonic/ConfigureDemo.java | 3 --- .../com/tencent/supersonic/util/DataUtils.java | 1 - .../semantic/api/model/enums/OperatorEnum.java | 1 - .../api/model/enums/QueryTypeBackEnum.java | 1 - .../semantic/api/model/enums/QueryTypeEnum.java | 1 - .../supersonic/semantic/api/model/pojo/Dim.java | 2 -- .../semantic/api/model/pojo/QueryStat.java | 4 +--- .../semantic/api/model/pojo/SchemaItem.java | 1 - .../semantic/api/model/request/DomainReq.java | 1 - .../semantic/api/model/request/ModelReq.java | 4 ---- .../api/model/request/SqlExecuteReq.java | 1 - .../semantic/api/model/response/ModelResp.java | 1 - .../api/query/request/QueryMultiStructReq.java | 2 +- .../api/query/request/QueryStructReq.java | 2 -- .../MaterializationConfServiceImpl.java | 6 +----- .../domain/MaterializationConfService.java | 2 -- .../domain/MaterializationRecordService.java | 1 - .../rest/MaterializationConfController.java | 4 +--- .../rest/MaterializationRecordController.java | 3 +-- .../semantic/model/application/CatalogImpl.java | 1 - .../model/application/DatabaseServiceImpl.java | 1 - .../model/application/DimensionServiceImpl.java | 1 - .../model/application/DomainServiceImpl.java | 3 --- .../model/application/ModelServiceImpl.java | 2 -- .../model/application/ViewInfoServiceImpl.java | 2 -- .../semantic/model/domain/Catalog.java | 1 - .../semantic/model/domain/ModelRelaService.java | 1 - .../adaptor/engineadapter/EngineAdaptor.java | 2 -- .../engineadapter/EngineAdaptorFactory.java | 2 -- .../adaptor/engineadapter/MysqlAdaptor.java | 2 -- .../domain/manager/DatasourceYamlManager.java | 2 -- .../domain/manager/DimensionYamlManager.java | 2 -- .../model/domain/manager/MetricYamlManager.java | 1 - .../semantic/model/domain/pojo/Domain.java | 1 - .../model/domain/pojo/JdbcDataSource.java | 3 +-- .../domain/repository/DatabaseRepository.java | 1 - .../domain/repository/DimensionRepository.java | 1 - .../domain/repository/DomainRepository.java | 1 - .../model/domain/utils/DatabaseConverter.java | 4 ---- .../model/domain/utils/DimensionConverter.java | 1 - .../model/domain/utils/DomainConvert.java | 1 - .../model/domain/utils/JdbcDataSourceUtils.java | 3 +-- .../model/domain/utils/ModelConverter.java | 5 ----- .../semantic/model/domain/utils/SqlUtils.java | 1 - .../domain/utils/SysTimeDimensionBuilder.java | 2 -- .../mapper/ModelDOCustomMapper.java | 1 - .../repository/DatabaseRepositoryImpl.java | 1 - .../repository/DateInfoRepositoryImpl.java | 3 +-- .../repository/DomainRepositoryImpl.java | 1 - .../repository/ModelRepositoryImpl.java | 1 - .../repository/ViewInfoRepositoryImpl.java | 5 ----- .../semantic/model/rest/CollectController.java | 2 -- .../semantic/model/rest/DimensionController.java | 7 ------- .../semantic/model/rest/MetricController.java | 5 ----- .../semantic/model/rest/ModelController.java | 2 -- .../semantic/model/rest/ModelRelaController.java | 1 - .../semantic/model/rest/ViewInfoController.java | 2 -- .../model/application/ModelServiceImplTest.java | 3 +-- .../semantic/query/parser/QueryParser.java | 2 -- .../parser/calcite/SemanticSchemaManager.java | 3 --- .../query/parser/calcite/planner/AggPlanner.java | 3 --- .../calcite/planner/MaterializationPlanner.java | 2 -- .../parser/calcite/schema/SchemaBuilder.java | 1 - .../parser/calcite/schema/SemanticSchema.java | 5 +++-- .../parser/calcite/sql/node/DataSourceNode.java | 1 - .../parser/calcite/sql/node/DimensionNode.java | 1 - .../parser/calcite/sql/node/MeasureNode.java | 2 +- .../parser/calcite/sql/node/SemanticNode.java | 1 - .../parser/calcite/sql/render/JoinRender.java | 2 -- .../parser/calcite/sql/render/SourceRender.java | 1 - .../parser/convert/CalculateAggConverter.java | 5 ----- .../parser/convert/ParserDefaultConverter.java | 2 -- .../query/persistence/pojo/QueryStatement.java | 1 - .../semantic/query/rest/QueryController.java | 1 - .../service/MaterializationServiceImpl.java | 2 +- .../semantic/query/service/QueryService.java | 2 -- .../semantic/query/service/QueryServiceImpl.java | 5 ----- .../query/service/SchemaServiceImpl.java | 2 -- .../query/service/SemanticQueryEngineImpl.java | 4 +--- .../semantic/query/utils/ComponentFactory.java | 1 - .../semantic/query/utils/DimValueAspect.java | 3 --- .../semantic/query/utils/QueryStructUtils.java | 3 --- .../semantic/query/utils/QueryUtils.java | 3 --- .../semantic/query/utils/SqlGenerateUtils.java | 1 - .../semantic/query/utils/StatUtils.java | 5 +---- .../calcite/SemanticParserServiceTest.java | 3 +-- .../query/service/DownloadServiceImplTest.java | 3 +-- .../query/utils/DataTransformUtilsTest.java | 3 +-- webapp/pnpm-lock.yaml | 16 ++++++++++------ 172 files changed, 42 insertions(+), 321 deletions(-) diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java index 0f24f39c4..119868254 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/AuthenticationInterceptor.java @@ -29,7 +29,6 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor { protected S2ThreadContext s2ThreadContext; - protected boolean isExcludedUri(String uri) { String excludePathStr = authenticationConfig.getExcludePath(); if (Strings.isEmpty(excludePathStr)) { @@ -59,7 +58,6 @@ public abstract class AuthenticationInterceptor implements HandlerInterceptor { return "true".equalsIgnoreCase(internal); } - protected void reflectSetparam(HttpServletRequest request, String key, String value) { try { if (request instanceof StandardMultipartHttpServletRequest) { diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java index b1c1c8c80..b62f72072 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/interceptor/DefaultAuthenticationInterceptor.java @@ -76,5 +76,4 @@ public class DefaultAuthenticationInterceptor extends AuthenticationInterceptor s2ThreadContext.set(threadContext); } - } diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/Impl/UserRepositoryImpl.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/Impl/UserRepositoryImpl.java index 2d34fe813..be8ccf539 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/Impl/UserRepositoryImpl.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/Impl/UserRepositoryImpl.java @@ -20,7 +20,6 @@ public class UserRepositoryImpl implements UserRepository { this.userDOMapper = userDOMapper; } - @Override public List getUserList() { return userDOMapper.selectByExample(new UserDOExample()); @@ -40,5 +39,4 @@ public class UserRepositoryImpl implements UserRepository { return userDOOptional.orElse(null); } - } diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java index 123818553..1bbc9e7e1 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java @@ -29,7 +29,6 @@ public class UserController { this.userService = userService; } - @GetMapping("/getCurrentUser") public User getCurrentUser(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { return UserHolder.findUser(httpServletRequest, httpServletResponse); @@ -70,5 +69,4 @@ public class UserController { return userService.login(userCmd); } - } diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java index d2315b160..a2d930e03 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/service/UserServiceImpl.java @@ -13,7 +13,6 @@ import org.springframework.stereotype.Service; @Service public class UserServiceImpl implements UserService { - @Override public List getUserNames() { return ComponentFactory.getUserAdaptor().getUserNames(); diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java index a494c158d..90eff1ed5 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/strategy/FakeUserStrategy.java @@ -20,5 +20,4 @@ public class FakeUserStrategy implements UserStrategy { return User.getFakeUser(); } - } diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java index 82e93bcf3..f1ef5b590 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java @@ -58,7 +58,6 @@ public class UserTokenUtils { return generate(claims); } - public User getUser(HttpServletRequest request) { String token = request.getHeader(authenticationConfig.getTokenHttpHeaderKey()); final Claims claims = getClaims(token); @@ -120,5 +119,4 @@ public class UserTokenUtils { .compact(); } - } diff --git a/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/application/AuthServiceImpl.java b/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/application/AuthServiceImpl.java index f0695ce23..21f2efd3d 100644 --- a/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/application/AuthServiceImpl.java +++ b/auth/authorization/src/main/java/com/tencent/supersonic/auth/authorization/application/AuthServiceImpl.java @@ -75,7 +75,6 @@ public class AuthServiceImpl implements AuthService { jdbcTemplate.update("delete from s2_auth_groups where group_id = ?", group.getGroupId()); } - @Override public AuthorizedResourceResp queryAuthorizedResources(QueryAuthResReq req, User user) { Set userOrgIds = userService.getUserAllOrgId(user.getName()); diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/BaseSemanticCorrector.java b/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/BaseSemanticCorrector.java index e67399b50..23cb8c20d 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/BaseSemanticCorrector.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/BaseSemanticCorrector.java @@ -43,7 +43,6 @@ public abstract class BaseSemanticCorrector implements SemanticCorrector { } } - public abstract void doCorrect(QueryReq queryReq, SemanticParseInfo semanticParseInfo); protected Map getFieldNameMap(Set modelIds) { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/HavingCorrector.java b/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/HavingCorrector.java index 018bccc41..7b0812db8 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/HavingCorrector.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/HavingCorrector.java @@ -62,5 +62,4 @@ public class HavingCorrector extends BaseSemanticCorrector { return; } - } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/SchemaCorrector.java b/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/SchemaCorrector.java index b5798d1d2..d3f96e72f 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/SchemaCorrector.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/corrector/SchemaCorrector.java @@ -86,7 +86,6 @@ public class SchemaCorrector extends BaseSemanticCorrector { return parseResult.getLinkingValues(); } - private void updateFieldValueByLinkingValue(SemanticParseInfo semanticParseInfo) { List linking = getLinkingValues(semanticParseInfo); if (CollectionUtils.isEmpty(linking)) { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/BaseMapper.java b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/BaseMapper.java index 4388e59db..cdbe54d6b 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/BaseMapper.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/BaseMapper.java @@ -44,7 +44,6 @@ public abstract class BaseMapper implements SchemaMapper { public abstract void doMap(QueryContext queryContext); - public void addToSchemaMap(SchemaMapInfo schemaMap, Long modelId, SchemaElementMatch newElementMatch) { Map> modelElementMatches = schemaMap.getModelElementMatches(); List schemaElementMatches = modelElementMatches.putIfAbsent(modelId, new ArrayList<>()); diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/BaseMatchStrategy.java b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/BaseMatchStrategy.java index 241a86238..90cda628d 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/BaseMatchStrategy.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/BaseMatchStrategy.java @@ -154,5 +154,4 @@ public abstract class BaseMatchStrategy implements MatchStrategy { public abstract void detectByStep(QueryContext queryContext, Set results, Set detectModelIds, Integer startIndex, Integer index, int offset); - } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/EmbeddingMatchStrategy.java b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/EmbeddingMatchStrategy.java index 130df3a2e..8163af681 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/EmbeddingMatchStrategy.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/EmbeddingMatchStrategy.java @@ -46,7 +46,6 @@ public class EmbeddingMatchStrategy extends BaseMatchStrategy { return a.getName() + Constants.UNDERLINE + a.getId(); } - @Override protected void detectByBatch(QueryContext queryContext, Set results, Set detectModelIds, Set detectSegments) { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/FuzzyNameMatchStrategy.java b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/FuzzyNameMatchStrategy.java index 9a1619418..f88c7e486 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/FuzzyNameMatchStrategy.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/FuzzyNameMatchStrategy.java @@ -36,7 +36,6 @@ public class FuzzyNameMatchStrategy extends BaseMatchStrategy { private SchemaService schemaService; private List allElements; - @Override public Map> match(QueryContext queryContext, List terms, Set detectModelIds) { @@ -97,7 +96,6 @@ public class FuzzyNameMatchStrategy extends BaseMatchStrategy { return allElements; } - private Double getThreshold(QueryContext queryContext) { Double metricDimensionThresholdConfig = optimizationConfig.getMetricDimensionThresholdConfig(); Double metricDimensionMinThresholdConfig = optimizationConfig.getMetricDimensionMinThresholdConfig(); diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/HanlpDictMapper.java b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/HanlpDictMapper.java index ef64a52a2..09461a712 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/HanlpDictMapper.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/HanlpDictMapper.java @@ -39,7 +39,6 @@ public class HanlpDictMapper extends BaseMapper { convertTermsToSchemaMapInfo(matches, queryContext.getMapInfo(), terms); } - private void convertTermsToSchemaMapInfo(List hanlpMapResults, SchemaMapInfo schemaMap, List terms) { if (CollectionUtils.isEmpty(hanlpMapResults)) { @@ -82,5 +81,4 @@ public class HanlpDictMapper extends BaseMapper { } } - } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/MapperHelper.java b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/MapperHelper.java index 48056b733..6908b3fe6 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/MapperHelper.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/MapperHelper.java @@ -41,7 +41,6 @@ public class MapperHelper { return index; } - public Integer getStepOffset(List termList, Integer index) { List offsetList = termList.stream().sorted(Comparator.comparing(Term::getOffset)) .map(term -> term.getOffset()).collect(Collectors.toList()); diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/plugin/PluginParser.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/plugin/PluginParser.java index 587b4facb..61581c5db 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/plugin/PluginParser.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/plugin/PluginParser.java @@ -99,7 +99,6 @@ public abstract class PluginParser implements SemanticParser { return semanticParseInfo; } - private void fillSemanticParseInfo(SemanticParseInfo semanticParseInfo) { List schemaElementMatches = semanticParseInfo.getElementMatches(); if (CollectionUtils.isEmpty(schemaElementMatches)) { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/HeuristicModelResolver.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/HeuristicModelResolver.java index 20187f1d4..07184d0cb 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/HeuristicModelResolver.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/HeuristicModelResolver.java @@ -86,7 +86,6 @@ public class HeuristicModelResolver implements ModelResolver { return null; } - public static Map getModelTypeMap(SchemaModelClusterMapInfo schemaMap) { Map modelCount = new HashMap<>(); for (Map.Entry> entry : schemaMap.getModelElementMatches().entrySet()) { @@ -114,7 +113,6 @@ public class HeuristicModelResolver implements ModelResolver { return modelCount; } - public String resolve(QueryContext queryContext, ChatContext chatCtx, Set restrictiveModels) { SchemaModelClusterMapInfo mapInfo = queryContext.getModelClusterMapInfo(); Set matchedModelClusters = mapInfo.getElementMatchesByModelIds(restrictiveModels).keySet(); diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java index 46265a287..2d52b8898 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java @@ -59,7 +59,6 @@ public class LLMRequestService { @Autowired private OptimizationConfig optimizationConfig; - public boolean check(QueryContext queryCtx) { QueryReq request = queryCtx.getRequest(); if (StringUtils.isEmpty(llmParserConfig.getUrl())) { @@ -192,7 +191,6 @@ public class LLMRequestService { return extraInfoSb.toString(); } - protected List getValueList(QueryContext queryCtx, ModelCluster modelCluster) { Map itemIdToName = getItemIdToName(modelCluster); @@ -223,7 +221,6 @@ public class LLMRequestService { .collect(Collectors.toMap(SchemaElement::getId, SchemaElement::getName, (value1, value2) -> value2)); } - private Set getTopNFieldNames(ModelCluster modelCluster, LLMParserConfig llmParserConfig) { SemanticSchema semanticSchema = schemaService.getSemanticSchema(); Set results = semanticSchema.getDimensions(modelCluster.getModelIds()).stream() @@ -242,7 +239,6 @@ public class LLMRequestService { return results; } - protected Set getMatchedFieldNames(QueryContext queryCtx, ModelCluster modelCluster) { Map itemIdToName = getItemIdToName(modelCluster); List matchedElements = queryCtx.getModelClusterMapInfo() diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMSqlParser.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMSqlParser.java index 4987f3bf3..a0f36b530 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMSqlParser.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMSqlParser.java @@ -79,5 +79,4 @@ public class LLMSqlParser implements SemanticParser { } } - } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatContextRepositoryImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatContextRepositoryImpl.java index cf82a2592..2765e1f06 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatContextRepositoryImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatContextRepositoryImpl.java @@ -45,7 +45,6 @@ public class ChatContextRepositoryImpl implements ChatContextRepository { } } - private ChatContext cast(ChatContextDO contextDO) { ChatContext chatContext = new ChatContext(); chatContext.setChatId(contextDO.getChatId()); diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatQueryRepositoryImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatQueryRepositoryImpl.java index 5c9b8212d..521ee426f 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatQueryRepositoryImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatQueryRepositoryImpl.java @@ -185,7 +185,6 @@ public class ChatQueryRepositoryImpl implements ChatQueryRepository { return chatQueryDOMapper.updateByPrimaryKeyWithBLOBs(chatQueryDO); } - public ChatParseDO getParseInfo(Long questionId, int parseId) { return chatParseMapper.getParseInfo(questionId, parseId); } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatRepositoryImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatRepositoryImpl.java index 09f243a97..2121bb4ce 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatRepositoryImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/ChatRepositoryImpl.java @@ -30,7 +30,6 @@ public class ChatRepositoryImpl implements ChatRepository { return chatMapper.getAll(creator, agentId); } - @Override public Boolean updateChatName(Long chatId, String chatName, String lastTime, String creator) { return chatMapper.updateChatName(chatId, chatName, lastTime, creator); diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/StatisticsRepositoryImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/StatisticsRepositoryImpl.java index 476a80267..1cbf8b065 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/StatisticsRepositoryImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/StatisticsRepositoryImpl.java @@ -24,5 +24,4 @@ public class StatisticsRepositoryImpl implements StatisticsRepository { statisticsMapper.batchSaveStatistics(list); } - } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/plugin/PluginManager.java b/chat/core/src/main/java/com/tencent/supersonic/chat/plugin/PluginManager.java index 88da9ed57..34cfb2bd2 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/plugin/PluginManager.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/plugin/PluginManager.java @@ -285,7 +285,6 @@ public class PluginManager { .collect(Collectors.toSet()); } - private static List getSemanticOption(Plugin plugin) { WebBase webBase = JSONObject.parseObject(plugin.getConfig(), WebBase.class); if (Objects.isNull(webBase)) { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/processor/MetricCheckProcessor.java b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/MetricCheckProcessor.java index 1db5acba1..29dacb629 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/processor/MetricCheckProcessor.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/MetricCheckProcessor.java @@ -103,7 +103,6 @@ public class MetricCheckProcessor implements ParseResultProcessor { return removeFieldInSql(correctSql, metricToRemove, groupByToRemove, whereFieldsToRemove); } - /** * To check whether the dimension bound to the metric exists, * eg: metric like UV is calculated in a certain dimension, it cannot be used on other dimensions. diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/processor/TimeCostProcessor.java b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/TimeCostProcessor.java index aa5118367..61f457b05 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/processor/TimeCostProcessor.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/TimeCostProcessor.java @@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class TimeCostProcessor implements ParseResultProcessor { - @Override public void process(ParseResp parseResp, QueryContext queryContext, ChatContext chatContext) { long parseStartTime = parseResp.getParseTimeCost().getParseStartTime(); @@ -19,5 +18,4 @@ public class TimeCostProcessor implements ParseResultProcessor { System.currentTimeMillis() - parseStartTime - parseResp.getParseTimeCost().getSqlTime()); } - } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java index d6323ef88..6b21cbafa 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java @@ -126,7 +126,6 @@ public class MetricAnalyzeQuery extends LLMSemanticQuery { } } - private String replaceAnswer(String text, Map replacedMap) { for (String key : replacedMap.keySet()) { text = text.replaceAll(key, replacedMap.get(key)); @@ -149,7 +148,6 @@ public class MetricAnalyzeQuery extends LLMSemanticQuery { return tableBuilder.toString(); } - public String fetchInterpret(String queryText, String dataText) { PluginManager pluginManager = ContextUtils.getBean(PluginManager.class); LLMAnswerReq lLmAnswerReq = new LLMAnswerReq(); @@ -164,5 +162,4 @@ public class MetricAnalyzeQuery extends LLMSemanticQuery { return null; } - } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java index d225224bc..55b4a32d4 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java @@ -191,7 +191,6 @@ public abstract class RuleSemanticQuery extends BaseSemanticQuery { } } - @Override public QueryResult execute(User user) { String queryMode = parseInfo.getQueryMode(); @@ -285,7 +284,6 @@ public abstract class RuleSemanticQuery extends BaseSemanticQuery { return matchedQueries; } - protected QueryStructReq convertQueryStruct() { return QueryReqBuilder.buildStructReq(parseInfo); } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java b/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java index 2086787b6..8bfe52b05 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java @@ -42,7 +42,6 @@ public class ChatConfigController { private SemanticInterpreter semanticInterpreter = ComponentFactory.getSemanticLayer(); - @PostMapping public Long addChatConfig(@RequestBody ChatConfigBaseReq extendBaseCmd, HttpServletRequest request, @@ -59,7 +58,6 @@ public class ChatConfigController { return configService.editConfig(extendEditCmd, user); } - @PostMapping("/search") public List search(@RequestBody ChatConfigFilter filter, HttpServletRequest request, @@ -68,7 +66,6 @@ public class ChatConfigController { return configService.search(filter, user); } - @GetMapping("/richDesc/{modelId}") public ChatConfigRichResp getModelExtendRichInfo(@PathVariable("modelId") Long modelId) { return configService.getConfigRichInfo(modelId); @@ -123,5 +120,4 @@ public class ChatConfigController { return semanticInterpreter.getMetricPage(pageMetricReq, user); } - } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatQueryController.java b/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatQueryController.java index 151a11cf9..89618078b 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatQueryController.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatQueryController.java @@ -33,7 +33,6 @@ public class ChatQueryController { @Autowired private SearchService searchService; - @PostMapping("search") public Object search(@RequestBody QueryReq queryCtx, HttpServletRequest request, HttpServletResponse response) { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java index 89f07e8b0..c801585bf 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java @@ -72,7 +72,6 @@ public class ChatServiceImpl implements ChatService { return null; } - @Override public ChatContext getOrCreateContext(int chatId) { return chatContextRepository.getOrCreateContext(chatId); @@ -90,7 +89,6 @@ public class ChatServiceImpl implements ChatService { chatCtx.setParseInfo(new SemanticParseInfo()); } - @Override public Boolean addChat(User user, String chatName, Integer agentId) { ChatDO chatDO = new ChatDO(); @@ -176,7 +174,6 @@ public class ChatServiceImpl implements ChatService { return showCaseResp; } - private void fillParseInfo(List queryResps) { List queryIds = queryResps.stream() .map(QueryResp::getQuestionId).collect(Collectors.toList()); diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java index c9bc0ab2f..a84801e50 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java @@ -97,7 +97,6 @@ public class ConfigServiceImpl implements ConfigService { } } - @Override public Long editConfig(ChatConfigEditReqReq configEditCmd, User user) { log.info("[edit model extend] object:{}", JsonUtil.toString(configEditCmd, true)); @@ -168,13 +167,11 @@ public class ConfigServiceImpl implements ConfigService { return chaConfigDescList; } - @Override public ChatConfigResp fetchConfigByModelId(Long modelId) { return chatConfigRepository.getConfigByModelId(modelId); } - private ItemVisibilityInfo fetchVisibilityDescByConfig(ItemVisibility visibility, ModelSchema modelSchema) { ItemVisibilityInfo itemVisibilityDesc = new ItemVisibilityInfo(); @@ -329,7 +326,6 @@ public class ConfigServiceImpl implements ConfigService { return defaultRichConfig; } - private List fillKnowledgeBizName(List knowledgeInfos, ModelSchema modelSchema) { if (CollectionUtils.isEmpty(knowledgeInfos)) { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java index 4cc75ab45..af897ed1a 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java @@ -73,7 +73,6 @@ public class PluginServiceImpl implements PluginService { } } - @Override public List getPluginList() { List plugins = Lists.newArrayList(); @@ -90,7 +89,6 @@ public class PluginServiceImpl implements PluginService { return convertList(pluginDOS); } - @Override public List query(PluginQueryReq pluginQueryReq) { PluginDOExample pluginDOExample = new PluginDOExample(); diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java index ff4710058..b61f2984c 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java @@ -172,7 +172,6 @@ public class QueryServiceImpl implements QueryService { return parseResult; } - @Override @TimeCost public QueryResult performExecution(ExecuteQueryReq queryReq) throws Exception { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/ChatConfigHelper.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/ChatConfigHelper.java index 6106a86e9..f43c46547 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/ChatConfigHelper.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/ChatConfigHelper.java @@ -46,7 +46,6 @@ public class ChatConfigHelper { return chatConfig; } - public ChatConfig editChatConfig(ChatConfigEditReqReq extendEditCmd, User facadeUser) { ChatConfig chatConfig = new ChatConfig(); diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java index f37682dbf..155dde2dc 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java @@ -48,7 +48,6 @@ public class DictQueryHelper { @Value("${dimension.white.weight:60000000}") private Long dimensionWhiteWeight; - public List fetchDimValueSingle(Long modelId, DefaultMetric defaultMetricDesc, Dim4Dict dim4Dict, User user) { List data = new ArrayList<>(); @@ -214,4 +213,4 @@ public class DictQueryHelper { return joiner.toString(); } -} \ No newline at end of file +} diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java index 036de766c..50d0d5fac 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java @@ -242,5 +242,4 @@ public class QueryReqBuilder { return queryStructCmd; } - } diff --git a/chat/core/src/test/java/com/tencent/supersonic/chat/mapper/LoadRemoveServiceTest.java b/chat/core/src/test/java/com/tencent/supersonic/chat/mapper/LoadRemoveServiceTest.java index bb3d028fd..299077254 100644 --- a/chat/core/src/test/java/com/tencent/supersonic/chat/mapper/LoadRemoveServiceTest.java +++ b/chat/core/src/test/java/com/tencent/supersonic/chat/mapper/LoadRemoveServiceTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.Test; class LoadRemoveServiceTest { - @Test void edit() { int compute = EditDistance.compute("在", "在你的身边"); diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/FileHandler.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/FileHandler.java index b4cee26b1..b02df286e 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/FileHandler.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/FileHandler.java @@ -19,7 +19,6 @@ public interface FileHandler { */ void createDir(String path); - Boolean existPath(String path); /** diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/LocalFileHandler.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/LocalFileHandler.java index 26adb9579..f5695b792 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/LocalFileHandler.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/LocalFileHandler.java @@ -106,7 +106,6 @@ public class LocalFileHandler implements FileHandler { return Paths.get(path).toAbsolutePath().toString(); } - @Override public String getDictRootPath() { return Paths.get(localFileConfig.getDictDirectoryLatest()).toAbsolutePath().toString(); diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/DimensionWordBuilder.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/DimensionWordBuilder.java index 8ea7eeee8..3046181ac 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/DimensionWordBuilder.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/dictionary/builder/DimensionWordBuilder.java @@ -22,7 +22,6 @@ public class DimensionWordBuilder extends BaseWordBuilder { @Value("${nlp.dimension.use.suffix:true}") private boolean nlpDimensionUseSuffix = true; - @Override public List doGet(String word, SchemaElement schemaElement) { List result = Lists.newArrayList(); diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/persistence/repository/DictRepositoryImpl.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/persistence/repository/DictRepositoryImpl.java index ad24f2896..6f0d3de34 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/persistence/repository/DictRepositoryImpl.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/persistence/repository/DictRepositoryImpl.java @@ -44,7 +44,6 @@ public class DictRepositoryImpl implements DictRepository { return dictTaskDO.getId(); } - @Override public Boolean updateDictTaskStatus(Integer status, DictTaskDO dictTaskDO) { dictTaskDO.setStatus(status); diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/KnowledgeServiceImpl.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/KnowledgeServiceImpl.java index 5f42a5823..656708ed2 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/KnowledgeServiceImpl.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/KnowledgeServiceImpl.java @@ -31,7 +31,6 @@ public class KnowledgeServiceImpl implements KnowledgeService { SearchService.loadSuffix(suffixes); } - public void reloadAllData(List natures) { // 1. reload custom knowledge try { diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/LoadRemoveService.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/LoadRemoveService.java index c00ce9d7b..c4b7e9588 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/LoadRemoveService.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/LoadRemoveService.java @@ -21,7 +21,6 @@ public class LoadRemoveService { @Value("${mapper.remove.nature.prefix:}") private String mapperRemoveNaturePrefix; - public List removeNatures(List value, Integer agentId, Set detectModelIds) { if (CollectionUtils.isEmpty(value)) { return value; @@ -52,4 +51,4 @@ public class LoadRemoveService { return resultList; } -} \ No newline at end of file +} diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/SearchService.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/SearchService.java index 0e0333cd0..0367fca11 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/SearchService.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/SearchService.java @@ -118,7 +118,6 @@ public class SearchService { trie.put(key, getValue(attribute.nature)); } - public static void loadSuffix(List suffixes) { if (CollectionUtils.isEmpty(suffixes)) { return; diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/utils/NatureHelper.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/utils/NatureHelper.java index 3f7d12466..bb536839c 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/utils/NatureHelper.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/utils/NatureHelper.java @@ -104,7 +104,6 @@ public class NatureHelper { .build(); } - private static long getModelCount(List terms) { return terms.stream().filter(term -> isModelOrEntity(term, getModelByNature(term.nature))).count(); } diff --git a/common/src/main/java/com/tencent/supersonic/common/config/DataBaseConfig.java b/common/src/main/java/com/tencent/supersonic/common/config/DataBaseConfig.java index e1fea5c05..8fb2293b9 100644 --- a/common/src/main/java/com/tencent/supersonic/common/config/DataBaseConfig.java +++ b/common/src/main/java/com/tencent/supersonic/common/config/DataBaseConfig.java @@ -17,4 +17,5 @@ public class DataBaseConfig { public DataSource dataSource() { return new DruidDataSource(); } + } diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/PageBaseReq.java b/common/src/main/java/com/tencent/supersonic/common/pojo/PageBaseReq.java index 0d20903ba..68257ea53 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/PageBaseReq.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/PageBaseReq.java @@ -19,5 +19,4 @@ public class PageBaseReq { return this.pageSize; } - } diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/RecordInfo.java b/common/src/main/java/com/tencent/supersonic/common/pojo/RecordInfo.java index a463977f3..1219b4499 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/RecordInfo.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/RecordInfo.java @@ -18,7 +18,6 @@ public class RecordInfo { private Date updatedAt; - public RecordInfo createdBy(String userName) { this.createdBy = userName; this.createdAt = new Date(); diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/ReturnCode.java b/common/src/main/java/com/tencent/supersonic/common/pojo/ReturnCode.java index e9f806d0e..7ef51c09f 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/ReturnCode.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/ReturnCode.java @@ -15,7 +15,6 @@ public enum ReturnCode { this.message = message; } - public int getCode() { return code; } @@ -23,4 +22,4 @@ public enum ReturnCode { public String getMessage() { return message; } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java index b6c0125cb..412dcf1f0 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java @@ -52,5 +52,4 @@ public enum AggOperatorEnum { return null != aggType && aggType.toUpperCase().equals(COUNT_DISTINCT.getOperator()); } - -} \ No newline at end of file +} diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggregateTypeEnum.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggregateTypeEnum.java index ad1907133..137c67124 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggregateTypeEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggregateTypeEnum.java @@ -10,7 +10,6 @@ public enum AggregateTypeEnum { COUNT, NONE; - public static AggregateTypeEnum of(String agg) { for (AggregateTypeEnum aggEnum : AggregateTypeEnum.values()) { if (aggEnum.name().equalsIgnoreCase(agg)) { diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/DictWordType.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/DictWordType.java index 3f2968176..1948fa175 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/DictWordType.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/DictWordType.java @@ -36,7 +36,6 @@ public enum DictWordType { return NATURE_SPILT + type; } - public static DictWordType getNatureType(String nature) { if (StringUtils.isEmpty(nature) || !nature.startsWith(NATURE_SPILT)) { return null; diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/FilterOperatorEnum.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/FilterOperatorEnum.java index cffccae76..01b720603 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/FilterOperatorEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/FilterOperatorEnum.java @@ -41,12 +41,10 @@ public enum FilterOperatorEnum { return value; } - public static boolean isValueCompare(FilterOperatorEnum filterOperatorEnum) { return EQUALS.equals(filterOperatorEnum) || GREATER_THAN.equals(filterOperatorEnum) || GREATER_THAN_EQUALS.equals(filterOperatorEnum) || MINOR_THAN.equals(filterOperatorEnum) || MINOR_THAN_EQUALS.equals(filterOperatorEnum) || NOT_EQUALS.equals(filterOperatorEnum); } - } diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/SensitiveLevelEnum.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/SensitiveLevelEnum.java index 901f6ba90..9e19792de 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/SensitiveLevelEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/SensitiveLevelEnum.java @@ -17,5 +17,4 @@ public enum SensitiveLevelEnum { return code; } - } diff --git a/common/src/main/java/com/tencent/supersonic/common/rest/SysParameterController.java b/common/src/main/java/com/tencent/supersonic/common/rest/SysParameterController.java index c39b62a86..7cc3fc06e 100644 --- a/common/src/main/java/com/tencent/supersonic/common/rest/SysParameterController.java +++ b/common/src/main/java/com/tencent/supersonic/common/rest/SysParameterController.java @@ -27,5 +27,4 @@ public class SysParameterController { return sysParameterService.getSysParameter(); } - } diff --git a/common/src/main/java/com/tencent/supersonic/common/util/BeanMapper.java b/common/src/main/java/com/tencent/supersonic/common/util/BeanMapper.java index 2ee4c189c..9f7206f2e 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/BeanMapper.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/BeanMapper.java @@ -29,5 +29,4 @@ public class BeanMapper { return (String[]) emptyNames.toArray(result); } - } diff --git a/common/src/main/java/com/tencent/supersonic/common/util/ChatGptHelper.java b/common/src/main/java/com/tencent/supersonic/common/util/ChatGptHelper.java index 939b2a04a..3fa9c75d0 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/ChatGptHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/ChatGptHelper.java @@ -32,7 +32,6 @@ public class ChatGptHelper { @Value("${llm.chatgpt.proxyPort:}") private Integer proxyPort; - public ChatGPT getChatGPT() { Proxy proxy = null; if (!"default".equals(proxyIp)) { @@ -76,7 +75,6 @@ public class ChatGptHelper { return res.getContent(); } - public String mockAlias(String mockType, String name, String bizName, @@ -124,7 +122,6 @@ public class ChatGptHelper { return res.getContent(); } - public String mockDimensionValueAlias(String json) { String msg = "Assuming you are a professional data analyst specializing in indicators,for you a json list，" + "the required content to follow is as follows: " @@ -144,11 +141,9 @@ public class ChatGptHelper { return res.getContent(); } - public static void main(String[] args) { ChatGptHelper chatGptHelper = new ChatGptHelper(); System.out.println(chatGptHelper.mockAlias("", "", "", "", "", false)); } - } diff --git a/common/src/main/java/com/tencent/supersonic/common/util/ContextUtils.java b/common/src/main/java/com/tencent/supersonic/common/util/ContextUtils.java index 6fc04b817..3b3245a6a 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/ContextUtils.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/ContextUtils.java @@ -76,7 +76,6 @@ public class ContextUtils implements ApplicationContextAware { return context; } - public static String getActiveProfile() { String activeProfile = context.getEnvironment().getActiveProfiles()[0]; if (StringUtils.isEmpty(activeProfile)) { @@ -85,4 +84,4 @@ public class ContextUtils implements ApplicationContextAware { return activeProfile; } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/tencent/supersonic/common/util/DateModeUtils.java b/common/src/main/java/com/tencent/supersonic/common/util/DateModeUtils.java index 7d0fde4d4..571b6cb49 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/DateModeUtils.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/DateModeUtils.java @@ -105,7 +105,6 @@ public class DateModeUtils { dateInfo.getEndDate()); } - public String generateMonthSql(LocalDate endData, Long unit, String dateFormatStr) { LocalDate dateMax = endData; List months = generateMonthStr(dateMax, unit, dateFormatStr); @@ -227,7 +226,6 @@ public class DateModeUtils { return -1L; } - public String recentDateStr(ItemDateResp dateDate, DateConf dateInfo) { if (Objects.isNull(dateDate)) { return ""; @@ -412,4 +410,4 @@ public class DateModeUtils { return Arrays.asList(sysDateCol, sysDateMonthCol, sysDateWeekCol); } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/tencent/supersonic/common/util/DatePeriodEnum.java b/common/src/main/java/com/tencent/supersonic/common/util/DatePeriodEnum.java index be9139f78..a26733573 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/DatePeriodEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/DatePeriodEnum.java @@ -24,5 +24,4 @@ public enum DatePeriodEnum { return null; } - } 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 985b45c17..1335102bd 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 @@ -57,7 +57,6 @@ public class DateUtils { return DateTimeFormatter.ofPattern(formats[0]); } - public static String getBeforeDate(int intervalDay) { Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); @@ -66,7 +65,6 @@ public class DateUtils { return dateFormat.format(calendar.getTime()); } - public static String getBeforeDate(int intervalDay, DatePeriodEnum datePeriodEnum) { SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT); String currentDate = dateFormat.format(new Date()); @@ -107,7 +105,6 @@ public class DateUtils { return null; } - public static String format(Date date) { DateFormat dateFormat; if (containsTime(date)) { diff --git a/common/src/main/java/com/tencent/supersonic/common/util/HttpClientUtils.java b/common/src/main/java/com/tencent/supersonic/common/util/HttpClientUtils.java index 10323cc7e..6c1a6c36e 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/HttpClientUtils.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/HttpClientUtils.java @@ -338,7 +338,6 @@ public class HttpClientUtils { } } - /** * @param headers * @param httpMethod @@ -507,7 +506,6 @@ public class HttpClientUtils { return res; } - /** * for us scheduling * @@ -595,7 +593,6 @@ public class HttpClientUtils { return builder.build(); } - /** * for us scheduling， send delete * @@ -659,7 +656,6 @@ public class HttpClientUtils { } } - public static HttpClientResult doPutJson(String url, Map headers, String req) { return RetryUtils.exec(() -> { HttpPut httpPut = null; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/JsonUtil.java b/common/src/main/java/com/tencent/supersonic/common/util/JsonUtil.java index eb1cdf24e..50eb06b36 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/JsonUtil.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/JsonUtil.java @@ -171,7 +171,6 @@ public class JsonUtil { return INSTANCE.asmapToObject(map, clazz); } - /** * 对象转json * @@ -418,7 +417,6 @@ public class JsonUtil { }); } - /** * 对象转换成Map */ @@ -445,7 +443,6 @@ public class JsonUtil { return objectMapper.convertValue(map, clazz); } - /** * Json转换成ListMap * @@ -627,4 +624,4 @@ public class JsonUtil { super(message, cause, enableSuppression, writableStackTrace); } } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/tencent/supersonic/common/util/SqlFilterUtils.java b/common/src/main/java/com/tencent/supersonic/common/util/SqlFilterUtils.java index 346085d38..a3bb17bfb 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/SqlFilterUtils.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/SqlFilterUtils.java @@ -72,7 +72,6 @@ public class SqlFilterUtils { return ""; } - public String getWhereClause(List filters) { return getWhereClause(filters, true); } @@ -248,5 +247,4 @@ public class SqlFilterUtils { return PARENTHESES_START + SPACE + criterion.getValue().toString() + SPACE + PARENTHESES_END; } - -} \ No newline at end of file +} diff --git a/common/src/main/java/com/tencent/supersonic/common/util/YamlUtils.java b/common/src/main/java/com/tencent/supersonic/common/util/YamlUtils.java index f32eba300..6dad218fb 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/YamlUtils.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/YamlUtils.java @@ -58,7 +58,6 @@ public class YamlUtils { return null; } - public static String toYamlWithoutNull(Object object) { String jsonStr = JSONObject.toJSONString(object); if (object instanceof List) { diff --git a/common/src/main/java/com/tencent/supersonic/common/util/embedding/Retrieval.java b/common/src/main/java/com/tencent/supersonic/common/util/embedding/Retrieval.java index 114470079..c1e02672c 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/embedding/Retrieval.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/embedding/Retrieval.java @@ -17,7 +17,6 @@ public class Retrieval { protected Map metadata; - public static Long getLongId(String id) { if (StringUtils.isBlank(id)) { return null; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/DateFunctionHelper.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/DateFunctionHelper.java index 2e9432d31..c45cc489c 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/DateFunctionHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/DateFunctionHelper.java @@ -48,5 +48,4 @@ public class DateFunctionHelper { return unit.getValue(); } - } diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java index fcdeb5552..bb107ca35 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java @@ -86,14 +86,12 @@ public class FieldAndValueAcquireVisitor extends ExpressionVisitorAdapter { fieldExpressions.add(fieldExpression); } - @Override public void visit(MinorThanEquals expr) { FieldExpression fieldExpression = getFilterExpression(expr); fieldExpressions.add(fieldExpression); } - @Override public void visit(GreaterThan expr) { FieldExpression fieldExpression = getFilterExpression(expr); diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledFilterReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledFilterReplaceVisitor.java index a3c968177..96aa55558 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledFilterReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledFilterReplaceVisitor.java @@ -53,7 +53,6 @@ public class FiledFilterReplaceVisitor extends ExpressionVisitorAdapter { } } - @Override public void visit(GreaterThan expr) { List expressions = parserFilter(expr, JsqlConstants.GREATER_THAN_CONSTANT); @@ -74,7 +73,6 @@ public class FiledFilterReplaceVisitor extends ExpressionVisitorAdapter { return waitingForAdds; } - public List parserFilter(ComparisonOperator comparisonOperator, String condExpr) { List result = new ArrayList<>(); String toString = comparisonOperator.toString(); @@ -109,4 +107,4 @@ public class FiledFilterReplaceVisitor extends ExpressionVisitorAdapter { return null; } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledNameReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledNameReplaceVisitor.java index cf3c958d5..73c7d6d5a 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledNameReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledNameReplaceVisitor.java @@ -70,5 +70,4 @@ public class FiledNameReplaceVisitor extends ExpressionVisitorAdapter { return value; } - -} \ No newline at end of file +} diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FilterRemoveVisitor.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FilterRemoveVisitor.java index 88ca87a47..7f704945d 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FilterRemoveVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FilterRemoveVisitor.java @@ -54,7 +54,6 @@ public class FilterRemoveVisitor extends ExpressionVisitorAdapter { expr.setLeftExpression(new LongValue(0L)); } - @Override public void visit(MinorThanEquals expr) { if (!isRemove(expr.getLeftExpression())) { @@ -64,7 +63,6 @@ public class FilterRemoveVisitor extends ExpressionVisitorAdapter { expr.setLeftExpression(new LongValue(1L)); } - @Override public void visit(GreaterThan expr) { if (!isRemove(expr.getLeftExpression())) { @@ -93,4 +91,4 @@ public class FilterRemoveVisitor extends ExpressionVisitorAdapter { expr.setLeftExpression(new LongValue(1L)); } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionReplaceVisitor.java index 9bd780352..1b3c46213 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionReplaceVisitor.java @@ -49,7 +49,6 @@ public class FunctionReplaceVisitor extends ExpressionVisitorAdapter { } } - @Override public void visit(GreaterThan expr) { List expressions = reparseDate(expr, "<"); @@ -70,7 +69,6 @@ public class FunctionReplaceVisitor extends ExpressionVisitorAdapter { return waitingForAdds; } - public List reparseDate(ComparisonOperator comparisonOperator, String startDateOperator) { List result = new ArrayList<>(); Expression leftExpression = comparisonOperator.getLeftExpression(); diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserAddHelper.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserAddHelper.java index b2402b8d1..75ca0351e 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserAddHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserAddHelper.java @@ -141,7 +141,6 @@ public class SqlParserAddHelper { return selectStatement.toString(); } - public static String addWhere(String sql, Expression expression) { Select selectStatement = SqlParserSelectHelper.getSelect(sql); SelectBody selectBody = selectStatement.getSelectBody(); diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserRemoveHelper.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserRemoveHelper.java index 989987206..1e063a566 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserRemoveHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserRemoveHelper.java @@ -83,6 +83,7 @@ public class SqlParserRemoveHelper { } removeWhereExpression(whereExpression, removeFieldNames); } + public static String removeNumberCondition(String sql) { Select selectStatement = SqlParserSelectHelper.getSelect(sql); if (selectStatement == null) { diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectHelper.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectHelper.java index b1781a93f..04381721d 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectHelper.java @@ -81,7 +81,6 @@ public class SqlParserSelectHelper { }); } - public static List getSelectFields(String sql) { List plainSelectList = getPlainSelect(sql); if (CollectionUtils.isEmpty(plainSelectList)) { diff --git a/common/src/test/java/com/tencent/supersonic/common/util/calcite/SqlParseUtilsTest.java b/common/src/test/java/com/tencent/supersonic/common/util/calcite/SqlParseUtilsTest.java index 943aacf64..604609072 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/calcite/SqlParseUtilsTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/util/calcite/SqlParseUtilsTest.java @@ -53,7 +53,6 @@ class SqlParseUtilsTest { Assert.assertTrue(addFieldToSql.toLowerCase().contains("pv")); } - @Test void getSqlParseInfo() { @@ -115,7 +114,6 @@ class SqlParseUtilsTest { Assert.assertTrue(!selectFields.contains("play_count")); } - @Test void getWhereFieldTest() { SqlParserInfo sqlParserInfo = SqlParseUtils.getSqlParseInfo( diff --git a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserAddHelperTest.java b/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserAddHelperTest.java index dbb4553a1..16d4cd8e3 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserAddHelperTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserAddHelperTest.java @@ -49,7 +49,6 @@ class SqlParserAddHelperTest { } - @Test void addFunctionToSelect() { String sql = "SELECT user_name FROM 超音数 WHERE sys_imp_date <= '2023-09-03' AND " @@ -117,7 +116,6 @@ class SqlParserAddHelperTest { replaceSql); } - @Test void addAggregateToMetricField() { String sql = "select department, pv from t_1 where sys_imp_date = '2023-09-11' order by pv desc limit 10"; @@ -217,7 +215,6 @@ class SqlParserAddHelperTest { replaceSql); } - @Test void addAggregateToCountDiscountMetricField() { String sql = "select department, uv from t_1 where sys_imp_date = '2023-09-11' order by uv desc limit 10"; @@ -375,7 +372,6 @@ class SqlParserAddHelperTest { replaceSql); } - @Test void addParenthesisToWhere() { String sql = "select 歌曲名 from 歌曲库 where datediff('day', 发布日期, '2023-08-09') <= 1 " diff --git a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserReplaceHelperTest.java b/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserReplaceHelperTest.java index 719598fb7..4bef9ed35 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserReplaceHelperTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserReplaceHelperTest.java @@ -100,7 +100,6 @@ class SqlParserReplaceHelperTest { + "ORDER BY 播放量 DESC LIMIT 11", replaceSql); } - @Test void replaceFieldNameByValue() { @@ -350,7 +349,6 @@ class SqlParserReplaceHelperTest { + "sum(user_id) < (SELECT min(user_id) FROM CSpider WHERE user_id = '英文')", replaceSql); } - @Test void replaceTable() { diff --git a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectFunctionHelperTest.java b/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectFunctionHelperTest.java index c25b50806..0cc921e66 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectFunctionHelperTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectFunctionHelperTest.java @@ -43,7 +43,6 @@ class SqlParserSelectFunctionHelperTest { Assert.assertEquals(hasAggregateFunction, true); } - @Test void hasFunction() throws JSQLParserException { diff --git a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectHelperTest.java b/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectHelperTest.java index 54392b2ec..40078be2d 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectHelperTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectHelperTest.java @@ -120,7 +120,6 @@ class SqlParserSelectHelperTest { System.out.println(fieldExpression); } - @Test void getAllFields() { @@ -173,7 +172,6 @@ class SqlParserSelectHelperTest { Assert.assertEquals(allFields.size(), 3); } - @Test void getSelectFields() { diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/ConfigureDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/ConfigureDemo.java index 98be626bd..c82aac973 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/ConfigureDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/ConfigureDemo.java @@ -299,7 +299,6 @@ public class ConfigureDemo implements ApplicationListener return chatDetailConfig; } - public void addDemoChatConfig_6() { ChatConfigBaseReq chatConfigBaseReq = new ChatConfigBaseReq(); chatConfigBaseReq.setModelId(6L); @@ -375,7 +374,6 @@ public class ConfigureDemo implements ApplicationListener configService.addConfig(chatConfigBaseReq, user); } - private void addPlugin_1() { Plugin plugin1 = new Plugin(); plugin1.setType("WEB_PAGE"); @@ -502,5 +500,4 @@ public class ConfigureDemo implements ApplicationListener } } - } diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java b/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java index b248597bd..2a19691bf 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java @@ -147,7 +147,6 @@ public class DataUtils { return dimensionFilterExist; } - public static Agent getAgent() { Agent agent = new Agent(); agent.setId(1); diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/OperatorEnum.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/OperatorEnum.java index 707f5db91..a0cd59b6b 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/OperatorEnum.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/OperatorEnum.java @@ -29,5 +29,4 @@ public enum OperatorEnum { return operator; } - } diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeBackEnum.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeBackEnum.java index 038b72fac..7cb37f193 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeBackEnum.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeBackEnum.java @@ -31,5 +31,4 @@ public enum QueryTypeBackEnum { return state; } - } diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeEnum.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeEnum.java index db23db28f..08170c77a 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeEnum.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeEnum.java @@ -25,5 +25,4 @@ public enum QueryTypeEnum { return value; } - } diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Dim.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Dim.java index 11c21f15c..a72500541 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Dim.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Dim.java @@ -55,8 +55,6 @@ public class Dim { this.bizName = bizName; } - - public static Dim getDefault() { return new Dim("日期", "time", "2023-05-28", Constants.DAY_FORMAT, diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryStat.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryStat.java index 04f34dff7..ecc0941b0 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryStat.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryStat.java @@ -51,7 +51,6 @@ public class QueryStat { private String resultCacheKey; private String queryOptMode; - public QueryStat setQueryOptMode(String queryOptMode) { this.queryOptMode = queryOptMode; return this; @@ -219,9 +218,8 @@ public class QueryStat { return JSONObject.parseArray(metrics, String.class); } - public List getDimensionListBizName() { return JSONObject.parseArray(dimensions, String.class); } -} \ No newline at end of file +} diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/SchemaItem.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/SchemaItem.java index 9e98d9eb3..8922799cb 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/SchemaItem.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/SchemaItem.java @@ -30,7 +30,6 @@ public class SchemaItem extends RecordInfo { private Integer sensitiveLevel = SensitiveLevelEnum.LOW.getCode(); - @Override public boolean equals(Object o) { if (this == o) { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainReq.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainReq.java index 7d7394520..d2c222de3 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainReq.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainReq.java @@ -31,7 +31,6 @@ public class DomainReq extends SchemaItem { return String.join(",", viewOrgs); } - public String getAdmin() { return String.join(",", admins); } diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ModelReq.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ModelReq.java index b3af891fe..c886f6778 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ModelReq.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ModelReq.java @@ -40,7 +40,6 @@ public class ModelReq extends SchemaItem { private List adminOrgs = new ArrayList<>(); - public List getTimeDimension() { if (CollectionUtils.isEmpty(modelDetail.getDimensions())) { return Lists.newArrayList(); @@ -50,7 +49,6 @@ public class ModelReq extends SchemaItem { .collect(Collectors.toList()); } - public String getViewer() { return String.join(",", viewers); } @@ -59,7 +57,6 @@ public class ModelReq extends SchemaItem { return String.join(",", viewOrgs); } - public String getAdmin() { return String.join(",", admins); } @@ -68,5 +65,4 @@ public class ModelReq extends SchemaItem { return String.join(",", adminOrgs); } - } diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/SqlExecuteReq.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/SqlExecuteReq.java index 959c57455..6a1edf94a 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/SqlExecuteReq.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/SqlExecuteReq.java @@ -23,5 +23,4 @@ public class SqlExecuteReq { return String.format(LIMIT_WRAPPER, sql); } - } diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelResp.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelResp.java index dddc5a194..3be771bef 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelResp.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelResp.java @@ -43,7 +43,6 @@ public class ModelResp extends SchemaItem { private Integer metricCnt; - public boolean openToAll() { return isOpen != null && isOpen == 1; } diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryMultiStructReq.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryMultiStructReq.java index c154aaacb..a216dd16b 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryMultiStructReq.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryMultiStructReq.java @@ -13,7 +13,6 @@ public class QueryMultiStructReq { List queryStructReqs; - public String toCustomizedString() { return JSONObject.toJSONString(queryStructReqs); } @@ -21,4 +20,5 @@ public class QueryMultiStructReq { public String generateCommandMd5() { return DigestUtils.md5Hex(this.toCustomizedString()); } + } diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryStructReq.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryStructReq.java index d1819abf1..3d7f203f4 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryStructReq.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryStructReq.java @@ -142,7 +142,6 @@ public class QueryStructReq { return stringBuilder.toString(); } - public String generateCommandMd5() { return DigestUtils.md5Hex(this.toCustomizedString()); } @@ -178,7 +177,6 @@ public class QueryStructReq { return sb.toString(); } - /** * convert queryStructReq to QueryS2QLReq * diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/application/MaterializationConfServiceImpl.java b/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/application/MaterializationConfServiceImpl.java index a054a7a4e..742c95c14 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/application/MaterializationConfServiceImpl.java +++ b/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/application/MaterializationConfServiceImpl.java @@ -104,7 +104,6 @@ public class MaterializationConfServiceImpl implements MaterializationConfServic return materializationRespList.get(0); } - @Override public Boolean addMaterializationElementConf(MaterializationElementReq materializationElementReq, User user) { log.info("materializationElementReq:{}, user:{}", JsonUtil.toString(materializationElementReq), @@ -292,7 +291,6 @@ public class MaterializationConfServiceImpl implements MaterializationConfServic return materializationElementRepository.cleanMaterializationElement(materializationId); } - @Override public List getMaterializationElementModels(Long materializationId, User user) { MaterializationResp materializationResp = materializationRepository.getMaterialization(materializationId); @@ -473,7 +471,6 @@ public class MaterializationConfServiceImpl implements MaterializationConfServic } } - private String getDataSourceMeasure(List measureRespList, String bizName) { if (!CollectionUtils.isEmpty(measureRespList)) { Optional measure = measureRespList.stream() @@ -485,5 +482,4 @@ public class MaterializationConfServiceImpl implements MaterializationConfServic return ""; } - -} \ No newline at end of file +} diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationConfService.java b/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationConfService.java index fd50893e2..ac6cad772 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationConfService.java +++ b/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationConfService.java @@ -19,7 +19,6 @@ public interface MaterializationConfService { List getMaterializationResp(MaterializationFilter filter, User user); - Boolean addMaterializationElementConf(MaterializationElementReq materializationElementReq, User user); Boolean updateMaterializationElementConf(MaterializationElementReq materializationElementReq, User user); @@ -40,5 +39,4 @@ public interface MaterializationConfService { Long getSourceIdByMeasure(List measureRespList, String bizName); - } diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationRecordService.java b/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationRecordService.java index 8eb6ea2ec..2425e9eb5 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationRecordService.java +++ b/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationRecordService.java @@ -23,5 +23,4 @@ public interface MaterializationRecordService { List fetchMaterializationDate(List materializationIds, String elementName, String startTime, String endTime); - } diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationConfController.java b/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationConfController.java index 6478214ad..10d5f2d8e 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationConfController.java +++ b/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationConfController.java @@ -55,7 +55,6 @@ public class MaterializationConfController { return confService.getMaterializationResp(filter, user); } - @PostMapping("/element") public Boolean addMaterializationElementConf(@RequestBody MaterializationElementReq materializationElementReq, HttpServletRequest request, @@ -107,5 +106,4 @@ public class MaterializationConfController { return confService.getMaterializationSourceResp(filter.getMaterializationId()); } - -} \ No newline at end of file +} diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationRecordController.java b/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationRecordController.java index 865de2bb2..756447ec1 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationRecordController.java +++ b/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationRecordController.java @@ -72,5 +72,4 @@ public class MaterializationRecordController { return recordService.fetchMaterializationDate(filter, user); } - -} \ No newline at end of file +} diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/CatalogImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/CatalogImpl.java index 5c989efe6..8df729d6e 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/CatalogImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/CatalogImpl.java @@ -81,7 +81,6 @@ public class CatalogImpl implements Catalog { return modelRelaService.getModelRela(modelIds); } - @Override public List getDimensions(List modelIds) { MetaFilter metricFilter = new MetaFilter(modelIds); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java index 35a3b9b71..f91724a9b 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java @@ -162,7 +162,6 @@ public class DatabaseServiceImpl implements DatabaseService { return queryWithColumns(metaQuerySql, databaseResp); } - @Override public QueryResultWithSchemaResp getColumns(Long id, String db, String table) { DatabaseResp databaseResp = getDatabase(id); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DimensionServiceImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DimensionServiceImpl.java index 972ce827f..f09599392 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DimensionServiceImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DimensionServiceImpl.java @@ -370,5 +370,4 @@ public class DimensionServiceImpl implements DimensionService { .modelId(dimensionDO.getModelId()).type(TypeEnums.DIMENSION).build(); } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DomainServiceImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DomainServiceImpl.java index a82ad254d..de3d2cba4 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DomainServiceImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DomainServiceImpl.java @@ -142,7 +142,6 @@ public class DomainServiceImpl implements DomainService { return domainSet; } - @Override public DomainResp getDomain(Long id) { Map fullDomainPathMap = getDomainFullPathMap(); @@ -220,12 +219,10 @@ public class DomainServiceImpl implements DomainService { return domainFullPathMap; } - protected DomainDO getDomainDO(Long id) { return domainRepository.getDomainById(id); } - private boolean checkAdminPermission(Set orgIds, User user, DomainResp domainResp) { List admins = domainResp.getAdmins(); List adminOrgs = domainResp.getAdminOrgs(); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelServiceImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelServiceImpl.java index b83438268..7bffed91f 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelServiceImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelServiceImpl.java @@ -580,7 +580,6 @@ public class ModelServiceImpl implements ModelService { return false; } - @Override public void getModelYamlTplByModelIds(Set modelIds, Map> dimensionYamlMap, List dataModelYamlTplList, List metricYamlTplList, @@ -617,5 +616,4 @@ public class ModelServiceImpl implements ModelService { return datasource; } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ViewInfoServiceImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ViewInfoServiceImpl.java index 0bc2eb262..2cb23b778 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ViewInfoServiceImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ViewInfoServiceImpl.java @@ -64,7 +64,6 @@ public class ViewInfoServiceImpl { return domainSchemaRelaResps; } - public ViewInfoDO createOrUpdateViewInfo(ViewInfoReq viewInfoReq, User user) { if (viewInfoReq.getId() == null) { ViewInfoDO viewInfoDO = new ViewInfoDO(); @@ -85,7 +84,6 @@ public class ViewInfoServiceImpl { return viewInfoDO; } - public void deleteViewInfo(Long id) { viewInfoRepository.deleteViewInfo(id); } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/Catalog.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/Catalog.java index 9b77f04f5..c728bd0bc 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/Catalog.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/Catalog.java @@ -36,7 +36,6 @@ public interface Catalog { List dataModelYamlTplList, List metricYamlTplList, Map modelIdName); - ItemDateResp getItemDate(ItemDateFilter dimension, ItemDateFilter metric); } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/ModelRelaService.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/ModelRelaService.java index a7ac31668..54a763309 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/ModelRelaService.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/ModelRelaService.java @@ -7,7 +7,6 @@ import java.util.List; public interface ModelRelaService { - void save(ModelRela modelRela, User user); void update(ModelRela modelRela, User user); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptor.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptor.java index d9d46b3a8..69d641569 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptor.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptor.java @@ -3,10 +3,8 @@ package com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter; public abstract class EngineAdaptor { - public abstract String getDateFormat(String dateType, String dateFormat, String column); - public abstract String getColumnMetaQueryTpl(); public abstract String getDbMetaQueryTpl(); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptorFactory.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptorFactory.java index 1ad3f7f51..6f6cf3cdf 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptorFactory.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptorFactory.java @@ -17,10 +17,8 @@ public class EngineAdaptorFactory { engineAdaptorMap.put(EngineTypeEnum.H2.getName(), new H2Adaptor()); } - public static EngineAdaptor getEngineAdaptor(String engineType) { return engineAdaptorMap.get(engineType); } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/MysqlAdaptor.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/MysqlAdaptor.java index c47571418..e39d3d7c4 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/MysqlAdaptor.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/MysqlAdaptor.java @@ -32,7 +32,6 @@ public class MysqlAdaptor extends EngineAdaptor { return column; } - @Override public String getDbMetaQueryTpl() { return "select distinct TABLE_SCHEMA as name from information_schema.tables " @@ -55,5 +54,4 @@ public class MysqlAdaptor extends EngineAdaptor { + "FROM information_schema.columns WHERE table_schema ='%s' AND table_name = '%s'"; } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DatasourceYamlManager.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DatasourceYamlManager.java index 69b71dafd..fc237fe39 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DatasourceYamlManager.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DatasourceYamlManager.java @@ -80,7 +80,6 @@ public class DatasourceYamlManager { return identifyYamlTpl; } - private static void addInterCntMetric(String datasourceEnName, ModelDetail datasourceDetail) { Measure measure = new Measure(); measure.setExpr("1"); @@ -93,5 +92,4 @@ public class DatasourceYamlManager { datasourceDetail.getMeasures().add(measure); } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DimensionYamlManager.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DimensionYamlManager.java index da2e265d7..c9c7a659b 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DimensionYamlManager.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DimensionYamlManager.java @@ -16,7 +16,6 @@ import org.springframework.util.CollectionUtils; @Service public class DimensionYamlManager { - public static List convert2DimensionYaml(List dimensions) { if (CollectionUtils.isEmpty(dimensions)) { return new ArrayList<>(); @@ -27,5 +26,4 @@ public class DimensionYamlManager { return dimensionYamlTpls; } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/MetricYamlManager.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/MetricYamlManager.java index b266a386c..6e461f433 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/MetricYamlManager.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/MetricYamlManager.java @@ -13,7 +13,6 @@ import org.springframework.stereotype.Service; @Service public class MetricYamlManager { - public static List convert2YamlObj(List metrics) { List metricYamlTpls = new ArrayList<>(); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Domain.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Domain.java index 3470147da..7190c004d 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Domain.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Domain.java @@ -34,5 +34,4 @@ public class Domain extends SchemaItem { return domain; } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/JdbcDataSource.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/JdbcDataSource.java index c4f24750b..a376db1d6 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/JdbcDataSource.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/JdbcDataSource.java @@ -154,7 +154,6 @@ public class JdbcDataSource { } } - public void removeDatasource(DatabaseResp jdbcSourceInfo) { String key = getDataSourceKey(jdbcSourceInfo); @@ -313,4 +312,4 @@ public class JdbcDataSource { jdbcSourceInfo.getUsername(), jdbcSourceInfo.getPassword(), "", false); } -} \ No newline at end of file +} diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DatabaseRepository.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DatabaseRepository.java index a907c9e10..b899c3c5b 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DatabaseRepository.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DatabaseRepository.java @@ -5,7 +5,6 @@ import java.util.List; public interface DatabaseRepository { - void createDatabase(DatabaseDO databaseDO); void updateDatabase(DatabaseDO databaseDO); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DimensionRepository.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DimensionRepository.java index bf9d2e171..dac6cda83 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DimensionRepository.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DimensionRepository.java @@ -6,7 +6,6 @@ import java.util.List; public interface DimensionRepository { - void createDimension(DimensionDO dimensionDO); void createDimensionBatch(List dimensionDOS); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DomainRepository.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DomainRepository.java index 5aacb9b9e..9ed6d3e46 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DomainRepository.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DomainRepository.java @@ -8,7 +8,6 @@ import java.util.List; public interface DomainRepository { - void createDomain(DomainDO metaDomainDO); void updateDomain(DomainDO metaDomainDO); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatabaseConverter.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatabaseConverter.java index 4d37c8c2b..b7607d1a1 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatabaseConverter.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatabaseConverter.java @@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; public class DatabaseConverter { - public static Database convert(DatabaseReq databaseReq) { Database database = new Database(); BeanUtils.copyProperties(databaseReq, database); @@ -36,7 +35,6 @@ public class DatabaseConverter { return databaseDO; } - public static DatabaseDO convert(Database database) { DatabaseDO databaseDO = new DatabaseDO(); BeanUtils.copyProperties(database, databaseDO); @@ -46,7 +44,6 @@ public class DatabaseConverter { return databaseDO; } - public static DatabaseResp convert(DatabaseDO databaseDO) { DatabaseResp databaseResp = new DatabaseResp(); BeanUtils.copyProperties(databaseDO, databaseResp); @@ -64,5 +61,4 @@ public class DatabaseConverter { return databaseResp; } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DimensionConverter.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DimensionConverter.java index 158555b27..d94424914 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DimensionConverter.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DimensionConverter.java @@ -77,7 +77,6 @@ public class DimensionConverter { return dimensionResp; } - public static DimensionYamlTpl convert2DimensionYamlTpl(Dimension dimension) { DimensionYamlTpl dimensionYamlTpl = new DimensionYamlTpl(); BeanUtils.copyProperties(dimension, dimensionYamlTpl); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DomainConvert.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DomainConvert.java index 355ea9cda..043256250 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DomainConvert.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DomainConvert.java @@ -52,5 +52,4 @@ public class DomainConvert { return domainResp; } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/JdbcDataSourceUtils.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/JdbcDataSourceUtils.java index 7b6750dfc..9b3fc51dc 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/JdbcDataSourceUtils.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/JdbcDataSourceUtils.java @@ -37,7 +37,6 @@ public class JdbcDataSourceUtils { this.jdbcDataSource = jdbcDataSource; } - public static boolean testDatabase(Database database) { try { @@ -196,4 +195,4 @@ public class JdbcDataSourceUtils { public void releaseDataSource(DatabaseResp databaseResp) { jdbcDataSource.removeDatasource(databaseResp); } -} \ No newline at end of file +} diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/ModelConverter.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/ModelConverter.java index 90ae94fd3..9d81f079a 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/ModelConverter.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/ModelConverter.java @@ -34,7 +34,6 @@ import java.util.stream.Collectors; public class ModelConverter { - public static ModelDO convert(ModelReq modelReq, User user) { ModelDO modelDO = new ModelDO(); ModelDetail modelDetail = getModelDetail(modelReq); @@ -72,8 +71,6 @@ public class ModelConverter { return modelResp; } - - public static ModelDO convert(ModelDO modelDO, ModelReq modelReq, User user) { ModelDetail modelDetail = getModelDetail(modelReq); BeanMapper.mapper(modelReq, modelDO); @@ -142,7 +139,6 @@ public class ModelConverter { return modelDescs; } - private static boolean isCreateDimension(Dim dim) { return dim.getIsCreateDimension() == 1 && StringUtils.isNotBlank(dim.getName()) @@ -186,7 +182,6 @@ public class ModelConverter { return dimensionReqs; } - public static List convertMetricList(ModelDO modelDO) { ModelDetail modelDetail = JSONObject.parseObject(modelDO.getModelDetail(), ModelDetail.class); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SqlUtils.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SqlUtils.java index be7782c04..f858095fb 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SqlUtils.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SqlUtils.java @@ -108,7 +108,6 @@ public class SqlUtils { return jdbcTemplate; } - public void queryInternal(String sql, QueryResultWithSchemaResp queryResultWithColumns) { getResult(sql, queryResultWithColumns, jdbcTemplate()); } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SysTimeDimensionBuilder.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SysTimeDimensionBuilder.java index 79cd829f8..c2237bd32 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SysTimeDimensionBuilder.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SysTimeDimensionBuilder.java @@ -25,7 +25,6 @@ public class SysTimeDimensionBuilder { log.debug("addSysTimeDimension after:{}, engineAdaptor:{}", dims, engineAdaptor); } - private static Dim generateSysDayDimension(Dim timeDim, EngineAdaptor engineAdaptor) { Dim dim = new Dim(); dim.setBizName(TimeDimensionEnum.DAY.getName()); @@ -77,5 +76,4 @@ public class SysTimeDimensionBuilder { return null; } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelDOCustomMapper.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelDOCustomMapper.java index a5df4b5be..eed177996 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelDOCustomMapper.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelDOCustomMapper.java @@ -10,5 +10,4 @@ public interface ModelDOCustomMapper { void batchUpdateStatus(List modelDOS); - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DatabaseRepositoryImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DatabaseRepositoryImpl.java index c0767d052..13fd2c14f 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DatabaseRepositoryImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DatabaseRepositoryImpl.java @@ -24,7 +24,6 @@ public class DatabaseRepositoryImpl implements DatabaseRepository { databaseDOMapper.insert(databaseDO); } - @Override public void updateDatabase(DatabaseDO databaseDO) { databaseDOMapper.updateByPrimaryKeyWithBLOBs(databaseDO); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DateInfoRepositoryImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DateInfoRepositoryImpl.java index 6ac386c14..b98f36b40 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DateInfoRepositoryImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DateInfoRepositoryImpl.java @@ -29,7 +29,6 @@ public class DateInfoRepositoryImpl implements DateInfoRepository { @Autowired private DateInfoMapper dateInfoMapper; - @Override public Integer upsertDateInfo(List dateInfoCommends) { List dateInfoDOList = new ArrayList<>(); @@ -70,4 +69,4 @@ public class DateInfoRepositoryImpl implements DateInfoRepository { log.info("before final, elapsed time:{}", stopwatch.elapsed(TimeUnit.MILLISECONDS)); return 0; } -} \ No newline at end of file +} diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DomainRepositoryImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DomainRepositoryImpl.java index 40885d68e..174bcbc0e 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DomainRepositoryImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DomainRepositoryImpl.java @@ -45,5 +45,4 @@ public class DomainRepositoryImpl implements DomainRepository { return domainDOMapper.selectById(id); } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ModelRepositoryImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ModelRepositoryImpl.java index 2609ada3d..1430c8ad5 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ModelRepositoryImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ModelRepositoryImpl.java @@ -27,7 +27,6 @@ public class ModelRepositoryImpl implements ModelRepository { this.modelDOCustomMapper = modelDOCustomMapper; } - @Override public void createModel(ModelDO datasourceDO) { modelDOMapper.insert(datasourceDO); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ViewInfoRepositoryImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ViewInfoRepositoryImpl.java index fc0a2da1e..46819ff56 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ViewInfoRepositoryImpl.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ViewInfoRepositoryImpl.java @@ -24,29 +24,24 @@ public class ViewInfoRepositoryImpl implements ViewInfoRepository { return viewInfoDOMapper.selectList(wrapper); } - @Override public ViewInfoDO getViewInfoById(Long id) { return viewInfoDOMapper.selectById(id); } - @Override public void deleteViewInfo(Long id) { viewInfoDOMapper.deleteById(id); } - @Override public void createViewInfo(ViewInfoDO viewInfoDO) { viewInfoDOMapper.insert(viewInfoDO); } - @Override public void updateViewInfo(ViewInfoDO viewInfoDO) { viewInfoDOMapper.updateById(viewInfoDO); } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/CollectController.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/CollectController.java index cd938461d..aec6fd190 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/CollectController.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/CollectController.java @@ -27,7 +27,6 @@ public class CollectController { this.collectService = collectService; } - @PostMapping("/createCollectionIndicators") public boolean createCollectionIndicators(@RequestBody CollectDO collectDO, HttpServletRequest request, @@ -36,7 +35,6 @@ public class CollectController { return collectService.createCollectionIndicators(user, collectDO.getId()); } - @DeleteMapping("/deleteCollectionIndicators/{id}") public boolean deleteCollectionIndicators(@PathVariable Long id, HttpServletRequest request, diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DimensionController.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DimensionController.java index 16fc925e7..4c3ebc550 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DimensionController.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DimensionController.java @@ -51,7 +51,6 @@ public class DimensionController { return true; } - @PostMapping("/updateDimension") public Boolean updateDimension(@RequestBody DimensionReq dimensionReq, HttpServletRequest request, @@ -78,7 +77,6 @@ public class DimensionController { return dimensionService.mockAlias(dimensionReq, "dimension", user); } - @PostMapping("/mockDimensionValuesAlias") public List mockDimensionValuesAlias(@RequestBody DimensionReq dimensionReq, HttpServletRequest request, @@ -99,20 +97,17 @@ public class DimensionController { return dimensionService.getDimensionInModelCluster(modelId); } - @GetMapping("/{modelId}/{dimensionName}") public DimensionResp getDimensionDescByNameAndId(@PathVariable("modelId") Long modelId, @PathVariable("dimensionName") String dimensionBizName) { return dimensionService.getDimension(dimensionBizName, modelId); } - @PostMapping("/queryDimension") public PageInfo queryDimension(@RequestBody PageDimensionReq pageDimensionReq) { return dimensionService.queryDimension(pageDimensionReq); } - @DeleteMapping("deleteDimension/{id}") public Boolean deleteDimension(@PathVariable("id") Long id, HttpServletRequest request, @@ -122,7 +117,6 @@ public class DimensionController { return true; } - @GetMapping("/getAllHighSensitiveDimension") public List getAllHighSensitiveDimension() { MetaFilter metaFilter = new MetaFilter(); @@ -130,5 +124,4 @@ public class DimensionController { return dimensionService.getDimensions(metaFilter); } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/MetricController.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/MetricController.java index 315fce2ab..943907255 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/MetricController.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/MetricController.java @@ -40,7 +40,6 @@ public class MetricController { this.metricService = metricService; } - @PostMapping("/creatExprMetric") public Boolean creatExprMetric(@RequestBody MetricReq metricReq, HttpServletRequest request, @@ -68,7 +67,6 @@ public class MetricController { return true; } - @PostMapping("/mockMetricAlias") public List mockMetricAlias(@RequestBody MetricReq metricReq, HttpServletRequest request, @@ -83,7 +81,6 @@ public class MetricController { return metricService.getMetrics(metaFilter); } - @PostMapping("/queryMetric") public PageInfo queryMetric(@RequestBody PageMetricReq pageMetricReq, HttpServletRequest request, @@ -121,13 +118,11 @@ public class MetricController { return metricService.getMetrics(metricFilter); } - @GetMapping("/getMetricTags") public Set getMetricTags() { return metricService.getMetricTags(); } - @GetMapping("/getDrillDownDimension") public List getDrillDownDimension(Long metricId) { return metricService.getDrillDownDimension(metricId); diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelController.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelController.java index 5a8332e09..9552d2b4b 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelController.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelController.java @@ -64,7 +64,6 @@ public class ModelController { return modelService.getModelListWithAuth(user, domainId, AuthType.ADMIN); } - @GetMapping("/getModel/{id}") public ModelResp getModel(@PathVariable("id") Long id) { return modelService.getModel(id); @@ -83,7 +82,6 @@ public class ModelController { return modelService.getDatabaseByModelId(modelId); } - @PostMapping("/batchUpdateStatus") public Boolean batchUpdateStatus(@RequestBody MetaBatchReq metaBatchReq, HttpServletRequest request, diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelRelaController.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelRelaController.java index aee051d8a..56540dbbe 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelRelaController.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelRelaController.java @@ -45,5 +45,4 @@ public class ModelRelaController { modelRelaService.delete(id); } - } diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ViewInfoController.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ViewInfoController.java index ae237da65..a961547bf 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ViewInfoController.java +++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ViewInfoController.java @@ -29,7 +29,6 @@ public class ViewInfoController { this.viewInfoServiceImpl = viewInfoServiceImpl; } - @PostMapping("/createOrUpdateViewInfo") public ViewInfoDO createOrUpdateViewInfo(@RequestBody ViewInfoReq viewInfoReq, HttpServletRequest request, HttpServletResponse response) { @@ -52,5 +51,4 @@ public class ViewInfoController { return viewInfoServiceImpl.getDomainSchema(domainId); } - } diff --git a/semantic/model/src/test/java/com/tencent/supersonic/semantic/model/application/ModelServiceImplTest.java b/semantic/model/src/test/java/com/tencent/supersonic/semantic/model/application/ModelServiceImplTest.java index 50f9741b1..0d735c288 100644 --- a/semantic/model/src/test/java/com/tencent/supersonic/semantic/model/application/ModelServiceImplTest.java +++ b/semantic/model/src/test/java/com/tencent/supersonic/semantic/model/application/ModelServiceImplTest.java @@ -60,7 +60,6 @@ class ModelServiceImplTest { Assertions.assertEquals("alice", actualModelResp.getUpdatedBy()); } - private ModelService mockModelService(ModelRepository modelRepository) { MetricService metricService = Mockito.mock(MetricService.class); DimensionService dimensionService = Mockito.mock(DimensionService.class); @@ -238,4 +237,4 @@ class ModelServiceImplTest { return modelResp; } -} \ No newline at end of file +} diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/QueryParser.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/QueryParser.java index efc70635e..4ab572083 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/QueryParser.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/QueryParser.java @@ -49,7 +49,6 @@ public class QueryParser { return parser(metricReq); } - public QueryStatement parser(ParseSqlReq sqlCommend) { log.info("parser MetricReq [{}] ", sqlCommend); QueryStatement queryStatement = new QueryStatement(); @@ -121,5 +120,4 @@ public class QueryParser { return queryStatement; } - } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/SemanticSchemaManager.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/SemanticSchemaManager.java index 0a08ad4ab..4c2252487 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/SemanticSchemaManager.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/SemanticSchemaManager.java @@ -113,12 +113,10 @@ public class SemanticSchemaManager { return getMetricsByMetricYamlTpl(t); } - public static List getDimensions(final List t) { return getDimension(t); } - public static DataSource getDatasource(final DataModelYamlTpl d) { DataSource datasource = DataSource.builder().sourceId(d.getSourceId()).sqlQuery(d.getSqlQuery()) .name(d.getName()).tableQuery(d.getTableQuery()).identifiers(getIdentify(d.getIdentifiers())) @@ -231,7 +229,6 @@ public class SemanticSchemaManager { return joinRelations; } - public static void update(SemanticSchema schema, List metric) throws Exception { if (schema != null) { updateMetric(metric, schema.getMetrics()); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/AggPlanner.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/AggPlanner.java index 797a9f537..87c760007 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/AggPlanner.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/AggPlanner.java @@ -40,7 +40,6 @@ public class AggPlanner implements Planner { this.schema = schema; } - public void parse() throws Exception { // find the match Datasource scope = SchemaBuilder.getScope(schema); @@ -74,7 +73,6 @@ public class AggPlanner implements Planner { } - private List getMatchDataSource(SqlValidatorScope scope) throws Exception { return DataSourceNode.getMatchDataSources(scope, schema, metricReq); } @@ -93,7 +91,6 @@ public class AggPlanner implements Planner { return isAgg; } - @Override public void explain(QueryStatement queryStatement, AggOption aggOption) throws Exception { this.metricReq = queryStatement.getMetricReq(); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/MaterializationPlanner.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/MaterializationPlanner.java index f3af6b887..798ffb471 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/MaterializationPlanner.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/MaterializationPlanner.java @@ -224,7 +224,6 @@ public class MaterializationPlanner implements Planner { return schema; } - private void init() { viewSchema = SchemaBuilder.getMaterializationSchema(); hepProgramBuilder = new HepProgramBuilder(); @@ -336,5 +335,4 @@ public class MaterializationPlanner implements Planner { return tableNames; } - } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SchemaBuilder.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SchemaBuilder.java index 8dac3c159..2dcb0077f 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SchemaBuilder.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SchemaBuilder.java @@ -24,7 +24,6 @@ public class SchemaBuilder { public static final String MATERIALIZATION_SYS_FIELD_DATE = "C1"; public static final String MATERIALIZATION_SYS_FIELD_DATA = "C2"; - public static SqlValidatorScope getScope(SemanticSchema schema) throws Exception { Map nameToTypeMap = new HashMap<>(); CalciteSchema rootSchema = CalciteSchema.createRootSchema(true, false); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSchema.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSchema.java index ce81c167f..ccc392c74 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSchema.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSchema.java @@ -84,6 +84,7 @@ public class SemanticSchema extends AbstractSchema { public void setMaterializationList(List materializationList) { semanticModel.setMaterializationList(materializationList); } + public List getMaterializationList() { return semanticModel.getMaterializationList(); } @@ -120,9 +121,9 @@ public class SemanticSchema extends AbstractSchema { return this; } - public SemanticSchema build() { return new SemanticSchema(rootPath, tableMap); } } -} \ No newline at end of file + +} diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DataSourceNode.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DataSourceNode.java index 7a0fc272a..16017a463 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DataSourceNode.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DataSourceNode.java @@ -49,7 +49,6 @@ public class DataSourceNode extends SemanticNode { return buildAs(datasource.getName(), getTable(sqlTable, scope)); } - public static SqlNode buildExtend(DataSource datasource, Set exprList, SqlValidatorScope scope) throws Exception { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DimensionNode.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DimensionNode.java index b8ee89f02..b351110e9 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DimensionNode.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DimensionNode.java @@ -62,5 +62,4 @@ public class DimensionNode extends SemanticNode { return expand(dimension, scope); } - } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/MeasureNode.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/MeasureNode.java index afd6cab5c..5db3b95be 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/MeasureNode.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/MeasureNode.java @@ -25,7 +25,6 @@ public class MeasureNode extends SemanticNode { } } - public static SqlNode buildNonAgg(String alias, Measure measure, SqlValidatorScope scope) throws Exception { return buildAs(measure.getName(), getExpr(measure, alias, scope)); } @@ -47,4 +46,5 @@ public class MeasureNode extends SemanticNode { } return parse(measure.getExpr(), scope); } + } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/SemanticNode.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/SemanticNode.java index 015a5a56c..2e8eab4e7 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/SemanticNode.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/SemanticNode.java @@ -180,5 +180,4 @@ public abstract class SemanticNode { optimization.visit(this); } - } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/JoinRender.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/JoinRender.java index 522609265..f6e9bc0e1 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/JoinRender.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/JoinRender.java @@ -199,7 +199,6 @@ public class JoinRender extends Renderer { Collectors.toSet()); } - private boolean getMatchMetric(SemanticSchema schema, Set sourceMeasure, String m, List queryMetrics) { Optional metric = schema.getMetrics().stream().filter(mm -> mm.getName().equalsIgnoreCase(m)) @@ -297,7 +296,6 @@ public class JoinRender extends Renderer { return matchJoinRelation; } - private SqlNode getCondition(JoinRelation joinRelation, SqlValidatorScope scope) throws Exception { SqlNode condition = null; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/SourceRender.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/SourceRender.java index fc93d9b05..7cc4bac05 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/SourceRender.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/SourceRender.java @@ -320,5 +320,4 @@ public class SourceRender extends Renderer { super.tableView = joinRender.getTableView(); } - } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/CalculateAggConverter.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/CalculateAggConverter.java index 39be0bc86..44aa7a029 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/CalculateAggConverter.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/CalculateAggConverter.java @@ -93,7 +93,6 @@ public class CalculateAggConverter implements SemanticConverter { return sqlCommand; } - @Override public boolean accept(QueryStructReq queryStructCmd) { if (queryStructCmd.getQueryType().isNativeAggQuery()) { @@ -131,7 +130,6 @@ public class CalculateAggConverter implements SemanticConverter { sqlCommend.setSupportWith(parseSqlReq.isSupportWith()); } - /** * Ratio */ @@ -388,7 +386,6 @@ public class CalculateAggConverter implements SemanticConverter { } } - private String getAllJoinSelect(QueryStructReq queryStructCmd, String alias) { String aggStr = queryStructCmd.getAggregators().stream() .map(f -> getSelectField(f, alias) + " as " + getSelectField(f, "") @@ -403,7 +400,6 @@ public class CalculateAggConverter implements SemanticConverter { } - private String getGroupDimWithOutTime(QueryStructReq queryStructCmd) { String timeDim = getTimeDim(queryStructCmd); return queryStructCmd.getGroups().stream().filter(f -> !f.equalsIgnoreCase(timeDim)) @@ -422,7 +418,6 @@ public class CalculateAggConverter implements SemanticConverter { return ""; } - private String getAllSelect(QueryStructReq queryStructCmd, String alias) { String aggStr = queryStructCmd.getAggregators().stream().map(f -> getSelectField(f, alias)) .collect(Collectors.joining(",")); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/ParserDefaultConverter.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/ParserDefaultConverter.java index b99278d42..bc0e6691c 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/ParserDefaultConverter.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/ParserDefaultConverter.java @@ -42,7 +42,6 @@ public class ParserDefaultConverter implements SemanticConverter { BeanUtils.copyProperties(metricReq, metricCommand); } - public MetricReq generateSqlCommand(Catalog catalog, QueryStructReq queryStructCmd) { MetricReq sqlCommend = new MetricReq(); sqlCommend.setMetrics(queryStructCmd.getMetrics()); @@ -72,5 +71,4 @@ public class ParserDefaultConverter implements SemanticConverter { return sqlCommend; } - } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/pojo/QueryStatement.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/pojo/QueryStatement.java index 95c24d982..723973b53 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/pojo/QueryStatement.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/pojo/QueryStatement.java @@ -20,7 +20,6 @@ public class QueryStatement { private Integer status = 0; private List> timeRanges; - public boolean isOk() { this.ok = "".equals(errMsg) && !"".equals(sql); return ok; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/rest/QueryController.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/rest/QueryController.java index b09f4217c..4ed68ea65 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/rest/QueryController.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/rest/QueryController.java @@ -45,7 +45,6 @@ public class QueryController { @Autowired private DownloadService downloadService; - @PostMapping("/sql") public Object queryBySql(@RequestBody QueryS2SQLReq queryS2SQLReq, HttpServletRequest request, diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/MaterializationServiceImpl.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/MaterializationServiceImpl.java index 50bf56d3d..ff5e54fa3 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/MaterializationServiceImpl.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/MaterializationServiceImpl.java @@ -128,7 +128,6 @@ public class MaterializationServiceImpl implements MaterializationService { throw new Exception("cant find MaterializationSource"); } - protected List getMetric(MetricSchemaResp metricSchemaResp) { if (Objects.nonNull(metricSchemaResp.getTypeParams()) && metricSchemaResp.getTypeParams().getExpr() .contains(queryStructUtils.getVariablePrefix())) { @@ -137,4 +136,5 @@ public class MaterializationServiceImpl implements MaterializationService { } return Arrays.asList(metricSchemaResp.getBizName()); } + } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryService.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryService.java index e6b017cba..c5f6252b6 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryService.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryService.java @@ -25,7 +25,6 @@ public interface QueryService { QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructCmd, User user) throws Exception; - QueryResultWithSchemaResp queryDimValue(QueryDimValueReq queryDimValueReq, User user); Object queryByQueryStatement(QueryStatement queryStatement); @@ -36,5 +35,4 @@ public interface QueryService { QueryStatement parseMetricReq(MetricReq metricReq) throws Exception; - } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryServiceImpl.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryServiceImpl.java index 1511b3093..1e4731cf8 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryServiceImpl.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryServiceImpl.java @@ -140,7 +140,6 @@ public class QueryServiceImpl implements QueryService { } } - @Override @DataPermission @SneakyThrows @@ -148,7 +147,6 @@ public class QueryServiceImpl implements QueryService { return queryByStruct(queryStructCmd, user); } - @Override public QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user) throws Exception { @@ -199,7 +197,6 @@ public class QueryServiceImpl implements QueryService { return queryByStruct(queryStructReq, user); } - private void handleGlobalCacheDisable(QueryStructReq queryStructCmd) { if (!cacheEnable) { Cache cacheInfo = new Cache(); @@ -251,7 +248,6 @@ public class QueryServiceImpl implements QueryService { return ExplainResp.builder().sql(sql).build(); } - public QueryStatement parseMetricReq(MetricReq metricReq) throws Exception { QueryStructReq queryStructCmd = new QueryStructReq(); return semanticQueryEngine.physicalSql(queryStructCmd, metricReq); @@ -321,5 +317,4 @@ public class QueryServiceImpl implements QueryService { return String.join(",", modelIds.stream().map(Object::toString).collect(Collectors.toList())); } - } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SchemaServiceImpl.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SchemaServiceImpl.java index bfeabe989..2e91006be 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SchemaServiceImpl.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SchemaServiceImpl.java @@ -52,7 +52,6 @@ public class SchemaServiceImpl implements SchemaService { this.domainService = domainService; } - @Override public List fetchModelSchema(ModelSchemaFilterReq filter, User user) { List domainSchemaDescList = modelService.fetchModelSchema(filter); @@ -65,7 +64,6 @@ public class SchemaServiceImpl implements SchemaService { return domainSchemaDescList; } - private void fillCnt(List domainSchemaDescList, List statInfos) { Map typeIdAndStatPair = statInfos.stream() diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SemanticQueryEngineImpl.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SemanticQueryEngineImpl.java index ee04f0c16..ccb9a9a2f 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SemanticQueryEngineImpl.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SemanticQueryEngineImpl.java @@ -30,7 +30,6 @@ public class SemanticQueryEngineImpl implements SemanticQueryEngine { this.queryUtils = queryUtils; } - public QueryResultWithSchemaResp execute(QueryStatement queryStatement) { QueryResultWithSchemaResp queryResultWithColumns = null; QueryExecutor queryExecutor = route(queryStatement); @@ -68,14 +67,13 @@ public class SemanticQueryEngineImpl implements SemanticQueryEngine { return null; } - @Override public QueryStatement physicalSql(QueryStructReq queryStructCmd, ParseSqlReq sqlCommend) throws Exception { return optimize(queryStructCmd, queryParser.parser(sqlCommend)); } - public QueryStatement physicalSql(QueryStructReq queryStructCmd, MetricReq metricCommand) throws Exception { return queryParser.parser(metricCommand); } + } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/ComponentFactory.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/ComponentFactory.java index 1af70e721..c0b653747 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/ComponentFactory.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/ComponentFactory.java @@ -88,5 +88,4 @@ public class ComponentFactory { queryExecutors.add(ContextUtils.getContext().getBean("JdbcExecutor", JdbcExecutor.class)); } - } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DimValueAspect.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DimValueAspect.java index c19fe549e..a950bbdbf 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DimValueAspect.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DimValueAspect.java @@ -133,7 +133,6 @@ public class DimValueAspect { filedNameToValueMap.put(fieldName, map); } - @Around("execution(* com.tencent.supersonic.semantic.query.rest.QueryController.queryByStruct(..))" + " || execution(* com.tencent.supersonic.semantic.query.service.QueryService.queryByStruct(..))" + " || execution(* com.tencent.supersonic.semantic.query.service.QueryService.queryByStructWithAuth(..))") @@ -199,7 +198,6 @@ public class DimValueAspect { return false; } - private void rewriteFilter(List dimensionFilters, Map> aliasAndTechNamePair) { for (Filter filter : dimensionFilters) { if (Objects.isNull(filter)) { @@ -278,7 +276,6 @@ public class DimValueAspect { return Objects.isNull(dimValueMap) || Strings.isEmpty(dimValueMap.getTechName()); } - private Map> getTechNameToBizName(List dimensions) { if (CollectionUtils.isEmpty(dimensions)) { return new HashMap<>(); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryStructUtils.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryStructUtils.java index fe40992de..6bba5f504 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryStructUtils.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryStructUtils.java @@ -92,7 +92,6 @@ public class QueryStructUtils { this.catalog = catalog; } - private List getDimensionIds(QueryStructReq queryStructCmd) { List dimensionIds = new ArrayList<>(); List dimensions = catalog.getDimensions(queryStructCmd.getModelIds()); @@ -168,7 +167,6 @@ public class QueryStructUtils { return dateModeUtils.getDateWhereStr(dateInfo, dateDate); } - public String generateWhere(QueryStructReq queryStructCmd) { String whereClauseFromFilter = sqlFilterUtils.getWhereClause(queryStructCmd.getOriginalFilter()); String whereFromDate = getDateWhereClause(queryStructCmd); @@ -299,7 +297,6 @@ public class QueryStructUtils { return queryStatement.getSql(); } - public String getZipperDateWhereClause(QueryStructReq queryStructCmd) { List> timeRanges = getTimeRanges(queryStructCmd); List wheres = new ArrayList<>(); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryUtils.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryUtils.java index 0ba7e54ee..1c873056e 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryUtils.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryUtils.java @@ -118,7 +118,6 @@ public class QueryUtils { }); } - public void fillItemNameInfo(QueryResultWithSchemaResp queryResultWithColumns, QueryMultiStructReq queryMultiStructCmd) { List aggregators = queryMultiStructCmd.getQueryStructReqs().stream() @@ -205,7 +204,6 @@ public class QueryUtils { } } - public void checkSqlParse(QueryStatement sqlParser) { if (com.google.common.base.Strings.isNullOrEmpty(sqlParser.getSql()) || com.google.common.base.Strings.isNullOrEmpty(sqlParser.getSourceId())) { @@ -213,7 +211,6 @@ public class QueryUtils { } } - public QueryStatement sqlParserUnion(QueryMultiStructReq queryMultiStructCmd, List sqlParsers) { QueryStatement sqlParser = new QueryStatement(); StringBuilder unionSqlBuilder = new StringBuilder(); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/SqlGenerateUtils.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/SqlGenerateUtils.java index 96aef2235..eecd0414c 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/SqlGenerateUtils.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/SqlGenerateUtils.java @@ -82,5 +82,4 @@ public class SqlGenerateUtils { .collect(Collectors.joining(",")); } - } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/StatUtils.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/StatUtils.java index aa6364ddf..e5e2c2fc8 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/StatUtils.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/StatUtils.java @@ -85,7 +85,6 @@ public class StatUtils { return true; } - public void initStatInfo(QueryS2SQLReq queryS2SQLReq, User facadeUser) { QueryStat queryStatInfo = new QueryStat(); List allFields = SqlParserSelectHelper.getAllFields(queryS2SQLReq.getSql()); @@ -119,8 +118,6 @@ public class StatUtils { StatUtils.set(queryStatInfo); } - - public void initStatInfo(QueryStructReq queryStructCmd, User facadeUser) { QueryStat queryStatInfo = new QueryStat(); String traceId = ""; @@ -186,4 +183,4 @@ public class StatUtils { public List getQueryStatInfoWithoutCache(ItemUseReq itemUseCommend) { return statRepository.getQueryStatInfoWithoutCache(itemUseCommend); } -} \ No newline at end of file +} diff --git a/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/domain/calcite/SemanticParserServiceTest.java b/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/domain/calcite/SemanticParserServiceTest.java index c8ff6f6f1..7e534447e 100644 --- a/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/domain/calcite/SemanticParserServiceTest.java +++ b/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/domain/calcite/SemanticParserServiceTest.java @@ -193,7 +193,6 @@ class SemanticParserServiceTest { } - private static void addDepartment(SemanticSchema semanticSchema) { DataModelYamlTpl datasource = new DataModelYamlTpl(); datasource.setName("user_department"); @@ -253,4 +252,4 @@ class SemanticParserServiceTest { .put("user_department", SemanticSchemaManager.getDimensions(dimensionYamlTpls)); } -} \ No newline at end of file +} diff --git a/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/service/DownloadServiceImplTest.java b/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/service/DownloadServiceImplTest.java index 69d80999d..9b8f480e7 100644 --- a/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/service/DownloadServiceImplTest.java +++ b/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/service/DownloadServiceImplTest.java @@ -73,7 +73,6 @@ class DownloadServiceImplTest { return dimSchemaResp; } - private MetricSchemaResp mockMetricPv() { return mockMetric(1L, "pv", "访问次数", Lists.newArrayList(1L, 2L)); } @@ -118,4 +117,4 @@ class DownloadServiceImplTest { return map; } -} \ No newline at end of file +} diff --git a/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/utils/DataTransformUtilsTest.java b/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/utils/DataTransformUtilsTest.java index 187d9632c..b59853e3f 100644 --- a/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/utils/DataTransformUtilsTest.java +++ b/semantic/query/src/test/java/com/tencent/supersonic/semantic/query/utils/DataTransformUtilsTest.java @@ -11,7 +11,6 @@ import java.util.Map; class DataTransformUtilsTest { - @Test public void testTransform() { List> inputData = new ArrayList<>(); @@ -38,4 +37,4 @@ class DataTransformUtilsTest { return map; } -} \ No newline at end of file +} diff --git a/webapp/pnpm-lock.yaml b/webapp/pnpm-lock.yaml index 2bd87a237..21805ba11 100644 --- a/webapp/pnpm-lock.yaml +++ b/webapp/pnpm-lock.yaml @@ -354,6 +354,9 @@ importers: crypto-js: specifier: ^4.0.0 version: 4.1.1 + dayjs: + specifier: ^1.11.10 + version: 1.11.10 echarts: specifier: ^5.0.2 version: 5.4.3 @@ -691,9 +694,9 @@ packages: dependencies: '@ant-design/colors': 7.0.0 '@ant-design/icons-svg': 4.3.1 - '@babel/runtime': 7.23.2 + '@babel/runtime': 7.22.15 classnames: 2.3.2 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false @@ -9809,6 +9812,7 @@ packages: /domexception@4.0.0: resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==} engines: {node: '>=12'} + deprecated: Use your platform's native DOMException instead dependencies: webidl-conversions: 7.0.0 dev: true @@ -10171,7 +10175,7 @@ packages: is-arrayish: 0.2.1 /error-stack-parser@1.3.6: - resolution: {integrity: sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=} + resolution: {integrity: sha512-xhuSYd8wLgOXwNgjcPeXMPL/IiiA1Huck+OPvClpJViVNNlJVtM41o+1emp7bPvlCJwCatFX2DWc05/DgfbWzA==} dependencies: stackframe: 0.3.1 dev: true @@ -12900,7 +12904,7 @@ packages: engines: {node: '>= 4'} /image-size@0.5.5: - resolution: {integrity: sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=} + resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==} engines: {node: '>=0.10.0'} hasBin: true requiresBuild: true @@ -22736,7 +22740,7 @@ packages: dev: true /source-map@0.5.6: - resolution: {integrity: sha1-dc449SvwczxafwwRjYEzSiu19BI=} + resolution: {integrity: sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==} engines: {node: '>=0.10.0'} dev: true @@ -22897,7 +22901,7 @@ packages: dev: true /stackframe@0.3.1: - resolution: {integrity: sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=} + resolution: {integrity: sha512-XmoiF4T5nuWEp2x2w92WdGjdHGY/cZa6LIbRsDRQR/Xlk4uW0PAUlH1zJYVffocwKpCdwyuypIp25xsSXEtZHw==} dev: true /stackframe@1.3.4: