From 96e4d3a53079f373de16b2754d1a5eee32d9ee2c Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 29 Sep 2021 14:02:37 +0200 Subject: [PATCH] Fail Gradle build for Javadoc warnings In order to catch Javadoc errors in the build, we now enable the `Xwerror` flag for the `javadoc` tool. In addition, we now use `Xdoclint:syntax` instead of `Xdoclint:none` in order to validate syntax within our Javadoc. This commit fixes all resulting Javadoc errors and warnings. This commit also upgrades to Undertow 2.2.12.Final and fixes the artifact names for exclusions for the Servlet and annotations APIs. The incorrect exclusion of the Servlet API resulted in the Servlet API being on the classpath twice for the javadoc task, which resulted in the following warnings in previous builds. javadoc: warning - Multiple sources of package comments found for package "javax.servlet" javadoc: warning - Multiple sources of package comments found for package "javax.servlet.http" javadoc: warning - Multiple sources of package comments found for package "javax.servlet.descriptor" javadoc: warning - Multiple sources of package comments found for package "javax.servlet.annotation" Closes gh-27480 --- build.gradle | 7 ++- gradle/docs.gradle | 5 ++- .../target/QuickTargetSourceCreator.java | 8 ++-- .../org/springframework/beans/BeanUtils.java | 2 +- .../beans/PropertyAccessorUtils.java | 4 +- .../factory/config/MethodInvokingBean.java | 14 +++--- .../config/MethodInvokingFactoryBean.java | 24 +++++----- .../config/ServiceLocatorFactoryBean.java | 44 +++++++++---------- .../beans/factory/config/YamlProcessor.java | 2 +- .../AbstractAutowireCapableBeanFactory.java | 4 +- .../factory/xml/DefaultDocumentLoader.java | 2 +- .../factory/xml/PluggableSchemaResolver.java | 6 +-- .../mail/javamail/MimeMessageHelper.java | 8 ++-- .../AnnotationBeanNameGenerator.java | 2 +- ...ReloadableResourceBundleMessageSource.java | 2 +- .../rmi/JndiRmiClientInterceptor.java | 2 +- .../remoting/rmi/JndiRmiProxyFactoryBean.java | 2 +- .../remoting/rmi/JndiRmiServiceExporter.java | 2 +- .../support/ResourceBundleThemeSource.java | 2 +- .../springframework/validation/Errors.java | 4 +- .../org/springframework/core/Constants.java | 8 ++-- .../core/SmartClassLoader.java | 1 - .../core/io/FileSystemResource.java | 8 ++-- .../springframework/core/io/PathResource.java | 6 +-- .../springframework/util/AntPathMatcher.java | 16 +++---- .../java/org/springframework/util/Assert.java | 2 +- .../springframework/util/MethodInvoker.java | 2 +- .../org/springframework/util/PathMatcher.java | 2 +- .../org/springframework/util/StringUtils.java | 6 +-- .../util/comparator/InvertibleComparator.java | 4 +- .../LazyConnectionDataSourceProxy.java | 4 +- .../UserCredentialsDataSourceAdapter.java | 2 +- ...erCredentialsConnectionFactoryAdapter.java | 2 +- .../DefaultJmsActivationSpecFactory.java | 4 +- .../endpoint/JmsMessageEndpointManager.java | 2 +- .../MessageMappingMessageHandler.java | 2 +- .../support/RSocketMessageHandler.java | 2 +- .../orm/hibernate5/SpringBeanContainer.java | 2 +- .../r2dbc/core/DatabaseClient.java | 10 ++--- .../r2dbc/core/ExecuteFunction.java | 2 +- .../AbstractRequestExpectationManager.java | 2 +- .../reactive/server/FluxExchangeResult.java | 2 +- .../web/reactive/server/WebTestClient.java | 10 ++--- ...onnectionSpecConnectionFactoryAdapter.java | 2 +- .../TransactionProxyFactoryBean.java | 2 +- .../http/ContentDisposition.java | 11 +++-- .../org/springframework/http/HttpStatus.java | 6 +-- .../client/ClientHttpRequestInterceptor.java | 6 +-- .../http/codec/xml/XmlEventDecoder.java | 2 +- .../ObjectToStringHttpMessageConverter.java | 10 ++--- .../feed/AtomFeedHttpMessageConverter.java | 2 +- .../feed/RssChannelHttpMessageConverter.java | 2 +- .../SimpleHttpServerJaxWsServiceExporter.java | 2 +- .../jaxws/SimpleJaxWsServiceExporter.java | 2 +- .../SpringServletContainerInitializer.java | 4 +- .../web/WebApplicationInitializer.java | 10 ++--- .../web/jsf/el/SpringBeanFacesELResolver.java | 28 ++++++------ .../WebApplicationContextFacesELResolver.java | 6 +-- .../web/server/ServerWebExchange.java | 2 +- .../web/util/UrlPathHelper.java | 10 ++--- .../function/client/ExchangeFunction.java | 2 +- .../reactive/function/client/WebClient.java | 8 ++-- .../function/server/RouterFunctions.java | 18 ++++---- .../function/server/ServerRequest.java | 6 +-- .../result/view/UrlBasedViewResolver.java | 2 +- .../web/reactive/socket/WebSocketHandler.java | 10 ++--- .../web/servlet/DispatcherServlet.java | 2 +- .../web/servlet/ModelAndView.java | 2 +- .../web/servlet/function/RouterFunctions.java | 18 ++++---- .../web/servlet/function/ServerRequest.java | 6 +-- .../web/servlet/function/ServerResponse.java | 8 ++-- .../DefaultHandlerExceptionResolver.java | 1 - .../servlet/support/WebContentGenerator.java | 2 +- .../servlet/view/InternalResourceView.java | 2 +- .../web/servlet/view/JstlView.java | 2 +- .../servlet/view/UrlBasedViewResolver.java | 12 ++--- .../view/feed/AbstractAtomFeedView.java | 2 +- .../servlet/view/feed/AbstractFeedView.java | 2 +- .../view/feed/AbstractRssFeedView.java | 2 +- .../view/freemarker/FreeMarkerConfigurer.java | 2 +- .../servlet/view/tiles3/TilesConfigurer.java | 38 ++++++++-------- 81 files changed, 251 insertions(+), 250 deletions(-) diff --git a/build.gradle b/build.gradle index ba209903d9..86379dd04b 100644 --- a/build.gradle +++ b/build.gradle @@ -139,14 +139,14 @@ configure(allprojects) { project -> entry 'tomcat-embed-core' entry 'tomcat-embed-websocket' } - dependencySet(group: 'io.undertow', version: '2.2.10.Final') { + dependencySet(group: 'io.undertow', version: '2.2.12.Final') { entry 'undertow-core' entry('undertow-websockets-jsr') { exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec" } entry('undertow-servlet') { - exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_3.1_spec" - exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.2_spec" + exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec" + exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.3_spec" } } @@ -371,7 +371,6 @@ configure([rootProject] + javaProjects) { project -> "https://docs.oracle.com/javaee/7/api/", "https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ "https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/", - "https://glassfish.java.net/nonav/docs/v3/api/", "https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/", "https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/", "https://tiles.apache.org/tiles-request/apidocs/", diff --git a/gradle/docs.gradle b/gradle/docs.gradle index bfb26d152b..b0a356be92 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -46,8 +46,9 @@ task api(type: Javadoc) { stylesheetFile = file("src/docs/api/stylesheet.css") splitIndex = true links(project.ext.javadocLinks) - addStringOption('Xdoclint:none', '-quiet') - if(JavaVersion.current().isJava9Compatible()) { + addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint + addBooleanOption('Xwerror', true) // fail build on Javadoc warnings + if (JavaVersion.current().isJava9Compatible()) { addBooleanOption('html5', true) } } diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java index a6a741e0f8..f7df6c3024 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java @@ -25,9 +25,11 @@ import org.springframework.lang.Nullable; /** * Convenient TargetSourceCreator using bean name prefixes to create one of three * well-known TargetSource types: - *
  • : CommonsPool2TargetSource - *
  • % ThreadLocalTargetSource - *
  • ! PrototypeTargetSource + * * * @author Rod Johnson * @author Stephane Nicoll diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java index 9483d18871..3a2b3f0b03 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java @@ -540,7 +540,7 @@ public abstract class BeanUtils { /** * Find a JavaBeans PropertyEditor following the 'Editor' suffix convention - * (e.g. "mypackage.MyDomainClass" -> "mypackage.MyDomainClassEditor"). + * (e.g. "mypackage.MyDomainClass" → "mypackage.MyDomainClassEditor"). *

    Compatible to the standard JavaBeans convention as implemented by * {@link java.beans.PropertyEditorManager} but isolated from the latter's * registered default editors for primitive types. diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java index 55f50e5a27..564194e2f0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java @@ -134,8 +134,8 @@ public abstract class PropertyAccessorUtils { /** * Determine the canonical name for the given property path. * Removes surrounding quotes from map keys:
    - * {@code map['key']} -> {@code map[key]}
    - * {@code map["key"]} -> {@code map[key]} + * {@code map['key']} → {@code map[key]}
    + * {@code map["key"]} → {@code map[key]} * @param propertyName the bean property path * @return the canonical representation of the property path */ diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingBean.java index 1374c4105e..57fa7ab222 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingBean.java @@ -47,17 +47,17 @@ import org.springframework.util.ClassUtils; * which uses this class to call a static initialization method: * * 

    - * <bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingBean">
- *   <property name="staticMethod" value="com.whatever.MyClass.init"/>
- * </bean>
    + * <bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingBean"> + * <property name="staticMethod" value="com.whatever.MyClass.init"/> + * </bean> * *

    An example of calling an instance method to start some server bean: * * 

    - * <bean id="myStarter" class="org.springframework.beans.factory.config.MethodInvokingBean">
- *   <property name="targetObject" ref="myServer"/>
- *   <property name="targetMethod" value="start"/>
- * </bean>
    + * <bean id="myStarter" class="org.springframework.beans.factory.config.MethodInvokingBean"> + * <property name="targetObject" ref="myServer"/> + * <property name="targetMethod" value="start"/> + * </bean> * * @author Juergen Hoeller * @since 4.0.3 diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java index 86a6be9856..3ff39d81e5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java @@ -56,24 +56,24 @@ import org.springframework.lang.Nullable; * which uses this class to call a static factory method: * * 
    - * <bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- *   <property name="staticMethod" value="com.whatever.MyClassFactory.getInstance"/>
- * </bean>
    + * <bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"> + * <property name="staticMethod" value="com.whatever.MyClassFactory.getInstance"/> + * </bean> * *

    An example of calling a static method then an instance method to get at a * Java system property. Somewhat verbose, but it works. * * 

    - * <bean id="sysProps" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- *   <property name="targetClass" value="java.lang.System"/>
- *   <property name="targetMethod" value="getProperties"/>
- * </bean>
+ * <bean id="sysProps" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ *   <property name="targetClass" value="java.lang.System"/>
+ *   <property name="targetMethod" value="getProperties"/>
+ * </bean>
  *
- * <bean id="javaVersion" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- *   <property name="targetObject" ref="sysProps"/>
- *   <property name="targetMethod" value="getProperty"/>
- *   <property name="arguments" value="java.version"/>
- * </bean>
    + * <bean id="javaVersion" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"> + * <property name="targetObject" ref="sysProps"/> + * <property name="targetMethod" value="getProperty"/> + * <property name="arguments" value="java.version"/> + * </bean> * * @author Colin Sampaleanu * @author Juergen Hoeller diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java index e0ee01e6e3..272e97f5b7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java @@ -83,22 +83,22 @@ import org.springframework.util.StringUtils; *

    A sample config in an XML-based * {@link org.springframework.beans.factory.BeanFactory} might look as follows: * - * 

    <beans>
+ * 
    <beans>
  *
- *   <!-- Prototype bean since we have state -->
- *   <bean id="myService" class="a.b.c.MyService" singleton="false"/>
+ *   <!-- Prototype bean since we have state -->
+ *   <bean id="myService" class="a.b.c.MyService" singleton="false"/>
  *
- *   <!-- will lookup the above 'myService' bean by *TYPE* -->
+ *   <!-- will lookup the above 'myService' bean by *TYPE* -->
  *   <bean id="myServiceFactory"
- *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
- *     <property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/>
- *   </bean>
+ *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
+ *     <property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/>
+ *   </bean>
  *
- *   <bean id="clientBean" class="a.b.c.MyClientBean">
- *     <property name="myServiceFactory" ref="myServiceFactory"/>
- *   </bean>
+ *   <bean id="clientBean" class="a.b.c.MyClientBean">
+ *     <property name="myServiceFactory" ref="myServiceFactory"/>
+ *   </bean>
  *
- *</beans>
    
+ *</beans>
    * *

    The attendant {@code MyClientBean} class implementation might then * look something like this: @@ -135,22 +135,22 @@ import org.springframework.util.StringUtils; *

    A sample config in an XML-based * {@link org.springframework.beans.factory.BeanFactory} might look as follows: * - * 

    <beans>
+ * 
    <beans>
  *
- *   <!-- Prototype beans since we have state (both extend MyService) -->
- *   <bean id="specialService" class="a.b.c.SpecialService" singleton="false"/>
- *   <bean id="anotherService" class="a.b.c.AnotherService" singleton="false"/>
+ *   <!-- Prototype beans since we have state (both extend MyService) -->
+ *   <bean id="specialService" class="a.b.c.SpecialService" singleton="false"/>
+ *   <bean id="anotherService" class="a.b.c.AnotherService" singleton="false"/>
  *
  *   <bean id="myServiceFactory"
- *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
- *     <property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/>
- *   </bean>
+ *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
+ *     <property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/>
+ *   </bean>
  *
- *   <bean id="clientBean" class="a.b.c.MyClientBean">
- *     <property name="myServiceFactory" ref="myServiceFactory"/>
- *   </bean>
+ *   <bean id="clientBean" class="a.b.c.MyClientBean">
+ *     <property name="myServiceFactory" ref="myServiceFactory"/>
+ *   </bean>
  *
- *</beans>
    
+ *</beans>
    * *

    The attendant {@code MyClientBean} class implementation might then * look something like this: diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java index e34d7c25ce..7949003c68 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java @@ -86,7 +86,7 @@ public abstract class YamlProcessor { * * when mapped with * 

    -	 * setDocumentMatchers(properties ->
+	 * setDocumentMatchers(properties ->
 	 *     ("prod".equals(properties.getProperty("environment")) ? MatchStatus.FOUND : MatchStatus.NOT_FOUND));
 	 *
    * would end up as diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java index 02b27fe304..e3908a2a7c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java @@ -1342,7 +1342,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * @param beanName the name of the bean * @param mbd the bean definition for the bean * @param explicitArgs argument values passed in programmatically via the getBean method, - * or {@code null} if none (-> use constructor argument values from bean definition) + * or {@code null} if none (implying the use of constructor argument values from bean definition) * @return a BeanWrapper for the new instance * @see #getBean(String, Object[]) */ @@ -1363,7 +1363,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * @param mbd the bean definition for the bean * @param ctors the chosen candidate constructors * @param explicitArgs argument values passed in programmatically via the getBean method, - * or {@code null} if none (-> use constructor argument values from bean definition) + * or {@code null} if none (implying the use of constructor argument values from bean definition) * @return a BeanWrapper for the new instance */ protected BeanWrapper autowireConstructor( diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java index a443e7b1d6..08b1d16f27 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java @@ -39,7 +39,7 @@ import org.springframework.util.xml.XmlValidationModeDetector; * when starting your JVM. For example, to use the Oracle {@link DocumentBuilder}, * you might start your application like as follows: * - * 
    java -Djavax.xml.parsers.DocumentBuilderFactory=oracle.xml.jaxp.JXDocumentBuilderFactory MyMainClass
    + * 
    java -Djavax.xml.parsers.DocumentBuilderFactory=oracle.xml.jaxp.JXDocumentBuilderFactory MyMainClass
    * * @author Rob Harrop * @author Juergen Hoeller diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java index 3b1bff1feb..82d632302d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java @@ -71,13 +71,13 @@ public class PluggableSchemaResolver implements EntityResolver { private final String schemaMappingsLocation; - /** Stores the mapping of schema URL -> local schema path. */ + /** Stores the mapping of schema URL → local schema path. */ @Nullable private volatile Map schemaMappings; /** - * Loads the schema URL -> schema file location mappings using the default + * Loads the schema URL → schema file location mappings using the default * mapping file pattern "META-INF/spring.schemas". * @param classLoader the ClassLoader to use for loading * (can be {@code null}) to use the default ClassLoader) @@ -89,7 +89,7 @@ public class PluggableSchemaResolver implements EntityResolver { } /** - * Loads the schema URL -> schema file location mappings using the given + * Loads the schema URL → schema file location mappings using the given * mapping file pattern. * @param classLoader the ClassLoader to use for loading * (can be {@code null}) to use the default ClassLoader) diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java index f795390fa2..1eff5cebfa 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java +++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java @@ -896,7 +896,7 @@ public class MimeMessageHelper { *

    NOTE: Invoke {@code addInline} after {@link #setText}; * else, mail readers might not be able to resolve inline references correctly. * @param contentId the content ID to use. Will end up as "Content-ID" header - * in the body part, surrounded by angle brackets: e.g. "myId" -> "<myId>". + * in the body part, surrounded by angle brackets: e.g. "myId" → "<myId>". * Can be referenced in HTML source via src="cid:myId" expressions. * @param dataSource the {@code javax.activation.DataSource} to take * the content from, determining the InputStream and the content type @@ -923,7 +923,7 @@ public class MimeMessageHelper { *

    NOTE: Invoke {@code addInline} after {@link #setText}; * else, mail readers might not be able to resolve inline references correctly. * @param contentId the content ID to use. Will end up as "Content-ID" header - * in the body part, surrounded by angle brackets: e.g. "myId" -> "<myId>". + * in the body part, surrounded by angle brackets: e.g. "myId" → "<myId>". * Can be referenced in HTML source via src="cid:myId" expressions. * @param file the File resource to take the content from * @throws MessagingException in case of errors @@ -950,7 +950,7 @@ public class MimeMessageHelper { *

    NOTE: Invoke {@code addInline} after {@link #setText}; * else, mail readers might not be able to resolve inline references correctly. * @param contentId the content ID to use. Will end up as "Content-ID" header - * in the body part, surrounded by angle brackets: e.g. "myId" -> "<myId>". + * in the body part, surrounded by angle brackets: e.g. "myId" → "<myId>". * Can be referenced in HTML source via src="cid:myId" expressions. * @param resource the resource to take the content from * @throws MessagingException in case of errors @@ -976,7 +976,7 @@ public class MimeMessageHelper { *

    NOTE: Invoke {@code addInline} after {@code setText}; * else, mail readers might not be able to resolve inline references correctly. * @param contentId the content ID to use. Will end up as "Content-ID" header - * in the body part, surrounded by angle brackets: e.g. "myId" -> "<myId>". + * in the body part, surrounded by angle brackets: e.g. "myId" → "<myId>". * Can be referenced in HTML source via src="cid:myId" expressions. * @param inputStreamSource the resource to take the content from * @param contentType the content type to use for the element diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java index a589a92335..4beee86806 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java @@ -156,7 +156,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator { /** * Derive a default bean name from the given bean definition. *

    The default implementation simply builds a decapitalized version - * of the short class name: e.g. "mypackage.MyJdbcDao" -> "myJdbcDao". + * of the short class name: e.g. "mypackage.MyJdbcDao" → "myJdbcDao". *

    Note that inner classes will thus have names of the form * "outerClassName.InnerClassName", which because of the period in the * name may be an issue if you are autowiring by name. diff --git a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java index 6b6ff96af1..1a93dd38d0 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java +++ b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java @@ -315,7 +315,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased /** * Calculate the filenames for the given bundle basename and Locale, * appending language code, country code, and variant code. - * E.g.: basename "messages", Locale "de_AT_oo" -> "messages_de_AT_OO", + *

    For example, basename "messages", Locale "de_AT_oo" → "messages_de_AT_OO", * "messages_de_AT", "messages_de". *

    Follows the rules defined by {@link java.util.Locale#toString()}. * @param basename the basename of the bundle diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java index d90dd6a1a3..e883ff2949 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java @@ -56,7 +56,7 @@ import org.springframework.util.Assert; * For example: * * 

    <property name="jndiEnvironment">
- * 	 <props>
+ * 	 <props>
  *		 <prop key="java.naming.factory.initial">com.sun.jndi.cosnaming.CNCtxFactory</prop>
  *		 <prop key="java.naming.provider.url">iiop://localhost:1050</prop>
  *	 </props>
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
index a9d33d8973..48feb108a0 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
@@ -43,7 +43,7 @@ import org.springframework.util.ClassUtils;
  * For example:
  *
  * 
    <property name="jndiEnvironment">
- * 	 <props>
+ * 	 <props>
  *		 <prop key="java.naming.factory.initial">com.sun.jndi.cosnaming.CNCtxFactory</prop>
  *		 <prop key="java.naming.provider.url">iiop://localhost:1050</prop>
  *	 </props>
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
index 49b2db295a..60543f6b18 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
@@ -52,7 +52,7 @@ import org.springframework.util.ReflectionUtils;
  * For example:
  *
  * 
    <property name="jndiEnvironment">
- * 	 <props>
+ * 	 <props>
  *		 <prop key="java.naming.factory.initial">com.sun.jndi.cosnaming.CNCtxFactory</prop>
  *		 <prop key="java.naming.provider.url">iiop://localhost:1050</prop>
  *	 </props>
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
index 0e5ba7e9a8..fe68fc0fc8 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
@@ -87,7 +87,7 @@ public class ResourceBundleThemeSource implements HierarchicalThemeSource, BeanC
 	/**
 	 * Set the prefix that gets applied to the ResourceBundle basenames,
 	 * i.e. the theme names.
-	 * E.g.: basenamePrefix="test.", themeName="theme" -> basename="test.theme".
+	 * E.g.: basenamePrefix="test.", themeName="theme" → basename="test.theme".
 	 * 
    Note that ResourceBundle names are effectively classpath locations: As a
 	 * consequence, the JDK's standard ResourceBundle treats dots as package separators.
 	 * This means that "test.theme" is effectively equivalent to "test/theme",
diff --git a/spring-context/src/main/java/org/springframework/validation/Errors.java b/spring-context/src/main/java/org/springframework/validation/Errors.java
index ebaa9460bf..45ae5d7b57 100644
--- a/spring-context/src/main/java/org/springframework/validation/Errors.java
+++ b/spring-context/src/main/java/org/springframework/validation/Errors.java
@@ -83,8 +83,8 @@ public interface Errors {
 	 * {@code pushNestedPath(String)} call.
 	 * 
    Using the nested path stack allows to set temporary nested paths
 	 * for subobjects without having to worry about a temporary path holder.
-	 * 
    For example: current path "spouse.", pushNestedPath("child") ->
-	 * result path "spouse.child."; popNestedPath() -> "spouse." again.
+	 * 
    For example: current path "spouse.", pushNestedPath("child") →
+	 * result path "spouse.child."; popNestedPath() → "spouse." again.
 	 * @param subPath the sub path to push onto the nested path stack
 	 * @see #popNestedPath
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/Constants.java b/spring-core/src/main/java/org/springframework/core/Constants.java
index 8e91d511c1..f94b1842bb 100644
--- a/spring-core/src/main/java/org/springframework/core/Constants.java
+++ b/spring-core/src/main/java/org/springframework/core/Constants.java
@@ -310,10 +310,10 @@ public class Constants {
 	 * Convert the given bean property name to a constant name prefix.
 	 * 
    Uses a common naming idiom: turning all lower case characters to
 	 * upper case, and prepending upper case characters with an underscore.
-	 * 
    Example: "imageSize" -> "IMAGE_SIZE"
    
-	 * Example: "imagesize" -> "IMAGESIZE".
    
-	 * Example: "ImageSize" -> "_IMAGE_SIZE".
    
-	 * Example: "IMAGESIZE" -> "_I_M_A_G_E_S_I_Z_E"
+	 * 
    Example: "imageSize" → "IMAGE_SIZE"
    
+	 * Example: "imagesize" → "IMAGESIZE".
    
+	 * Example: "ImageSize" → "_IMAGE_SIZE".
    
+	 * Example: "IMAGESIZE" → "_I_M_A_G_E_S_I_Z_E"
 	 * @param propertyName the name of the bean property
 	 * @return the corresponding constant name prefix
 	 * @see #getValuesForProperty
diff --git a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
index e6a39c149e..964c791a8e 100644
--- a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
@@ -91,7 +91,6 @@ public interface SmartClassLoader {
 	 * not being possible (thrown by the default implementation in this interface)
 	 * @since 5.3.4
 	 * @see ClassLoader#defineClass(String, byte[], int, int, ProtectionDomain)
-	 * @see java.lang.invoke.MethodHandles.Lookup#defineClass(byte[])
 	 */
 	default Class publicDefineClass(String name, byte[] b, @Nullable ProtectionDomain protectionDomain) {
 		throw new UnsupportedOperationException();
diff --git a/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java b/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
index d0f7d392e8..feb2f9067d 100644
--- a/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
@@ -70,9 +70,9 @@ public class FileSystemResource extends AbstractResource implements WritableReso
 	 * 
    Note: When building relative resources via {@link #createRelative},
 	 * it makes a difference whether the specified resource base path here
 	 * ends with a slash or not. In the case of "C:/dir1/", relative paths
-	 * will be built underneath that root: e.g. relative path "dir2" ->
+	 * will be built underneath that root: e.g. relative path "dir2" →
 	 * "C:/dir1/dir2". In the case of "C:/dir1", relative paths will apply
-	 * at the same directory level: relative path "dir2" -> "C:/dir2".
+	 * at the same directory level: relative path "dir2" → "C:/dir2".
 	 * @param path a file path
 	 * @see #FileSystemResource(Path)
 	 */
@@ -87,7 +87,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso
 	 * Create a new {@code FileSystemResource} from a {@link File} handle.
 	 * 
    Note: When building relative resources via {@link #createRelative},
 	 * the relative path will apply at the same directory level:
-	 * e.g. new File("C:/dir1"), relative path "dir2" -> "C:/dir2"!
+	 * e.g. new File("C:/dir1"), relative path "dir2" → "C:/dir2"!
 	 * If you prefer to have relative paths built underneath the given root directory,
 	 * use the {@link #FileSystemResource(String) constructor with a file path}
 	 * to append a trailing slash to the root path: "C:/dir1/", which indicates
@@ -111,7 +111,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso
 	 * path cleaning and {@link #createRelative(String)} handling.
 	 * 
    Note: When building relative resources via {@link #createRelative},
 	 * the relative path will apply at the same directory level:
-	 * e.g. Paths.get("C:/dir1"), relative path "dir2" -> "C:/dir2"!
+	 * e.g. Paths.get("C:/dir1"), relative path "dir2" → "C:/dir2"!
 	 * If you prefer to have relative paths built underneath the given root directory,
 	 * use the {@link #FileSystemResource(String) constructor with a file path}
 	 * to append a trailing slash to the root path: "C:/dir1/", which indicates
diff --git a/spring-core/src/main/java/org/springframework/core/io/PathResource.java b/spring-core/src/main/java/org/springframework/core/io/PathResource.java
index bd334cc518..6412f001a2 100644
--- a/spring-core/src/main/java/org/springframework/core/io/PathResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/PathResource.java
@@ -64,7 +64,7 @@ public class PathResource extends AbstractResource implements WritableResource {
 	 * Create a new PathResource from a Path handle.
 	 * 
    Note: Unlike {@link FileSystemResource}, when building relative resources
 	 * via {@link #createRelative}, the relative path will be built underneath
-	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" -> "C:/dir1/dir2"!
+	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" → "C:/dir1/dir2"!
 	 * @param path a Path handle
 	 */
 	public PathResource(Path path) {
@@ -76,7 +76,7 @@ public class PathResource extends AbstractResource implements WritableResource {
 	 * Create a new PathResource from a Path handle.
 	 * 
    Note: Unlike {@link FileSystemResource}, when building relative resources
 	 * via {@link #createRelative}, the relative path will be built underneath
-	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" -> "C:/dir1/dir2"!
+	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" → "C:/dir1/dir2"!
 	 * @param path a path
 	 * @see java.nio.file.Paths#get(String, String...)
 	 */
@@ -89,7 +89,7 @@ public class PathResource extends AbstractResource implements WritableResource {
 	 * Create a new PathResource from a Path handle.
 	 * 
    Note: Unlike {@link FileSystemResource}, when building relative resources
 	 * via {@link #createRelative}, the relative path will be built underneath
-	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" -> "C:/dir1/dir2"!
+	 * the given root: e.g. Paths.get("C:/dir1/"), relative path "dir2" → "C:/dir1/dir2"!
 	 * @param uri a path URI
 	 * @see java.nio.file.Paths#get(URI)
 	 */
diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
index 59087313ea..9979256136 100644
--- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -475,14 +475,14 @@ public class AntPathMatcher implements PathMatcher {
 
 	/**
 	 * Given a pattern and a full path, determine the pattern-mapped part. 
    For example: 
      
-	 * 
    • '{@code /docs/cvs/commit.html}' and '{@code /docs/cvs/commit.html} -> ''
      • 
-	 * 
    • '{@code /docs/*}' and '{@code /docs/cvs/commit} -> '{@code cvs/commit}'
      • 
-	 * 
    • '{@code /docs/cvs/*.html}' and '{@code /docs/cvs/commit.html} -> '{@code commit.html}'
      • 
-	 * 
    • '{@code /docs/**}' and '{@code /docs/cvs/commit} -> '{@code cvs/commit}'
      • 
-	 * 
    • '{@code /docs/**\/*.html}' and '{@code /docs/cvs/commit.html} -> '{@code cvs/commit.html}'
      • 
-	 * 
    • '{@code /*.html}' and '{@code /docs/cvs/commit.html} -> '{@code docs/cvs/commit.html}'
      • 
-	 * 
    • '{@code *.html}' and '{@code /docs/cvs/commit.html} -> '{@code /docs/cvs/commit.html}'
      • 
-	 * 
    • '{@code *}' and '{@code /docs/cvs/commit.html} -> '{@code /docs/cvs/commit.html}'
      •  
    
+	 * 
  • '{@code /docs/cvs/commit.html}' and '{@code /docs/cvs/commit.html} → ''
    • 
+	 * 
  • '{@code /docs/*}' and '{@code /docs/cvs/commit} → '{@code cvs/commit}'
    • 
+	 * 
  • '{@code /docs/cvs/*.html}' and '{@code /docs/cvs/commit.html} → '{@code commit.html}'
    • 
+	 * 
  • '{@code /docs/**}' and '{@code /docs/cvs/commit} → '{@code cvs/commit}'
    • 
+	 * 
  • '{@code /docs/**\/*.html}' and '{@code /docs/cvs/commit.html} → '{@code cvs/commit.html}'
    • 
+	 * 
  • '{@code /*.html}' and '{@code /docs/cvs/commit.html} → '{@code docs/cvs/commit.html}'
    • 
+	 * 
  • '{@code *.html}' and '{@code /docs/cvs/commit.html} → '{@code /docs/cvs/commit.html}'
    • 
+	 * 
  • '{@code *}' and '{@code /docs/cvs/commit.html} → '{@code /docs/cvs/commit.html}'
    •  
 	 * 
    Assumes that {@link #match} returns {@code true} for '{@code pattern}' and '{@code path}', but
 	 * does not enforce this.
 	 */
diff --git a/spring-core/src/main/java/org/springframework/util/Assert.java b/spring-core/src/main/java/org/springframework/util/Assert.java
index fbba65fbc4..fd84179393 100644
--- a/spring-core/src/main/java/org/springframework/util/Assert.java
+++ b/spring-core/src/main/java/org/springframework/util/Assert.java
@@ -43,7 +43,7 @@ import org.springframework.lang.Nullable;
  *
  * 
      * Assert.notNull(clazz, "The class must not be null");
- * Assert.isTrue(i > 0, "The value must be greater than zero");
    
+ * Assert.isTrue(i > 0, "The value must be greater than zero");
    
  *
  * 
    Mainly for internal use within the framework; for a more comprehensive suite
  * of assertion utilities consider {@code org.apache.commons.lang3.Validate} from
diff --git a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
index 8672b0197a..b3e0c55548 100644
--- a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
+++ b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
@@ -288,7 +288,7 @@ public class MethodInvoker {
 	 * Algorithm that judges the match between the declared parameter types of a candidate method
 	 * and a specific list of arguments that this method is supposed to be invoked with.
 	 * 
    Determines a weight that represents the class hierarchy difference between types and
-	 * arguments. A direct match, i.e. type Integer -> arg of class Integer, does not increase
+	 * arguments. A direct match, i.e. type Integer → arg of class Integer, does not increase
 	 * the result - all direct matches means weight 0. A match between type Object and arg of
 	 * class Integer would increase the weight by 2, due to the superclass 2 steps up in the
 	 * hierarchy (i.e. Object) being the last one that still matches the required type Object.
diff --git a/spring-core/src/main/java/org/springframework/util/PathMatcher.java b/spring-core/src/main/java/org/springframework/util/PathMatcher.java
index 5d711d00b2..7268e7ba5b 100644
--- a/spring-core/src/main/java/org/springframework/util/PathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/PathMatcher.java
@@ -94,7 +94,7 @@ public interface PathMatcher {
 	 * Given a pattern and a full path, extract the URI template variables. URI template
 	 * variables are expressed through curly brackets ('{' and '}').
 	 * 
    For example: For pattern "/hotels/{hotel}" and path "/hotels/1", this method will
-	 * return a map containing "hotel"->"1".
+	 * return a map containing "hotel" → "1".
 	 * @param pattern the path pattern, possibly containing URI templates
 	 * @param path the full path to extract template variables from
 	 * @return a map, containing variable names as keys; variables values as values
diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index 269257fd60..5b5c762408 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -571,7 +571,7 @@ public abstract class StringUtils {
 
 	/**
 	 * Extract the filename from the given Java resource path,
-	 * e.g. {@code "mypath/myfile.txt" -> "myfile.txt"}.
+	 * e.g. {@code "mypath/myfile.txt" → "myfile.txt"}.
 	 * @param path the file path (may be {@code null})
 	 * @return the extracted filename, or {@code null} if none
 	 */
@@ -587,7 +587,7 @@ public abstract class StringUtils {
 
 	/**
 	 * Extract the filename extension from the given Java resource path,
-	 * e.g. "mypath/myfile.txt" -> "txt".
+	 * e.g. "mypath/myfile.txt" → "txt".
 	 * @param path the file path (may be {@code null})
 	 * @return the extracted filename extension, or {@code null} if none
 	 */
@@ -612,7 +612,7 @@ public abstract class StringUtils {
 
 	/**
 	 * Strip the filename extension from the given Java resource path,
-	 * e.g. "mypath/myfile.txt" -> "mypath/myfile".
+	 * e.g. "mypath/myfile.txt" → "mypath/myfile".
 	 * @param path the file path
 	 * @return the path with stripped filename extension
 	 */
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
index fbb17f687c..7da876615b 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
@@ -81,8 +81,8 @@ public class InvertibleComparator implements Comparator, Serializable {
 	}
 
 	/**
-	 * Invert the sort order: ascending -> descending or
-	 * descending -> ascending.
+	 * Invert the sort order: ascending → descending or
+	 * descending → ascending.
 	 */
 	public void invertOrder() {
 		this.ascending = !this.ascending;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
index e22d47de37..680e5feb74 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
@@ -111,7 +111,7 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource {
 
 	/**
 	 * Set the default auto-commit mode to expose when no target Connection
-	 * has been fetched yet (-> actual JDBC Connection default not known yet).
+	 * has been fetched yet (when the actual JDBC Connection default is not known yet).
 	 * 
    If not specified, the default gets determined by checking a target
 	 * Connection on startup. If that check fails, the default will be determined
 	 * lazily on first access of a Connection.
@@ -123,7 +123,7 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource {
 
 	/**
 	 * Set the default transaction isolation level to expose when no target Connection
-	 * has been fetched yet (-> actual JDBC Connection default not known yet).
+	 * has been fetched yet (when the actual JDBC Connection default is not known yet).
 	 * 
    This property accepts the int constant value (e.g. 8) as defined in the
 	 * {@link java.sql.Connection} interface; it is mainly intended for programmatic
 	 * use. Consider using the "defaultTransactionIsolationName" property for setting
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
index 8d09575023..659c11fae8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
@@ -48,7 +48,7 @@ import org.springframework.util.StringUtils;
  *   <property name="targetDataSource" ref="myTargetDataSource"/>
  *   <property name="username" value="myusername"/>
  *   <property name="password" value="mypassword"/>
- * </bean>
    
+ * </bean>
    * *

    If the "username" is empty, this proxy will simply delegate to the * standard {@code getConnection()} method of the target DataSource. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java index f8d2e4b9b4..1943d753c4 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java @@ -55,7 +55,7 @@ import org.springframework.util.StringUtils; * <property name="targetConnectionFactory" ref="myTargetConnectionFactory"/> * <property name="username" value="myusername"/> * <property name="password" value="mypassword"/> - * </bean> + * </bean> * *

    If the "username" is empty, this proxy will simply delegate to the standard * {@code createConnection()} method of the target ConnectionFactory. diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java index 1702070063..d85d89211f 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java @@ -33,7 +33,7 @@ import org.springframework.beans.BeanWrapper; *

    An ActivationSpec factory is effectively dependent on the concrete * JMS provider, e.g. on ActiveMQ. This default implementation simply * guesses the ActivationSpec class name from the provider's class name - * ("ActiveMQResourceAdapter" -> "ActiveMQActivationSpec" in the same package, + * ("ActiveMQResourceAdapter" → "ActiveMQActivationSpec" in the same package, * or "ActivationSpecImpl" in the same package as the ResourceAdapter class), * and populates the ActivationSpec properties as suggested by the * JCA 1.5 specification (Appendix B). Specify the 'activationSpecClass' @@ -68,7 +68,7 @@ public class DefaultJmsActivationSpecFactory extends StandardJmsActivationSpecFa /** * This implementation guesses the ActivationSpec class name from the - * provider's class name: e.g. "ActiveMQResourceAdapter" -> + * provider's class name: e.g. "ActiveMQResourceAdapter" → * "ActiveMQActivationSpec" in the same package, or a class named * "ActivationSpecImpl" in the same package as the ResourceAdapter class. */ diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java index 518736f59e..c6820c66eb 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java @@ -104,7 +104,7 @@ public class JmsMessageEndpointManager extends GenericMessageEndpointManager * {@link #setActivationSpecConfig JmsActivationSpecConfig} objects. *

    This factory is dependent on the concrete JMS provider, e.g. on ActiveMQ. * The default implementation simply guesses the ActivationSpec class name - * from the provider's class name (e.g. "ActiveMQResourceAdapter" -> + * from the provider's class name (e.g. "ActiveMQResourceAdapter" → * "ActiveMQActivationSpec" in the same package), and populates the * ActivationSpec properties as suggested by the JCA 1.5 specification * (plus a couple of autodetected vendor-specific properties). diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java index 0804bff2d0..86bd272085 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java @@ -200,7 +200,7 @@ public class MessageMappingMessageHandler extends AbstractMethodMessageHandler - * ControllerAdviceBean.findAnnotatedBeans(context).forEach(bean -> + * ControllerAdviceBean.findAnnotatedBeans(context).forEach(bean -> * messageHandler.registerMessagingAdvice(new ControllerAdviceWrapper(bean)); * * public class ControllerAdviceWrapper implements MessagingAdviceBean { diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java index 4bcd5c0f4e..a779b32726 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java @@ -461,7 +461,7 @@ public class RSocketMessageHandler extends MessageMappingMessageHandler { * RSocketMessageHandler.responder(strategies, new ClientHandler()); * * RSocketRequester.builder() - * .rsocketConnector(connector -> connector.acceptor(responder)) + * .rsocketConnector(connector -> connector.acceptor(responder)) * .connectTcp("localhost", server.address().getPort()); * * diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java index 92064f2a4c..b96d9df89b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java @@ -46,7 +46,7 @@ import org.springframework.util.ConcurrentReferenceHashMap; * <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> * ... * <property name="jpaPropertyMap"> - * <map> + * <map> * <entry key="hibernate.resource.beans.container"> * <bean class="org.springframework.orm.hibernate5.SpringBeanContainer"/> * </entry> diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java index 324e419ce0..7b0c7ddd59 100644 --- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java +++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java @@ -44,9 +44,9 @@ import org.springframework.util.Assert; * ConnectionFactory factory = … * * DatabaseClient client = DatabaseClient.create(factory); - * Mono>Actor;lt actor = client.sql("select first_name, last_name from t_actor") - * .map(row -> new Actor(row.get("first_name, String.class"), - * row.get("last_name, String.class"))) + * Mono<Actor> actor = client.sql("select first_name, last_name from t_actor") + * .map(row -> new Actor(row.get("first_name, String.class"), + * row.get("last_name, String.class"))) * .first(); * * @@ -190,7 +190,7 @@ public interface DatabaseClient extends ConnectionAccessor { * before it is executed. For example: * 

     		 * DatabaseClient client = …;
-		 * client.sql("SELECT book_id FROM book").filter(statement -> statement.fetchSize(100))
+		 * client.sql("SELECT book_id FROM book").filter(statement -> statement.fetchSize(100))
 		 *
    * @param filterFunction the filter to be added to the chain */ @@ -205,7 +205,7 @@ public interface DatabaseClient extends ConnectionAccessor { * before it is executed. For example: * 
     		 * DatabaseClient client = …;
-		 * client.sql("SELECT book_id FROM book").filter((statement, next) -> next.execute(statement.fetchSize(100)))
+		 * client.sql("SELECT book_id FROM book").filter((statement, next) -> next.execute(statement.fetchSize(100)))
 		 *
    * @param filter the filter to be added to the chain */ diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ExecuteFunction.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ExecuteFunction.java index c60888f6eb..a0bfb22d8a 100644 --- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ExecuteFunction.java +++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/ExecuteFunction.java @@ -36,7 +36,7 @@ import org.reactivestreams.Publisher; * For example: * 

      * DatabaseClient.builder()
- *		.executeFunction(statement -> statement.execute())
+ *		.executeFunction(statement -> statement.execute())
  * 		.build();
  *
    * diff --git a/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java b/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java index 10e1f39b3a..bd57ec72fc 100644 --- a/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java +++ b/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java @@ -256,7 +256,7 @@ public abstract class AbstractRequestExpectationManager implements RequestExpect /** * Invoke this for an expectation that has been matched. *

    The count of the given expectation is incremented, then it is - * either stored if remainingCount > 0 or removed otherwise. + * either stored if remainingCount > 0 or removed otherwise. */ public void update(RequestExpectation expectation) { expectation.incrementAndValidate(); diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/FluxExchangeResult.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/FluxExchangeResult.java index a8d48e9e9d..f15528a102 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/FluxExchangeResult.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/FluxExchangeResult.java @@ -80,7 +80,7 @@ public class FluxExchangeResult extends ExchangeResult { * .exchange() * .expectStatus().isOk() * .returnResult() - * .consumeWith(result -> assertThat(...); + * .consumeWith(result -> assertThat(...); * * @param consumer the consumer for {@code "this"} instance */ diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java index 878a901c22..141428f171 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java @@ -448,15 +448,15 @@ public interface WebTestClient { * 

     		 * client.get().uri("/accounts/1")
 		 *         .exchange()
-		 *         .expectBody(Person.class).consumeWith(exchangeResult -> ... ));
+		 *         .expectBody(Person.class).consumeWith(exchangeResult -> ... ));
 		 *
 		 * client.get().uri("/accounts")
 		 *         .exchange()
-		 *         .expectBodyList(Person.class).consumeWith(exchangeResult -> ... ));
+		 *         .expectBodyList(Person.class).consumeWith(exchangeResult -> ... ));
 		 *
 		 * client.get().uri("/accounts/1")
 		 *         .exchange()
-		 *         .expectBody().consumeWith(exchangeResult -> ... ));
+		 *         .expectBody().consumeWith(exchangeResult -> ... ));
 		 *
    *

    Note that the configured consumer does not apply to responses * decoded to {@code Flux} which can be consumed outside the workflow @@ -802,8 +802,8 @@ public interface WebTestClient { * 

     		 * webTestClient.get().uri("/hello").exchange()
 		 *     .expectAll(
-		 *         responseSpec -> responseSpec.expectStatus().isOk(),
-		 *         responseSpec -> responseSpec.expectBody(String.class).isEqualTo("Hello, World!")
+		 *         responseSpec -> responseSpec.expectStatus().isOk(),
+		 *         responseSpec -> responseSpec.expectBody(String.class).isEqualTo("Hello, World!")
 		 *     );
 		 *
    * @param consumers the list of {@code ResponseSpec} consumers diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java index 2f80f0cefe..2e6f567564 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java @@ -43,7 +43,7 @@ import org.springframework.util.Assert; * 
      * <bean id="myTargetConnectionFactory" class="org.springframework.jndi.JndiObjectFactoryBean">
  *   <property name="jndiName" value="java:comp/env/cci/mycf"/>
- * </bean>
+ * </bean>
  *
  * <bean id="myConnectionFactory" class="org.springframework.jca.cci.connection.ConnectionSpecConnectionFactoryAdapter">
  *   <property name="targetConnectionFactory" ref="myTargetConnectionFactory"/>
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
index 56e5cef3d8..774107b46f 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
@@ -79,7 +79,7 @@ import org.springframework.transaction.PlatformTransactionManager;
  * deriving concrete child bean definitions for specific target objects.
  * This reduces the per-bean definition effort to a minimum.
  *
- * 
    + * 
      * <bean id="baseTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
  *     abstract="true">
  *   <property name="transactionManager" ref="transactionManager"/>
diff --git a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java
index 32c718814b..1d5254e336 100644
--- a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java
+++ b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java
@@ -576,14 +576,13 @@ public final class ContentDisposition {
 		Builder filename(String filename);
 
 		/**
-		 * Set the value of the {@literal filename*} that will be encoded as
-		 * defined in the RFC 5987. Only the US-ASCII, UTF-8 and ISO-8859-1
+		 * Set the value of the {@code filename} that will be encoded as
+		 * defined in RFC 5987. Only the US-ASCII, UTF-8, and ISO-8859-1
 		 * charsets are supported.
 		 * 
    Note: Do not use this for a
-		 * {@code "multipart/form-data"} requests as per
-		 * RFC 7578, Section 4.2
-		 * and also RFC 5987 itself mentions it does not apply to multipart
-		 * requests.
+		 * {@code "multipart/form-data"} request since
+		 * RFC 7578, Section 4.2
+		 * and also RFC 5987 mention it does not apply to multipart requests.
 		 */
 		Builder filename(String filename, Charset charset);
 
diff --git a/spring-web/src/main/java/org/springframework/http/HttpStatus.java b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
index f6a9911d1a..486b524df9 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpStatus.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
@@ -285,21 +285,21 @@ public enum HttpStatus {
 	I_AM_A_TEAPOT(418, Series.CLIENT_ERROR, "I'm a teapot"),
 	/**
 	 * @deprecated See
-	 * 
+	 * 
 	 *     WebDAV Draft Changes
 	 */
 	@Deprecated
 	INSUFFICIENT_SPACE_ON_RESOURCE(419, Series.CLIENT_ERROR, "Insufficient Space On Resource"),
 	/**
 	 * @deprecated See
-	 * 
+	 * 
 	 *     WebDAV Draft Changes
 	 */
 	@Deprecated
 	METHOD_FAILURE(420, Series.CLIENT_ERROR, "Method Failure"),
 	/**
 	 * @deprecated
-	 * See 
+	 * See 
 	 *     WebDAV Draft Changes
 	 */
 	@Deprecated
diff --git a/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
index 9668698786..82e6f7be71 100644
--- a/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
@@ -42,15 +42,15 @@ public interface ClientHttpRequestInterceptor {
 	 * request and response to the next entity in the chain.
 	 * 
    A typical implementation of this method would follow the following pattern:
 	 * 
      
-	 * 
    1. Examine the {@linkplain HttpRequest request} and body
      2. 
+	 * 
    2. Examine the {@linkplain HttpRequest request} and body.
      3. 
 	 * 
    3. Optionally {@linkplain org.springframework.http.client.support.HttpRequestWrapper
 	 * wrap} the request to filter HTTP attributes.
      4. 
 	 * 
    4. Optionally modify the body of the request.
      5. 
-	 * 
    5. Either
 	 * 
        
+	 * 
      • Either
 	 * 
      • execute the request using
 	 * {@link ClientHttpRequestExecution#execute(org.springframework.http.HttpRequest, byte[])},
        • 
-	 * or
+	 * 
      • or
        • 
 	 * 
      • do not execute the request to block the execution altogether.
        • 
 	 * 
      
 	 * 
    6. Optionally wrap the response to filter HTTP attributes.
      7. 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
index dac5463039..ccd6928087 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/xml/XmlEventDecoder.java
@@ -55,7 +55,7 @@ import org.springframework.util.xml.StaxUtils;
  * 
      Given the following XML:
  *
  * 
      - * <root>
+ * <root>
  *     <child>foo</child>
  *     <child>bar</child>
  * </root>
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java
index d35f7f4d26..6f6ac69bd4 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java
@@ -38,11 +38,11 @@ import org.springframework.util.Assert;
  * 
      A usage example:
  *
  * 
      - * <bean class="org.springframework.http.converter.ObjectToStringHttpMessageConverter">
- *   <constructor-arg>
- *     <bean class="org.springframework.context.support.ConversionServiceFactoryBean"/>
- *   </constructor-arg>
- * </bean>
+ * <bean class="org.springframework.http.converter.ObjectToStringHttpMessageConverter">
+ *   <constructor-arg>
+ *     <bean class="org.springframework.context.support.ConversionServiceFactoryBean"/>
+ *   </constructor-arg>
+ * </bean>
  * 
      
  *
  * @author Dmitry Katsubo
diff --git a/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
index 88a074752a..ae0a5fdb0b 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
@@ -25,7 +25,7 @@ import org.springframework.http.MediaType;
  * that can read and write Atom feeds. Specifically, this converter can handle {@link Feed}
  * objects from the ROME project.
  *
- * 
      >NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
+ * 
      NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
  * variant of ROME, version 1.5. Please upgrade your build dependency.
  *
  * 
      By default, this converter reads and writes the media type ({@code application/atom+xml}).
diff --git a/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
index 0ecf87a703..28a5f19e78 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
@@ -25,7 +25,7 @@ import org.springframework.http.MediaType;
  * that can read and write RSS feeds. Specifically, this converter can handle {@link Channel}
  * objects from the ROME project.
  *
- * 
      >NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
+ * 
      NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
  * variant of ROME, version 1.5. Please upgrade your build dependency.
  *
  * 
      By default, this converter reads and writes the media type ({@code application/rss+xml}).
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
index 54382b30d6..8b5ff40dc2 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleHttpServerJaxWsServiceExporter.java
@@ -135,7 +135,7 @@ public class SimpleHttpServerJaxWsServiceExporter extends AbstractJaxWsServiceEx
 	 * Set the base path for context publication. Default is "/".
 	 * 
      For each context publication path, the service name will be
 	 * appended to this base address. E.g. service name "OrderService"
-	 * -> "/OrderService".
+	 * → "/OrderService".
 	 * @see javax.xml.ws.Endpoint#publish(Object)
 	 * @see javax.jws.WebService#serviceName()
 	 */
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
index 06786578f9..33441765a8 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/SimpleJaxWsServiceExporter.java
@@ -52,7 +52,7 @@ public class SimpleJaxWsServiceExporter extends AbstractJaxWsServiceExporter {
 	 * Default is "http://localhost:8080/".
 	 * 
      For each actual publication address, the service name will be
 	 * appended to this base address. E.g. service name "OrderService"
-	 * -> "http://localhost:8080/OrderService".
+	 * → "http://localhost:8080/OrderService".
 	 * @see javax.xml.ws.Endpoint#publish(String)
 	 * @see javax.jws.WebService#serviceName()
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
index da3cd91c3d..c5ab1e70d1 100644
--- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
@@ -61,8 +61,8 @@ import org.springframework.util.ReflectionUtils;
  *
  * 
        * <absolute-ordering>
- *   <name>some_web_fragment</name>
- *   <name>spring_web</name>
+ *   <name>some_web_fragment</name>
+ *   <name>spring_web</name>
  * </absolute-ordering>
  * 
      
  *
diff --git a/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java b/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
index 337f53291e..955fc624b9 100644
--- a/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/WebApplicationInitializer.java
@@ -36,15 +36,15 @@ import javax.servlet.ServletException;
  * follows:
  * 
        * <servlet>
- *   <servlet-name>dispatcher</servlet-name>
+ *   <servlet-name>dispatcher</servlet-name>
  *   <servlet-class>
  *     org.springframework.web.servlet.DispatcherServlet
  *   </servlet-class>
- *   <init-param>
- *     <param-name>contextConfigLocation</param-name>
- *     <param-value>/WEB-INF/spring/dispatcher-config.xml</param-value>
+ *   <init-param>
+ *     <param-name>contextConfigLocation</param-name>
+ *     <param-value>/WEB-INF/spring/dispatcher-config.xml</param-value>
  *   </init-param>
- *   <load-on-startup>1</load-on-startup>
+ *   <load-on-startup>1</load-on-startup>
  * </servlet>
  *
  * <servlet-mapping>
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
index 922174d830..ab16c0baa5 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
@@ -36,33 +36,33 @@ import org.springframework.web.jsf.FacesContextUtils;
  * 
      Configure this resolver in your {@code faces-config.xml} file as follows:
  *
  * 
      - * <application>
+ * <application>
  *   ...
- *   <el-resolver>org.springframework.web.jsf.el.SpringBeanFacesELResolver</el-resolver>
- * </application>
      
+ *   <el-resolver>org.springframework.web.jsf.el.SpringBeanFacesELResolver</el-resolver>
+ * </application>
      
  *
  * All your JSF expressions can then implicitly refer to the names of
  * Spring-managed service layer beans, for example in property values of
  * JSF-managed beans:
  *
  * 
      - * <managed-bean>
- *   <managed-bean-name>myJsfManagedBean</managed-bean-name>
- *   <managed-bean-class>example.MyJsfManagedBean</managed-bean-class>
- *   <managed-bean-scope>session</managed-bean-scope>
- *   <managed-property>
- *     <property-name>mySpringManagedBusinessObject</property-name>
- *     <value>#{mySpringManagedBusinessObject}</value>
- *   </managed-property>
- * </managed-bean>
      
+ * <managed-bean>
+ *   <managed-bean-name>myJsfManagedBean</managed-bean-name>
+ *   <managed-bean-class>example.MyJsfManagedBean</managed-bean-class>
+ *   <managed-bean-scope>session</managed-bean-scope>
+ *   <managed-property>
+ *     <property-name>mySpringManagedBusinessObject</property-name>
+ *     <value>#{mySpringManagedBusinessObject}</value>
+ *   </managed-property>
+ * </managed-bean>
      
  *
  * with "mySpringManagedBusinessObject" defined as Spring bean in
  * applicationContext.xml:
  *
  * 
      - * <bean id="mySpringManagedBusinessObject" class="example.MySpringManagedBusinessObject">
+ * <bean id="mySpringManagedBusinessObject" class="example.MySpringManagedBusinessObject">
  *   ...
- * </bean>
      
+ * </bean>
    
  *
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
index d729187464..fd8d4a132b 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
@@ -45,10 +45,10 @@ import org.springframework.web.jsf.FacesContextUtils;
  * 
    Configure this resolver in your {@code faces-config.xml} file as follows:
  *
  * 
    - * <application>
+ * <application>
  *   ...
- *   <el-resolver>org.springframework.web.jsf.el.WebApplicationContextFacesELResolver</el-resolver>
- * </application>
    
+ *   <el-resolver>org.springframework.web.jsf.el.WebApplicationContextFacesELResolver</el-resolver>
+ * </application>
    
  *
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-web/src/main/java/org/springframework/web/server/ServerWebExchange.java b/spring-web/src/main/java/org/springframework/web/server/ServerWebExchange.java
index d8cef56757..0062325b64 100644
--- a/spring-web/src/main/java/org/springframework/web/server/ServerWebExchange.java
+++ b/spring-web/src/main/java/org/springframework/web/server/ServerWebExchange.java
@@ -248,7 +248,7 @@ public interface ServerWebExchange {
 		 * Configure a consumer to modify the current request using a builder.
 		 * 
    Effectively this:
 		 * 
    -		 * exchange.mutate().request(builder-> builder.method(HttpMethod.PUT));
+		 * exchange.mutate().request(builder -> builder.method(HttpMethod.PUT));
 		 *
 		 * // vs...
 		 *
diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index 663dbb7566..e38fdff9b5 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -290,11 +290,11 @@ public class UrlPathHelper {
 	 * i.e. the part of the request's URL beyond the part that called the servlet,
 	 * or "" if the whole URL has been used to identify the servlet.
 	 * 
    Detects include request URL if called within a RequestDispatcher include.
-	 * 
    E.g.: servlet mapping = "/*"; request URI = "/test/a" -> "/test/a".
-	 * 
    E.g.: servlet mapping = "/"; request URI = "/test/a" -> "/test/a".
-	 * 
    E.g.: servlet mapping = "/test/*"; request URI = "/test/a" -> "/a".
-	 * 
    E.g.: servlet mapping = "/test"; request URI = "/test" -> "".
-	 * 
    E.g.: servlet mapping = "/*.test"; request URI = "/a.test" -> "".
+	 * 
    E.g.: servlet mapping = "/*"; request URI = "/test/a" → "/test/a".
+	 * 
    E.g.: servlet mapping = "/"; request URI = "/test/a" → "/test/a".
+	 * 
    E.g.: servlet mapping = "/test/*"; request URI = "/test/a" → "/a".
+	 * 
    E.g.: servlet mapping = "/test"; request URI = "/test" → "".
+	 * 
    E.g.: servlet mapping = "/*.test"; request URI = "/a.test" → "".
 	 * @param request current HTTP request
 	 * @param pathWithinApp a precomputed path within the application
 	 * @return the path within the servlet mapping, or ""
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
index fddb3389c5..c5325284a6 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
@@ -32,7 +32,7 @@ import reactor.core.publisher.Mono;
  *
  * Mono<String> bodyMono = exchangeFunction
  *     .exchange(request)
- *     .flatMap(response -> response.bodyToMono(String.class));
+ *     .flatMap(response -> response.bodyToMono(String.class));
  * 
    
  *
  * @author Arjen Poutsma
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
index 801609d68f..4d929888bd 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
@@ -522,7 +522,7 @@ public interface WebClient {
 		 * Mono<Object> entityMono = client.get()
 		 *     .uri("/persons/1")
 		 *     .accept(MediaType.APPLICATION_JSON)
-		 *     .exchangeToMono(response -> {
+		 *     .exchangeToMono(response -> {
 		 *         if (response.statusCode().equals(HttpStatus.OK)) {
 		 *             return response.bodyToMono(Person.class);
 		 *         }
@@ -554,7 +554,7 @@ public interface WebClient {
 		 * Mono<Object> entityMono = client.get()
 		 *     .uri("/persons")
 		 *     .accept(MediaType.APPLICATION_JSON)
-		 *     .exchangeToFlux(response -> {
+		 *     .exchangeToFlux(response -> {
 		 *         if (response.statusCode().equals(HttpStatus.OK)) {
 		 *             return response.bodyToFlux(Person.class);
 		 *         }
@@ -751,7 +751,7 @@ public interface WebClient {
 		 * Provide a function to map specific error status codes to an error
 		 * signal to be propagated downstream instead of the response.
 		 * 
    By default, if there are no matching status handlers, responses
-		 * with status codes >= 400 are mapped to
+		 * with status codes >= 400 are mapped to
 		 * {@link WebClientResponseException} which is created with
 		 * {@link ClientResponse#createException()}.
 		 * 
    To suppress the treatment of a status code as an error and process
@@ -766,7 +766,7 @@ public interface WebClient {
 		 *     .retrieve()
 		 *     .bodyToMono(Account.class)
 		 *     .onErrorResume(WebClientResponseException.class,
-		 *          ex -> ex.getRawStatusCode() == 404 ? Mono.empty() : Mono.error(ex));
+		 *          ex -> ex.getRawStatusCode() == 404 ? Mono.empty() : Mono.error(ex));
 		 *
    * @param statusPredicate to match responses with * @param exceptionFunction to map the response to an error signal diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java index 64d1e3ed9b..30157153d4 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java @@ -670,7 +670,7 @@ public abstract class RouterFunctions { * 
     		 * RouterFunction<ServerResponse> nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .nest(RequestPredicates.path("/user"), () ->
+		 *     .nest(RequestPredicates.path("/user"), () ->
 		 *       RouterFunctions.route()
 		 *         .GET(this::listUsers)
 		 *         .POST(this::createUser)
@@ -695,7 +695,7 @@ public abstract class RouterFunctions {
 		 * 
     		 * RouterFunction<ServerResponse> nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .nest(RequestPredicates.path("/user"), builder ->
+		 *     .nest(RequestPredicates.path("/user"), builder ->
 		 *       builder.GET(this::listUsers)
 		 *              .POST(this::createUser))
 		 *     .build();
@@ -740,7 +740,7 @@ public abstract class RouterFunctions {
 		 * 
     		 * RouterFunction<ServerResponse> nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .path("/user", builder ->
+		 *     .path("/user", builder ->
 		 *       builder.GET(this::listUsers)
 		 *              .POST(this::createUser))
 		 *     .build();
@@ -762,7 +762,7 @@ public abstract class RouterFunctions {
 		 * RouterFunction<ServerResponse> filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .filter((request, next) -> {
+		 *     .filter((request, next) -> {
 		 *       // check for authentication headers
 		 *       if (isAuthenticated(request)) {
 		 *         return next.handle(request);
@@ -788,7 +788,7 @@ public abstract class RouterFunctions {
 		 * RouterFunction<ServerResponse> filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .before(request -> {
+		 *     .before(request -> {
 		 *       log(request);
 		 *       return request;
 		 *     })
@@ -809,7 +809,7 @@ public abstract class RouterFunctions {
 		 * RouterFunction<ServerResponse> filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .after((request, response) -> {
+		 *     .after((request, response) -> {
 		 *       log(response);
 		 *       return response;
 		 *     })
@@ -829,8 +829,8 @@ public abstract class RouterFunctions {
 		 * RouterFunction<ServerResponse> filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .onError(e -> e instanceof IllegalStateException,
-		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
+		 *     .onError(e -> e instanceof IllegalStateException,
+		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
 		 *     .build();
 		 * 
    
 		 * @param predicate the type of exception to filter
@@ -850,7 +850,7 @@ public abstract class RouterFunctions {
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
 		 *     .onError(IllegalStateException.class,
-		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
+		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
 		 *     .build();
 		 * 
    
 		 * @param exceptionType the type of exception to filter
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
index 5376269f24..5b44e5a456 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
@@ -310,7 +310,7 @@ public interface ServerRequest {
 	 * public Mono<ServerResponse> myHandleMethod(ServerRequest request) {
 	 *   Instant lastModified = // application-specific calculation
 	 *	 return request.checkNotModified(lastModified)
-	 *	   .switchIfEmpty(Mono.defer(() -> {
+	 *	   .switchIfEmpty(Mono.defer(() -> {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   }));
@@ -344,7 +344,7 @@ public interface ServerRequest {
 	 * public Mono<ServerResponse> myHandleMethod(ServerRequest request) {
 	 *   String eTag = // application-specific calculation
 	 *	 return request.checkNotModified(eTag)
-	 *	   .switchIfEmpty(Mono.defer(() -> {
+	 *	   .switchIfEmpty(Mono.defer(() -> {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   }));
@@ -381,7 +381,7 @@ public interface ServerRequest {
 	 *   Instant lastModified = // application-specific calculation
 	 *   String eTag = // application-specific calculation
 	 *	 return request.checkNotModified(lastModified, eTag)
-	 *	   .switchIfEmpty(Mono.defer(() -> {
+	 *	   .switchIfEmpty(Mono.defer(() -> {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   }));
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java
index 0a31cb5aaf..fd46f78331 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java
@@ -45,7 +45,7 @@ import org.springframework.util.PatternMatchUtils;
  * specified prefix and/or suffix. Exporting an attribute that holds the
  * RequestContext to all views is explicitly supported.
  *
- * 
    Example: prefix="templates/", suffix=".ftl", viewname="test" ->
+ * 
    Example: prefix="templates/", suffix=".ftl", viewname="test" →
  * "templates/test.ftl"
  *
  * 
    As a special feature, redirect URLs can be specified via the "redirect:"
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
index 616931ebda..0703dae330 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
@@ -45,13 +45,13 @@ import reactor.core.publisher.Mono;
  * 	public Mono<Void> handle(WebSocketSession session) {
  *
  * 		Flux<WebSocketMessage> output = session.receive()
- *			.doOnNext(message -> {
+ *			.doOnNext(message -> {
  * 				// ...
  * 			})
- * 			.concatMap(message -> {
+ * 			.concatMap(message -> {
  * 				// ...
  * 			})
- * 			.map(value -> session.textMessage("Echo " + value));
+ * 			.map(value -> session.textMessage("Echo " + value));
  *
  * 		return session.send(output);
  * 	}
@@ -68,10 +68,10 @@ import reactor.core.publisher.Mono;
  * 	public Mono<Void> handle(WebSocketSession session) {
  *
  * 		Mono<Void> input = session.receive()
- *			.doOnNext(message -> {
+ *			.doOnNext(message -> {
  * 				// ...
  * 			})
- * 			.concatMap(message -> {
+ * 			.concatMap(message -> {
  * 				// ...
  * 			})
  * 			.then();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
index 5be28f3e13..869b4c6979 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
@@ -1268,7 +1268,7 @@ public class DispatcherServlet extends FrameworkServlet {
 	}
 
 	/**
-	 * No handler found -> set appropriate HTTP response status.
+	 * No handler found → set appropriate HTTP response status.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @throws Exception if preparing the response failed
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
index 9dbb3af4aa..b10775cf81 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
@@ -303,7 +303,7 @@ public class ModelAndView {
 
 	/**
 	 * Add all attributes contained in the provided Map to the model.
-	 * @param modelMap a Map of attributeName -> attributeValue pairs
+	 * @param modelMap a Map of attributeName → attributeValue pairs
 	 * @see ModelMap#addAllAttributes(Map)
 	 * @see #getModelMap()
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java
index 745bce13ae..95a59373f4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java
@@ -582,7 +582,7 @@ public abstract class RouterFunctions {
 		 * 
     		 * RouterFunction<ServerResponse> nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .nest(RequestPredicates.path("/user"), () ->
+		 *     .nest(RequestPredicates.path("/user"), () ->
 		 *       RouterFunctions.route()
 		 *         .GET(this::listUsers)
 		 *         .POST(this::createUser)
@@ -607,7 +607,7 @@ public abstract class RouterFunctions {
 		 * 
     		 * RouterFunction<ServerResponse> nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .nest(RequestPredicates.path("/user"), builder ->
+		 *     .nest(RequestPredicates.path("/user"), builder ->
 		 *       builder.GET(this::listUsers)
 		 *              .POST(this::createUser))
 		 *     .build();
@@ -652,7 +652,7 @@ public abstract class RouterFunctions {
 		 * 
     		 * RouterFunction<ServerResponse> nestedRoute =
 		 *   RouterFunctions.route()
-		 *     .path("/user", builder ->
+		 *     .path("/user", builder ->
 		 *       builder.GET(this::listUsers)
 		 *              .POST(this::createUser))
 		 *     .build();
@@ -674,7 +674,7 @@ public abstract class RouterFunctions {
 		 * RouterFunction<ServerResponse> filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .filter((request, next) -> {
+		 *     .filter((request, next) -> {
 		 *       // check for authentication headers
 		 *       if (isAuthenticated(request)) {
 		 *         return next.handle(request);
@@ -700,7 +700,7 @@ public abstract class RouterFunctions {
 		 * RouterFunction<ServerResponse> filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .before(request -> {
+		 *     .before(request -> {
 		 *       log(request);
 		 *       return request;
 		 *     })
@@ -721,7 +721,7 @@ public abstract class RouterFunctions {
 		 * RouterFunction<ServerResponse> filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .after((request, response) -> {
+		 *     .after((request, response) -> {
 		 *       log(response);
 		 *       return response;
 		 *     })
@@ -741,8 +741,8 @@ public abstract class RouterFunctions {
 		 * RouterFunction<ServerResponse> filteredRoute =
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
-		 *     .onError(e -> e instanceof IllegalStateException,
-		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
+		 *     .onError(e -> e instanceof IllegalStateException,
+		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
 		 *     .build();
 		 * 
    
 		 * @param predicate the type of exception to filter
@@ -762,7 +762,7 @@ public abstract class RouterFunctions {
 		 *   RouterFunctions.route()
 		 *     .GET("/user", this::listUsers)
 		 *     .onError(IllegalStateException.class,
-		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
+		 *       (e, request) -> ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).build())
 		 *     .build();
 		 * 
    
 		 * @param exceptionType the type of exception to filter
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
index d8f2f2d013..ce50a2466b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java
@@ -259,7 +259,7 @@ public interface ServerRequest {
 	 * public ServerResponse myHandleMethod(ServerRequest request) {
 	 *   Instant lastModified = // application-specific calculation
 	 *	 return request.checkNotModified(lastModified)
-	 *	   .orElseGet(() -> {
+	 *	   .orElseGet(() -> {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   });
@@ -293,7 +293,7 @@ public interface ServerRequest {
 	 * public ServerResponse myHandleMethod(ServerRequest request) {
 	 *   String eTag = // application-specific calculation
 	 *	 return request.checkNotModified(eTag)
-	 *	   .orElseGet(() -> {
+	 *	   .orElseGet(() -> {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   });
@@ -330,7 +330,7 @@ public interface ServerRequest {
 	 *   Instant lastModified = // application-specific calculation
 	 *   String eTag = // application-specific calculation
 	 *	 return request.checkNotModified(lastModified, eTag)
-	 *	   .orElseGet(() -> {
+	 *	   .orElseGet(() -> {
 	 *	     // further request processing, actually building content
 	 *		 return ServerResponse.ok().body(...);
 	 *	   });
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
index 2c1479ca70..0923087483 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java
@@ -267,14 +267,14 @@ public interface ServerResponse {
 	 * 
    For example:
 	 * 
     	 * public ServerResponse handleSse(ServerRequest request) {
-	 *     return ServerResponse.sse(sse -> sse.send("Hello World!"));
+	 *     return ServerResponse.sse(sse -> sse.send("Hello World!"));
 	 * }
 	 * 
    
 	 *
 	 * 
    or, to set both the id and event type:
 	 * 
     	 * public ServerResponse handleSse(ServerRequest request) {
-	 *     return ServerResponse.sse(sse -> sse
+	 *     return ServerResponse.sse(sse -> sse
 	 *         .id("42)
 	 *         .event("event")
 	 *         .send("Hello World!"));
@@ -296,14 +296,14 @@ public interface ServerResponse {
 	 * 
    For example:
 	 * 
     	 * public ServerResponse handleSse(ServerRequest request) {
-	 *     return ServerResponse.sse(sse -> sse.send("Hello World!"));
+	 *     return ServerResponse.sse(sse -> sse.send("Hello World!"));
 	 * }
 	 * 
    
 	 *
 	 * 
    or, to set both the id and event type:
 	 * 
     	 * public ServerResponse handleSse(ServerRequest request) {
-	 *     return ServerResponse.sse(sse -> sse
+	 *     return ServerResponse.sse(sse -> sse
 	 *         .id("42)
 	 *         .event("event")
 	 *         .send("Hello World!"));
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
index 542f0ae8f8..acb57f6652 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
@@ -61,7 +61,6 @@ import org.springframework.web.servlet.handler.AbstractHandlerExceptionResolver;
  * 
    This exception resolver is enabled by default in the common Spring
  * {@link org.springframework.web.servlet.DispatcherServlet}.
  *
- * 
    
  * 
  * 
  * 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
index e6bb3a73a5..2dd0aa5180 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
@@ -244,7 +244,7 @@ public abstract class WebContentGenerator extends WebApplicationObjectSupport {
 	 * 
      
 	 * 
    • seconds == -1 (default value): no generation cache-related headers
      • 
 	 * 
    • seconds == 0: "Cache-Control: no-store" will prevent caching
      • 
-	 * 
    • seconds > 0: "Cache-Control: max-age=seconds" will ask to cache content
      • 
+	 * 
    • seconds > 0: "Cache-Control: max-age=seconds" will ask to cache content
      • 
 	 * 
    
 	 * 
    For more specific needs, a custom {@link org.springframework.http.CacheControl}
 	 * should be used.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
index 6deab1ca3b..192aa56812 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
@@ -51,7 +51,7 @@ import org.springframework.web.util.WebUtils;
  * </bean>
  *
  * Every view name returned from a handler will be translated to a JSP
- * resource (for example: "myView" -> "/WEB-INF/jsp/myView.jsp"), using
+ * resource (for example: "myView" → "/WEB-INF/jsp/myView.jsp"), using
  * this view class by default.
  *
  * @author Rod Johnson
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
index c11eb4e6c9..8b36835d25 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
@@ -47,7 +47,7 @@ import org.springframework.web.servlet.support.RequestContext;
  * </bean>
  *
  * Every view name returned from a handler will be translated to a JSP
- * resource (for example: "myView" -> "/WEB-INF/jsp/myView.jsp"), using
+ * resource (for example: "myView" → "/WEB-INF/jsp/myView.jsp"), using
  * this view class to enable explicit JSTL support.
  *
  * 
    The specified MessageSource loads messages from "messages.properties" etc
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
index d25f426d9e..323f1ec93b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
@@ -49,7 +49,7 @@ import org.springframework.web.servlet.View;
  * specified prefix and/or suffix. Exporting an attribute that holds the
  * RequestContext to all views is explicitly supported.
  *
- * 
    Example: prefix="/WEB-INF/jsp/", suffix=".jsp", viewname="test" ->
+ * 
    Example: prefix="/WEB-INF/jsp/", suffix=".jsp", viewname="test" →
  * "/WEB-INF/jsp/test.jsp"
  *
  * 
    As a special feature, redirect URLs can be specified via the "redirect:"
@@ -342,14 +342,16 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements
 	}
 
 	/**
-	 * Specify whether views resolved by this resolver should add path variables to the model or not.
-	 * 
    >The default setting is to let each View decide (see {@link AbstractView#setExposePathVariables}.
-	 * However, you can use this property to override that.
+	 * Specify whether views resolved by this resolver should add path
+	 * variables to the model or not.
+	 * 
    The default setting is to let each View decide
+	 * (see {@link AbstractView#setExposePathVariables}). However, you
+	 * can use this property to override that.
 	 * @param exposePathVariables
 	 * 
      
 	 * 
    • {@code true} - all Views resolved by this resolver will expose path variables
 	 * 
    • {@code false} - no Views resolved by this resolver will expose path variables
-	 * 
    • {@code null} - individual Views can decide for themselves (this is used by the default)
+	 * 
    • {@code null} - individual Views can decide for themselves (this is used by default)
 	 * 
    
 	 * @see AbstractView#setExposePathVariables
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
index 58e0893cd2..1e17ce42aa 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
@@ -29,7 +29,7 @@ import com.rometools.rome.feed.atom.Feed;
  * Abstract superclass for Atom Feed views, using the
  * ROME package.
  *
- * 
    >NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
+ * 
    NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
  * variant of ROME, version 1.5. Please upgrade your build dependency.
  *
  * 
    Application-specific view classes will extend this class.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
index 6ea7566458..0e34fe189d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
@@ -33,7 +33,7 @@ import org.springframework.web.servlet.view.AbstractView;
  * Abstract base class for Atom and RSS Feed views, using the
  * ROME package.
  *
- * 
    >NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
+ * 
    NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
  * variant of ROME, version 1.5. Please upgrade your build dependency.
  *
  * 
    Application-specific view classes will typically extend from either
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
index aef278f791..769fbd37ad 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
@@ -31,7 +31,7 @@ import org.springframework.http.MediaType;
  * Abstract superclass for RSS Feed views, using the
  * ROME package.
  *
- * 
    >NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
+ * 
    NOTE: As of Spring 4.1, this is based on the {@code com.rometools}
  * variant of ROME, version 1.5. Please upgrade your build dependency.
  *
  * 
    Application-specific view classes will extend this class.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
index 0eb2e30f3b..577b1025d0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
@@ -42,7 +42,7 @@ import org.springframework.web.context.ServletContextAware;
  *
  * 
      * <bean id="freemarkerConfig" class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer">
- *   <property name="templateLoaderPath"><value>/WEB-INF/freemarker/</value></property>
+ *   <property name="templateLoaderPath"><value>/WEB-INF/freemarker/</value></property>
  * </bean>
    
  *
  * This bean must be included in the application context of any application
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
index dbbdf0f22e..8567055fc0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
@@ -88,17 +88,17 @@ import org.springframework.web.context.ServletContextAware;
  * 
    A typical TilesConfigurer bean definition looks as follows:
  *
  * 
    - * <bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
- *   <property name="definitions">
- *     <list>
- *       <value>/WEB-INF/defs/general.xml</value>
- *       <value>/WEB-INF/defs/widgets.xml</value>
- *       <value>/WEB-INF/defs/administrator.xml</value>
- *       <value>/WEB-INF/defs/customer.xml</value>
- *       <value>/WEB-INF/defs/templates.xml</value>
- *     </list>
- *   </property>
- * </bean>
+ * <bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
+ *   <property name="definitions">
+ *     <list>
+ *       <value>/WEB-INF/defs/general.xml</value>
+ *       <value>/WEB-INF/defs/widgets.xml</value>
+ *       <value>/WEB-INF/defs/administrator.xml</value>
+ *       <value>/WEB-INF/defs/customer.xml</value>
+ *       <value>/WEB-INF/defs/templates.xml</value>
+ *     </list>
+ *   </property>
+ * </bean>
  * 
    
  *
  * The values in the list are the actual Tiles XML files containing the definitions.
@@ -108,14 +108,14 @@ import org.springframework.web.context.ServletContextAware;
  * definitions is used to indicate locale information, for example:
  *
  * 
    - * <bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
- *   <property name="definitions">
- *     <list>
- *       <value>/WEB-INF/defs/tiles.xml</value>
- *       <value>/WEB-INF/defs/tiles_fr_FR.xml</value>
- *     </list>
- *   </property>
- * </bean>
+ * <bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
+ *   <property name="definitions">
+ *     <list>
+ *       <value>/WEB-INF/defs/tiles.xml</value>
+ *       <value>/WEB-INF/defs/tiles_fr_FR.xml</value>
+ *     </list>
+ *   </property>
+ * </bean>
  * 
    
  *
  * @author mick semb wever

    Supported Exceptions