Skip to content

Commit 59b485e

Browse files
chore: merge main into release [skip ci]
2 parents ff03d84 + 9fbeccc commit 59b485e

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,10 @@
1717

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

20-
import org.springframework.boot.autoconfigure.cache.CacheProperties;
2120
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2221
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2322
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
24-
import org.springframework.boot.autoconfigure.context.MessageSourceProperties;
2523
import org.springframework.boot.autoconfigure.jackson.JacksonProperties;
26-
import org.springframework.boot.autoconfigure.jmx.JmxProperties;
2724
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2825

2926
import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type.REACTIVE;
@@ -36,8 +33,8 @@
3633
* @since 1.0.0
3734
*/
3835
@ConditionalOnWebApplication(type = REACTIVE)
39-
@ConditionalOnClass(value = JmxProperties.class)
36+
@ConditionalOnClass(value = JacksonProperties.class)
4037
@ConditionalOnProperty(name = "reactive.web-app.enabled", matchIfMissing = true)
41-
@EnableConfigurationProperties(value = JmxProperties.class)
38+
@EnableConfigurationProperties(value = JacksonProperties.class)
4239
public class ReactiveWebApplicationAutoConfiguration {
4340
}

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

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

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

20-
import org.springframework.boot.autoconfigure.cache.CacheProperties;
2120
import org.springframework.boot.autoconfigure.jackson.JacksonProperties;
22-
import org.springframework.boot.autoconfigure.jmx.JmxProperties;
2321
import org.springframework.boot.test.context.SpringBootTest;
2422

2523
import java.util.Set;
@@ -40,7 +38,7 @@ public class ReactiveWebApplicationAutoConfigurationTest extends ReactiveWebAuto
4038

4139
@Override
4240
protected void configureAutoConfiguredClasses(Set<Class<?>> autoConfiguredClasses) {
43-
autoConfiguredClasses.add(JmxProperties.class);
41+
autoConfiguredClasses.add(JacksonProperties.class);
4442
}
4543

4644
@Override
@@ -50,6 +48,6 @@ protected void configureGlobalDisabledPropertyValues(Set<String> globalDisabledP
5048

5149
@Override
5250
protected void configureGlobalMissingClasses(Set<Class<?>> globalMissingClasses) {
53-
globalMissingClasses.add(JmxProperties.class);
51+
globalMissingClasses.add(JacksonProperties.class);
5452
}
5553
}

0 commit comments

Comments
 (0)