Merge branch '5.3.x'

Author: sbrannen

spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java

@@ -115,7 +115,7 @@ public final ClientHttpResponse execute() throws IOException {
 	 * The default implementation returns the configured
 	 * {@link #setResponse(ClientHttpResponse) response}.
 	 * <p>Override this method to execute the request and provide a response,
-	 * potentially different than the configured response.
+	 * potentially different from the configured response.
 	 */
 	protected ClientHttpResponse executeInternal() throws IOException {
 		Assert.state(this.clientHttpResponse != null, "No ClientHttpResponse");

spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java

@@ -231,7 +231,7 @@ public static BodyBuilder method(HttpMethod method, String uri, Object... vars)
 	}
 
 	/**
-	 * Create a builder with a raw HTTP method value value that is outside the
+	 * Create a builder with a raw HTTP method value that is outside the
 	 * range of {@link HttpMethod} enum values.
 	 * @param httpMethod the HTTP methodValue value
 	 * @param uri the URI template for target the URL
@@ -253,7 +253,7 @@ private static URI toUri(String uri, Object[] vars) {
 
 	/**
 	 * Request builder exposing properties not related to the body.
-	 * @param <B> the builder sub-class
+	 * @param <B> the builder subclass
 	 */
 	public interface BaseBuilder<B extends BaseBuilder<B>> {
 

spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java

@@ -78,7 +78,7 @@
 	Class<? extends ActiveProfilesResolver> resolver() default ActiveProfilesResolver.class;
 
 	/**
-	 * Whether or not bean definition profiles from superclasses and enclosing
+	 * Whether bean definition profiles from superclasses and enclosing
 	 * classes should be <em>inherited</em>.
 	 * <p>The default value is {@code true}, which means that a test class will
 	 * <em>inherit</em> bean definition profiles defined by a test superclass or

spring-test/src/main/java/org/springframework/test/context/ContextHierarchy.java

@@ -66,7 +66,7 @@
  * {@code SoapWebServiceTests} and {@code RestWebServiceTests} both extend
  * {@code AbstractWebTests} and define a context hierarchy via {@code @ContextHierarchy}.
  * The result is that three application contexts will be loaded (one for each
- * declaration of {@code @ContextConfiguration}, and the application context
+ * declaration of {@code @ContextConfiguration}), and the application context
  * loaded based on the configuration in {@code AbstractWebTests} will be set as
  * the parent context for each of the contexts loaded for the concrete subclasses.
  *

spring-test/src/main/java/org/springframework/test/context/NestedTestConfiguration.java

@@ -34,7 +34,7 @@
  * enclosing class hierarchies (i.e., for <em>inner</em> test classes).
  *
  * <p>If {@code @NestedTestConfiguration} is not <em>present</em> or
- * <em>meta-present</em> on a test class, in its super type hierarchy, or in its
+ * <em>meta-present</em> on a test class, in its supertype hierarchy, or in its
  * enclosing class hierarchy, the default <em>enclosing configuration inheritance
  * mode</em> will be used. A {@code @NestedTestConfiguration} declaration on an
  * enclosing class for a nested interface will be ignored when searching for the

spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java

@@ -78,7 +78,7 @@
 	Class<? extends TestExecutionListener>[] listeners() default {};
 
 	/**
-	 * Whether or not {@link #listeners TestExecutionListeners} from superclasses
+	 * Whether {@link #listeners TestExecutionListeners} from superclasses
 	 * and enclosing classes should be <em>inherited</em>.
 	 * <p>The default value is {@code true}, which means that an annotated class
 	 * will <em>inherit</em> the listeners defined by an annotated superclass or
@@ -130,7 +130,7 @@
 
 
 	/**
-	 * Enumeration of <em>modes</em> that dictate whether or not explicitly
+	 * Enumeration of <em>modes</em> that dictate whether explicitly
 	 * declared listeners are merged with the default listeners when
 	 * {@code @TestExecutionListeners} is declared on a class that does
 	 * <strong>not</strong> inherit listeners from a superclass or enclosing

spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java

@@ -150,7 +150,7 @@
 	String[] locations() default {};
 
 	/**
-	 * Whether or not test property source {@link #locations} from superclasses
+	 * Whether test property source {@link #locations} from superclasses
 	 * and enclosing classes should be <em>inherited</em>.
 	 * <p>The default value is {@code true}, which means that a test class will
 	 * <em>inherit</em> property source locations defined by a superclass or
@@ -230,7 +230,7 @@
 	String[] properties() default {};
 
 	/**
-	 * Whether or not inlined test {@link #properties} from superclasses and
+	 * Whether inlined test {@link #properties} from superclasses and
 	 * enclosing classes should be <em>inherited</em>.
 	 * <p>The default value is {@code true}, which means that a test class will
 	 * <em>inherit</em> inlined properties defined by a superclass or enclosing

spring-test/src/main/java/org/springframework/test/context/cache/ContextCache.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -36,7 +36,7 @@
  * initialization is complex. Although the initialization of a Spring context
  * itself is typically very quick, some beans in a context — for example,
  * an embedded database or a {@code LocalContainerEntityManagerFactoryBean} for
- * working with JPA — may take several seconds to initialize. Hence it
+ * working with JPA — may take several seconds to initialize. Hence, it
  * often makes sense to perform that initialization only once per test suite or
  * JVM process.
  *
@@ -155,7 +155,8 @@ public interface ContextCache {
 	void clear();
 
 	/**
-	 * Clear hit and miss count statistics for the cache (i.e., reset counters to zero).
+	 * Clear {@linkplain #getHitCount() hit count} and {@linkplain #getMissCount()
+	 * miss count} statistics for the cache (i.e., reset counters to zero).
 	 */
 	void clearStatistics();
 

spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java

@@ -193,7 +193,7 @@ protected int deleteFromTableWhere(String tableName, String whereClause, Object.
 	}
 
 	/**
-	 * Convenience method for dropping all of the specified tables.
+	 * Convenience method for dropping all the specified tables.
 	 * <p>Use with caution outside of a transaction!
 	 * @param names the names of the tables to drop
 	 * @since 3.2
@@ -209,7 +209,7 @@ protected void dropTables(String... names) {
 	 * <p>The script will normally be loaded by classpath.
 	 * <p><b>Do not use this method to execute DDL if you expect rollback.</b>
 	 * @param sqlResourcePath the Spring resource path for the SQL script
-	 * @param continueOnError whether or not to continue without throwing an
+	 * @param continueOnError whether to continue without throwing an
 	 * exception in the event of an error
 	 * @throws DataAccessException if there is an error executing a statement
 	 * @see ResourceDatabasePopulator

spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java

@@ -284,13 +284,13 @@ protected String[] modifyLocations(Class<?> clazz, String... locations) {
 	}
 
 	/**
-	 * Determine whether or not <em>default</em> resource locations should be
+	 * Determine whether <em>default</em> resource locations should be
 	 * generated if the {@code locations} provided to
 	 * {@link #processLocations(Class, String...)} are {@code null} or empty.
 	 * <p>As of Spring 3.1, the semantics of this method have been overloaded
 	 * to include detection of either default resource locations or default
 	 * configuration classes. Consequently, this method can also be used to
-	 * determine whether or not <em>default</em> configuration classes should be
+	 * determine whether <em>default</em> configuration classes should be
 	 * detected if the {@code classes} present in the
 	 * {@link ContextConfigurationAttributes configuration attributes} supplied
 	 * to {@link #processContextConfiguration(ContextConfigurationAttributes)}