Commit 329a6905 authored by Stephane Nicoll's avatar Stephane Nicoll

Polish "Permit use of @JsonTest without Jackson"

Closes gh-16070
parent 36f71883
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -34,18 +34,20 @@ import org.springframework.util.ClassUtils; ...@@ -34,18 +34,20 @@ import org.springframework.util.ClassUtils;
*/ */
class JsonExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { class JsonExcludeFilter extends AnnotationCustomizableTypeExcludeFilter {
private static final String JACKSON_MODULE = "com.fasterxml.jackson.databind.Module";
private static final Set<Class<?>> DEFAULT_INCLUDES; private static final Set<Class<?>> DEFAULT_INCLUDES;
static { static {
Set<Class<?>> includes = new LinkedHashSet<Class<?>>(); Set<Class<?>> includes = new LinkedHashSet<Class<?>>();
includes.add(JsonComponent.class);
try { try {
includes.add(ClassUtils.forName("com.fasterxml.jackson.databind.Module", null)); includes.add(ClassUtils.forName(JACKSON_MODULE, null));
} catch (Exception ex) { }
// Ignore catch (Exception ex) {
} }
includes.add(JsonComponent.class);
DEFAULT_INCLUDES = Collections.unmodifiableSet(includes); DEFAULT_INCLUDES = Collections.unmodifiableSet(includes);
}; }
private final JsonTest annotation; private final JsonTest annotation;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment