Skip to content

Commit 36f7188

Browse files
wonwoosnicoll
authored andcommitted
Permit use of @jsontest without Jackson
See gh-16070
1 parent 6ffa808 commit 36f7188

File tree

1 file changed

+6
-3
lines changed
  • spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json

1 file changed

+6
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@
2020
import java.util.LinkedHashSet;
2121
import java.util.Set;
2222

23-
import com.fasterxml.jackson.databind.Module;
24-
2523
import org.springframework.boot.context.TypeExcludeFilter;
2624
import org.springframework.boot.jackson.JsonComponent;
2725
import org.springframework.boot.test.autoconfigure.filter.AnnotationCustomizableTypeExcludeFilter;
2826
import org.springframework.context.annotation.ComponentScan.Filter;
2927
import org.springframework.core.annotation.AnnotatedElementUtils;
28+
import org.springframework.util.ClassUtils;
3029

3130
/**
3231
* {@link TypeExcludeFilter} for {@link JsonTest @JsonTest}.
@@ -39,8 +38,12 @@ class JsonExcludeFilter extends AnnotationCustomizableTypeExcludeFilter {
3938

4039
static {
4140
Set<Class<?>> includes = new LinkedHashSet<Class<?>>();
42-
includes.add(Module.class);
4341
includes.add(JsonComponent.class);
42+
try {
43+
includes.add(ClassUtils.forName("com.fasterxml.jackson.databind.Module", null));
44+
} catch (Exception ex) {
45+
// Ignore
46+
}
4447
DEFAULT_INCLUDES = Collections.unmodifiableSet(includes);
4548
};
4649

0 commit comments

Comments
 (0)