From 36f718833487a5fa26a69840782e53d7c7e831ff Mon Sep 17 00:00:00 2001 From: fidel Date: Sat, 2 Mar 2019 17:21:20 +0900 Subject: [PATCH] Permit use of @JsonTest without Jackson See gh-16070 --- .../boot/test/autoconfigure/json/JsonExcludeFilter.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java index 6bbb15fcc14..74d8c525fee 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java @@ -20,13 +20,12 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; -import com.fasterxml.jackson.databind.Module; - import org.springframework.boot.context.TypeExcludeFilter; import org.springframework.boot.jackson.JsonComponent; import org.springframework.boot.test.autoconfigure.filter.AnnotationCustomizableTypeExcludeFilter; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.core.annotation.AnnotatedElementUtils; +import org.springframework.util.ClassUtils; /** * {@link TypeExcludeFilter} for {@link JsonTest @JsonTest}. @@ -39,8 +38,12 @@ class JsonExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { static { Set> includes = new LinkedHashSet>(); - includes.add(Module.class); includes.add(JsonComponent.class); + try { + includes.add(ClassUtils.forName("com.fasterxml.jackson.databind.Module", null)); + } catch (Exception ex) { + // Ignore + } DEFAULT_INCLUDES = Collections.unmodifiableSet(includes); };