Skip to content

Commit e764878

Browse files
committed
Address some missed parts of the Jackson 3 migration
See gh-45535
1 parent c86eb52 commit e764878

File tree

13 files changed

+14
-31
lines changed

13 files changed

+14
-31
lines changed

module/spring-boot-activemq/src/test/java/org/springframework/boot/activemq/autoconfigure/ActiveMQAutoConfigurationTests.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616

1717
package org.springframework.boot.activemq.autoconfigure;
1818

19-
import java.util.HashMap;
20-
import java.util.Map;
21-
22-
import com.fasterxml.jackson.annotation.JsonInclude.Include;
23-
import com.fasterxml.jackson.core.JsonProcessingException;
24-
import com.fasterxml.jackson.databind.ObjectMapper;
2519
import jakarta.jms.ConnectionFactory;
2620
import org.apache.activemq.ActiveMQConnectionFactory;
2721
import org.junit.jupiter.api.Test;
@@ -53,14 +47,6 @@ class ActiveMQAutoConfigurationTests {
5347
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
5448
.withConfiguration(AutoConfigurations.of(ActiveMQAutoConfiguration.class, JmsAutoConfiguration.class));
5549

56-
@Test
57-
void dunno() throws JsonProcessingException {
58-
Map<String, String> map = new HashMap<>();
59-
map.put("key", null);
60-
String string = new ObjectMapper().setDefaultPropertyInclusion(Include.NON_NULL).writeValueAsString(map);
61-
System.out.println(string);
62-
}
63-
6450
@Test
6551
void brokerIsEmbeddedByDefault() {
6652
this.contextRunner.withUserConfiguration(EmptyConfiguration.class).run((context) -> {

module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/servlet/SecurityFilterAutoConfigurationEarlyInitializationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import java.util.regex.Matcher;
2020
import java.util.regex.Pattern;
2121

22-
import com.fasterxml.jackson.core.JsonParser;
23-
import com.fasterxml.jackson.databind.DeserializationContext;
24-
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
25-
import com.fasterxml.jackson.databind.module.SimpleModule;
2622
import org.junit.jupiter.api.Test;
2723
import org.junit.jupiter.api.extension.ExtendWith;
24+
import tools.jackson.core.JsonParser;
25+
import tools.jackson.databind.DeserializationContext;
26+
import tools.jackson.databind.deser.std.StdDeserializer;
27+
import tools.jackson.databind.module.SimpleModule;
2828

2929
import org.springframework.beans.factory.annotation.Autowired;
3030
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;

module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTypeExcludeFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class GraphQlTypeExcludeFilter extends StandardAnnotationCustomizableType
4545

4646
private static final Class<?>[] NO_CONTROLLERS = {};
4747

48-
private static final String[] OPTIONAL_INCLUDES = { "com.fasterxml.jackson.databind.Module" };
48+
private static final String[] OPTIONAL_INCLUDES = { "tools.jackson.databind.JacksonModule" };
4949

5050
private static final Set<Class<?>> DEFAULT_INCLUDES;
5151

module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTypeExcludeFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*/
3434
public final class JsonTypeExcludeFilter extends StandardAnnotationCustomizableTypeExcludeFilter<JsonTest> {
3535

36-
private static final String JACKSON_MODULE = "com.fasterxml.jackson.databind.Module";
36+
private static final String JACKSON_MODULE = "tools.jackson.databind.JacksonModule";
3737

3838
private static final Set<Class<?>> DEFAULT_INCLUDES;
3939

module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTypeExcludeFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public final class RestClientTypeExcludeFilter extends StandardAnnotationCustomi
3636

3737
private static final Class<?>[] NO_COMPONENTS = {};
3838

39-
private static final String DATABIND_MODULE_CLASS_NAME = "com.fasterxml.jackson.databind.Module";
39+
private static final String DATABIND_MODULE_CLASS_NAME = "tools.jackson.databind.JacksonModule";
4040

4141
private static final Set<Class<?>> DEFAULT_INCLUDES;
4242

module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTypeExcludeFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public final class WebFluxTypeExcludeFilter extends StandardAnnotationCustomizab
4444

4545
private static final Class<?>[] NO_CONTROLLERS = {};
4646

47-
private static final String[] OPTIONAL_INCLUDES = { "com.fasterxml.jackson.databind.Module",
47+
private static final String[] OPTIONAL_INCLUDES = { "tools.jackson.databind.JacksonModule",
4848
"org.thymeleaf.dialect.IDialect" };
4949

5050
private static final Set<Class<?>> DEFAULT_INCLUDES;

module/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public final class WebMvcTypeExcludeFilter extends StandardAnnotationCustomizabl
5151

5252
private static final Class<?>[] NO_CONTROLLERS = {};
5353

54-
private static final String[] OPTIONAL_INCLUDES = { "com.fasterxml.jackson.databind.Module",
54+
private static final String[] OPTIONAL_INCLUDES = { "tools.jackson.databind.JacksonModule",
5555
"org.springframework.security.config.annotation.web.WebSecurityConfigurer",
5656
"org.springframework.security.web.SecurityFilterChain", "org.thymeleaf.dialect.IDialect" };
5757

module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTypeExcludeFilterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import java.io.IOException;
2020
import java.util.List;
2121

22-
import com.fasterxml.jackson.databind.module.SimpleModule;
2322
import graphql.GraphQLError;
2423
import graphql.execution.instrumentation.Instrumentation;
2524
import graphql.schema.DataFetchingEnvironment;
2625
import graphql.schema.idl.RuntimeWiring;
2726
import org.junit.jupiter.api.Test;
2827
import reactor.core.publisher.Mono;
28+
import tools.jackson.databind.module.SimpleModule;
2929

3030
import org.springframework.boot.graphql.autoconfigure.GraphQlSourceBuilderCustomizer;
3131
import org.springframework.context.annotation.ComponentScan;

module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTestWithoutJacksonIntegrationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class RestClientTestWithoutJacksonIntegrationTests {
4747
void restClientTestCanBeUsedWhenJacksonIsNotOnTheClassPath() {
4848
ClassLoader classLoader = getClass().getClassLoader();
4949
assertThat(ClassUtils.isPresent("com.fasterxml.jackson.databind.Module", classLoader)).isFalse();
50+
assertThat(ClassUtils.isPresent("tools.jackson.databind.JacksonModule", classLoader)).isFalse();
5051
this.server.expect(requestTo("/test")).andRespond(withSuccess("hello", MediaType.TEXT_HTML));
5152
assertThat(this.client.test()).isEqualTo("hello");
5253
}

module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTypeExcludeFilterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import java.io.IOException;
2020

21-
import com.fasterxml.jackson.databind.module.SimpleModule;
2221
import org.junit.jupiter.api.Test;
2322
import org.thymeleaf.dialect.IDialect;
2423
import reactor.core.publisher.Mono;
24+
import tools.jackson.databind.module.SimpleModule;
2525

2626
import org.springframework.context.annotation.ComponentScan.Filter;
2727
import org.springframework.context.annotation.FilterType;

0 commit comments

Comments
 (0)