11/*
2- * Copyright 2002-2010 the original author or authors.
2+ * Copyright 2002-2012 the original author or authors.
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
3535import org .springframework .http .converter .StringHttpMessageConverter ;
3636import org .springframework .http .converter .feed .AtomFeedHttpMessageConverter ;
3737import org .springframework .http .converter .feed .RssChannelHttpMessageConverter ;
38+ import org .springframework .http .converter .json .MappingJackson2HttpMessageConverter ;
3839import org .springframework .http .converter .json .MappingJacksonHttpMessageConverter ;
3940import org .springframework .http .converter .xml .Jaxb2RootElementHttpMessageConverter ;
4041import org .springframework .http .converter .xml .SourceHttpMessageConverter ;
6566import org .w3c .dom .Element ;
6667
6768/**
68- * A {@link BeanDefinitionParser} that provides the configuration for the
69+ * A {@link BeanDefinitionParser} that provides the configuration for the
6970 * {@code <annotation-driven/>} MVC namespace element.
7071 *
7172 * <p>This class registers the following {@link HandlerMapping}s:</p>
7273 * <ul>
73- * <li>{@link RequestMappingHandlerMapping}
74+ * <li>{@link RequestMappingHandlerMapping}
7475 * ordered at 0 for mapping requests to annotated controller methods.
75- * <li>{@link BeanNameUrlHandlerMapping}
76+ * <li>{@link BeanNameUrlHandlerMapping}
7677 * ordered at 2 to map URL paths to controller bean names.
7778 * </ul>
7879 *
79- * <p><strong>Note:</strong> Additional HandlerMappings may be registered
80- * as a result of using the {@code <view-controller>} or the
80+ * <p><strong>Note:</strong> Additional HandlerMappings may be registered
81+ * as a result of using the {@code <view-controller>} or the
8182 * {@code <resources>} MVC namespace elements.
82- *
83+ *
8384 * <p>This class registers the following {@link HandlerAdapter}s:
8485 * <ul>
85- * <li>{@link RequestMappingHandlerAdapter}
86+ * <li>{@link RequestMappingHandlerAdapter}
8687 * for processing requests with annotated controller methods.
87- * <li>{@link HttpRequestHandlerAdapter}
88+ * <li>{@link HttpRequestHandlerAdapter}
8889 * for processing requests with {@link HttpRequestHandler}s.
89- * <li>{@link SimpleControllerHandlerAdapter}
90+ * <li>{@link SimpleControllerHandlerAdapter}
9091 * for processing requests with interface-based {@link Controller}s.
9192 * </ul>
92- *
93+ *
9394 * <p>This class registers the following {@link HandlerExceptionResolver}s:
9495 * <ul>
95- * <li>{@link ExceptionHandlerExceptionResolver} for handling exceptions
96+ * <li>{@link ExceptionHandlerExceptionResolver} for handling exceptions
9697 * through @{@link ExceptionHandler} methods.
97- * <li>{@link ResponseStatusExceptionResolver} for exceptions annotated
98+ * <li>{@link ResponseStatusExceptionResolver} for exceptions annotated
9899 * with @{@link ResponseStatus}.
99- * <li>{@link DefaultHandlerExceptionResolver} for resolving known Spring
100+ * <li>{@link DefaultHandlerExceptionResolver} for resolving known Spring
100101 * exception types
101102 * </ul>
102- *
103- * <p>Both the {@link RequestMappingHandlerAdapter} and the
104- * {@link ExceptionHandlerExceptionResolver} are configured with default
103+ *
104+ * <p>Both the {@link RequestMappingHandlerAdapter} and the
105+ * {@link ExceptionHandlerExceptionResolver} are configured with default
105106 * instances of the following kind, unless custom instances are provided:
106107 * <ul>
107108 * <li>A {@link DefaultFormattingConversionService}
108- * <li>A {@link LocalValidatorFactoryBean} if a JSR-303 implementation is
109+ * <li>A {@link LocalValidatorFactoryBean} if a JSR-303 implementation is
109110 * available on the classpath
110- * <li>A range of {@link HttpMessageConverter}s depending on what 3rd party
111+ * <li>A range of {@link HttpMessageConverter}s depending on what 3rd party
111112 * libraries are available on the classpath.
112113 * </ul>
113- *
114+ *
114115 * @author Keith Donald
115116 * @author Juergen Hoeller
116117 * @author Arjen Poutsma
@@ -125,6 +126,10 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
125126 private static final boolean jaxb2Present =
126127 ClassUtils .isPresent ("javax.xml.bind.Binder" , AnnotationDrivenBeanDefinitionParser .class .getClassLoader ());
127128
129+ private static final boolean jackson2Present =
130+ ClassUtils .isPresent ("com.fasterxml.jackson.databind.ObjectMapper" , AnnotationDrivenBeanDefinitionParser .class .getClassLoader ()) &&
131+ ClassUtils .isPresent ("com.fasterxml.jackson.core.JsonGenerator" , AnnotationDrivenBeanDefinitionParser .class .getClassLoader ());
132+
128133 private static final boolean jacksonPresent =
129134 ClassUtils .isPresent ("org.codehaus.jackson.map.ObjectMapper" , AnnotationDrivenBeanDefinitionParser .class .getClassLoader ()) &&
130135 ClassUtils .isPresent ("org.codehaus.jackson.JsonGenerator" , AnnotationDrivenBeanDefinitionParser .class .getClassLoader ());
@@ -158,7 +163,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
158163 ManagedList <?> messageConverters = getMessageConverters (element , source , parserContext );
159164 ManagedList <?> argumentResolvers = getArgumentResolvers (element , source , parserContext );
160165 ManagedList <?> returnValueHandlers = getReturnValueHandlers (element , source , parserContext );
161-
166+
162167 RootBeanDefinition methodAdapterDef = new RootBeanDefinition (RequestMappingHandlerAdapter .class );
163168 methodAdapterDef .setSource (source );
164169 methodAdapterDef .setRole (BeanDefinition .ROLE_INFRASTRUCTURE );
@@ -215,7 +220,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
215220 parserContext .registerComponent (new BeanComponentDefinition (defaultExceptionResolver , defaultExceptionResolverName ));
216221 parserContext .registerComponent (new BeanComponentDefinition (mappedCsInterceptorDef , mappedInterceptorName ));
217222
218- // Ensure BeanNameUrlHandlerMapping (SPR-8289) and default HandlerAdapters are not "turned off"
223+ // Ensure BeanNameUrlHandlerMapping (SPR-8289) and default HandlerAdapters are not "turned off"
219224 MvcNamespaceUtils .registerDefaultComponents (parserContext , source );
220225
221226 parserContext .popAndRegisterContainingComponent ();
@@ -309,7 +314,10 @@ private ManagedList<?> getMessageConverters(Element element, Object source, Pars
309314 messageConverters
310315 .add (createConverterBeanDefinition (Jaxb2RootElementHttpMessageConverter .class , source ));
311316 }
312- if (jacksonPresent ) {
317+ if (jackson2Present ) {
318+ messageConverters .add (createConverterBeanDefinition (MappingJackson2HttpMessageConverter .class , source ));
319+ }
320+ else if (jacksonPresent ) {
313321 messageConverters .add (createConverterBeanDefinition (MappingJacksonHttpMessageConverter .class , source ));
314322 }
315323 if (romePresent ) {
0 commit comments