From 721270a98043da3c0c0a5127c054437a90bdd258 Mon Sep 17 00:00:00 2001 From: liaozan <378024053@qq.com> Date: Thu, 6 Jul 2023 17:43:15 +0800 Subject: [PATCH] Polish --- .../common/util/ConfigurationPropertiesUtils.java | 4 +++- .../java/com/schbrain/common/util/ExcelUtils.java | 9 +++++++-- .../java/com/schbrain/common/util/InetUtils.java | 5 ++++- .../java/com/schbrain/common/util/JacksonUtils.java | 10 ++++++++-- .../java/com/schbrain/common/util/PageUtils.java | 3 ++- .../java/com/schbrain/common/util/SpelUtils.java | 4 +++- .../java/com/schbrain/common/util/StreamUtils.java | 9 +++++++-- .../util/support/ValidationMessageBuilder.java | 8 ++++++-- .../common/util/support/delay/DelayedQueueUtils.java | 4 +++- .../excel/listener/ExcelReadListenerBase.java | 5 ++++- .../excel/listener/HierarchicalDataReadListener.java | 4 +++- .../com/schbrain/common/entity/PaginationInfo.java | 4 +++- .../schbrain/common/module/tree/dao/TreeNodeDao.java | 4 +++- .../common/web/ExceptionHandingConfiguration.java | 5 ++++- .../common/web/ServletComponentConfiguration.java | 2 +- .../common/web/WebCommonAutoConfiguration.java | 8 ++++++-- .../exception/DefaultGlobalExceptionResolver.java | 8 ++++++-- .../common/web/exception/GlobalExceptionHandler.java | 11 ++++++++--- .../web/support/concurrent/RateLimitAspect.java | 8 ++++++-- .../com/schbrain/maven/plugin/mojo/PrepareMojo.java | 9 +++++++-- ...igurationInitializerEnvironmentPostProcessor.java | 3 ++- .../event/listener/ConfigLoadedEventListener.java | 4 +++- .../apollo/util/PropertySourceOrderUtils.java | 7 +++++-- .../autoconfigure/cache/provider/CacheProvider.java | 5 ++++- .../provider/redis/RedisCacheConfiguration.java | 4 +++- .../cache/provider/redis/RedisCacheProvider.java | 5 ++++- .../DubboSerializeCheckScopeModelInitializer.java | 7 +++++-- .../logger/LoggerConfigurationInitializer.java | 5 ++++- .../apollo/listener/LoggingLevelChangeListener.java | 7 +++++-- .../listener/LoggerConfigLoadedEventListener.java | 4 +++- .../mybatis/MybatisAutoConfiguration.java | 12 +++++++++--- .../autoconfigure/mybatis/base/BaseEntity.java | 4 +++- .../autoconfigure/mybatis/base/BaseService.java | 6 ++++-- .../autoconfigure/mybatis/base/BaseServiceImpl.java | 7 +++++-- .../autoconfigure/mybatis/biz/BizIdHelper.java | 6 ++++-- .../constraint/DefaultTableMetaDataLoader.java | 5 ++++- .../autoconfigure/mybatis/constraint/Table.java | 4 +++- .../mybatis/core/LogicDeleteSupportSqlSource.java | 4 +++- .../customizer/DefaultDataSourceCustomizer.java | 4 +++- .../mybatis/listener/TableConstraintCheckerBean.java | 12 +++++++++--- .../mybatis/type/InstantToLongTypeHandler.java | 5 ++++- .../autoconfigure/oss/bean/UploadCredentials.java | 4 +++- .../dao/mybatis/BaseMethodInvocationHandler.java | 4 +++- .../support/spring/GenericBeanPostProcessor.java | 4 +++- .../DefaultPropertiesEnvironmentPostProcessor.java | 9 +++++++-- 45 files changed, 199 insertions(+), 66 deletions(-) diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/ConfigurationPropertiesUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/ConfigurationPropertiesUtils.java index 1aeb36c..3d6ae2e 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/ConfigurationPropertiesUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/ConfigurationPropertiesUtils.java @@ -6,7 +6,9 @@ import com.google.common.base.Converter; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.annotation.MergedAnnotation; -import java.util.*; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; /** * @author liaozan diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/ExcelUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/ExcelUtils.java index 3aa0437..2e11315 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/ExcelUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/ExcelUtils.java @@ -3,11 +3,16 @@ package com.schbrain.common.util; import com.alibaba.excel.EasyExcel; import com.schbrain.common.util.support.excel.bean.ExcelReadResult; import com.schbrain.common.util.support.excel.exception.ExcelException; -import com.schbrain.common.util.support.excel.listener.*; +import com.schbrain.common.util.support.excel.listener.ExcelBeanReadListener; +import com.schbrain.common.util.support.excel.listener.ExcelMapDataReadListener; +import com.schbrain.common.util.support.excel.listener.ExcelReadListenerBase; +import com.schbrain.common.util.support.excel.listener.HierarchicalDataReadListener; import com.schbrain.common.util.support.excel.listener.HierarchicalDataReadListener.ImportedRecord; import org.apache.commons.collections4.CollectionUtils; -import java.io.*; +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; import java.nio.file.Path; import java.util.List; import java.util.Map; diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/InetUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/InetUtils.java index 6d6f81f..a771c4d 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/InetUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/InetUtils.java @@ -4,7 +4,10 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; import java.io.IOException; -import java.net.*; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.util.Enumeration; diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/JacksonUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/JacksonUtils.java index 0800a4f..983b794 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/JacksonUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/JacksonUtils.java @@ -2,7 +2,10 @@ package com.schbrain.common.util; import cn.hutool.extra.spring.SpringUtil; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.NullNode; import com.schbrain.common.util.exception.JSONException; import lombok.extern.slf4j.Slf4j; @@ -11,7 +14,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.TypeUtils; import java.lang.reflect.ParameterizedType; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT; diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/PageUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/PageUtils.java index 005cbd3..7b4a7c5 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/PageUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/PageUtils.java @@ -9,7 +9,8 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; -import static com.schbrain.common.constants.PageConstants.*; +import static com.schbrain.common.constants.PageConstants.DEFAULT_SEARCH_COUNT; +import static com.schbrain.common.constants.PageConstants.DEFAULT_TOTAL_COUNT; /** * @author liaozan diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/SpelUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/SpelUtils.java index 406294f..98280f3 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/SpelUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/SpelUtils.java @@ -1,7 +1,9 @@ package com.schbrain.common.util; import org.apache.commons.lang3.StringUtils; -import org.springframework.expression.*; +import org.springframework.expression.EvaluationContext; +import org.springframework.expression.Expression; +import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java index fa33a11..0556661 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java @@ -3,8 +3,13 @@ package com.schbrain.common.util; import lombok.extern.slf4j.Slf4j; import java.util.*; -import java.util.function.*; -import java.util.stream.*; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.function.Supplier; +import java.util.stream.Collector; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; import static java.util.Collections.emptyList; import static java.util.stream.Collectors.*; diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java b/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java index 1667833..ff34054 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java @@ -1,10 +1,14 @@ package com.schbrain.common.util.support; import org.hibernate.validator.internal.engine.path.PathImpl; -import org.springframework.validation.*; +import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; +import org.springframework.validation.ObjectError; import javax.validation.ConstraintViolation; -import java.util.*; +import java.util.Optional; +import java.util.Set; +import java.util.StringJoiner; /** * @author liaozan diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/support/delay/DelayedQueueUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/support/delay/DelayedQueueUtils.java index 2d0a6b0..8838ec5 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/support/delay/DelayedQueueUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/support/delay/DelayedQueueUtils.java @@ -4,7 +4,9 @@ import cn.hutool.core.text.StrPool; import cn.hutool.extra.spring.SpringUtil; import com.schbrain.common.exception.BaseException; import com.schbrain.common.util.ApplicationName; -import org.redisson.api.*; +import org.redisson.api.RBlockingQueue; +import org.redisson.api.RDelayedQueue; +import org.redisson.api.RedissonClient; import org.springframework.beans.BeansException; import org.springframework.util.CollectionUtils; diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/ExcelReadListenerBase.java b/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/ExcelReadListenerBase.java index 78cc1bd..6ec7798 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/ExcelReadListenerBase.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/ExcelReadListenerBase.java @@ -10,7 +10,10 @@ import com.schbrain.common.util.support.excel.exception.ExcelException; import lombok.*; import javax.validation.Validator; -import java.util.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * @author liaozan diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/HierarchicalDataReadListener.java b/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/HierarchicalDataReadListener.java index 88a6284..c8532b9 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/HierarchicalDataReadListener.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/HierarchicalDataReadListener.java @@ -10,7 +10,9 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * 层级数据 excel 读取类 diff --git a/commons/common/src/main/java/com/schbrain/common/entity/PaginationInfo.java b/commons/common/src/main/java/com/schbrain/common/entity/PaginationInfo.java index 3723efe..50b1e71 100644 --- a/commons/common/src/main/java/com/schbrain/common/entity/PaginationInfo.java +++ b/commons/common/src/main/java/com/schbrain/common/entity/PaginationInfo.java @@ -1,6 +1,8 @@ package com.schbrain.common.entity; -import lombok.*; +import lombok.AccessLevel; +import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.ArrayList; diff --git a/commons/module-tree/src/main/java/com/schbrain/common/module/tree/dao/TreeNodeDao.java b/commons/module-tree/src/main/java/com/schbrain/common/module/tree/dao/TreeNodeDao.java index e430ff6..afa18b9 100644 --- a/commons/module-tree/src/main/java/com/schbrain/common/module/tree/dao/TreeNodeDao.java +++ b/commons/module-tree/src/main/java/com/schbrain/common/module/tree/dao/TreeNodeDao.java @@ -9,7 +9,9 @@ import com.schbrain.framework.dao.BaseDao; import com.schbrain.framework.dao.util.SQLUtil; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; /** * @author hzchengyi diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/ExceptionHandingConfiguration.java b/commons/web-common/src/main/java/com/schbrain/common/web/ExceptionHandingConfiguration.java index 5c1a632..88f6238 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/ExceptionHandingConfiguration.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/ExceptionHandingConfiguration.java @@ -1,6 +1,9 @@ package com.schbrain.common.web; -import com.schbrain.common.web.exception.*; +import com.schbrain.common.web.exception.DefaultExceptionTranslator; +import com.schbrain.common.web.exception.ExceptionHandingWebMvcConfigurer; +import com.schbrain.common.web.exception.ExceptionTranslator; +import com.schbrain.common.web.exception.GlobalExceptionHandler; import com.schbrain.common.web.properties.WebProperties; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/ServletComponentConfiguration.java b/commons/web-common/src/main/java/com/schbrain/common/web/ServletComponentConfiguration.java index 6216e99..7f10a9f 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/ServletComponentConfiguration.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/ServletComponentConfiguration.java @@ -1,8 +1,8 @@ package com.schbrain.common.web; -import com.schbrain.common.web.servlet.RequestLoggingFilter; import com.schbrain.common.web.properties.WebProperties; import com.schbrain.common.web.servlet.CharacterEncodingServletContextInitializer; +import com.schbrain.common.web.servlet.RequestLoggingFilter; import com.schbrain.common.web.servlet.TraceIdInitializeServletListener; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/WebCommonAutoConfiguration.java b/commons/web-common/src/main/java/com/schbrain/common/web/WebCommonAutoConfiguration.java index aef1b8d..300af19 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/WebCommonAutoConfiguration.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/WebCommonAutoConfiguration.java @@ -7,11 +7,15 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; -import org.springframework.boot.autoconfigure.condition.*; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.client.RestTemplateBuilder; -import org.springframework.context.annotation.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.Lazy; import org.springframework.web.client.RestTemplate; import java.util.List; diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/exception/DefaultGlobalExceptionResolver.java b/commons/web-common/src/main/java/com/schbrain/common/web/exception/DefaultGlobalExceptionResolver.java index 5771cd6..a96b592 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/exception/DefaultGlobalExceptionResolver.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/exception/DefaultGlobalExceptionResolver.java @@ -7,7 +7,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.annotation.ExceptionHandlerMethodResolver; -import org.springframework.web.method.support.*; +import org.springframework.web.method.support.HandlerMethodArgumentResolverComposite; +import org.springframework.web.method.support.HandlerMethodReturnValueHandlerComposite; +import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.handler.AbstractHandlerMethodExceptionResolver; import org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver; @@ -17,7 +19,9 @@ import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/exception/GlobalExceptionHandler.java b/commons/web-common/src/main/java/com/schbrain/common/web/exception/GlobalExceptionHandler.java index 9853a2c..2ed3129 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/exception/GlobalExceptionHandler.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/exception/GlobalExceptionHandler.java @@ -12,9 +12,13 @@ import org.springframework.http.HttpStatus; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.util.ClassUtils; import org.springframework.validation.BindException; -import org.springframework.web.*; +import org.springframework.web.HttpMediaTypeNotAcceptableException; +import org.springframework.web.HttpMediaTypeNotSupportedException; +import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.*; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.context.request.async.AsyncRequestTimeoutException; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; import org.springframework.web.multipart.support.MissingServletRequestPartException; @@ -25,7 +29,8 @@ import java.sql.SQLException; import java.util.Arrays; import java.util.List; -import static com.schbrain.common.constants.ResponseCodeConstants.*; +import static com.schbrain.common.constants.ResponseCodeConstants.PARAM_INVALID; +import static com.schbrain.common.constants.ResponseCodeConstants.SERVER_ERROR; /** * @author liaozan diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/support/concurrent/RateLimitAspect.java b/commons/web-common/src/main/java/com/schbrain/common/web/support/concurrent/RateLimitAspect.java index 6763c4a..8c088f4 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/support/concurrent/RateLimitAspect.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/support/concurrent/RateLimitAspect.java @@ -2,7 +2,9 @@ package com.schbrain.common.web.support.concurrent; import cn.hutool.extra.spring.SpringUtil; import com.schbrain.common.exception.BaseException; -import com.schbrain.common.util.*; +import com.schbrain.common.util.ApplicationName; +import com.schbrain.common.util.ParameterDiscoverUtils; +import com.schbrain.common.util.SpelUtils; import com.schbrain.common.web.utils.ServletUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -18,7 +20,9 @@ import org.springframework.data.redis.core.BoundValueOperations; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; /** diff --git a/integration/integration-maven-plugin/src/main/java/com/schbrain/maven/plugin/mojo/PrepareMojo.java b/integration/integration-maven-plugin/src/main/java/com/schbrain/maven/plugin/mojo/PrepareMojo.java index bf8f51b..8bce1ba 100644 --- a/integration/integration-maven-plugin/src/main/java/com/schbrain/maven/plugin/mojo/PrepareMojo.java +++ b/integration/integration-maven-plugin/src/main/java/com/schbrain/maven/plugin/mojo/PrepareMojo.java @@ -3,12 +3,17 @@ package com.schbrain.maven.plugin.mojo; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugins.annotations.*; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; import java.io.File; import java.io.IOException; -import java.nio.file.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ApolloConfigurationInitializerEnvironmentPostProcessor.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ApolloConfigurationInitializerEnvironmentPostProcessor.java index 1b3e488..a1641b2 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ApolloConfigurationInitializerEnvironmentPostProcessor.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ApolloConfigurationInitializerEnvironmentPostProcessor.java @@ -17,7 +17,8 @@ import java.util.Map; import static com.ctrip.framework.apollo.core.ApolloClientSystemConsts.*; import static com.ctrip.framework.apollo.core.ConfigConsts.APOLLO_META_KEY; -import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.*; +import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED; +import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED; /** * @author liaozan diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/ConfigLoadedEventListener.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/ConfigLoadedEventListener.java index 12dd0a3..08a482b 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/ConfigLoadedEventListener.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/ConfigLoadedEventListener.java @@ -1,7 +1,9 @@ package com.schbrain.framework.autoconfigure.apollo.event.listener; import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent; -import org.springframework.context.*; +import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.ApplicationListener; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.Ordered; /** diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/util/PropertySourceOrderUtils.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/util/PropertySourceOrderUtils.java index 64c6a18..c1b0a18 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/util/PropertySourceOrderUtils.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/util/PropertySourceOrderUtils.java @@ -3,13 +3,16 @@ package com.schbrain.framework.autoconfigure.apollo.util; import com.schbrain.framework.autoconfigure.apollo.properties.ApolloProperties; import org.apache.commons.collections4.CollectionUtils; import org.springframework.boot.DefaultPropertiesPropertySource; -import org.springframework.core.env.*; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.MutablePropertySources; +import org.springframework.core.env.PropertySource; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.*; +import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME; +import static com.ctrip.framework.apollo.spring.config.PropertySourcesConstants.APOLLO_PROPERTY_SOURCE_NAME; /** * @author liaozan diff --git a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/CacheProvider.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/CacheProvider.java index fbb95b7..d64cb5c 100644 --- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/CacheProvider.java +++ b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/CacheProvider.java @@ -1,7 +1,10 @@ package com.schbrain.framework.autoconfigure.cache.provider; import java.time.Duration; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author zhuyf diff --git a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheConfiguration.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheConfiguration.java index 67a877d..dba1bb4 100644 --- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheConfiguration.java +++ b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheConfiguration.java @@ -2,7 +2,9 @@ package com.schbrain.framework.autoconfigure.cache.provider.redis; import com.schbrain.framework.autoconfigure.cache.provider.CacheProvider; import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.autoconfigure.condition.*; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.connection.RedisConnectionFactory; diff --git a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheProvider.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheProvider.java index 4296b01..fffc8e3 100644 --- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheProvider.java +++ b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheProvider.java @@ -7,7 +7,10 @@ import com.schbrain.framework.autoconfigure.cache.exception.CacheException; import com.schbrain.framework.autoconfigure.cache.provider.CacheProvider; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.data.redis.core.*; +import org.springframework.data.redis.core.Cursor; +import org.springframework.data.redis.core.RedisCallback; +import org.springframework.data.redis.core.ScanOptions; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.util.CollectionUtils; diff --git a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/initializer/DubboSerializeCheckScopeModelInitializer.java b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/initializer/DubboSerializeCheckScopeModelInitializer.java index 732be16..d9d2c27 100644 --- a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/initializer/DubboSerializeCheckScopeModelInitializer.java +++ b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/initializer/DubboSerializeCheckScopeModelInitializer.java @@ -4,7 +4,10 @@ import com.alibaba.fastjson2.JSONFactory; import org.apache.dubbo.common.beans.factory.ScopeBeanFactory; import org.apache.dubbo.common.utils.SerializeCheckStatus; import org.apache.dubbo.common.utils.SerializeSecurityManager; -import org.apache.dubbo.rpc.model.*; +import org.apache.dubbo.rpc.model.ApplicationModel; +import org.apache.dubbo.rpc.model.FrameworkModel; +import org.apache.dubbo.rpc.model.ModuleModel; +import org.apache.dubbo.rpc.model.ScopeModelInitializer; /** * @author liaozan @@ -36,4 +39,4 @@ public class DubboSerializeCheckScopeModelInitializer implements ScopeModelIniti } -} +} \ No newline at end of file diff --git a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/LoggerConfigurationInitializer.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/LoggerConfigurationInitializer.java index 6336cee..fe9ee03 100644 --- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/LoggerConfigurationInitializer.java +++ b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/LoggerConfigurationInitializer.java @@ -3,7 +3,10 @@ package com.schbrain.framework.autoconfigure.logger; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.*; +import ch.qos.logback.core.Appender; +import ch.qos.logback.core.ConsoleAppender; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.FileAppender; import ch.qos.logback.core.rolling.RollingFileAppender; import ch.qos.logback.core.rolling.TimeBasedRollingPolicy; import cn.hutool.json.JSONObject; diff --git a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/listener/LoggingLevelChangeListener.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/listener/LoggingLevelChangeListener.java index 0ea011d..6e03997 100644 --- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/listener/LoggingLevelChangeListener.java +++ b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/listener/LoggingLevelChangeListener.java @@ -5,11 +5,14 @@ import com.ctrip.framework.apollo.enums.PropertyChangeType; import com.ctrip.framework.apollo.model.ConfigChange; import com.ctrip.framework.apollo.model.ConfigChangeEvent; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.logging.*; +import org.springframework.boot.logging.LogLevel; +import org.springframework.boot.logging.LoggerConfiguration; +import org.springframework.boot.logging.LoggingSystem; import java.util.Set; -import static com.ctrip.framework.apollo.enums.PropertyChangeType.*; +import static com.ctrip.framework.apollo.enums.PropertyChangeType.ADDED; +import static com.ctrip.framework.apollo.enums.PropertyChangeType.MODIFIED; import static org.springframework.boot.logging.LoggingSystem.ROOT_LOGGER_NAME; /** diff --git a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerConfigLoadedEventListener.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerConfigLoadedEventListener.java index 6b91c24..7a59481 100644 --- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerConfigLoadedEventListener.java +++ b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerConfigLoadedEventListener.java @@ -20,7 +20,9 @@ import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.StringUtils; import java.io.IOException; -import java.nio.file.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Map; import static org.springframework.boot.context.logging.LoggingApplicationListener.CONFIG_PROPERTY; diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/MybatisAutoConfiguration.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/MybatisAutoConfiguration.java index 85e401f..55c31d7 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/MybatisAutoConfiguration.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/MybatisAutoConfiguration.java @@ -12,9 +12,13 @@ import com.schbrain.framework.autoconfigure.mybatis.configuration.MybatisPlusGlo import com.schbrain.framework.autoconfigure.mybatis.datasource.DataSourceConnectionPostProcessor; import com.schbrain.framework.autoconfigure.mybatis.datasource.customizer.DataSourceCustomizer; import com.schbrain.framework.autoconfigure.mybatis.datasource.customizer.DefaultDataSourceCustomizer; -import com.schbrain.framework.autoconfigure.mybatis.datasource.extractor.*; +import com.schbrain.framework.autoconfigure.mybatis.datasource.extractor.DataSourcePropertiesExtractor; +import com.schbrain.framework.autoconfigure.mybatis.datasource.extractor.DruidDataSourcePropertiesExtractor; +import com.schbrain.framework.autoconfigure.mybatis.datasource.extractor.HikariDataSourcePropertiesExtractor; import com.schbrain.framework.autoconfigure.mybatis.listener.TableConstraintCheckerBean; -import com.schbrain.framework.autoconfigure.mybatis.properties.*; +import com.schbrain.framework.autoconfigure.mybatis.properties.DataSourceConnectionProperties; +import com.schbrain.framework.autoconfigure.mybatis.properties.DataSourceProperties; +import com.schbrain.framework.autoconfigure.mybatis.properties.MybatisProperties; import com.schbrain.framework.autoconfigure.mybatis.sql.injector.DefaultMethodSqlInjector; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.config.BeanDefinition; @@ -22,7 +26,9 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.Role; import javax.sql.DataSource; import java.util.List; diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseEntity.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseEntity.java index 345d2c8..bbee30f 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseEntity.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseEntity.java @@ -1,6 +1,8 @@ package com.schbrain.framework.autoconfigure.mybatis.base; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.schbrain.framework.autoconfigure.mybatis.constant.MybatisConstants; import lombok.Data; diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseService.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseService.java index 1b1ec7b..90e5215 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseService.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseService.java @@ -2,7 +2,9 @@ package com.schbrain.framework.autoconfigure.mybatis.base; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; import java.util.function.Supplier; public interface BaseService extends IService { @@ -70,4 +72,4 @@ public interface BaseService extends IService { */ boolean updateBatchByIdsWithNull(Collection entityList, int batchSize); -} +} \ No newline at end of file diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseServiceImpl.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseServiceImpl.java index 79881ac..040f316 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseServiceImpl.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/base/BaseServiceImpl.java @@ -17,7 +17,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ReflectionUtils; import java.io.Serializable; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.function.Supplier; /** @@ -144,4 +147,4 @@ public class BaseServiceImpl, T extends BaseEntity> exte return mapperClass.getName() + StringPool.DOT + "alwaysUpdateSomeColumnById"; } -} +} \ No newline at end of file diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdHelper.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdHelper.java index 0ef748a..8fd8859 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdHelper.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdHelper.java @@ -1,6 +1,8 @@ package com.schbrain.framework.autoconfigure.mybatis.biz; -import com.baomidou.mybatisplus.core.metadata.*; +import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; +import com.baomidou.mybatisplus.core.metadata.TableInfo; +import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.schbrain.common.exception.BaseException; import com.schbrain.framework.autoconfigure.mybatis.annotation.BizId; @@ -52,4 +54,4 @@ public class BizIdHelper { return fieldInfoList.get(0); } -} +} \ No newline at end of file diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/constraint/DefaultTableMetaDataLoader.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/constraint/DefaultTableMetaDataLoader.java index 31af9a8..c5cfb4b 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/constraint/DefaultTableMetaDataLoader.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/constraint/DefaultTableMetaDataLoader.java @@ -3,7 +3,10 @@ package com.schbrain.framework.autoconfigure.mybatis.constraint; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @author liaozan diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/constraint/Table.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/constraint/Table.java index b6dfe56..a20f787 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/constraint/Table.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/constraint/Table.java @@ -9,7 +9,9 @@ import lombok.Getter; import org.apache.commons.lang3.StringUtils; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * @author liaozan diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/core/LogicDeleteSupportSqlSource.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/core/LogicDeleteSupportSqlSource.java index 3a02ea8..fd33198 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/core/LogicDeleteSupportSqlSource.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/core/LogicDeleteSupportSqlSource.java @@ -1,6 +1,8 @@ package com.schbrain.framework.autoconfigure.mybatis.core; -import org.apache.ibatis.mapping.*; +import org.apache.ibatis.mapping.BoundSql; +import org.apache.ibatis.mapping.ParameterMapping; +import org.apache.ibatis.mapping.SqlSource; import java.util.List; diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/datasource/customizer/DefaultDataSourceCustomizer.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/datasource/customizer/DefaultDataSourceCustomizer.java index b08e634..31c2d6b 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/datasource/customizer/DefaultDataSourceCustomizer.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/datasource/customizer/DefaultDataSourceCustomizer.java @@ -6,7 +6,9 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator; import javax.sql.DataSource; import java.sql.SQLException; -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.Properties; /** * @author liaozan diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/listener/TableConstraintCheckerBean.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/listener/TableConstraintCheckerBean.java index ee9e344..ea4c73d 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/listener/TableConstraintCheckerBean.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/listener/TableConstraintCheckerBean.java @@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.baomidou.mybatisplus.core.toolkit.ReflectionKit; import com.schbrain.common.exception.BaseException; import com.schbrain.common.util.StreamUtils; -import com.schbrain.framework.autoconfigure.mybatis.base.*; +import com.schbrain.framework.autoconfigure.mybatis.base.BaseEntity; +import com.schbrain.framework.autoconfigure.mybatis.base.BaseEntityWithLogicDelete; +import com.schbrain.framework.autoconfigure.mybatis.base.BaseMapper; import com.schbrain.framework.autoconfigure.mybatis.constraint.*; import com.schbrain.framework.autoconfigure.mybatis.constraint.Table.FieldInfo; import com.schbrain.framework.autoconfigure.mybatis.exception.TableConstraintException; @@ -16,7 +18,9 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.beans.BeansException; -import org.springframework.beans.factory.*; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.beans.factory.BeanFactoryAware; +import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.util.Assert; @@ -24,7 +28,9 @@ import org.springframework.util.ClassUtils; import javax.sql.DataSource; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import static java.util.stream.Collectors.toList; diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/type/InstantToLongTypeHandler.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/type/InstantToLongTypeHandler.java index 1c2fbf8..53bf6e2 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/type/InstantToLongTypeHandler.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/type/InstantToLongTypeHandler.java @@ -3,7 +3,10 @@ package com.schbrain.framework.autoconfigure.mybatis.type; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; -import java.sql.*; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.time.Instant; /** diff --git a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/UploadCredentials.java b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/UploadCredentials.java index 3bc6c4f..7544064 100644 --- a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/UploadCredentials.java +++ b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/UploadCredentials.java @@ -4,7 +4,9 @@ import com.aliyuncs.auth.sts.AssumeRoleResponse.Credentials; import lombok.Data; import lombok.EqualsAndHashCode; -import java.time.*; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; /** diff --git a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/BaseMethodInvocationHandler.java b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/BaseMethodInvocationHandler.java index 812adf3..37c4fdc 100644 --- a/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/BaseMethodInvocationHandler.java +++ b/support/schbrain-base-dao/src/main/java/com/schbrain/framework/dao/mybatis/BaseMethodInvocationHandler.java @@ -7,7 +7,9 @@ import org.mybatis.spring.SqlSessionTemplate; import java.io.Serializable; import java.lang.invoke.MethodHandles.Lookup; -import java.lang.reflect.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; /** * description diff --git a/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/GenericBeanPostProcessor.java b/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/GenericBeanPostProcessor.java index ec9ced6..fbbfa8c 100644 --- a/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/GenericBeanPostProcessor.java +++ b/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/GenericBeanPostProcessor.java @@ -3,7 +3,9 @@ package com.schbrain.framework.support.spring; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor; -import org.springframework.context.*; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.ResolvableType; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.Assert; diff --git a/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/defaults/DefaultPropertiesEnvironmentPostProcessor.java b/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/defaults/DefaultPropertiesEnvironmentPostProcessor.java index 3559db5..602b534 100644 --- a/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/defaults/DefaultPropertiesEnvironmentPostProcessor.java +++ b/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/defaults/DefaultPropertiesEnvironmentPostProcessor.java @@ -6,7 +6,10 @@ import com.schbrain.common.constants.DateTimeFormatters; import com.schbrain.common.util.EnvUtils; import com.schbrain.common.util.PortUtils; import com.schbrain.framework.support.spring.LoggerAwareEnvironmentPostProcessor; -import org.springframework.boot.*; +import org.springframework.boot.Banner; +import org.springframework.boot.ConfigurableBootstrapContext; +import org.springframework.boot.DefaultPropertiesPropertySource; +import org.springframework.boot.SpringApplication; import org.springframework.boot.actuate.autoconfigure.health.HealthProperties.Show; import org.springframework.boot.actuate.info.InfoPropertiesInfoContributor.Mode; import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor; @@ -18,7 +21,9 @@ import org.springframework.util.ClassUtils; import org.springframework.util.unit.DataSize; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.TimeZone; /** * @author liaozan -- GitLab