* The 'merge' extension should be used to define how projects are merged, for example: - *
+ *
* configure(subprojects) {
* apply plugin: MergePlugin
* }
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
index b4a3d93d1d3..8a1beb8a896 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
@@ -23,7 +23,7 @@ package org.springframework.beans.factory.aspectj;
*
* The subaspect of this aspect doesn't need to include any AOP constructs.
* For example, here is a subaspect that configures the {@code PricingStrategyClient} objects.
- *
+ *
* aspect PricingStrategyDependencyInjectionAspect
* extends GenericInterfaceDrivenDependencyInjectionAspect {
* private PricingStrategy pricingStrategy;
diff --git a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
index 6606741ee4e..f89350cfe49 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
@@ -44,7 +44,7 @@ import static org.springframework.beans.PropertyDescriptorUtils.*;
* Decorator for a standard {@link BeanInfo} object, e.g. as created by
* {@link Introspector#getBeanInfo(Class)}, designed to discover and register static
* and/or non-void returning setter methods. For example:
- * {@code
+ *
* public class Bean {
* private Foo foo;
*
@@ -56,7 +56,7 @@ import static org.springframework.beans.PropertyDescriptorUtils.*;
* this.foo = foo;
* return this;
* }
- * }}
+ * }
* The standard JavaBeans {@code Introspector} will discover the {@code getFoo} read
* method, but will bypass the {@code #setFoo(Foo)} write method, because its non-void
* returning signature does not comply with the JavaBeans specification.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
index ac683c5243b..a5f40628102 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
@@ -34,7 +34,7 @@ import org.springframework.core.io.Resource;
* The mapping file should be in the following format, as specified by the
* Java Activation Framework:
*
- *
+ *
* # map text/html to .htm and .html files
* text/html html htm HTML HTM
*
diff --git a/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
index 8c0fb757bef..0b15856df32 100644
--- a/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
@@ -74,15 +74,12 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
/**
* Registers a
- *
+ *
*
*
- *
*
- * @param element
- * @param parserContext
*/
private void registerCacheAspect(Element element, ParserContext parserContext) {
if (!parserContext.getRegistry().containsBeanDefinition(CACHE_ASPECT_BEAN_NAME)) {
diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
index 7c3d8bcc114..8c1efa7bece 100644
--- a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
@@ -54,7 +54,7 @@ import org.springframework.util.Assert;
*
* Usage example:
*
- *
+ *
* GenericApplicationContext ctx = new GenericApplicationContext();
* XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(ctx);
* xmlReader.loadBeanDefinitions(new ClassPathResource("applicationContext.xml"));
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
index 260d1d48851..6d4d4bce0b9 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
@@ -31,7 +31,7 @@ import org.springframework.util.ClassUtils;
* NOTE: On JBoss 6.0, to avoid the container loading the classes before the
* application actually starts, one needs to add a WEB-INF/jboss-scanning.xml
* file to the application archive - with the following content:
- *
<scanning xmlns="urn:jboss:scanning:1.0"/>
+ * <scanning xmlns="urn:jboss:scanning:1.0"/>
*
* Thanks to Ales Justin and Marius Bogoevici for the initial prototype.
*
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
index 5a9bb616b18..25f742de17b 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
@@ -31,7 +31,7 @@ import org.springframework.aop.TargetSource;
*
*
Example:
*
- *
+ *
* <bean id="queueConnectionFactoryTarget" class="org.springframework.jndi.JndiObjectTargetSource">
* <property name="jndiName" value="JmsQueueConnectionFactory"/>
* <property name="lookupOnStartup" value="false"/>
diff --git a/spring-core/src/main/java/org/springframework/asm/Handle.java b/spring-core/src/main/java/org/springframework/asm/Handle.java
index bd82d46c10b..8c22338524a 100644
--- a/spring-core/src/main/java/org/springframework/asm/Handle.java
+++ b/spring-core/src/main/java/org/springframework/asm/Handle.java
@@ -154,7 +154,7 @@ public final class Handle {
* Returns the textual representation of this handle. The textual
* representation is:
*
- *
+ *
* owner '.' name desc ' ' '(' tag ')'
*
*
diff --git a/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java b/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
index e0c215e8c83..4dabda69599 100644
--- a/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
+++ b/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
@@ -449,7 +449,7 @@ public abstract class MethodVisitor {
* constant types, implementations of this method should check for
* unexpected constant types, like this:
*
- *
+ *
* if (cst instanceof Integer) {
* // ...
* } else if (cst instanceof Float) {
diff --git a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
index 7d8045b51ba..3ddd2942364 100644
--- a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
@@ -111,7 +111,7 @@ public abstract class GenericTypeResolver {
* method for {@code creatProxy()} and an {@code Object[]} array containing
* {@code MyService.class}, {@code resolveReturnTypeForGenericMethod()} will
* infer that the target return type is {@code MyService}.
- * {@code public static T createProxy(Class clazz)}
+ * {@code public static T createProxy(Class clazz)}
* Possible Return Values
*
* - the target return type, if it can be inferred
diff --git a/spring-core/src/main/java/org/springframework/core/env/Environment.java b/spring-core/src/main/java/org/springframework/core/env/Environment.java
index 3f9ee725e20..37e1f17b915 100644
--- a/spring-core/src/main/java/org/springframework/core/env/Environment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/Environment.java
@@ -102,7 +102,7 @@ public interface Environment extends PropertyResolver {
* explicit active profiles, whether one or more of the given profiles is included in
* the set of default profiles. If a profile begins with '!' the logic is inverted,
* i.e. the method will return true if the given profile is not active. For
- * example,
env.acceptsProfiles("p1", "!p2") will return true if profile
+ * example, env.acceptsProfiles("p1", "!p2") will return true if profile
* 'p1' is active or 'p2' is not active.
* @throws IllegalArgumentException if called with zero arguments
* @throws IllegalArgumentException if any profile is null, empty or whitespace-only
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java b/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
index 89e8b69be48..ec6dd412029 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
@@ -72,7 +72,7 @@ import org.springframework.util.StringUtils;
* Ant-style Patterns:
*
*
When the path location contains an Ant-style pattern, e.g.:
- *
+ *
* /WEB-INF/*-context.xml
* com/mycompany/**/applicationContext.xml
* file:C:/some/path/*-context.xml
@@ -143,9 +143,9 @@ import org.springframework.util.StringUtils;
*
* WARNING: Ant-style patterns with "classpath:" resources are not
* guaranteed to find matching resources if the root package to search is available
- * in multiple class path locations. This is because a resource such as
+ * in multiple class path locations. This is because a resource such as
* com/mycompany/package1/service-context.xml
- *
may be in only one location, but when a path such as
+ *
may be in only one location, but when a path such as
* classpath:com/mycompany/**/service-context.xml
*
is used to try to resolve it, the resolver will work off the (first) URL
* returned by {@code getResource("com/mycompany");}. If this base package
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 7fa4b75cf9d..0b9a65d4dcf 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -87,7 +87,7 @@ public abstract class StringUtils {
/**
* Check that the given CharSequence is neither {@code null} nor of length 0.
* Note: Will return {@code true} for a CharSequence that purely consists of whitespace.
- *
+ *
* StringUtils.hasLength(null) = false
* StringUtils.hasLength("") = false
* StringUtils.hasLength(" ") = true
@@ -116,7 +116,7 @@ public abstract class StringUtils {
* Check whether the given CharSequence has actual text.
* More specifically, returns {@code true} if the string not {@code null},
* its length is greater than 0, and it contains at least one non-whitespace character.
- *
+ *
* StringUtils.hasText(null) = false
* StringUtils.hasText("") = false
* StringUtils.hasText(" ") = false
diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionParser.java
index 913749a0f99..9f4cd288b57 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ExpressionParser.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionParser.java
@@ -29,7 +29,7 @@ public interface ExpressionParser {
/**
* Parse the expression string and return an Expression object you can use for repeated evaluation.
* Some examples:
- *
+ *
* 3 + 4
* name.firstName
*
@@ -42,7 +42,7 @@ public interface ExpressionParser {
/**
* Parse the expression string and return an Expression object you can use for repeated evaluation.
* Some examples:
- *
+ *
* 3 + 4
* name.firstName
*
diff --git a/spring-expression/src/main/java/org/springframework/expression/ParserContext.java b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
index a1ae657bc3d..0fa439dd8d8 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
@@ -29,7 +29,7 @@ public interface ParserContext {
* Whether or not the expression being parsed is a template. A template expression consists of literal text that can
* be mixed with evaluatable blocks. Some examples:
*
- *
+ *
* Some literal text
* Hello #{name.firstName}!
* #{3 + 4}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
index 3f89bed5121..c6d95a94139 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
@@ -25,7 +25,7 @@ import java.text.MessageFormat;
*
* When a message is formatted, it will have this kind of form
*
- *
+ *
* EL1004E: (pos 34): Type cannot be found 'String'
*
*
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
index 82b0a31c3b5..895a719dd5f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
@@ -24,7 +24,7 @@ import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
* A builder that provides a convenient API for constructing an embedded database.
*
* Usage example:
- *
+ *
* EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
* EmbeddedDatabase db = builder.setType(H2).addScript("schema.sql").addScript("data.sql").build();
* db.shutdown();
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
index f194ca56266..63bb1b66f93 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
@@ -41,7 +41,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* DataSources are defined as individual Spring beans with names
* "myRepeatableReadDataSource", "mySerializableDataSource" and "myDefaultDataSource":
*
- *
+ *
* <bean id="dataSourceRouter" class="org.springframework.jdbc.datasource.lookup.IsolationLevelDataSourceRouter">
* <property name="targetDataSources">
* <map>
@@ -57,7 +57,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* names for a standard JNDI lookup. This allows for a single concise definition
* without the need for separate DataSource bean definitions.
*
- *
+ *
* <bean id="dataSourceRouter" class="org.springframework.jdbc.datasource.lookup.IsolationLevelDataSourceRouter">
* <property name="targetDataSources">
* <map>
@@ -74,7 +74,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* (By default, JtaTransactionManager will only accept a default isolation level
* because of the lack of isolation level support in standard JTA itself.)
*
- *
+ *
* <bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
* <property name="allowCustomIsolationLevels" value="true"/>
* </bean>
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
index b5ac8cd7ea0..e445a51f154 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
@@ -35,7 +35,7 @@ import org.springframework.beans.factory.InitializingBean;
* definition, as the list element for the "filterDefinitions" bean property.
* For example:
*
- *
+ *
* <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
* ...
* <property name="filterDefinitions">
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java
index 79339de558f..a7faee60a09 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java
@@ -36,7 +36,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* Hibernate's own {@code SessionFactory.getCurrentSession()} method, to be
* able to detect a thread-bound Session. Typically, the code will look like as follows:
*
- *
+ *
* public void doSomeDataAccessAction() {
* Session session = this.sessionFactory.getCurrentSession();
* ...
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java
index d0308a1ee7c..eb1fc0103e8 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java
@@ -445,7 +445,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
* This configuration setting corresponds to the <class-cache> entry
* in the "hibernate.cfg.xml" configuration format.
* For example:
- *
+ *
* <property name="entityCacheStrategies">
* <props>
* <prop key="com.mycompany.Customer">read-write</prop>
@@ -465,7 +465,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
* This configuration setting corresponds to the <collection-cache> entry
* in the "hibernate.cfg.xml" configuration format.
* For example:
- *
+ *
* <property name="collectionCacheStrategies">
* <props>
* <prop key="com.mycompany.Order.items">read-write</prop>
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
index 475fe463af5..d478d6aa979 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.InitializingBean;
* definition, as list element for the "typeDefinitions" bean property.
* For example:
*
- *
+ *
* <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
* ...
* <property name="typeDefinitions">
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
index fa867d2054e..a189463f2da 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
@@ -30,7 +30,7 @@ import org.springframework.aop.support.AopUtils;
*
* Usage example:
*
- *
+ *
* <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
* ...
* <property name="entityInterceptor">
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
index 53b92dd16cf..a4e2817adae 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
@@ -81,7 +81,7 @@ import org.springframework.util.CollectionUtils;
*
* For example, in case of JPOX:
*
- *
+ *
* <bean id="persistenceManagerFactory" class="org.jpox.PersistenceManagerFactoryImpl" destroy-method="close">
* <property name="connectionFactory" ref="dataSource"/>
* <property name="nontransactionalRead" value="true"/>
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
index 4d708ddd185..2ec08718016 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
@@ -39,7 +39,7 @@ import org.springframework.web.client.support.RestGatewaySupport;
* actual running server.
*
* Below is an example:
- *
+ *
* RestTemplate restTemplate = new RestTemplate()
* MockRestServiceServer mockServer = MockRestServiceServer.createServer(restTemplate);
*
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
index b18fc3554fa..a163c967215 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
*
* Below is an example:
*
- *
+ *
* static imports:
* MockMvcBuilders.*, MockMvcRequestBuilders.*, MockMvcResultMatchers.*
*
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
index d94e8c7a156..903f4011d5a 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
@@ -31,7 +31,7 @@ public interface ResultActions {
/**
* Provide an expectation. For example:
- *
+ *
* static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
*
* mockMvc.perform(get("/person/1"))
@@ -52,7 +52,7 @@ public interface ResultActions {
/**
* Provide a general action. For example:
- *
+ *
* static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
*
* mockMvc.perform(get("/form")).andDo(print());
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
index b0ab9ca902d..1f5ee35b6ec 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
@@ -25,7 +25,7 @@ package org.springframework.test.web.servlet;
*
* Example:
*
- *
+ *
* static imports: MockMvcRequestBuilders.*, MockMvcResultHandlers.*
*
* mockMvc.perform(get("/form")).andDo(print());
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
index 98e3734d569..cc73bcc395e 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
@@ -24,7 +24,7 @@ package org.springframework.test.web.servlet;
*
* Example:
*
- *
+ *
* static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
*
* mockMvc.perform(get("/form"))
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
index bb0c109a099..409359c2c7a 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
@@ -117,14 +117,14 @@ public abstract class MockMvcRequestBuilders {
* {@link MvcResult} of the request that started async processing.
*
* Usage involves performing one request first that starts async processing:
- *
+ *
* MvcResult mvcResult = this.mockMvc.perform(get("/1"))
* .andExpect(request().asyncStarted())
* .andReturn();
*
*
* And then performing the async dispatch re-using the {@code MvcResult}:
- *
+ *
* this.mockMvc.perform(asyncDispatch(mvcResult))
* .andExpect(status().isOk())
* .andExpect(content().contentType(MediaType.APPLICATION_JSON))
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
index c71dc98b7fd..3368ffbedde 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
@@ -117,7 +117,7 @@ public class ContentResultMatchers {
/**
* Assert the response body content with a Hamcrest {@link Matcher}.
- *
+ *
* mockMvc.perform(get("/path"))
* .andExpect(content(containsString("text")));
*
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContext.java b/spring-test/src/main/java/org/springframework/test/context/TestContext.java
index 63d1de2863b..79ad66b4ec0 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestContext.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestContext.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
* agnostic of the actual testing framework in use.
*
* @author Sam Brannen
- * @author Juergen Hoeller
+ * @author Juergen Hoellereasymock
* @since 2.5
*/
public class TestContext extends AttributeAccessorSupport {
diff --git a/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java b/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
index 4f2dbab7f8c..0302686b2db 100644
--- a/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
+++ b/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
@@ -44,11 +44,11 @@ public abstract class AssertionErrors {
* values to be added to the message.
*
* For example given:
- *
+ *
* assertEquals("Response header [" + name + "]", actual, expected);
*
* The resulting message is:
- *
+ *
* Response header [Accept] expected:<application/json> but was:<text/plain>
*
*
@@ -76,7 +76,7 @@ public abstract class AssertionErrors {
/**
* Assert two objects are equal raise an {@link AssertionError} if not.
* For example:
- *
+ *
* assertEquals("Response header [" + name + "]", actual, expected);
*
*
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 5f203bd3c07..c1ef5c26dc3 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
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
* {@link #setSupportedMediaTypes supportedMediaTypes} property.
* Example of usage:
*
- *
+ *
* <bean class="org.springframework.http.converter.ObjectToStringHttpMessageConverter">
* <constructor-arg>
* <bean class="org.springframework.context.support.ConversionServiceFactoryBean"/>
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 bc0e428160f..50be04923e2 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
@@ -45,7 +45,7 @@ import org.springframework.util.Assert;
* Example usage with
* {@link org.springframework.http.converter.json.MappingJackson2HttpMessageConverter}:
*
- *
+ *
* <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
* <property name="objectMapper">
* <bean class="org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean"
@@ -58,7 +58,7 @@ import org.springframework.util.Assert;
*
* Example usage with MappingJackson2JsonView:
*
- *
+ *
* <bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
* <property name="objectMapper">
* <bean class="org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean"
@@ -78,7 +78,7 @@ import org.springframework.util.Assert;
* options), you can still use the more general methods
* {@link #setFeaturesToEnable(Object[])} and {@link #setFeaturesToDisable(Object[])}.
*
- *
+ *
* <bean class="org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean">
* <property name="featuresToEnable">
* <array>
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java
index 2f07e774806..451d11d2601 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java
@@ -36,7 +36,7 @@ import org.springframework.beans.factory.InitializingBean;
* to enable or disable Jackson features from within XML configuration.
*
* Example usage with MappingJacksonHttpMessageConverter:
- *
+ *
* <bean class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
* <property name="objectMapper">
* <bean class="org.springframework.web.context.support.JacksonObjectMapperFactoryBean"
@@ -48,7 +48,7 @@ import org.springframework.beans.factory.InitializingBean;
*
*
* Example usage with MappingJacksonJsonView:
- *
+ *
* <bean class="org.springframework.web.servlet.view.json.MappingJacksonJsonView">
* <property name="objectMapper">
* <bean class="org.springframework.web.context.support.JacksonObjectMapperFactoryBean"
@@ -63,7 +63,7 @@ import org.springframework.beans.factory.InitializingBean;
* options), you can still use the more general methods
* {@link #setFeaturesToEnable(Object[])} and {@link #setFeaturesToDisable(Object[])}.
*
- *
+ *
* <bean class="org.springframework.web.context.support.JacksonObjectMapperFactoryBean">
* <property name="featuresToEnable">
* <array>
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
index e0b9c1dbe04..0cd9462e84b 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
@@ -111,7 +111,7 @@ public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConv
/**
* Whether to use the {@link DefaultPrettyPrinter} when writing JSON.
* This is a shortcut for setting up an {@code ObjectMapper} as follows:
- *
+ *
* ObjectMapper mapper = new ObjectMapper();
* mapper.configure(SerializationFeature.INDENT_OUTPUT, true);
* converter.setObjectMapper(mapper);
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
index 0a331454046..e0a50b80818 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
@@ -109,7 +109,7 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve
/**
* Whether to use the {@link org.codehaus.jackson.util.DefaultPrettyPrinter} when writing JSON.
* This is a shortcut for setting up an {@code ObjectMapper} as follows:
- *
+ *
* ObjectMapper mapper = new ObjectMapper();
* mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
* converter.setObjectMapper(mapper);
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
index 320bb95d133..c15dc17edfd 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
@@ -321,7 +321,7 @@ public @interface RequestMapping {
* specified header is not supposed to be present in the request.
* Also supports media type wildcards (*), for headers such as Accept
* and Content-Type. For instance,
- *
+ *
* @RequestMapping(value = "/something", headers = "content-type=text/*")
*
* will match requests with a Content-Type of "text/html", "text/plain", etc.
@@ -340,7 +340,7 @@ public @interface RequestMapping {
* The format is a single media type or a sequence of media types,
* with a request only mapped if the {@code Content-Type} matches one of these media types.
* Examples:
- *
+ *
* consumes = "text/plain"
* consumes = {"text/plain", "application/*"}
*
@@ -359,7 +359,7 @@ public @interface RequestMapping {
* The format is a single media type or a sequence of media types,
* with a request only mapped if the {@code Accept} matches one of these media types.
* Examples:
- *
+ *
* produces = "text/plain"
* produces = {"text/plain", "application/*"}
*
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
index 8d02c531ed5..5ec14f0f1f9 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -79,14 +79,14 @@ import org.springframework.web.util.UriTemplate;
* {@link #getForObject(String, Class, Map)}), and are capable of substituting any {@linkplain UriTemplate URI templates}
* in that URL using either a {@code String} variable arguments array, or a {@code Map}.
* The string varargs variant expands the given template variables in order, so that
- *
+ *
* String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/bookings/{booking}", String.class, "42",
* "21");
*
* will perform a GET on {@code http://example.com/hotels/42/bookings/21}. The map variant expands the template based
* on variable name, and is therefore more useful when using many variables, or when a single variable is used multiple
* times. For example:
- *
+ *
* Map<String, String> vars = Collections.singletonMap("hotel", "42");
* String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/rooms/{hotel}", String.class, vars);
*
@@ -95,7 +95,7 @@ import org.springframework.web.util.UriTemplate;
* expanded URI multiple times.
*
* Furthermore, the {@code String}-argument methods assume that the URL String is unencoded. This means that
- *
+ *
* restTemplate.getForObject("http://example.com/hotel list");
*
* will perform a GET on {@code http://example.com/hotel%20list}. As a result, any URL passed that is already encoded
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
index e479057927d..3a665593dc1 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
@@ -29,7 +29,7 @@ import org.springframework.web.context.WebApplicationContext;
* Configure this handler proxy in your {@code faces-config.xml} file
* as follows:
*
- *
+ *
* <application>
* ...
* <navigation-handler>
@@ -43,7 +43,7 @@ import org.springframework.web.context.WebApplicationContext;
* Spring bean definition like the following. However, all of Spring's bean configuration
* power can be applied to such a bean, in particular all flavors of dependency injection.
*
- *
+ *
* <bean name="jsfNavigationHandler" class="mypackage.MyNavigationHandler">
* <property name="myProperty" ref="myOtherBean"/>
* </bean>
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 0edc7b4b083..6d6c19d2db9 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
@@ -30,7 +30,7 @@ import org.springframework.web.jsf.FacesContextUtils;
*
* Configure this resolver in your {@code faces-config.xml} file as follows:
*
- *
+ *
* <application>
* ...
* <el-resolver>org.springframework.web.jsf.el.SpringBeanFacesELResolver</el-resolver>
@@ -40,7 +40,7 @@ import org.springframework.web.jsf.FacesContextUtils;
* 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>
@@ -54,7 +54,7 @@ import org.springframework.web.jsf.FacesContextUtils;
* with "mySpringManagedBusinessObject" defined as Spring bean in
* applicationContext.xml:
*
- *
+ *
* <bean id="mySpringManagedBusinessObject" class="example.MySpringManagedBusinessObject">
* ...
* </bean>
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 454598405fe..faab2f4216d 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
@@ -42,7 +42,7 @@ import org.springframework.web.jsf.FacesContextUtils;
*
* Configure this resolver in your {@code faces-config.xml} file as follows:
*
- *
+ *
* <application>
* ...
* <el-resolver>org.springframework.web.jsf.el.WebApplicationContextFacesELResolver</el-resolver>
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
index eadf6839c39..13968ae813e 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
@@ -150,7 +150,7 @@ public class UriComponentsBuilder {
* contains {@code '='} or {@code '&'} characters, the query string cannot
* be parsed unambiguously. Such values should be substituted for URI
* variables to enable correct parsing:
- *
+ *
* String uriString = "/hotels/42?filter={value}";
* UriComponentsBuilder.fromUriString(uriString).buildAndExpand("hot&cold");
*
@@ -210,7 +210,7 @@ public class UriComponentsBuilder {
* contains {@code '='} or {@code '&'} characters, the query string cannot
* be parsed unambiguously. Such values should be substituted for URI
* variables to enable correct parsing:
- *
+ *
* String uriString = "/hotels/42?filter={value}";
* UriComponentsBuilder.fromUriString(uriString).buildAndExpand("hot&cold");
*
@@ -448,7 +448,7 @@ public class UriComponentsBuilder {
* contains {@code '='} or {@code '&'} characters, the query string cannot
* be parsed unambiguously. Such values should be substituted for URI
* variables to enable correct parsing:
- *
+ *
* String uriString = "/hotels/42?filter={value}";
* UriComponentsBuilder.fromUriString(uriString).buildAndExpand("hot&cold");
*
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 79951a64c79..3a3088e7e62 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
@@ -73,7 +73,7 @@ public abstract class UriUtils {
* Note that this method does not attempt to encode "=" and "&"
* characters in query parameter names and query parameter values because they cannot
* be parsed in a reliable way. Instead use:
- *
+ *
* UriComponents uriComponents = UriComponentsBuilder.fromUri("/path?name={value}").buildAndExpand("a=b");
* String encodedUri = uriComponents.encode().toUriString();
*
@@ -114,7 +114,7 @@ public abstract class UriUtils {
* Note that this method does not attempt to encode "=" and "&"
* characters in query parameter names and query parameter values because they cannot
* be parsed in a reliable way. Instead use:
- *
+ *
* UriComponents uriComponents = UriComponentsBuilder.fromHttpUrl("/path?name={value}").buildAndExpand("a=b");
* String encodedUri = uriComponents.encode().toUriString();
*
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
index 2957d73aed6..c4691860d8c 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
@@ -31,7 +31,7 @@ import org.springframework.util.CollectionUtils;
* interface to map from the current PortletMode to request handler beans.
*
* The bean configuration for this mapping will look something like this:
- *
+ *
* <bean id="portletModeHandlerMapping" class="org.springframework.web.portlet.handler.PortletModeHandlerMapping">
* <property name="portletModeMap">
* <map>
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
index f8a1df3d204..a76eb221cfd 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
@@ -61,7 +61,7 @@ import org.springframework.web.portlet.util.PortletUtils;
*
* Example:
*
- *
<bean id="wrappingController" class="org.springframework.web.portlet.mvc.PortletWrappingController">
+ * <bean id="wrappingController" class="org.springframework.web.portlet.mvc.PortletWrappingController">
* <property name="portletClass">
* <value>org.springframework.web.portlet.sample.HelloWorldPortlet</value>
* </property>
diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
index 5b43420b195..8788236168b 100644
--- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
+++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
@@ -83,7 +83,7 @@ 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>
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
index 73607f6d7fe..2574e1290f8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
@@ -38,7 +38,7 @@ import org.springframework.web.util.WebUtils;
* Example: web.xml, mapping all "/myservlet" requests to a Spring dispatcher.
* Also defines a custom "myServlet", but without servlet mapping.
*
- *
+ *
* <servlet>
* <servlet-name>myServlet</servlet-name>
* <servlet-class>mypackage.TestServlet</servlet-class>
@@ -59,7 +59,7 @@ import org.springframework.web.util.WebUtils;
* configured HandlerInterceptor chain (e.g. an OpenSessionInViewInterceptor).
* From the servlet point of view, everything will work as usual.
*
- *
+ *
* <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
* <property name="interceptors">
* <list>
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
index 10dffda157b..cdc3f8fddfc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
@@ -48,7 +48,7 @@ import org.springframework.web.servlet.ModelAndView;
* through the configured HandlerInterceptor chain (e.g. an OpenSessionInViewInterceptor).
* From the Struts point of view, everything will work as usual.
*
- *
+ *
* <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
* <property name="interceptors">
* <list>
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
index d23b050cbc9..f3f2e8b12ea 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
@@ -36,7 +36,7 @@ import org.springframework.web.servlet.FlashMap;
* automatically propagated to the "output" FlashMap of the current request.
*
* Example usage in an {@code @Controller}:
- *
+ *
* @RequestMapping(value = "/accounts", method = RequestMethod.POST)
* public String handle(Account account, BindingResult result, RedirectAttributes redirectAttrs) {
* if (result.hasErrors()) {
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 d702e14f283..a71e6cb0da8 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
@@ -63,7 +63,7 @@ import org.springframework.web.util.UriUtils;
* is 'false'. When setting the URL value into a variable, escaping is not recommended.
*
* Example usage:
- *
<spring:url value="/url/path/{variableName}">
+ * <spring:url value="/url/path/{variableName}">
* <spring:param name="variableName" value="more than JSTL c:url" />
* </spring:url>
* Results in:
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 3769cecf357..5cd17b19345 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
@@ -37,7 +37,7 @@ import org.springframework.web.context.ServletContextAware;
* The simplest way to use this class is to specify just a "templateLoaderPath";
* you do not need any further configuration then.
*
- *
+ *
* <bean id="freemarkerConfig" class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer">
* <property name="templateLoaderPath"><value>/WEB-INF/freemarker/</value></property>
* </bean>
@@ -58,7 +58,7 @@ import org.springframework.web.context.ServletContextAware;
* reference the "spring.ftl" macro library (contained in this package and thus
* in spring.jar) like this:
*
- *
+ *
* <#import "/spring.ftl" as spring/>
* <@spring.bind "person.age"/>
* age is ${spring.status.value}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java
index 00bb4439fb7..b2a1b3ef0d0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java
@@ -37,7 +37,7 @@ import org.springframework.util.CollectionUtils;
* view class. For example you might add the following code to your
* {@code Controller}:
*
- *
+ *
* Map model = new HashMap();
* model.put("format", "pdf");
*
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
index 115935fa899..67a7482840f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
@@ -137,7 +137,7 @@ public class MappingJackson2JsonView extends AbstractView {
/**
* Whether to use the default pretty printer when writing JSON.
* This is a shortcut for setting up an {@code ObjectMapper} as follows:
- *
+ *
* ObjectMapper mapper = new ObjectMapper();
* mapper.configure(SerializationFeature.INDENT_OUTPUT, true);
*
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
index baa727d8c03..53cec265e34 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
@@ -137,7 +137,7 @@ public class MappingJacksonJsonView extends AbstractView {
/**
* Whether to use the default pretty printer when writing JSON.
* This is a shortcut for setting up an {@code ObjectMapper} as follows:
- *
+ *
* ObjectMapper mapper = new ObjectMapper();
* mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
*
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
index 050aad09cf5..05e03544558 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
@@ -91,7 +91,7 @@ import org.springframework.web.context.ServletContextAware;
*
* A typical TilesConfigurer bean definition looks as follows:
*
- *
+ *
* <bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
* <property name="definitions">
* <list>
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java
index c3e119b1f42..db15862b970 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java
@@ -74,7 +74,7 @@ public interface WebSocketSession {
/**
* Close the WebSocket connection with status 1000, i.e. equivalent to:
- *
+ *
* session.close(CloseStatus.NORMAL);
*
*/