Skip to content

Commit ff03d84

Browse files
chore: merge main into release [skip ci]
2 parents dc0db01 + 8093e1b commit ff03d84

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
@@ -23,6 +23,7 @@
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2424
import org.springframework.boot.autoconfigure.context.MessageSourceProperties;
2525
import org.springframework.boot.autoconfigure.jackson.JacksonProperties;
26+
import org.springframework.boot.autoconfigure.jmx.JmxProperties;
2627
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2728

2829
import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type.REACTIVE;
@@ -35,8 +36,8 @@
3536
* @since 1.0.0
3637
*/
3738
@ConditionalOnWebApplication(type = REACTIVE)
38-
@ConditionalOnClass(value = JacksonProperties.class)
39+
@ConditionalOnClass(value = JmxProperties.class)
3940
@ConditionalOnProperty(name = "reactive.web-app.enabled", matchIfMissing = true)
40-
@EnableConfigurationProperties(value = JacksonProperties.class)
41+
@EnableConfigurationProperties(value = JmxProperties.class)
4142
public class ReactiveWebApplicationAutoConfiguration {
4243
}

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
@@ -19,6 +19,7 @@
1919

2020
import org.springframework.boot.autoconfigure.cache.CacheProperties;
2121
import org.springframework.boot.autoconfigure.jackson.JacksonProperties;
22+
import org.springframework.boot.autoconfigure.jmx.JmxProperties;
2223
import org.springframework.boot.test.context.SpringBootTest;
2324

2425
import java.util.Set;
@@ -39,7 +40,7 @@ public class ReactiveWebApplicationAutoConfigurationTest extends ReactiveWebAuto
3940

4041
@Override
4142
protected void configureAutoConfiguredClasses(Set<Class<?>> autoConfiguredClasses) {
42-
autoConfiguredClasses.add(JacksonProperties.class);
43+
autoConfiguredClasses.add(JmxProperties.class);
4344
}
4445

4546
@Override
@@ -49,6 +50,6 @@ protected void configureGlobalDisabledPropertyValues(Set<String> globalDisabledP
4950

5051
@Override
5152
protected void configureGlobalMissingClasses(Set<Class<?>> globalMissingClasses) {
52-
globalMissingClasses.add(JacksonProperties.class);
53+
globalMissingClasses.add(JmxProperties.class);
5354
}
5455
}

0 commit comments

Comments
 (0)