Skip to content

Commit 1585a82

Browse files
committed
Javadoc fixes
Issue: SPR-13765
1 parent b1ef6ec commit 1585a82

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@
7070
* detected on the classpath:
7171
* <ul>
7272
* <li><a href="https://github.com/FasterXML/jackson-datatype-jdk7">jackson-datatype-jdk7</a>: support for Java 7 types like {@link java.nio.file.Path}</li>
73-
* <li><a href="https://github.com/FasterXML/jackson-datatype-joda">jackson-datatype-joda</a>: support for Joda-Time types</li>
74-
* <li><a href="https://github.com/FasterXML/jackson-datatype-jsr310">jackson-datatype-jsr310</a>: support for Java 8 Date & Time API types</li>
7573
* <li><a href="https://github.com/FasterXML/jackson-datatype-jdk8">jackson-datatype-jdk8</a>: support for other Java 8 types like {@link java.util.Optional}</li>
74+
* <li><a href="https://github.com/FasterXML/jackson-datatype-jsr310">jackson-datatype-jsr310</a>: support for Java 8 Date & Time API types</li>
75+
* <li><a href="https://github.com/FasterXML/jackson-datatype-joda">jackson-datatype-joda</a>: support for Joda-Time types</li>
7676
* </ul>
7777
*
78-
* <p>Tested against Jackson 2.2, 2.3, 2.4, 2.5, 2.6; compatible with Jackson 2.0 and higher.
78+
* <p>Tested against Jackson 2.4, 2.5, 2.6; compatible with Jackson 2.0 and higher.
7979
*
8080
* @author Sebastien Deleuze
8181
* @author Juergen Hoeller

spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java

+12-10
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@
9797
* &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
9898
* &lt;property name="featuresToEnable">
9999
* &lt;array>
100-
* &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature$WRAP_ROOT_VALUE"/>
101-
* &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature$CLOSE_CLOSEABLE"/>
100+
* &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE"/>
101+
* &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.CLOSE_CLOSEABLE"/>
102102
* &lt;/array>
103103
* &lt;/property>
104104
* &lt;property name="featuresToDisable">
105105
* &lt;array>
106-
* &lt;util:constant static-field="com.fasterxml.jackson.databind.MapperFeature$USE_ANNOTATIONS"/>
106+
* &lt;util:constant static-field="com.fasterxml.jackson.databind.MapperFeature.USE_ANNOTATIONS"/>
107107
* &lt;/array>
108108
* &lt;/property>
109109
* &lt;/bean>
@@ -113,9 +113,9 @@
113113
* detected on the classpath:
114114
* <ul>
115115
* <li><a href="https://github.com/FasterXML/jackson-datatype-jdk7">jackson-datatype-jdk7</a>: support for Java 7 types like {@link java.nio.file.Path}</li>
116-
* <li><a href="https://github.com/FasterXML/jackson-datatype-joda">jackson-datatype-joda</a>: support for Joda-Time types</li>
117-
* <li><a href="https://github.com/FasterXML/jackson-datatype-jsr310">jackson-datatype-jsr310</a>: support for Java 8 Date & Time API types</li>
118116
* <li><a href="https://github.com/FasterXML/jackson-datatype-jdk8">jackson-datatype-jdk8</a>: support for other Java 8 types like {@link java.util.Optional}</li>
117+
* <li><a href="https://github.com/FasterXML/jackson-datatype-jsr310">jackson-datatype-jsr310</a>: support for Java 8 Date & Time API types</li>
118+
* <li><a href="https://github.com/FasterXML/jackson-datatype-joda">jackson-datatype-joda</a>: support for Joda-Time types</li>
119119
* </ul>
120120
*
121121
* <p>In case you want to configure Jackson's {@link ObjectMapper} with a custom {@link Module},
@@ -127,7 +127,7 @@
127127
* &lt;/bean
128128
* </pre>
129129
*
130-
* <p>Tested against Jackson 2.2, 2.3, 2.4, 2.5, 2.6; compatible with Jackson 2.0 and higher.
130+
* <p>Tested against Jackson 2.4, 2.5, 2.6; compatible with Jackson 2.0 and higher.
131131
*
132132
* @author <a href="mailto:[email protected]">Dmitry Katsubo</a>
133133
* @author Rossen Stoyanchev
@@ -397,8 +397,9 @@ public void setBeanClassLoader(ClassLoader beanClassLoader) {
397397
}
398398

399399
/**
400-
* Customize the construction of Jackson handlers ({@link JsonSerializer}, {@link JsonDeserializer},
401-
* {@link KeyDeserializer}, {@code TypeResolverBuilder} and {@code TypeIdResolver}).
400+
* Customize the construction of Jackson handlers
401+
* ({@link JsonSerializer}, {@link JsonDeserializer}, {@link KeyDeserializer},
402+
* {@code TypeResolverBuilder} and {@code TypeIdResolver}).
402403
* @since 4.1.3
403404
* @see Jackson2ObjectMapperFactoryBean#setApplicationContext(ApplicationContext)
404405
*/
@@ -407,8 +408,9 @@ public void setHandlerInstantiator(HandlerInstantiator handlerInstantiator) {
407408
}
408409

409410
/**
410-
* Set the builder {@link ApplicationContext} in order to autowire Jackson handlers ({@link JsonSerializer},
411-
* {@link JsonDeserializer}, {@link KeyDeserializer}, {@code TypeResolverBuilder} and {@code TypeIdResolver}).
411+
* Set the builder {@link ApplicationContext} in order to autowire Jackson handlers
412+
* ({@link JsonSerializer}, {@link JsonDeserializer}, {@link KeyDeserializer},
413+
* {@code TypeResolverBuilder} and {@code TypeIdResolver}).
412414
* @since 4.1.3
413415
* @see Jackson2ObjectMapperBuilder#applicationContext(ApplicationContext)
414416
* @see SpringHandlerInstantiator

0 commit comments

Comments
 (0)