From db73985fecd5098d64ff1f00085f800bc7938bc7 Mon Sep 17 00:00:00 2001 From: liaozan <378024053@qq.com> Date: Fri, 7 Jul 2023 23:44:28 +0800 Subject: [PATCH] Polish --- .../java/com/schbrain/common/util/StreamUtils.java | 4 +++- .../com/schbrain/common/entity/PaginationInfo.java | 5 ++++- .../common/web/utils/ContentCachingServletUtils.java | 12 ++++++------ .../apollo/ConfigurablePropertiesLoader.java | 2 +- .../apollo/ConfigurationPropertiesRegistry.java | 4 +++- .../autoconfigure/mybatis/biz/BizIdColumnField.java | 4 +++- .../sql/injector/DefaultMethodSqlInjector.java | 6 ++++-- 7 files changed, 24 insertions(+), 13 deletions(-) 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 0556661..c985675 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 @@ -12,7 +12,9 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; import static java.util.Collections.emptyList; -import static java.util.stream.Collectors.*; +import static java.util.stream.Collectors.groupingBy; +import static java.util.stream.Collectors.joining; +import static java.util.stream.Collectors.mapping; /** * @author liaozan 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 50b1e71..b5b3f40 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 @@ -8,7 +8,10 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import static com.schbrain.common.constants.PageConstants.*; +import static com.schbrain.common.constants.PageConstants.DEFAULT_PAGE_INDEX; +import static com.schbrain.common.constants.PageConstants.DEFAULT_PAGE_SIZE; +import static com.schbrain.common.constants.PageConstants.DEFAULT_TOTAL_COUNT; +import static com.schbrain.common.constants.PageConstants.DEFAULT_TOTAL_PAGE_COUNT; /** * @author liaozan diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/utils/ContentCachingServletUtils.java b/commons/web-common/src/main/java/com/schbrain/common/web/utils/ContentCachingServletUtils.java index 4fd71d1..811c8ea 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/utils/ContentCachingServletUtils.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/utils/ContentCachingServletUtils.java @@ -16,25 +16,25 @@ public class ContentCachingServletUtils { /** * Make request content cacheable to avoid stream closed error after inputStream closed */ - public static HttpServletRequest wrapRequestIfRequired(HttpServletRequest request) { + public static ContentCachingRequestWrapper wrapRequestIfRequired(HttpServletRequest request) { Assert.notNull(request, "request must not be null"); if (request instanceof ContentCachingRequestWrapper) { - return request; + return (ContentCachingRequestWrapper) request; } else { - return new ContentCachingRequestWrapper(request); + return new ContentCachingRequestWrapper(request, request.getContentLength()); } } /** * Make response content cacheable to avoid stream closed error after outputStream closed */ - public static HttpServletResponse wrapResponseIfRequired(HttpServletResponse response) { + public static ContentCachingResponseWrapper wrapResponseIfRequired(HttpServletResponse response) { Assert.notNull(response, "response must not be null"); if (response instanceof ContentCachingResponseWrapper) { - return response; + return (ContentCachingResponseWrapper) response; } else { return new ContentCachingResponseWrapper(response); } } -} \ No newline at end of file +} diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java index 239ed14..763df45 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java @@ -2,8 +2,8 @@ package com.schbrain.framework.autoconfigure.apollo; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigService; -import com.schbrain.framework.autoconfigure.apollo.config.OrderedMapPropertySource; import com.schbrain.common.util.support.ConfigurableProperties; +import com.schbrain.framework.autoconfigure.apollo.config.OrderedMapPropertySource; import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent; import com.schbrain.framework.autoconfigure.apollo.event.listener.ConfigLoadedEventListener; import com.schbrain.framework.autoconfigure.apollo.properties.ApolloProperties; diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurationPropertiesRegistry.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurationPropertiesRegistry.java index dab9fe7..9bd651e 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurationPropertiesRegistry.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurationPropertiesRegistry.java @@ -18,7 +18,9 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Map; -import static org.springframework.beans.factory.config.PlaceholderConfigurerSupport.*; +import static org.springframework.beans.factory.config.PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_PREFIX; +import static org.springframework.beans.factory.config.PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_SUFFIX; +import static org.springframework.beans.factory.config.PlaceholderConfigurerSupport.DEFAULT_VALUE_SEPARATOR; /** * @author liaozan diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdColumnField.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdColumnField.java index fd0dd93..ac2a0ee 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdColumnField.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdColumnField.java @@ -7,7 +7,9 @@ import lombok.Getter; import java.lang.invoke.MethodHandle; import java.lang.reflect.Field; -import static java.lang.invoke.MethodHandles.*; +import static java.lang.invoke.MethodHandles.Lookup; +import static java.lang.invoke.MethodHandles.lookup; +import static java.lang.invoke.MethodHandles.privateLookupIn; /** * @author liaozan diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/sql/injector/DefaultMethodSqlInjector.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/sql/injector/DefaultMethodSqlInjector.java index 0aa361c..b92568b 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/sql/injector/DefaultMethodSqlInjector.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/sql/injector/DefaultMethodSqlInjector.java @@ -15,7 +15,9 @@ import lombok.extern.slf4j.Slf4j; import java.util.List; import java.util.Set; -import static com.schbrain.framework.autoconfigure.mybatis.constant.MybatisConstants.*; +import static com.schbrain.framework.autoconfigure.mybatis.constant.MybatisConstants.CREATE_TIME; +import static com.schbrain.framework.autoconfigure.mybatis.constant.MybatisConstants.DELETE_VERSION; +import static com.schbrain.framework.autoconfigure.mybatis.constant.MybatisConstants.MODIFY_TIME; /** * @author liaozan @@ -56,4 +58,4 @@ public class DefaultMethodSqlInjector extends AbstractSqlInjector { return methodList; } -} +} \ No newline at end of file -- GitLab