Skip to content

Commit dc0db01

Browse files
chore: merge main into release [skip ci]
2 parents 3886b9a + 7d88e4f commit dc0db01

2 files changed

Lines changed: 6 additions & 4 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
@@ -22,6 +22,7 @@
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2424
import org.springframework.boot.autoconfigure.context.MessageSourceProperties;
25+
import org.springframework.boot.autoconfigure.jackson.JacksonProperties;
2526
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2627

2728
import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type.REACTIVE;
@@ -34,8 +35,8 @@
3435
* @since 1.0.0
3536
*/
3637
@ConditionalOnWebApplication(type = REACTIVE)
37-
@ConditionalOnClass(value = CacheProperties.class)
38+
@ConditionalOnClass(value = JacksonProperties.class)
3839
@ConditionalOnProperty(name = "reactive.web-app.enabled", matchIfMissing = true)
39-
@EnableConfigurationProperties(value = CacheProperties.class)
40+
@EnableConfigurationProperties(value = JacksonProperties.class)
4041
public class ReactiveWebApplicationAutoConfiguration {
4142
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package io.microsphere.spring.boot.test;
1919

2020
import org.springframework.boot.autoconfigure.cache.CacheProperties;
21+
import org.springframework.boot.autoconfigure.jackson.JacksonProperties;
2122
import org.springframework.boot.test.context.SpringBootTest;
2223

2324
import java.util.Set;
@@ -38,7 +39,7 @@ public class ReactiveWebApplicationAutoConfigurationTest extends ReactiveWebAuto
3839

3940
@Override
4041
protected void configureAutoConfiguredClasses(Set<Class<?>> autoConfiguredClasses) {
41-
autoConfiguredClasses.add(CacheProperties.class);
42+
autoConfiguredClasses.add(JacksonProperties.class);
4243
}
4344

4445
@Override
@@ -48,6 +49,6 @@ protected void configureGlobalDisabledPropertyValues(Set<String> globalDisabledP
4849

4950
@Override
5051
protected void configureGlobalMissingClasses(Set<Class<?>> globalMissingClasses) {
51-
globalMissingClasses.add(CacheProperties.class);
52+
globalMissingClasses.add(JacksonProperties.class);
5253
}
5354
}

0 commit comments

Comments
 (0)