Commit b45bb6d0 authored by izeye's avatar izeye Committed by Andy Wilkinson

Make all of GsonHttpMessageConvertersConfiguration conditional on Gson

Previously GsonHttpMessageConvertersConfiguration was unconditional
with its nested configuration class being
@ConditionalOnClass(Gson.class). This led to the unnecessary
registration of the GsonHttpMessageConvertersConfiguration bean when
Gson isn't on the classpath.

This commit moves the condition up onto the outer class so that no
Gson-related beans are created when Gson is not on the classpath.

Closes gh-2778
parent 5547f91b
...@@ -36,10 +36,10 @@ import com.google.gson.Gson; ...@@ -36,10 +36,10 @@ import com.google.gson.Gson;
* @since 1.2.2 * @since 1.2.2
*/ */
@Configuration @Configuration
@ConditionalOnClass(Gson.class)
class GsonHttpMessageConvertersConfiguration { class GsonHttpMessageConvertersConfiguration {
@Configuration @Configuration
@ConditionalOnClass(Gson.class)
@ConditionalOnBean(Gson.class) @ConditionalOnBean(Gson.class)
@Conditional(PreferGsonOrMissingJacksonCondition.class) @Conditional(PreferGsonOrMissingJacksonCondition.class)
protected static class GsonHttpMessageConverterConfiguration { protected static class GsonHttpMessageConverterConfiguration {
......
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