diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java index 8c49d4ff7d..297ab0cd1f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java @@ -61,7 +61,7 @@ public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator { * FactoryBean will get proxied. This default behavior applies as of Spring 2.0. * If you intend to proxy a FactoryBean instance itself (a rare use case, but * Spring 1.2's default behavior), specify the bean name of the FactoryBean - * including the factory-bean prefix "&": e.g. "&myFactoryBean". + * including the factory-bean prefix "&": e.g. "&myFactoryBean". * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.BeanFactory#FACTORY_BEAN_PREFIX */ diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java index da1ebc58c5..9ef7aa3799 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java @@ -75,18 +75,18 @@ import org.springframework.util.StringUtils; * * def reader = new GroovyBeanDefinitionReader(myApplicationContext) * reader.beans { - * dataSource(BasicDataSource) { // <--- invokeMethod + * dataSource(BasicDataSource) { // <--- invokeMethod * driverClassName = "org.hsqldb.jdbcDriver" * url = "jdbc:hsqldb:mem:grailsDB" - * username = "sa" // <-- setProperty + * username = "sa" // <-- setProperty * password = "" * settings = [mynew:"setting"] * } * sessionFactory(SessionFactory) { - * dataSource = dataSource // <-- getProperty for retrieving references + * dataSource = dataSource // <-- getProperty for retrieving references * } * myService(MyService) { - * nestedBean = { AnotherBean bean -> // <-- setProperty with closure for nested bean + * nestedBean = { AnotherBean bean -> // <-- setProperty with closure for nested bean * dataSource = dataSource * } * } @@ -113,7 +113,7 @@ import org.springframework.util.StringUtils; * dataSource = dataSource * } * myService(MyService) { - * nestedBean = { AnotherBean bean -> + * nestedBean = { AnotherBean bean -> * dataSource = dataSource * } * } diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java index 725999d89c..39856654f9 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -129,7 +129,7 @@ import org.springframework.stereotype.Component; * @Configuration * public class AppConfig { * - * @Autowired Environment env; + * @Autowired Environment env; * * @Bean * public MyBean myBean() { @@ -149,7 +149,7 @@ import org.springframework.stereotype.Component; * @PropertySource("classpath:/com/acme/app.properties") * public class AppConfig { * - * @Inject Environment env; + * @Inject Environment env; * * @Bean * public MyBean myBean() { @@ -170,7 +170,7 @@ import org.springframework.stereotype.Component; * @PropertySource("classpath:/com/acme/app.properties") * public class AppConfig { * - * @Value("${bean.name}") String beanName; + * @Value("${bean.name}") String beanName; * * @Bean * public MyBean myBean() { @@ -297,7 +297,7 @@ import org.springframework.stereotype.Component; * @ImportResource("classpath:/com/acme/database-config.xml") * public class AppConfig { * - * @Inject DataSource dataSource; // from XML + * @Inject DataSource dataSource; // from XML * * @Bean * public MyBean myBean() { diff --git a/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java b/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java index 8e26463406..62cb6404c4 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -98,7 +98,7 @@ import java.lang.annotation.Target; * @EnableAspectJAutoProxy * public class AppConfig { * - * // no explicit @Bean definitions required + * // no explicit @Bean definitions required * } * * Note: {@code @EnableAspectJAutoProxy} applies to its local application context only, diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java index 8e1f74ba45..4f4c070173 100644 --- a/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,18 +46,18 @@ import org.springframework.lang.Nullable; * * def context = new GenericGroovyApplicationContext() * context.reader.beans { - * dataSource(BasicDataSource) { // <--- invokeMethod + * dataSource(BasicDataSource) { // <--- invokeMethod * driverClassName = "org.hsqldb.jdbcDriver" * url = "jdbc:hsqldb:mem:grailsDB" - * username = "sa" // <-- setProperty + * username = "sa" // <-- setProperty * password = "" * settings = [mynew:"setting"] * } * sessionFactory(SessionFactory) { - * dataSource = dataSource // <-- getProperty for retrieving references + * dataSource = dataSource // <-- getProperty for retrieving references * } * myService(MyService) { - * nestedBean = { AnotherBean bean -> // <-- setProperty with closure for nested bean + * nestedBean = { AnotherBean bean -> // <-- setProperty with closure for nested bean * dataSource = dataSource * } * } @@ -84,7 +84,7 @@ import org.springframework.lang.Nullable; * dataSource = dataSource * } * myService(MyService) { - * nestedBean = { AnotherBean bean -> + * nestedBean = { AnotherBean bean -> * dataSource = dataSource * } * } 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 e7f78f83f6..6b6ff96af1 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -229,7 +229,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased * for a Locale, after merging all specified resource bundles. * Either fetches the holder from the cache or freshly loads it. *

Only used when caching resource bundle contents forever, i.e. - * with cacheSeconds < 0. Therefore, merged properties are always + * with cacheSeconds < 0. Therefore, merged properties are always * cached forever. */ protected PropertiesHolder getMergedProperties(Locale locale) { diff --git a/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java b/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java index 805a9828c4..3ffbba9ef0 100644 --- a/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java +++ b/spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java @@ -37,7 +37,7 @@ import org.springframework.util.StringValueResolver; * as {@code DefaultConversionService} exposes its own * {@link DefaultConversionService#addDefaultConverters addDefaultConverters} method. * - *

Automatically registers formatters for JSR-354 Money & Currency, JSR-310 Date-Time + *

Automatically registers formatters for JSR-354 Money & Currency, JSR-310 Date-Time * and/or Joda-Time 2.x, depending on the presence of the corresponding API on the classpath. * * @author Chris Beams @@ -100,7 +100,7 @@ public class DefaultFormattingConversionService extends FormattingConversionServ /** * Add formatters appropriate for most environments: including number formatters, - * JSR-354 Money & Currency formatters, JSR-310 Date-Time and/or Joda-Time formatters, + * JSR-354 Money & Currency formatters, JSR-310 Date-Time and/or Joda-Time formatters, * depending on the presence of the corresponding API on the classpath. * @param formatterRegistry the service to register default formatters with */ diff --git a/spring-context/src/main/java/org/springframework/validation/Validator.java b/spring-context/src/main/java/org/springframework/validation/Validator.java index d95b054872..b67b6d5d8b 100644 --- a/spring-context/src/main/java/org/springframework/validation/Validator.java +++ b/spring-context/src/main/java/org/springframework/validation/Validator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ package org.springframework.validation; * wholly of whitespace), and that any password that is present is * at least {@code 'MINIMUM_PASSWORD_LENGTH'} characters in length. * - * 

 public class UserLoginValidator implements Validator {
+ * 
public class UserLoginValidator implements Validator {
  *
  *    private static final int MINIMUM_PASSWORD_LENGTH = 6;
  *
@@ -46,7 +46,7 @@ package org.springframework.validation;
  *       ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "field.required");
  *       UserLogin login = (UserLogin) target;
  *       if (login.getPassword() != null
- *             && login.getPassword().trim().length() < MINIMUM_PASSWORD_LENGTH) {
+ *             && login.getPassword().trim().length() < MINIMUM_PASSWORD_LENGTH) {
  *          errors.rejectValue("password", "field.min.length",
  *                new Object[]{Integer.valueOf(MINIMUM_PASSWORD_LENGTH)},
  *                "The password must be at least [" + MINIMUM_PASSWORD_LENGTH + "] characters in length.");
diff --git a/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
index 321629954d..a7ee178a3e 100644
--- a/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,7 +110,7 @@ import org.springframework.util.StringUtils;
  * evaluate true:
  *
  * 
- * CommandLinePropertySource ps = ...
+ * CommandLinePropertySource<?> ps = ...
  * assert ps.containsProperty("o1") == true;
  * assert ps.containsProperty("o2") == true;
  * assert ps.containsProperty("o3") == false;
@@ -149,7 +149,7 @@ import org.springframework.util.StringUtils;
  * will evaluate true:
  *
  * 
- * CommandLinePropertySource ps = ...
+ * CommandLinePropertySource<?> ps = ...
  * assert ps.containsProperty("o1") == true;
  * assert ps.containsProperty("o2") == true;
  * assert ps.containsProperty("nonOptionArgs") == true;
diff --git a/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
index 64f67e3321..22353e0989 100644
--- a/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ import org.springframework.util.StringUtils;
  *     parser.accepts("option1");
  *     parser.accepts("option2").withRequiredArg();
  *     OptionSet options = parser.parse(args);
- *     PropertySource ps = new JOptCommandLinePropertySource(options);
+ *     PropertySource<?> ps = new JOptCommandLinePropertySource(options);
  *     // ...
  * }

  *
diff --git a/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java
index a4a25397ac..c4f34a13e5 100644
--- a/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ import org.springframework.util.StringUtils;
  * 
Typical usage

  * 
  * public static void main(String[] args) {
- *     PropertySource ps = new SimpleCommandLinePropertySource(args);
+ *     PropertySource<?> ps = new SimpleCommandLinePropertySource(args);
  *     // ...
  * }

  *
diff --git a/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java b/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java
index 79c4a3bca0..e4d97367d1 100644
--- a/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java
+++ b/spring-jms/src/main/java/org/springframework/jms/annotation/EnableJms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,7 +138,7 @@ import org.springframework.context.annotation.Import;
  *     }
  *
  *     @Bean
- *     public JmsListenerContainerFactory myJmsListenerContainerFactory() {
+ *     public JmsListenerContainerFactory<?> myJmsListenerContainerFactory() {
  *         // factory settings
  *     }
  *
@@ -184,7 +184,7 @@ import org.springframework.context.annotation.Import;
  *     }
  *
  *     @Bean
- *     public JmsListenerEndpointRegistry myJmsListenerEndpointRegistry() {
+ *     public JmsListenerEndpointRegistry<?> myJmsListenerEndpointRegistry() {
  *         // registry configuration
  *     }
  *
@@ -246,7 +246,7 @@ import org.springframework.context.annotation.Import;
  *     }
  *
  *     @Bean
- *     public JmsListenerContainerFactory anotherJmsListenerContainerFactory() {
+ *     public JmsListenerContainerFactory<?> anotherJmsListenerContainerFactory() {
  *         // ...
  *     }
  *
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/AbstractMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/AbstractMessageCondition.java
index 835020e90f..93bb26fcac 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/AbstractMessageCondition.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/AbstractMessageCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ public abstract class AbstractMessageCondition
+	 * 
 	 *     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/converter/json/Jackson2ObjectMapperBuilder.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
index 415113ff05..bdd1e57728 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -83,7 +83,7 @@ import org.springframework.util.xml.StaxUtils;
  * 
  • jackson-datatype-jdk8:
  * support for other Java 8 types like {@link java.util.Optional}
    • 
  * 
  • jackson-datatype-jsr310:
- * support for Java 8 Date & Time API types
    • 
+ * support for Java 8 Date & Time API types
  * 
  • jackson-datatype-joda:
  * support for Joda-Time types
    • 
  * 
  • jackson-module-kotlin:
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
index 57d3e63e18..376e6b2773 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,54 +62,54 @@ import org.springframework.lang.Nullable;
  * 
    Example usage with
  * {@link MappingJackson2HttpMessageConverter}:
  *
- * 
    - * <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
- *   <property name="objectMapper">
- *     <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
+ * 
    {@code
+ * 
+ *   
+ *     
- *   </property>
- * </bean>
- * 
    
+ *   
+ * 
+ * }
    
  *
  * 
    Example usage with MappingJackson2JsonView:
  *
- * 
    - * <bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
- *   <property name="objectMapper">
- *     <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
+ * 
    {@code
+ * 
+ *   
+ *     
- *       <property name="serializers">
- *         <array>
- *           <bean class="org.mycompany.MyCustomSerializer" />
- *         </array>
- *       </property>
- *     </bean>
- *   </property>
- * </bean>
- * 
    
+ *       
+ *         
+ *           
+ *         
+ *       
+ *     
+ *   
+ * 
+ * }
    
  *
  * 
    In case there are no specific setters provided (for some rarely used options),
  * you can still use the more general methods  {@link #setFeaturesToEnable} and
  * {@link #setFeaturesToDisable}.
  *
- * 
    - * <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
- *   <property name="featuresToEnable">
- *     <array>
- *       <util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE"/>
- *       <util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.CLOSE_CLOSEABLE"/>
- *     </array>
- *   </property>
- *   <property name="featuresToDisable">
- *     <array>
- *       <util:constant static-field="com.fasterxml.jackson.databind.MapperFeature.USE_ANNOTATIONS"/>
- *     </array>
- *   </property>
- * </bean>
- * 
    
+ * 
    {@code
+ * 
+ *   
+ *     
+ *       
+ *       
+ *     
+ *   
+ *   
+ *     
+ *       
+ *     
+ *   
+ * 
+ * }
    
  *
  * 
    It also automatically registers the following well-known modules if they are
  * detected on the classpath:
@@ -119,7 +119,7 @@ import org.springframework.lang.Nullable;
  * 
  • jackson-datatype-jdk8:
  * support for other Java 8 types like {@link java.util.Optional}
    • 
  * 
  • jackson-datatype-jsr310:
- * support for Java 8 Date & Time API types
    • 
+ * support for Java 8 Date & Time API types
  * 
  • jackson-datatype-joda:
  * support for Joda-Time types
    • 
  * 
  • jackson-module-kotlin:
@@ -129,11 +129,11 @@ import org.springframework.lang.Nullable;
  * 
    In case you want to configure Jackson's {@link ObjectMapper} with a custom {@link Module},
  * you can register one or more such Modules by class name via {@link #setModulesToInstall}:
  *
- * 
    - * <bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
- *   <property name="modulesToInstall" value="myapp.jackson.MySampleModule,myapp.jackson.MyOtherModule"/>
- * </bean
- * 
    
+ * 
    {@code
+ * 
+ *   
+ * 
  *
  * 
    Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
index 3cac0b07bb..07a200dc20 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public abstract class HtmlUtils {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * 
    Handles complete character set defined in HTML 4.01 recommendation.
+	 * 
    Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * 
    Escapes all special characters to their corresponding
 	 * entity reference (e.g. {@code <}).
 	 * 
    Reference:
@@ -65,7 +65,7 @@ public abstract class HtmlUtils {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * 
    Handles complete character set defined in HTML 4.01 recommendation.
+	 * 
    Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * 
    Escapes all special characters to their corresponding
 	 * entity reference (e.g. {@code <}) at least as required by the
 	 * specified encoding. In other words, if a special character does
@@ -98,9 +98,9 @@ public abstract class HtmlUtils {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * 
    Handles complete character set defined in HTML 4.01 recommendation.
+	 * 
    Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * 
    Escapes all special characters to their corresponding numeric
-	 * reference in decimal format (&#Decimal;).
+	 * reference in decimal format (&#Decimal;).
 	 * 
    Reference:
 	 * 
 	 * https://www.w3.org/TR/html4/sgml/entities.html
@@ -114,9 +114,9 @@ public abstract class HtmlUtils {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * 
    Handles complete character set defined in HTML 4.01 recommendation.
+	 * 
    Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * 
    Escapes all special characters to their corresponding numeric
-	 * reference in decimal format (&#Decimal;) at least as required by the
+	 * reference in decimal format (&#Decimal;) at least as required by the
 	 * specified encoding. In other words, if a special character does
 	 * not have to be escaped for the given encoding, it may not be.
 	 * 
    Reference:
@@ -148,9 +148,9 @@ public abstract class HtmlUtils {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * 
    Handles complete character set defined in HTML 4.01 recommendation.
+	 * 
    Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * 
    Escapes all special characters to their corresponding numeric
-	 * reference in hex format (&#xHex;).
+	 * reference in hex format (&#xHex;).
 	 * 
    Reference:
 	 * 
 	 * https://www.w3.org/TR/html4/sgml/entities.html
@@ -164,9 +164,9 @@ public abstract class HtmlUtils {
 
 	/**
 	 * Turn special characters into HTML character references.
-	 * 
    Handles complete character set defined in HTML 4.01 recommendation.
+	 * 
    Handles the complete character set defined in the HTML 4.01 recommendation.
 	 * 
    Escapes all special characters to their corresponding numeric
-	 * reference in hex format (&#xHex;) at least as required by the
+	 * reference in hex format (&#xHex;) at least as required by the
 	 * specified encoding. In other words, if a special character does
 	 * not have to be escaped for the given encoding, it may not be.
 	 * 
    Reference:
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
index 1abf615c8b..770c6ad749 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,7 +92,7 @@ public class UriTemplate implements Serializable {
 	 * UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
 	 * Map<String, String> uriVariables = new HashMap<String, String>();
 	 * uriVariables.put("booking", "42");
-	 * uriVariables.put("hotel", "Rest & Relax");
+	 * uriVariables.put("hotel", "Rest & Relax");
 	 * System.out.println(template.expand(uriVariables));
 	 * 
    
 	 * will print: 
    {@code https://example.com/hotels/Rest%20%26%20Relax/bookings/42}
    
@@ -113,7 +113,7 @@ public class UriTemplate implements Serializable {
 	 * 
    Example:
 	 * 
     	 * UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
-	 * System.out.println(template.expand("Rest & Relax", 42));
+	 * System.out.println(template.expand("Rest & Relax", 42));
 	 * 
    
 	 * will print: 
    {@code https://example.com/hotels/Rest%20%26%20Relax/bookings/42}
    
 	 * @param uriVariableValues the array of URI variables
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
index 4697b3affc..a67be402e5 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
@@ -246,15 +246,15 @@ public abstract class UriUtils {
 	 * Encode the query parameters from the given {@code MultiValueMap} with UTF-8.
 	 * 
    This can be used with {@link UriComponentsBuilder#queryParams(MultiValueMap)}
 	 * when building a URI from an already encoded template.
-	 * 
    -	 * MultiValueMap<String, String> params = new LinkedMultiValueMap<>(2);
+	 * 
    {@code
+	 * MultiValueMap params = new LinkedMultiValueMap<>(2);
 	 * // add to params...
 	 *
 	 * ServletUriComponentsBuilder.fromCurrentRequest()
 	 *         .queryParams(UriUtils.encodeQueryParams(params))
 	 *         .build(true)
 	 *         .toUriString();
-	 * 
    
+	 * }
    
 	 * @param params the parameters to encode
 	 * @return a new {@code MultiValueMap} with the encoded names and values
 	 * @since 5.2.3
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java
index 003f47caa2..afaf28433e 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import org.springframework.web.server.ServerWebExchange;
 
 /**
  * Implements the {@link RequestCondition} contract by delegating to multiple
- * {@code RequestCondition} types and using a logical conjunction (' && ') to
+ * {@code RequestCondition} types and using a logical conjunction ({@code ' && '}) to
  * ensure all conditions match a given request.
  *
  * 
    When {@code CompositeRequestCondition} instances are combined or compared
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java
index 229b610b84..8a785dcb0f 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import org.springframework.web.cors.reactive.CorsUtils;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
- * A logical conjunction (' && ') request condition that matches a request against
+ * A logical conjunction ({@code ' && '}) request condition that matches a request against
  * a set of header expressions with syntax defined in {@link RequestMapping#headers()}.
  *
  * 
    Expressions passed to the constructor with header names 'Accept' or
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java
index 9b1bc9f904..81ff4416ef 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
- * A logical conjunction (' && ') request condition that matches a request against
+ * A logical conjunction ({@code ' && '}) request condition that matches a request against
  * a set parameter expressions with syntax defined in {@link RequestMapping#params()}.
  *
  * @author Rossen Stoyanchev
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
index 5857fdc5eb..d2bf8da0ac 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import org.springframework.util.ObjectUtils;
 
 /**
  * Implements the {@link RequestCondition} contract by delegating to multiple
- * {@code RequestCondition} types and using a logical conjunction (' && ') to
+ * {@code RequestCondition} types and using a logical conjunction ({@code ' && '}) to
  * ensure all conditions match a given request.
  *
  * 
    When {@code CompositeRequestCondition} instances are combined or compared
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
index e3f1773318..2f7fac423f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.cors.CorsUtils;
 
 /**
- * A logical conjunction (' && ') request condition that matches a request against
+ * A logical conjunction ({@code ' && '}) request condition that matches a request against
  * a set of header expressions with syntax defined in {@link RequestMapping#headers()}.
  *
  * 
    Expressions passed to the constructor with header names 'Accept' or
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
index f06f363aa2..ead4ec3d04 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.util.WebUtils;
 
 /**
- * A logical conjunction (' && ') request condition that matches a request against
+ * A logical conjunction ({@code ' && '}) request condition that matches a request against
  * a set parameter expressions with syntax defined in {@link RequestMapping#params()}.
  *
  * @author Arjen Poutsma
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
index f6b2bf26c6..db1ca29c5c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
@@ -413,7 +413,7 @@ public class MvcUriComponentsBuilder {
 	 * A JSP can prepare a URL to the controller method as follows:
 	 *
 	 * 
    -	 * <%@ taglib uri="http://www.springframework.org/tags" prefix="s" %>
+	 * <%@ taglib uri="http://www.springframework.org/tags" prefix="s" %>
 	 *
 	 * <a href="${s:mvcUrl('PC#getPerson').arg(0,"123").build()}">Get Person</a>
 	 * 
    
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
index 079b321484..9b0043b363 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
@@ -313,7 +313,7 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
 	 * @param usedParams set of parameter names that have been applied as
 	 * template params
 	 * @param includeQueryStringDelimiter true if the query string should start
-	 * with a '?' instead of '&'
+	 * with a '?' instead of '&'
 	 * @return the query string
 	 */
 	protected String createQueryString(List params, Set usedParams, boolean includeQueryStringDelimiter)