Skip to content

Commit 3886b9a

Browse files
chore: merge main into release [skip ci]
2 parents 3d63f89 + ec476bf commit 3886b9a

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

microsphere-spring-boot-test/src/test/java/io/microsphere/spring/boot/test/ReactiveWebApplicationAutoConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package io.microsphere.spring.boot.test;
1919

20+
import org.springframework.boot.autoconfigure.cache.CacheProperties;
2021
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2122
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2223
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -33,8 +34,8 @@
3334
* @since 1.0.0
3435
*/
3536
@ConditionalOnWebApplication(type = REACTIVE)
36-
@ConditionalOnClass(value = MessageSourceProperties.class)
37+
@ConditionalOnClass(value = CacheProperties.class)
3738
@ConditionalOnProperty(name = "reactive.web-app.enabled", matchIfMissing = true)
38-
@EnableConfigurationProperties(value = MessageSourceProperties.class)
39+
@EnableConfigurationProperties(value = CacheProperties.class)
3940
public class ReactiveWebApplicationAutoConfiguration {
4041
}

microsphere-spring-boot-test/src/test/java/io/microsphere/spring/boot/test/ReactiveWebApplicationAutoConfigurationTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package io.microsphere.spring.boot.test;
1919

20-
import org.springframework.boot.autoconfigure.context.MessageSourceProperties;
20+
import org.springframework.boot.autoconfigure.cache.CacheProperties;
2121
import org.springframework.boot.test.context.SpringBootTest;
2222

2323
import java.util.Set;
@@ -38,7 +38,7 @@ public class ReactiveWebApplicationAutoConfigurationTest extends ReactiveWebAuto
3838

3939
@Override
4040
protected void configureAutoConfiguredClasses(Set<Class<?>> autoConfiguredClasses) {
41-
autoConfiguredClasses.add(MessageSourceProperties.class);
41+
autoConfiguredClasses.add(CacheProperties.class);
4242
}
4343

4444
@Override
@@ -48,6 +48,6 @@ protected void configureGlobalDisabledPropertyValues(Set<String> globalDisabledP
4848

4949
@Override
5050
protected void configureGlobalMissingClasses(Set<Class<?>> globalMissingClasses) {
51-
globalMissingClasses.add(MessageSourceProperties.class);
51+
globalMissingClasses.add(CacheProperties.class);
5252
}
5353
}

0 commit comments

Comments
 (0)