Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Permit use of @JsonTest without Jackson

Browse Source 
See gh-16070
This commit is contained in:
fidel 2019-03-02 17:21:20 +09:00 committed by Stephane Nicoll
parent 6ffa80870d
commit 36f7188334
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<Class<?>> includes = new LinkedHashSet<Class<?>>();
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);
};