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 13b9f8e87d3fa919aca0938655acff24c12469c7..0f00dd9dcbfeda0c2bf476a78567eb25e2bc4321 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 @@ -8,9 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.core.annotation.MergedAnnotation; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.Map; +import java.util.*; /** * @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 4ea156319898709e4512b80c888ce15cb8651be3..9d3a7d2e09c08409d7863f895e1e3661e6d65139 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 @@ -4,16 +4,11 @@ import cn.hutool.poi.excel.ExcelUtil; 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.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.*; import com.schbrain.common.util.support.excel.listener.HierarchicalDataReadListener.ImportedRecord; import org.apache.commons.collections4.CollectionUtils; -import java.io.File; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; 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/HostInfoHolder.java b/commons/common-util/src/main/java/com/schbrain/common/util/HostInfoHolder.java index f99d23ab132f10e37b792dbd7b6ef0a3b9785712..4b97e59dad31d82ac64661cf9f2d3497c4df01a7 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/HostInfoHolder.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/HostInfoHolder.java @@ -4,10 +4,7 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; import java.io.IOException; -import java.net.Inet4Address; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.UnknownHostException; +import java.net.*; 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 76e5653518456330c2e781cbf7d558cf1479d0c5..77a3312e4c1fc9328b7e08620e2be36488a5b052 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,10 +2,7 @@ package com.schbrain.common.util; import cn.hutool.extra.spring.SpringUtil; import com.fasterxml.jackson.core.type.TypeReference; -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.*; import com.fasterxml.jackson.databind.node.NullNode; import com.schbrain.common.util.exception.JSONException; import lombok.extern.slf4j.Slf4j; @@ -14,10 +11,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.TypeUtils; import java.lang.reflect.ParameterizedType; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; 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 3cadcb634777fd82c2ee811feead2cf41d2889a6..4669bb649bcbffe8808f5578dbb9fa73ef513e8c 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/StreamUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/StreamUtils.java index b229baf02617bf36be8d352164812b0d09fd92b0..dd479bd219856361b3d3e7231a7f4c878f178cde 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 @@ -5,13 +5,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import java.util.*; -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 java.util.function.*; +import java.util.stream.*; 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 5565ff43bb0667326e7adb888c7db87e648ebcb7..9814d48c5a1a73ea9df2788a6c4dc1a9902c439c 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 @@ -2,14 +2,10 @@ package com.schbrain.common.util.support; import cn.hutool.core.text.StrPool; import org.apache.commons.lang3.StringUtils; -import org.springframework.validation.BindingResult; -import org.springframework.validation.FieldError; -import org.springframework.validation.ObjectError; +import org.springframework.validation.*; import javax.validation.ConstraintViolation; -import java.util.Optional; -import java.util.Set; -import java.util.StringJoiner; +import java.util.*; /** * @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 8838ec5b482e64300337610bbcd56a98314b7e9a..7d67a8b1a31877c80ea13a2b877a1d5fc230ccfc 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,9 +4,7 @@ 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.RBlockingQueue; -import org.redisson.api.RDelayedQueue; -import org.redisson.api.RedissonClient; +import org.redisson.api.*; import org.springframework.beans.BeansException; import org.springframework.util.CollectionUtils; @@ -101,4 +99,4 @@ public class DelayedQueueUtils { return String.join(StrPool.COLON, APPLICATION_NAME, "delay-queue", queueName); } -} \ No newline at end of file +} 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 87dcf41a44b38b8b5feba563a03ccb56d17e760b..274da293a95bd2bf87e073ca2ca783514f6f6ad4 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,10 +10,7 @@ import com.schbrain.common.util.support.excel.exception.ExcelException; import lombok.*; import javax.validation.Validator; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @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 c8532b9db16d73670b23155a7b0639518321e0c1..cdd449fc33d08efd03659a78c9adfa9eb8a2d8ac 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 @@ -5,14 +5,13 @@ import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; import com.schbrain.common.util.support.excel.exception.ExcelException; import lombok.Data; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 层级数据 excel 读取类 @@ -23,6 +22,7 @@ import java.util.Map; @Slf4j public class HierarchicalDataReadListener extends ExcelReadListenerBase> { + @Getter private final List importedRecords = new LinkedList<>(); private final Table coordinateTable = HashBasedTable.create(); @@ -52,10 +52,6 @@ public class HierarchicalDataReadListener extends ExcelReadListenerBase getImportedRecords() { - return importedRecords; - } - protected void buildImportedRow(Integer rowIndex, Integer columnIndex, String text) { ImportedRecord importedRecord = new ImportedRecord(); importedRecord.setText(text); @@ -91,4 +87,4 @@ public class HierarchicalDataReadListener extends ExcelReadListenerBase { } } -} \ No newline at end of file +} 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 a4a3348e1dbb790d987f4912d9d420003f847f52..c4993d3983b215f71b0acf8906235be62e26c29b 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,9 +1,6 @@ package com.schbrain.common.web; -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.exception.*; import com.schbrain.common.web.properties.WebProperties; import com.schbrain.common.web.result.ResponseDTO; import org.springframework.beans.factory.ObjectProvider; 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 34c48d20bff0b2cfffe32c7693bbb03a67ca5432..b83ad7994faf8c2e9316aa0de3fd1c3592cbb4b2 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,9 +1,7 @@ package com.schbrain.common.web; 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 com.schbrain.common.web.servlet.*; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter; 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 e3c2590b25a9a05b6c7d6639bc2c622a2ff1f401..72c6c84dc085637aa85ce59ddc4a98bcbfbd66ae 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,15 +7,11 @@ import com.schbrain.common.web.support.converter.datetime.DateTimeConvertersWebM import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; -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.*; 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.Bean; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.Lazy; +import org.springframework.context.annotation.*; import org.springframework.web.client.RestTemplate; import java.util.List; diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/argument/BodyParamMethodArgumentResolver.java b/commons/web-common/src/main/java/com/schbrain/common/web/argument/BodyParamMethodArgumentResolver.java index efe536843190c5434cd388d2ad8337e0e3b4aa23..0b53816d94d76e27d181edfe8d77dc658df77be2 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/argument/BodyParamMethodArgumentResolver.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/argument/BodyParamMethodArgumentResolver.java @@ -1,8 +1,6 @@ package com.schbrain.common.web.argument; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.*; import com.schbrain.common.util.JacksonUtils; import com.schbrain.common.web.annotation.BodyParam; import lombok.Setter; 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 8e7bcbb07bf23c878b3fd2287cea0baf9b115d30..dd4ca9e9551edf79c9cbad2ad8e2c2c38abc32df 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 @@ -5,9 +5,7 @@ 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.HandlerMethodArgumentResolverComposite; -import org.springframework.web.method.support.HandlerMethodReturnValueHandlerComposite; -import org.springframework.web.method.support.ModelAndViewContainer; +import org.springframework.web.method.support.*; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.handler.AbstractHandlerMethodExceptionResolver; import org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver; @@ -17,9 +15,7 @@ import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import static com.schbrain.common.web.utils.HandlerMethodAnnotationUtils.getAnnotation; 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 8b407943a30efa25884b4b0c14df77f7f5d3dca9..09df3e781fbd74d8db1afa515e75360d06eb696d 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 @@ -11,13 +11,9 @@ 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.HttpMediaTypeNotAcceptableException; -import org.springframework.web.HttpMediaTypeNotSupportedException; -import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.*; import org.springframework.web.bind.*; -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.bind.annotation.*; import org.springframework.web.context.request.async.AsyncRequestTimeoutException; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; import org.springframework.web.multipart.support.MissingServletRequestPartException; @@ -28,8 +24,10 @@ import java.sql.SQLException; import java.util.Arrays; import java.util.List; -import static com.schbrain.common.constants.ResponseCodeConstants.*; -import static com.schbrain.common.util.support.ValidationMessageBuilder.*; +import static com.schbrain.common.constants.ResponseCodeConstants.PARAM_INVALID; +import static com.schbrain.common.constants.ResponseCodeConstants.SERVER_ERROR; +import static com.schbrain.common.util.support.ValidationMessageBuilder.buildBindingErrorMsg; +import static com.schbrain.common.util.support.ValidationMessageBuilder.buildConstraintViolationErrorMsg; /** * @author liaozan diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/servlet/RequestLoggingFilter.java b/commons/web-common/src/main/java/com/schbrain/common/web/servlet/RequestLoggingFilter.java index bfd045427cc5f2c2367b190064ed3c6ed9da072f..cf5767889f9cf5f90b4fc1886921b993486cf844 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/servlet/RequestLoggingFilter.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/servlet/RequestLoggingFilter.java @@ -14,7 +14,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import static com.schbrain.common.web.utils.RequestContentCachingUtils.*; +import static com.schbrain.common.web.utils.RequestContentCachingUtils.getRequestBody; +import static com.schbrain.common.web.utils.RequestContentCachingUtils.wrapIfRequired; /** * 请求日志拦截器 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 8bce1baddb2203043baa995af4871f39508986db..1967b3e8ab0992f0a6b3095bc771f8002a87035a 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,17 +3,12 @@ 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.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.plugins.annotations.*; import org.apache.maven.project.MavenProject; import java.io.File; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; +import java.nio.file.*; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; @@ -202,4 +197,4 @@ public class PrepareMojo extends AbstractMojo { return builder.deleteCharAt(builder.length() - 1).toString(); } -} \ No newline at end of file +} 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 f4bdecccd93b7949e2ff6aaaea234906884946da..34ebfd8704c4d7cc5af039078e9adab83929bf28 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 66ecc6cb854e75acd0ee640baff5c314a56b48a8..77ba64052f82b59e53741bd3fa532ff6c5deb41d 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,9 +1,7 @@ package com.schbrain.framework.autoconfigure.apollo.event.listener; import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent; -import org.springframework.context.ApplicationContextInitializer; -import org.springframework.context.ApplicationListener; -import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.*; 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 42d93e5e02538fe0360e5743ff72776a6d5413b4..bfa68ca7b86524e95247ee738a90f85f3c509466 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,15 +3,14 @@ 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.ConfigurableEnvironment; -import org.springframework.core.env.MutablePropertySources; -import org.springframework.core.env.PropertySource; +import org.springframework.core.env.*; 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/CacheOperation.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/CacheOperation.java index 95c7fc0334d8083b32e4f4787551a57940885456..90d7b0ea52be392c475818c0365015eb99a48050 100644 --- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/CacheOperation.java +++ b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/CacheOperation.java @@ -1,10 +1,7 @@ package com.schbrain.framework.autoconfigure.cache.provider; import java.time.Duration; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * @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 9674b0293cd67568a52db5f6a10bc4cf18c9fffa..fcbfc583b33cdb61d2a2ac17b321d9cb60a39b4e 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 @@ -1,9 +1,7 @@ package com.schbrain.framework.autoconfigure.cache.provider.redis; import org.springframework.beans.factory.ObjectProvider; -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.autoconfigure.condition.*; 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/RedisCacheOperation.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheOperation.java index 2b27b7074a787151121222b8b51475402f7d29fd..436d392617959cf29c7f5f25db5fd083d0983128 100644 --- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheOperation.java +++ b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisCacheOperation.java @@ -6,10 +6,7 @@ import com.schbrain.common.util.JacksonUtils; import com.schbrain.framework.autoconfigure.cache.exception.CacheException; import com.schbrain.framework.autoconfigure.cache.provider.CacheOperation; import org.apache.commons.lang3.StringUtils; -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.core.*; 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/env/DubboEnvironmentPostProcessor.java b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/env/DubboEnvironmentPostProcessor.java index bf7a8902d578b4bd3fc5f7736e742492b5c5a0dc..b40c75f78d7976a5bc091c79bc2d889dd926cfba 100644 --- a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/env/DubboEnvironmentPostProcessor.java +++ b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/env/DubboEnvironmentPostProcessor.java @@ -4,9 +4,7 @@ import cn.hutool.core.text.StrFormatter; import com.google.common.collect.Maps; import com.schbrain.common.util.EnvUtils; import com.schbrain.framework.support.spring.LoggerAwareEnvironmentPostProcessor; -import org.springframework.boot.ConfigurableBootstrapContext; -import org.springframework.boot.DefaultPropertiesPropertySource; -import org.springframework.boot.SpringApplication; +import org.springframework.boot.*; import org.springframework.boot.logging.DeferredLogFactory; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.ClassUtils; 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 d9d2c27e93909a1541744b0fe9e1f3ab70846c82..732be16811a5c5ad152cfa1571bafad4333545c4 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,10 +4,7 @@ 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.ApplicationModel; -import org.apache.dubbo.rpc.model.FrameworkModel; -import org.apache.dubbo.rpc.model.ModuleModel; -import org.apache.dubbo.rpc.model.ScopeModelInitializer; +import org.apache.dubbo.rpc.model.*; /** * @author liaozan @@ -39,4 +36,4 @@ public class DubboSerializeCheckScopeModelInitializer implements ScopeModelIniti } -} \ No newline at end of file +} diff --git a/starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/CustomKafkaListenerEndpointRegistry.java b/starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/CustomKafkaListenerEndpointRegistry.java index 84433e594578f6bfc1890fc5a7b565840ce8182d..239e4b69c3555ae66ee291255608238c5cdf1c22 100644 --- a/starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/CustomKafkaListenerEndpointRegistry.java +++ b/starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/CustomKafkaListenerEndpointRegistry.java @@ -3,9 +3,7 @@ package com.schbrain.framework.autoconfigure.kafka; import com.schbrain.common.util.EnvUtils; import com.schbrain.framework.autoconfigure.kafka.properties.KafkaProperties; import lombok.extern.slf4j.Slf4j; -import org.springframework.kafka.config.KafkaListenerContainerFactory; -import org.springframework.kafka.config.KafkaListenerEndpoint; -import org.springframework.kafka.config.KafkaListenerEndpointRegistry; +import org.springframework.kafka.config.*; /** * @author liaozan diff --git a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/JSONLoggingInitializer.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/JSONLoggingInitializer.java index 73fa95bbb268b45d453360e1cdfa760bedf6a28f..49ec75a95ec240c8f6278748cc83c792fedb77d7 100644 --- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/JSONLoggingInitializer.java +++ b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/JSONLoggingInitializer.java @@ -3,16 +3,11 @@ 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.Appender; -import ch.qos.logback.core.ConsoleAppender; -import ch.qos.logback.core.Context; -import ch.qos.logback.core.FileAppender; +import ch.qos.logback.core.*; import ch.qos.logback.core.rolling.RollingFileAppender; import ch.qos.logback.core.rolling.TimeBasedRollingPolicy; import cn.hutool.json.JSONObject; -import com.schbrain.common.util.ApplicationName; -import com.schbrain.common.util.EnvUtils; -import com.schbrain.common.util.HostInfoHolder; +import com.schbrain.common.util.*; import com.schbrain.common.util.HostInfoHolder.HostInfo; import com.schbrain.framework.autoconfigure.logger.logstash.EnhancedLogstashEncoder; import com.schbrain.framework.autoconfigure.logger.properties.LoggingProperties; diff --git a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/LoggingLevelChangeListener.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/LoggingLevelChangeListener.java index e584472e1dd63168e35b548d28346d287d1291f7..3f231023bcfbe7d99e9e3bd46e5f1a996bd71625 100644 --- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/LoggingLevelChangeListener.java +++ b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/LoggingLevelChangeListener.java @@ -5,13 +5,12 @@ 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.LogLevel; -import org.springframework.boot.logging.LoggerConfiguration; -import org.springframework.boot.logging.LoggingSystem; +import org.springframework.boot.logging.*; 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/LoggingConfigLoadedEventListener.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggingConfigLoadedEventListener.java index 230a69784e3079bca7e4246a335d45a831046bcc..b663cfcb308f3909e589ebc20871ab6c58a025aa 100644 --- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggingConfigLoadedEventListener.java +++ b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggingConfigLoadedEventListener.java @@ -20,9 +20,7 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; +import java.nio.file.*; 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 55c31d7d0fca5834198256b9f8bcda1cc3e5dbd3..f4bccb713e0fb42e3f59b7619f1c48a52b2cb7bd 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,13 +12,9 @@ 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.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.datasource.extractor.*; import com.schbrain.framework.autoconfigure.mybatis.listener.TableConstraintCheckerBean; -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.properties.*; import com.schbrain.framework.autoconfigure.mybatis.sql.injector.DefaultMethodSqlInjector; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.config.BeanDefinition; @@ -26,9 +22,7 @@ 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.Bean; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.Role; +import org.springframework.context.annotation.*; import javax.sql.DataSource; import java.util.List; @@ -101,4 +95,4 @@ public class MybatisAutoConfiguration { return new DataSourceConnectionPostProcessor(dataSourceCustomizers, connectionProperties); } -} \ No newline at end of file +} 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 004884ddab77ee2c9f8efed839a9cfbad1e7cfb0..3dea938179a89623314abdf83854d373979173aa 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,8 +1,6 @@ package com.schbrain.framework.autoconfigure.mybatis.base; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.*; 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 2cec8d6919d156ad3bf7c5d6952f55f8b5fd41fb..17f85c028be9459ba0a071a926ab7aefb49cd9da 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 @@ -3,9 +3,7 @@ package com.schbrain.framework.autoconfigure.mybatis.base; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Supplier; public interface BaseService extends IService { 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 4dc657e1e07fa2e960564aff95db43c611bd0b19..753ef345ed9fa7d1e66911a46c60c24e0f9a00f4 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 @@ -20,12 +20,11 @@ import org.springframework.util.ReflectionUtils; import javax.annotation.Nullable; import java.io.Serializable; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Supplier; -import static java.util.Collections.*; +import static java.util.Collections.emptyList; +import static java.util.Collections.emptyMap; /** * @author liaozan 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 8fd88592622ef19ea2e5b28bc66c219b7ce9bcd3..0ef748a9e7077714a75c96dff667c393e531cf16 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,8 +1,6 @@ package com.schbrain.framework.autoconfigure.mybatis.biz; -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.metadata.*; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.schbrain.common.exception.BaseException; import com.schbrain.framework.autoconfigure.mybatis.annotation.BizId; @@ -54,4 +52,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 c5cfb4b868ebf68914ab3c693460fcdaab6e0c87..c3f3027d9b8e99b3e74a6dae011803189fc2c42a 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,10 +3,7 @@ package com.schbrain.framework.autoconfigure.mybatis.constraint; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author liaozan @@ -36,4 +33,4 @@ public class DefaultTableMetaDataLoader implements TableMetaDataLoader { return metaMap; } -} \ No newline at end of file +} 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 a20f787af13e6c4b138f2362997934c9333b0252..7a34bd5e5cb033036f8247e9c071e4943ccb7213 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,9 +9,7 @@ import lombok.Getter; import org.apache.commons.lang3.StringUtils; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author liaozan @@ -65,4 +63,4 @@ public class Table { } -} \ No newline at end of file +} 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 e791095c81ad2c86d7ef6f42b280a466a26c16d3..7511a8a4decf9754e63fbbb359881d7d318e3008 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,8 +1,6 @@ package com.schbrain.framework.autoconfigure.mybatis.core; -import org.apache.ibatis.mapping.BoundSql; -import org.apache.ibatis.mapping.ParameterMapping; -import org.apache.ibatis.mapping.SqlSource; +import org.apache.ibatis.mapping.*; 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 31c2d6bf900e1d0d45fadb8365754848f3c348b2..01d5dc37f0ed704f861699e85f22ad2086b723fe 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,9 +6,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator; import javax.sql.DataSource; import java.sql.SQLException; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import java.util.*; /** * @author liaozan @@ -36,4 +34,4 @@ public class DefaultDataSourceCustomizer implements DataSourceCustomizer { } } -} \ No newline at end of file +} 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 0a34905da5e0ec279d1090378311522971824764..18b694a8e44e7036af5c6d991538bf160b55c58a 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,9 +6,7 @@ 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.BaseEntity; -import com.schbrain.framework.autoconfigure.mybatis.base.BaseEntityWithLogicDelete; -import com.schbrain.framework.autoconfigure.mybatis.base.BaseMapper; +import com.schbrain.framework.autoconfigure.mybatis.base.*; import com.schbrain.framework.autoconfigure.mybatis.constraint.*; import com.schbrain.framework.autoconfigure.mybatis.constraint.Table.FieldInfo; import com.schbrain.framework.autoconfigure.mybatis.exception.TableConstraintException; @@ -18,9 +16,7 @@ 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.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.beans.factory.SmartInitializingSingleton; +import org.springframework.beans.factory.*; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.util.Assert; @@ -28,9 +24,7 @@ import org.springframework.util.ClassUtils; import javax.sql.DataSource; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; 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 53bf6e2a7c740bd1d1cabae6896a946015179a2b..ce18ae077f7c3f83d538987c1873f5c7d830e749 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,10 +3,7 @@ package com.schbrain.framework.autoconfigure.mybatis.type; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; +import java.sql.*; import java.time.Instant; /** @@ -38,4 +35,4 @@ public class InstantToLongTypeHandler extends BaseTypeHandler { return result == 0 && cs.wasNull() ? null : Instant.ofEpochMilli(result); } -} \ No newline at end of file +} diff --git a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/CopyResult.java b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/CopyResult.java index 38c444ed28e80ab437b17e0b26c1e9543401508b..467b6f4dfcc1353f0b7fab1646b34e6f2c854be0 100644 --- a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/CopyResult.java +++ b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/CopyResult.java @@ -1,8 +1,6 @@ package com.schbrain.framework.autoconfigure.oss.bean; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; +import lombok.*; /** * @author lik diff --git a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/DeleteResult.java b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/DeleteResult.java index 751a7220f6aca2a55814de015bcde9ce97267503..5e93a2e3f1ae283bd1ad25e4bab5b97b2927b6fc 100644 --- a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/DeleteResult.java +++ b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/DeleteResult.java @@ -1,8 +1,6 @@ package com.schbrain.framework.autoconfigure.oss.bean; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; +import lombok.*; import java.util.List; diff --git a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/DownloadResult.java b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/DownloadResult.java index dadc63ef07f5ef8477910edfb93745e29a887229..c3b972dd7656b8b29cbb57054d8aec29dacdc42f 100644 --- a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/DownloadResult.java +++ b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/DownloadResult.java @@ -1,9 +1,7 @@ package com.schbrain.framework.autoconfigure.oss.bean; import com.aliyun.oss.model.OSSObject; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; +import lombok.*; /** * @author liaozan 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 2f7b257db31758148aa2a888a81608870d6df1b3..7fa52bdeda9c84b76a40b6b85b85d50d2bb59d39 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 @@ -1,14 +1,9 @@ package com.schbrain.framework.autoconfigure.oss.bean; import com.aliyuncs.auth.sts.AssumeRoleResponse.Credentials; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.ToString; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZoneOffset; +import lombok.*; + +import java.time.*; import java.time.format.DateTimeFormatter; /** diff --git a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/UploadResult.java b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/UploadResult.java index a4083cdef08f716d9925f9aa9cb3fd73d94ce290..a4f8975eb0c63a96aabd767ba84785205fa9d995 100644 --- a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/UploadResult.java +++ b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/bean/UploadResult.java @@ -1,8 +1,6 @@ package com.schbrain.framework.autoconfigure.oss.bean; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; +import lombok.*; /** * @author liaozan diff --git a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/util/OssUtils.java b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/util/OssUtils.java index 3f4d98076ba68f65136ff2ea982387fcd6ba9d0d..66910760c64b6a28995c95d1b7da5efe4b15a75f 100644 --- a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/util/OssUtils.java +++ b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/util/OssUtils.java @@ -15,9 +15,7 @@ import com.aliyuncs.auth.sts.AssumeRoleResponse.Credentials; import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.IClientProfile; -import com.schbrain.common.util.ApplicationName; -import com.schbrain.common.util.StreamUtils; -import com.schbrain.common.util.ValidateUtils; +import com.schbrain.common.util.*; import com.schbrain.framework.autoconfigure.oss.bean.*; import com.schbrain.framework.autoconfigure.oss.exception.OssException; import com.schbrain.framework.autoconfigure.oss.properties.OssProperties; 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 fbbfa8c3b063a4043180c9812cdd02f129e440cc..0447fbd8791718e6033dd4186a27b00febc79af5 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,9 +3,7 @@ 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.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.*; import org.springframework.core.ResolvableType; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.Assert; @@ -104,4 +102,4 @@ public abstract class GenericBeanPostProcessor implements SmartInstantiationA } // endregion -} \ No newline at end of file +} diff --git a/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/OnceApplicationContextEventListener.java b/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/OnceApplicationContextEventListener.java index b0b9655b7a0b777edf792a5c5f5bdf98833c9a0c..b539b3b7f72b3ef9be6bb9f03a41feb3bc410a90 100644 --- a/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/OnceApplicationContextEventListener.java +++ b/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/OnceApplicationContextEventListener.java @@ -2,10 +2,7 @@ package com.schbrain.framework.support.spring; import org.springframework.beans.BeansException; import org.springframework.boot.web.context.WebServerInitializedEvent; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.context.ApplicationEvent; -import org.springframework.context.ApplicationListener; +import org.springframework.context.*; import org.springframework.context.event.ApplicationContextEvent; import static org.springframework.util.ObjectUtils.nullSafeEquals; diff --git a/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/env/DefaultPropertiesEnvironmentPostProcessor.java b/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/env/DefaultPropertiesEnvironmentPostProcessor.java index 2817ee13ab200b67d336e9178d38e471c020823b..4b04a16f360e2ca7b966bd25c2a924daa1c2790e 100644 --- a/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/env/DefaultPropertiesEnvironmentPostProcessor.java +++ b/support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/env/DefaultPropertiesEnvironmentPostProcessor.java @@ -6,10 +6,7 @@ import cn.hutool.core.util.ArrayUtil; import com.schbrain.common.util.EnvUtils; import com.schbrain.common.util.PortUtils; import com.schbrain.framework.support.spring.LoggerAwareEnvironmentPostProcessor; -import org.springframework.boot.Banner; -import org.springframework.boot.ConfigurableBootstrapContext; -import org.springframework.boot.DefaultPropertiesPropertySource; -import org.springframework.boot.SpringApplication; +import org.springframework.boot.*; import org.springframework.boot.actuate.autoconfigure.health.HealthProperties.Show; import org.springframework.boot.actuate.info.InfoPropertiesInfoContributor.Mode; import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor; @@ -20,9 +17,7 @@ import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.unit.DataSize; import java.nio.charset.StandardCharsets; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.TimeZone; +import java.util.*; /** * @author liaozan