root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish "Permit use of @JsonTest without Jackson" 

Closes gh-16070
This commit is contained in:
Stephane Nicoll 2019-03-04 14:48:39 +01:00
parent 36f7188334
commit 329a6905d8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -34,18 +34,20 @@ import org.springframework.util.ClassUtils;
*/
class JsonExcludeFilter extends AnnotationCustomizableTypeExcludeFilter {
private static final String JACKSON_MODULE = "com.fasterxml.jackson.databind.Module";
private static final Set<Class<?>> DEFAULT_INCLUDES;
static {
Set<Class<?>> includes = new LinkedHashSet<Class<?>>();
includes.add(JsonComponent.class);
try {
includes.add(ClassUtils.forName("com.fasterxml.jackson.databind.Module", null));
} catch (Exception ex) {
// Ignore
includes.add(ClassUtils.forName(JACKSON_MODULE, null));
}
catch (Exception ex) {
}
includes.add(JsonComponent.class);
DEFAULT_INCLUDES = Collections.unmodifiableSet(includes);
};
}
private final JsonTest annotation;