From 5682d6d5bb752cfc8f59089d697cf57b24f28c9d Mon Sep 17 00:00:00 2001 From: abel533 Date: Fri, 16 Sep 2022 00:19:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3pr#138=E6=94=AF=E6=8C=81kebab?= =?UTF-8?q?case=E4=BD=86=E6=98=AF=E4=B8=8D=E6=94=AF=E6=8C=81=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autoconfigure/PageHelperAutoConfiguration.java | 9 ++++----- .../autoconfigure/PageHelperProperties.java | 5 +++-- ...bCase.java => PageHelperStandardProperties.java} | 13 +++++++------ 3 files changed, 14 insertions(+), 13 deletions(-) rename pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/{PageHelperPropertiesProcessKebabCase.java => PageHelperStandardProperties.java} (94%) diff --git a/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperAutoConfiguration.java b/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperAutoConfiguration.java index 174608f..7873ec7 100644 --- a/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperAutoConfiguration.java +++ b/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperAutoConfiguration.java @@ -33,7 +33,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Lazy; import java.util.List; @@ -45,9 +44,9 @@ */ @Configuration @ConditionalOnBean(SqlSessionFactory.class) -@EnableConfigurationProperties(PageHelperPropertiesProcessKebabCase.class) +@EnableConfigurationProperties({PageHelperProperties.class, PageHelperStandardProperties.class}) @AutoConfigureAfter(MybatisAutoConfiguration.class) -@Import(PageHelperProperties.class) +//@Import(PageHelperProperties.class) @Lazy(false) public class PageHelperAutoConfiguration implements InitializingBean { @@ -55,9 +54,9 @@ public class PageHelperAutoConfiguration implements InitializingBean { private final PageHelperProperties properties; - public PageHelperAutoConfiguration(List sqlSessionFactoryList, PageHelperProperties properties, PageHelperPropertiesProcessKebabCase propertiesKC) { + public PageHelperAutoConfiguration(List sqlSessionFactoryList, PageHelperStandardProperties standardProperties) { this.sqlSessionFactoryList = sqlSessionFactoryList; - this.properties = properties; + this.properties = standardProperties.getProperties(); } @Override diff --git a/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperProperties.java b/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperProperties.java index f5ddf7a..b7ae3d5 100644 --- a/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperProperties.java +++ b/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperProperties.java @@ -24,7 +24,7 @@ package com.github.pagehelper.autoconfigure; -import org.springframework.stereotype.Component; +import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.Properties; @@ -33,8 +33,9 @@ * * @author liuzh */ -@Component +@ConfigurationProperties(prefix = PageHelperProperties.PAGEHELPER_PREFIX) public class PageHelperProperties extends Properties { + public static final String PAGEHELPER_PREFIX = "pagehelper"; public Boolean getOffsetAsPageNum() { return Boolean.valueOf(getProperty("offsetAsPageNum")); diff --git a/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperPropertiesProcessKebabCase.java b/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperStandardProperties.java similarity index 94% rename from pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperPropertiesProcessKebabCase.java rename to pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperStandardProperties.java index c28fa86..d8af4df 100644 --- a/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperPropertiesProcessKebabCase.java +++ b/pagehelper-spring-boot-autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperStandardProperties.java @@ -19,11 +19,8 @@ * * @author showen */ -@ConfigurationProperties(prefix = PageHelperPropertiesProcessKebabCase.PAGEHELPER_PREFIX) -public class PageHelperPropertiesProcessKebabCase { - - public static final String PAGEHELPER_PREFIX = "pagehelper"; - +@ConfigurationProperties(prefix = PageHelperProperties.PAGEHELPER_PREFIX) +public class PageHelperStandardProperties { private final PageHelperProperties properties; private Boolean offsetAsPageNum; private Boolean rowBoundsWithCount; @@ -41,10 +38,14 @@ public class PageHelperPropertiesProcessKebabCase { private String autoDialectClass; @Autowired - public PageHelperPropertiesProcessKebabCase(PageHelperProperties properties) { + public PageHelperStandardProperties(PageHelperProperties properties) { this.properties = properties; } + public PageHelperProperties getProperties() { + return properties; + } + public Boolean getOffsetAsPageNum() { return offsetAsPageNum; }