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 9b846dd4c51c499be34de0f8818f3be23243b098..ea04596dd31fb7b8ec0384ae3cf336d6e06e97e2 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 14fa71361b09d82135a5fee70419ac27fbad1e1f..f73c522c72dcb13e14b7fc5e7bfcd2c8faf68046 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 ca8c4b0dea62373635d09d2e6210b471ec540a07..fc1838fcc8cef4a820c7705cf0f4744a99e066fc 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 a9f81df4b5af9d17c83bf7b8125a06558620be4a..62a2314c0ffa4c50d4553683b5dc34b75ddcfd89 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 25a5d0a35c3b3fb0b33cc095942e0ec7b847c998..0cba2aac491bd703e5bcfd4b1d4c2ee86687104c 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 47db5b2b5050fc7f4a916a7cf9d1200c9f0c67f3..fc2cf1ce6a3178d766fb223508a90c3e84a308c8 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 df8ede2cc0d6b3ce63725c4fe2dcbdc220960ffd..adc65ed3ad1ff2390c977a8f29fd228820939c37 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 a19248517ab655720aa1a2535dd31bc01491c562..49f5c83dd53adcfb77329818c68c5fedddb93bf0 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 b5e38e250c1f753783cfb8f956a652493aa9594f..706ec63d331ec245c238a3035c105841455fe423 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 949a8534a95735b0a9c1cb761ee3a4f0c557a994..d0922a5e45138b8d88fdb8e880daeb9e2757a330 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 f5fa98c5b43e63dba49816c5fa265e070c4e76da..9f054410de163c7912a4eeee0d5a8ea503b279a3 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 ae7f1563f784356ec6df65d1b6d33cf6493ee98a..795275d5fb4850da6abf1941c60a62ac06687c06 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 d36b907d5a206884428922dcf1c463b953d0018d..1e0a325d73275f9ed1eb7cfe14841d3829f2ea48 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 ec689ead102c81b273b54040f60931ae0f9d0dc4..797059c9a861033dec4cd22e5a90cea5268bf51a 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 1765026a431a528e787366bb645b2681ddda3653..5e73080e8971cdc53c358ae7adfde14a6dc91a62 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 2a1715f06bc911e6589ba6ce11aa5295de150738..a7e0b84c241f27277ccf719c82c46c91888469a7 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 4f7260222be2c8ffe63153044d068f8b043c3a5b..b34aa1e92e9f747c64fef138b5e25f78bdd53db0 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 cc2b729fbe27ddf4975e5558a238c57a0d911261..d6e3b393dbe51d699e230a0f50add4696e966d22 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 4d8a5c00d2832a5c3db0dfb1f8e1e8c8ac36ca51..424295ad72ee88d3d39e278e0f8cca549d44b64c 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 9935cd22d20a69e5bcce20245a6a3c03b5d54d53..cee1626cbde55e84dbdce11161e68de4034fe395 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;