From e361754bf9fd28727a163bd1e5239baf07bf89bd Mon Sep 17 00:00:00 2001 From: liaozan <378024053@qq.com> Date: Sun, 14 May 2023 14:13:11 +0800 Subject: [PATCH] Polish --- .../util/support/ConfigurableProperties.java | 24 +++++++------------ .../common/web/properties/WebProperties.java | 4 +--- .../apollo/ConfigurablePropertiesLoader.java | 12 +++++----- ...paredEvent.java => ConfigLoadedEvent.java} | 12 +++++----- ...er.java => ConfigLoadedEventListener.java} | 4 ++-- ... => GenericConfigLoadedEventListener.java} | 12 +++++----- .../cache/properties/CacheProperties.java | 4 +--- .../cache/provider/redis/RedisProperties.java | 4 +--- ...va => DubboConfigLoadedEventListener.java} | 8 +++---- .../dubbo/properties/DubboProperties.java | 4 +--- .../main/resources/META-INF/spring.factories | 2 +- .../properties/ElasticsearchProperties.java | 4 +--- .../kafka/properties/KafkaProperties.java | 4 +--- ...a => LoggerConfigLoadedEventListener.java} | 8 +++---- .../logger/properties/LoggerProperties.java | 4 +--- .../main/resources/META-INF/spring.factories | 2 +- .../properties/DataSourceProperties.java | 4 +--- .../mybatis/properties/MybatisProperties.java | 4 +--- .../oss/properties/OssProperties.java | 4 +--- .../xxl/properties/XxlJobProperties.java | 4 +--- 20 files changed, 49 insertions(+), 79 deletions(-) rename starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/{PropertiesPreparedEvent.java => ConfigLoadedEvent.java} (72%) rename starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/{PropertiesPreparedEventListener.java => ConfigLoadedEventListener.java} (61%) rename starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/{GenericPropertiesPreparedEventListener.java => GenericConfigLoadedEventListener.java} (55%) rename starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/{DubboPropertiesPreparedEventListener.java => DubboConfigLoadedEventListener.java} (83%) rename starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/{LoggerPropertiesPreparedEventListener.java => LoggerConfigLoadedEventListener.java} (91%) diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/support/ConfigurableProperties.java b/commons/common-util/src/main/java/com/schbrain/common/util/support/ConfigurableProperties.java index 9b846dd..ea04596 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/support/ConfigurableProperties.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/support/ConfigurableProperties.java @@ -1,9 +1,9 @@ package com.schbrain.common.util.support; import com.schbrain.common.util.ConfigurationPropertiesUtils; -import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.bind.*; +import org.springframework.boot.context.properties.bind.Bindable; +import org.springframework.boot.context.properties.bind.Binder; import org.springframework.core.Ordered; import org.springframework.core.env.ConfigurableEnvironment; @@ -11,30 +11,29 @@ import org.springframework.core.env.ConfigurableEnvironment; * @author liaozan * @since 2022/1/10 */ -@Data -public abstract class ConfigurableProperties implements Ordered { +public interface ConfigurableProperties extends Ordered { /** * get the namespace of remote config */ - public abstract String getNamespace(); + String getNamespace(); /** * bind properties */ - public ConfigurableProperties bind(ConfigurableEnvironment environment) { - return Binder.get(environment, bindHandler()).bindOrCreate(getPropertiesPrefix(), Bindable.ofInstance(this)); + default ConfigurableProperties bind(ConfigurableEnvironment environment) { + return Binder.get(environment).bindOrCreate(getPropertiesPrefix(), Bindable.ofInstance(this)); } @Override - public int getOrder() { + default int getOrder() { return Ordered.LOWEST_PRECEDENCE; } /** * the prefix of properties */ - protected String getPropertiesPrefix() { + private String getPropertiesPrefix() { ConfigurationProperties annotation = getClass().getAnnotation(ConfigurationProperties.class); if (annotation == null) { String className = ConfigurationProperties.class.getName(); @@ -44,11 +43,4 @@ public abstract class ConfigurableProperties implements Ordered { return ConfigurationPropertiesUtils.getPrefix(getClass()); } - /** - * get the {@link org.springframework.boot.context.properties.bind.BindHandler} for bind - */ - protected BindHandler bindHandler() { - return BindHandler.DEFAULT; - } - } \ No newline at end of file diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/properties/WebProperties.java b/commons/web-common/src/main/java/com/schbrain/common/web/properties/WebProperties.java index 14fa713..f73c522 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/properties/WebProperties.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/properties/WebProperties.java @@ -2,7 +2,6 @@ package com.schbrain.common.web.properties; import com.schbrain.common.util.support.ConfigurableProperties; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.boot.context.properties.ConfigurationProperties; import java.nio.charset.StandardCharsets; @@ -12,9 +11,8 @@ import java.nio.charset.StandardCharsets; * @since 2022/8/29 */ @Data -@EqualsAndHashCode(callSuper = true) @ConfigurationProperties(prefix = "schbrain.web") -public class WebProperties extends ConfigurableProperties { +public class WebProperties implements ConfigurableProperties { /** * whether to enable the request logging 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 ca8c4b0..fc1838f 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 @@ -5,8 +5,8 @@ import com.ctrip.framework.apollo.ConfigService; import com.schbrain.common.util.properties.OrderedMapPropertySource; import com.schbrain.common.util.support.ConfigurableProperties; import com.schbrain.framework.autoconfigure.apollo.event.ConcurrentEventMulticaster; -import com.schbrain.framework.autoconfigure.apollo.event.PropertiesPreparedEvent; -import com.schbrain.framework.autoconfigure.apollo.event.listener.PropertiesPreparedEventListener; +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; import com.schbrain.framework.autoconfigure.apollo.util.ConfigUtils; import org.apache.commons.collections4.CollectionUtils; @@ -79,16 +79,16 @@ class ConfigurablePropertiesLoader { }); } - private PropertiesPreparedEvent createEvent(ConfigurableEnvironment environment, SpringApplication application, - OrderedMapPropertySource propertySource, ConfigurableProperties properties) { + private ConfigLoadedEvent createEvent(ConfigurableEnvironment environment, SpringApplication application, + OrderedMapPropertySource propertySource, ConfigurableProperties properties) { ConfigurableProperties boundProperties = properties.bind(environment); - return new PropertiesPreparedEvent(environment, deferredLogFactory, propertySource, boundProperties, application); + return new ConfigLoadedEvent(environment, deferredLogFactory, propertySource, boundProperties, application); } private ConcurrentEventMulticaster createEventMulticaster(Set> listeners) { ConcurrentEventMulticaster eventMulticaster = new ConcurrentEventMulticaster(); for (ApplicationListener listener : listeners) { - if (ClassUtils.isAssignableValue(PropertiesPreparedEventListener.class, listener)) { + if (ClassUtils.isAssignableValue(ConfigLoadedEventListener.class, listener)) { eventMulticaster.addApplicationListener(listener); } } diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/PropertiesPreparedEvent.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/ConfigLoadedEvent.java similarity index 72% rename from starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/PropertiesPreparedEvent.java rename to starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/ConfigLoadedEvent.java index a9f81df..62a2314 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/PropertiesPreparedEvent.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/ConfigLoadedEvent.java @@ -13,7 +13,7 @@ import org.springframework.core.env.ConfigurableEnvironment; * @since 2023-04-28 */ @Getter -public class PropertiesPreparedEvent extends ApplicationEvent { +public class ConfigLoadedEvent extends ApplicationEvent { private static final long serialVersionUID = 2567291189881702459L; @@ -25,11 +25,11 @@ public class PropertiesPreparedEvent extends ApplicationEvent { private final SpringApplication springApplication; - public PropertiesPreparedEvent(ConfigurableEnvironment environment, - DeferredLogFactory deferredLogFactory, - OrderedMapPropertySource propertySource, - ConfigurableProperties properties, - SpringApplication springApplication) { + public ConfigLoadedEvent(ConfigurableEnvironment environment, + DeferredLogFactory deferredLogFactory, + OrderedMapPropertySource propertySource, + ConfigurableProperties properties, + SpringApplication springApplication) { super(properties); this.environment = environment; this.propertySource = propertySource; diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/PropertiesPreparedEventListener.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/ConfigLoadedEventListener.java similarity index 61% rename from starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/PropertiesPreparedEventListener.java rename to starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/ConfigLoadedEventListener.java index 25a5d0a..0cba2aa 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/PropertiesPreparedEventListener.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/ConfigLoadedEventListener.java @@ -1,6 +1,6 @@ package com.schbrain.framework.autoconfigure.apollo.event.listener; -import com.schbrain.framework.autoconfigure.apollo.event.PropertiesPreparedEvent; +import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent; import org.springframework.context.ApplicationListener; import org.springframework.core.Ordered; @@ -8,7 +8,7 @@ import org.springframework.core.Ordered; * @author liaozan * @since 2023-04-29 */ -public interface PropertiesPreparedEventListener extends ApplicationListener, Ordered { +public interface ConfigLoadedEventListener extends ApplicationListener, Ordered { @Override default int getOrder() { diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/GenericPropertiesPreparedEventListener.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/GenericConfigLoadedEventListener.java similarity index 55% rename from starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/GenericPropertiesPreparedEventListener.java rename to starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/GenericConfigLoadedEventListener.java index 47db5b2..fc2cf1c 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/GenericPropertiesPreparedEventListener.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/GenericConfigLoadedEventListener.java @@ -1,7 +1,7 @@ package com.schbrain.framework.autoconfigure.apollo.event.listener; import com.schbrain.common.util.support.ConfigurableProperties; -import com.schbrain.framework.autoconfigure.apollo.event.PropertiesPreparedEvent; +import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent; import org.apache.commons.logging.Log; import org.springframework.core.ResolvableType; @@ -10,24 +10,24 @@ import org.springframework.core.ResolvableType; * @since 2023-04-28 */ @SuppressWarnings("unchecked") -public abstract class GenericPropertiesPreparedEventListener implements PropertiesPreparedEventListener { +public abstract class GenericConfigLoadedEventListener implements ConfigLoadedEventListener { protected final ResolvableType propertiesType; protected Log log; - public GenericPropertiesPreparedEventListener() { + public GenericConfigLoadedEventListener() { this.propertiesType = ResolvableType.forInstance(this).getSuperType().getGeneric(0); } @Override - public void onApplicationEvent(PropertiesPreparedEvent event) { + public void onApplicationEvent(ConfigLoadedEvent event) { if (propertiesType.isInstance(event.getConfigurableProperties())) { this.log = event.getDeferredLogFactory().getLog(getClass()); - this.onPropertiesPrepared(event, (T) event.getConfigurableProperties()); + this.onConfigLoaded(event, (T) event.getConfigurableProperties()); } } - protected abstract void onPropertiesPrepared(PropertiesPreparedEvent event, T configurableProperties); + protected abstract void onConfigLoaded(ConfigLoadedEvent event, T configurableProperties); } \ No newline at end of file diff --git a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/properties/CacheProperties.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/properties/CacheProperties.java index df8ede2..adc65ed 100644 --- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/properties/CacheProperties.java +++ b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/properties/CacheProperties.java @@ -2,7 +2,6 @@ package com.schbrain.framework.autoconfigure.cache.properties; import com.schbrain.common.util.support.ConfigurableProperties; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -10,9 +9,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 2022/7/26 */ @Data -@EqualsAndHashCode(callSuper = true) @ConfigurationProperties(prefix = "schbrain.cache") -public class CacheProperties extends ConfigurableProperties { +public class CacheProperties implements ConfigurableProperties { /** * cache prefix diff --git a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisProperties.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisProperties.java index a192485..49f5c83 100644 --- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisProperties.java +++ b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisProperties.java @@ -2,7 +2,6 @@ package com.schbrain.framework.autoconfigure.cache.provider.redis; import com.schbrain.common.util.support.ConfigurableProperties; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -10,9 +9,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 2023-04-27 */ @Data -@EqualsAndHashCode(callSuper = true) @ConfigurationProperties(prefix = "spring.redis") -public class RedisProperties extends ConfigurableProperties { +public class RedisProperties implements ConfigurableProperties { @Override public String getNamespace() { diff --git a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/DubboPropertiesPreparedEventListener.java b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/DubboConfigLoadedEventListener.java similarity index 83% rename from starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/DubboPropertiesPreparedEventListener.java rename to starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/DubboConfigLoadedEventListener.java index b5e38e2..706ec63 100644 --- a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/DubboPropertiesPreparedEventListener.java +++ b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/listener/DubboConfigLoadedEventListener.java @@ -3,8 +3,8 @@ package com.schbrain.framework.autoconfigure.dubbo.listener; import com.alibaba.fastjson2.JSONFactory; import com.schbrain.common.util.ApplicationName; import com.schbrain.common.util.properties.OrderedMapPropertySource; -import com.schbrain.framework.autoconfigure.apollo.event.PropertiesPreparedEvent; -import com.schbrain.framework.autoconfigure.apollo.event.listener.GenericPropertiesPreparedEventListener; +import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent; +import com.schbrain.framework.autoconfigure.apollo.event.listener.GenericConfigLoadedEventListener; import com.schbrain.framework.autoconfigure.dubbo.properties.DubboProperties; import org.springframework.boot.SpringApplication; import org.springframework.context.ApplicationContextInitializer; @@ -18,7 +18,7 @@ import static org.apache.dubbo.config.ConfigKeys.DUBBO_SCAN_BASE_PACKAGES; * @author liaozan * @since 2023-04-28 */ -public class DubboPropertiesPreparedEventListener extends GenericPropertiesPreparedEventListener implements ApplicationContextInitializer { +public class DubboConfigLoadedEventListener extends GenericConfigLoadedEventListener implements ApplicationContextInitializer { public static final String DUBBO_APPLICATION_NAME = "dubbo.application.name"; @@ -33,7 +33,7 @@ public class DubboPropertiesPreparedEventListener extends GenericPropertiesPrepa } @Override - protected void onPropertiesPrepared(PropertiesPreparedEvent event, DubboProperties properties) { + protected void onConfigLoaded(ConfigLoadedEvent event, DubboProperties properties) { event.getSpringApplication().addInitializers(this); setRequiredProperties(event.getEnvironment(), event.getSpringApplication(), event.getPropertySource()); JSONFactory.setUseJacksonAnnotation(false); diff --git a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java index 949a853..d0922a5 100644 --- a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java +++ b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java @@ -2,7 +2,6 @@ package com.schbrain.framework.autoconfigure.dubbo.properties; import com.schbrain.common.util.support.ConfigurableProperties; import lombok.Data; -import lombok.EqualsAndHashCode; import org.apache.dubbo.config.*; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -18,9 +17,8 @@ import java.util.Set; * @since 2021/12/6 */ @Data -@EqualsAndHashCode(callSuper = true) @ConfigurationProperties(prefix = "dubbo") -public class DubboProperties extends ConfigurableProperties { +public class DubboProperties implements ConfigurableProperties { @NestedConfigurationProperty private Scan scan = new Scan(); diff --git a/starters/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.factories b/starters/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.factories index f5fa98c..9f05441 100644 --- a/starters/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/starters/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ com.schbrain.common.util.support.ConfigurableProperties=\ com.schbrain.framework.autoconfigure.dubbo.properties.DubboProperties org.springframework.context.ApplicationListener=\ - com.schbrain.framework.autoconfigure.dubbo.listener.DubboPropertiesPreparedEventListener \ No newline at end of file + com.schbrain.framework.autoconfigure.dubbo.listener.DubboConfigLoadedEventListener \ No newline at end of file diff --git a/starters/elasticsearch-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/elasticsearch/properties/ElasticsearchProperties.java b/starters/elasticsearch-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/elasticsearch/properties/ElasticsearchProperties.java index ae7f156..795275d 100644 --- a/starters/elasticsearch-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/elasticsearch/properties/ElasticsearchProperties.java +++ b/starters/elasticsearch-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/elasticsearch/properties/ElasticsearchProperties.java @@ -2,7 +2,6 @@ package com.schbrain.framework.autoconfigure.elasticsearch.properties; import com.schbrain.common.util.support.ConfigurableProperties; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -10,9 +9,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 2023-04-29 */ @Data -@EqualsAndHashCode(callSuper = true) @ConfigurationProperties(prefix = "spring.elasticsearch") -public class ElasticsearchProperties extends ConfigurableProperties { +public class ElasticsearchProperties implements ConfigurableProperties { @Override public String getNamespace() { diff --git a/starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/properties/KafkaProperties.java b/starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/properties/KafkaProperties.java index d36b907..1e0a325 100644 --- a/starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/properties/KafkaProperties.java +++ b/starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/properties/KafkaProperties.java @@ -2,7 +2,6 @@ package com.schbrain.framework.autoconfigure.kafka.properties; import com.schbrain.common.util.support.ConfigurableProperties; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -10,9 +9,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 2023-04-29 */ @Data -@EqualsAndHashCode(callSuper = true) @ConfigurationProperties(prefix = "spring.kafka") -public class KafkaProperties extends ConfigurableProperties { +public class KafkaProperties implements ConfigurableProperties { @Override public String getNamespace() { diff --git a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerPropertiesPreparedEventListener.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerConfigLoadedEventListener.java similarity index 91% rename from starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerPropertiesPreparedEventListener.java rename to starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerConfigLoadedEventListener.java index ec689ea..797059c 100644 --- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerPropertiesPreparedEventListener.java +++ b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/listener/LoggerConfigLoadedEventListener.java @@ -8,8 +8,8 @@ import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.google.common.collect.Maps; import com.schbrain.common.util.InetUtils; import com.schbrain.common.util.InetUtils.HostInfo; -import com.schbrain.framework.autoconfigure.apollo.event.PropertiesPreparedEvent; -import com.schbrain.framework.autoconfigure.apollo.event.listener.GenericPropertiesPreparedEventListener; +import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent; +import com.schbrain.framework.autoconfigure.apollo.event.listener.GenericConfigLoadedEventListener; import com.schbrain.framework.autoconfigure.logger.LoggerConfigurationInitializer; import com.schbrain.framework.autoconfigure.logger.properties.LoggerProperties; import org.springframework.core.env.ConfigurableEnvironment; @@ -25,10 +25,10 @@ import static org.springframework.boot.context.logging.LoggingApplicationListene * @author liaozan * @since 2023-04-28 */ -public class LoggerPropertiesPreparedEventListener extends GenericPropertiesPreparedEventListener { +public class LoggerConfigLoadedEventListener extends GenericConfigLoadedEventListener { @Override - protected void onPropertiesPrepared(PropertiesPreparedEvent event, LoggerProperties properties) { + protected void onConfigLoaded(ConfigLoadedEvent event, LoggerProperties properties) { ConfigurableEnvironment environment = event.getEnvironment(); HostInfo hostInfo = InetUtils.findFirstNonLoopBackHostInfo(); Map hostInfoProperties = buildHostInfoProperties(hostInfo); diff --git a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java index 1765026..5e73080 100644 --- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java +++ b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java @@ -2,7 +2,6 @@ package com.schbrain.framework.autoconfigure.logger.properties; import com.schbrain.common.util.support.ConfigurableProperties; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.PriorityOrdered; @@ -13,9 +12,8 @@ import java.time.Duration; * @since 2021/12/11 */ @Data -@EqualsAndHashCode(callSuper = true) @ConfigurationProperties(prefix = "schbrain.logging.file") -public class LoggerProperties extends ConfigurableProperties implements PriorityOrdered { +public class LoggerProperties implements ConfigurableProperties, PriorityOrdered { public static final String DEFAULT_LOG_PATH = "/data/logs"; diff --git a/starters/logger-spring-boot-starter/src/main/resources/META-INF/spring.factories b/starters/logger-spring-boot-starter/src/main/resources/META-INF/spring.factories index 2a1715f..a7e0b84 100644 --- a/starters/logger-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/starters/logger-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,6 +1,6 @@ org.springframework.context.ApplicationContextInitializer=\ com.schbrain.framework.autoconfigure.logger.logback.LogbackTraceIdConfiguration org.springframework.context.ApplicationListener=\ - com.schbrain.framework.autoconfigure.logger.listener.LoggerPropertiesPreparedEventListener + com.schbrain.framework.autoconfigure.logger.listener.LoggerConfigLoadedEventListener com.schbrain.common.util.support.ConfigurableProperties=\ com.schbrain.framework.autoconfigure.logger.properties.LoggerProperties \ No newline at end of file diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/DataSourceProperties.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/DataSourceProperties.java index 4f72602..b34aa1e 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/DataSourceProperties.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/DataSourceProperties.java @@ -2,7 +2,6 @@ package com.schbrain.framework.autoconfigure.mybatis.properties; import com.schbrain.common.util.support.ConfigurableProperties; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -10,9 +9,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 2023-04-27 */ @Data -@EqualsAndHashCode(callSuper = true) @ConfigurationProperties(prefix = "spring.datasource") -public class DataSourceProperties extends ConfigurableProperties { +public class DataSourceProperties implements ConfigurableProperties { @Override public String getNamespace() { diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/MybatisProperties.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/MybatisProperties.java index cc2b729..d6e3b39 100644 --- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/MybatisProperties.java +++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/MybatisProperties.java @@ -2,7 +2,6 @@ package com.schbrain.framework.autoconfigure.mybatis.properties; import com.schbrain.common.util.support.ConfigurableProperties; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -10,9 +9,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 2021/11/23 */ @Data -@EqualsAndHashCode(callSuper = true) @ConfigurationProperties(prefix = "schbrain.mybatis") -public class MybatisProperties extends ConfigurableProperties { +public class MybatisProperties implements ConfigurableProperties { /** * 分页拦截器 diff --git a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/properties/OssProperties.java b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/properties/OssProperties.java index 4d8a5c0..424295a 100644 --- a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/properties/OssProperties.java +++ b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/properties/OssProperties.java @@ -2,7 +2,6 @@ package com.schbrain.framework.autoconfigure.oss.properties; import com.schbrain.common.util.support.ConfigurableProperties; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; @@ -11,9 +10,8 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; * @since 2021/12/3 */ @Data -@EqualsAndHashCode(callSuper = true) @ConfigurationProperties(prefix = "schbrain.oss") -public class OssProperties extends ConfigurableProperties { +public class OssProperties implements ConfigurableProperties { private String accessKeyId; diff --git a/starters/xxl-job-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/xxl/properties/XxlJobProperties.java b/starters/xxl-job-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/xxl/properties/XxlJobProperties.java index 9935cd2..cee1626 100644 --- a/starters/xxl-job-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/xxl/properties/XxlJobProperties.java +++ b/starters/xxl-job-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/xxl/properties/XxlJobProperties.java @@ -3,7 +3,6 @@ package com.schbrain.framework.autoconfigure.xxl.properties; import com.schbrain.common.util.InetUtils; import com.schbrain.common.util.support.ConfigurableProperties; import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.boot.context.properties.ConfigurationProperties; /** @@ -11,9 +10,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 2022/1/8 */ @Data -@EqualsAndHashCode(callSuper = true) @ConfigurationProperties(prefix = "schbrain.xxl") -public class XxlJobProperties extends ConfigurableProperties { +public class XxlJobProperties implements ConfigurableProperties { private String adminAddresses; -- GitLab