Skip to content

Commit 1688832

Browse files
chore: merge main into release [skip ci]
2 parents 59b485e + d0f5320 commit 1688832

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2121
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
23-
import org.springframework.boot.autoconfigure.jackson.JacksonProperties;
23+
import org.springframework.boot.autoconfigure.jmx.JmxProperties;
2424
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2525

2626
import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type.REACTIVE;
@@ -33,8 +33,8 @@
3333
* @since 1.0.0
3434
*/
3535
@ConditionalOnWebApplication(type = REACTIVE)
36-
@ConditionalOnClass(value = JacksonProperties.class)
36+
@ConditionalOnClass(value = JmxProperties.class)
3737
@ConditionalOnProperty(name = "reactive.web-app.enabled", matchIfMissing = true)
38-
@EnableConfigurationProperties(value = JacksonProperties.class)
38+
@EnableConfigurationProperties(value = JmxProperties.class)
3939
public class ReactiveWebApplicationAutoConfiguration {
4040
}

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.jackson.JacksonProperties;
20+
import org.springframework.boot.autoconfigure.jmx.JmxProperties;
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(JacksonProperties.class);
41+
autoConfiguredClasses.add(JmxProperties.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(JacksonProperties.class);
51+
globalMissingClasses.add(JmxProperties.class);
5252
}
5353
}

0 commit comments

Comments
 (0)