Skip to content

Commit c625727

Browse files
chore: merge main into release [skip ci]
2 parents dc8e963 + df4a2e3 commit c625727

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

microsphere-spring-boot-core/src/main/java/io/microsphere/spring/boot/context/autoconfigure/ConfigurationPropertiesAutoConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@
2121
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2323
import org.springframework.boot.context.properties.ConfigurationProperties;
24+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2425

2526
/**
2627
* {@link ConfigurationProperties @ConfigurationProperties} Auto-Configuration
2728
*
2829
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
2930
* @see org.springframework.boot.autoconfigure.context.ConfigurationPropertiesAutoConfiguration
31+
* @see EnableConfigurationProperties
3032
* @see EnableConfigurationPropertiesExtension
3133
* @since 1.0.0
3234
*/
@@ -38,4 +40,4 @@
3840
})
3941
@EnableConfigurationPropertiesExtension
4042
public class ConfigurationPropertiesAutoConfiguration {
41-
}
43+
}

microsphere-spring-boot-webflux/src/main/java/io/microsphere/spring/boot/webflux/constants/PropertyConstants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ public interface PropertyConstants {
3838
/**
3939
* The default value of 'enabled' property of Microsphere Spring Boot WebFlux : "true"
4040
*/
41-
String DEFAULT_MICROSPHERE_SPRING_BOOT_WEBMVC_ENABLED = "true";
41+
String DEFAULT_MICROSPHERE_SPRING_BOOT_WEBFLUX_ENABLED = "true";
4242

4343
/**
4444
* The 'enabled' property name of Microsphere Spring Boot WebFlux : "microsphere.spring.boot.webflux.enabled"
4545
*/
4646
@ConfigurationProperty(
4747
type = boolean.class,
48-
defaultValue = DEFAULT_MICROSPHERE_SPRING_BOOT_WEBMVC_ENABLED,
48+
defaultValue = DEFAULT_MICROSPHERE_SPRING_BOOT_WEBFLUX_ENABLED,
4949
source = APPLICATION_SOURCE
5050
)
5151
String MICROSPHERE_SPRING_BOOT_WEBFLUX_ENALBED_PROPERTY_NAME = MICROSPHERE_SPRING_BOOT_WEBFLUX_PROPERTY_NAME_PREFIX + ENABLED_PROPERTY_NAME;

0 commit comments

Comments
 (0)