Merge pull request #2019 from Hanope

* pr/2019:
  Polish contribution
  Fix typos

spring-aop/src/main/java/org/aopalliance/intercept/MethodInvocation.java

@@ -32,7 +32,7 @@ public interface MethodInvocation extends Invocation {
 
 	/**
 	 * Get the method being called.
-	 * <p>This method is a frienly implementation of the
+	 * <p>This method is a friendly implementation of the
 	 * {@link Joinpoint#getStaticPart()} method (same result).
 	 * @return the method being called
 	 */

spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java

@@ -63,7 +63,7 @@ import org.springframework.util.StringUtils;
 public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedenceInformation, Serializable {
 
 	/**
-	 * Key used in ReflectiveMethodInvocation userAtributes map for the current joinpoint.
+	 * Key used in ReflectiveMethodInvocation userAttributes map for the current joinpoint.
 	 */
 	protected static final String JOIN_POINT_KEY = JoinPoint.class.getName();
 

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java

@@ -758,7 +758,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 
 		@Around(value="setAge(age)",argNames="age")
 		// @ArgNames({"age"})	// AMC needs more work here? ignoring pjp arg... ok??
-		// argNames should be suported in Around as it is in Pointcut
+		// argNames should be supported in Around as it is in Pointcut
 		public void changeReturnType(ProceedingJoinPoint pjp, int age) throws Throwable {
 			pjp.proceed(new Object[] {age*2});
 		}
@@ -884,12 +884,12 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 @Aspect
 abstract class AbstractMakeModifiable {
 
-	public interface MutableModifable extends Modifiable {
+	public interface MutableModifiable extends Modifiable {
 
 		void markDirty();
 	}
 
-	public static class ModifiableImpl implements MutableModifable {
+	public static class ModifiableImpl implements MutableModifiable {
 
 		private boolean modified;
 
@@ -911,7 +911,7 @@ abstract class AbstractMakeModifiable {
 
 	@Before(value="execution(void set*(*)) && this(modifiable) && args(newValue)", argNames="modifiable,newValue")
 	public void recordModificationIfSetterArgumentDiffersFromOldValue(
-			JoinPoint jp, MutableModifable mixin, Object newValue) {
+			JoinPoint jp, MutableModifiable mixin, Object newValue) {
 
 		/*
 		 * We use the mixin to check and, if necessary, change,
@@ -972,7 +972,7 @@ class MakeITestBeanModifiable extends AbstractMakeModifiable {
 
 	@DeclareParents(value = "org.springframework.tests.sample.beans.ITestBean+",
 			defaultImpl=ModifiableImpl.class)
-	public static MutableModifable mixin;
+	public static MutableModifiable mixin;
 
 }
 

spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -157,7 +157,7 @@ public class DelegatingIntroductionInterceptorTests {
 		TimeStamped ts = (TimeStamped) pf.getProxy();
 
 		assertThat(ts, instanceOf(TimeStamped.class));
-		// Shoulnd't proxy framework interfaces
+		// Shouldn't proxy framework interfaces
 		assertTrue(!(ts instanceof MethodInterceptor));
 		assertTrue(!(ts instanceof IntroductionInterceptor));
 

spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java

@@ -166,7 +166,7 @@ public class BeanWrapperImpl extends AbstractNestablePropertyAccessor implements
 	}
 
 	/**
-	 * Obtain a lazily initializted CachedIntrospectionResults instance
+	 * Obtain a lazily initialized CachedIntrospectionResults instance
 	 * for the wrapped object.
 	 */
 	private CachedIntrospectionResults getCachedIntrospectionResults() {

spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java

@@ -158,7 +158,7 @@ abstract class AutowireUtils {
 	 * on the given method itself.
 	 * <p>For example, given a factory method with the following signature, if
 	 * {@code resolveReturnTypeForFactoryMethod()} is invoked with the reflected
-	 * method for {@code creatProxy()} and an {@code Object[]} array containing
+	 * method for {@code createProxy()} and an {@code Object[]} array containing
 	 * {@code MyService.class}, {@code resolveReturnTypeForFactoryMethod()} will
 	 * infer that the target return type is {@code MyService}.
 	 * <pre class="code">{@code public static <T> T createProxy(Class<T> clazz)}</pre>

spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java

@@ -278,7 +278,7 @@ public final class BeanDefinitionBuilder {
 	}
 
 	/**
-	 * Set the depency check mode for this definition.
+	 * Set the dependency check mode for this definition.
 	 */
 	public BeanDefinitionBuilder setDependencyCheck(int dependencyCheck) {
 		this.beanDefinition.setDependencyCheck(dependencyCheck);

spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java

@@ -39,7 +39,7 @@ class BeanDefinitionResource extends AbstractResource {
 
 	/**
 	 * Create a new BeanDefinitionResource.
-	 * @param beanDefinition the BeanDefinition objectto wrap
+	 * @param beanDefinition the BeanDefinition object to wrap
 	 */
 	public BeanDefinitionResource(BeanDefinition beanDefinition) {
 		Assert.notNull(beanDefinition, "BeanDefinition must not be null");

spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java

@@ -89,7 +89,7 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 		catch (PropertyBatchUpdateException ex) {
 			assertTrue("Must contain 2 exceptions", ex.getExceptionCount() == 2);
 			// Test validly set property matches
-			assertTrue("Vaid set property must stick", target.getName().equals(newName));
+			assertTrue("Valid set property must stick", target.getName().equals(newName));
 			assertTrue("Invalid set property must retain old value", target.getAge() == 0);
 			assertTrue("New value of dodgy setter must be available through exception",
 					ex.getPropertyAccessException("touchy").getPropertyChangeEvent().getNewValue().equals(invalidTouchy));

spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -58,7 +58,7 @@ public class InternetAddressEditorTests {
 	}
 
 	@Test
-	public void simpleGoodAddess() {
+	public void simpleGoodAddress() {
 		editor.setAsText(SIMPLE);
 		assertEquals("Simple email address failed", SIMPLE, editor.getAsText());
 	}

spring-context/src/main/java/org/springframework/context/MessageSourceAware.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -38,7 +38,7 @@ public interface MessageSourceAware extends Aware {
 	 * <p>Invoked after population of normal bean properties but before an init
 	 * callback like InitializingBean's afterPropertiesSet or a custom init-method.
 	 * Invoked before ApplicationContextAware's setApplicationContext.
-	 * @param messageSource message sourceto be used by this object
+	 * @param messageSource message source to be used by this object
 	 */
 	void setMessageSource(MessageSource messageSource);
 

spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java

@@ -138,7 +138,7 @@ import org.springframework.core.io.support.PropertySourceFactory;
  * last.
  *
  * <p>In certain situations, it may not be possible or practical to tightly control
- * property source ordering when using {@code @ProperySource} annotations. For example,
+ * property source ordering when using {@code @PropertySource} annotations. For example,
  * if the {@code @Configuration} classes above were registered via component-scanning,
  * the ordering is difficult to predict. In such cases - and if overriding is important -
  * it is recommended that the user fall back to using the programmatic PropertySource API.

spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java

@@ -183,7 +183,7 @@ public abstract class AbstractSlsbInvokerInterceptor extends JndiObjectLocator
 
 
 	/**
-	 * Prepares the thread context if necessar, and delegates to
+	 * Prepares the thread context if necessary, and delegates to
 	 * {@link #invokeInContext}.
 	 */
 	@Override

spring-context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -23,7 +23,7 @@ import javax.management.ObjectName;
  * accessed by application developers during application runtime.
  *
  * <p>This interface should be used to export application resources to JMX using Spring's
- * management interface generation capabilties and, optionally, it's {@link ObjectName}
+ * management interface generation capabilities and, optionally, it's {@link ObjectName}
  * generation capabilities.
  *
  * @author Rob Harrop

spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java

@@ -509,7 +509,7 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo
 	/**
 	 * Register the defined beans with the {@link MBeanServer}.
 	 * <p>Each bean is exposed to the {@code MBeanServer} via a
-	 * {@code ModelMBean}. The actual implemetation of the
+	 * {@code ModelMBean}. The actual implementation of the
 	 * {@code ModelMBean} interface used depends on the implementation of
 	 * the {@code ModelMBeanProvider} interface that is configured. By
 	 * default the {@code RequiredModelMBean} class that is supplied with

spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -84,7 +84,7 @@ public class MethodNameBasedMBeanInfoAssembler extends AbstractConfigurableMBean
 	 * The property key should match the bean key and the property value should match
 	 * the list of method names. When searching for method names for a bean, Spring
 	 * will check these mappings first.
-	 * @param mappings the mappins of bean keys to method names
+	 * @param mappings the mappings of bean keys to method names
 	 */
 	public void setMethodMappings(Properties mappings) {
 		this.methodMappings = new HashMap<>();

spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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 javax.management.Notification;
  * implementing the {@link NotificationPublisherAware} interface. After a particular
  * managed resource instance is registered with the {@link javax.management.MBeanServer},
  * Spring will inject a {@code NotificationPublisher} instance into it if that
- * resource implements the {@link NotificationPublisherAware} inteface.
+ * resource implements the {@link NotificationPublisherAware} interface.
  *
  * <p>Each managed resource instance will have a distinct instance of a
  * {@code NotificationPublisher} implementation. This instance will keep

spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -103,7 +103,7 @@ public abstract class JndiObjectLocator extends JndiLocatorSupport implements In
 	 * Perform the actual JNDI lookup for this locator's target resource.
 	 * @return the located target object
 	 * @throws NamingException if the JNDI lookup failed or if the
-	 * located JNDI object is not assigable to the expected type
+	 * located JNDI object is not assignable to the expected type
 	 * @see #setJndiName
 	 * @see #setExpectedType
 	 * @see #lookup(String, Class)

spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java

@@ -59,7 +59,7 @@ public class AtAspectJAnnotationBindingTests {
 	}
 
 	@Test
-	public void testPointcutEvaulatedAgainstArray() {
+	public void testPointcutEvaluatedAgainstArray() {
 		ctx.getBean("arrayFactoryBean");
 	}
 

spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java

@@ -365,7 +365,7 @@ public abstract class AbstractAopProxyTests {
 		assertEquals("Only one invocation via AOP as use of this wasn't proxied", 1, di.getCount());
 		// 1 invocation
 		assertEquals("Increment happened", 1, proxied.getCount());
-		proxied.incrementViaProxy(); // 2 invoocations
+		proxied.incrementViaProxy(); // 2 invocations
 		assertEquals("Increment happened", 2, target.getCount());
 		assertEquals("3 more invocations via AOP as the first call was reentrant through the proxy", 4, di.getCount());
 	}
@@ -511,7 +511,7 @@ public abstract class AbstractAopProxyTests {
 	}
 
 	@Test
-	public void testUndeclaredUnheckedException() throws Throwable {
+	public void testUndeclaredUncheckedException() throws Throwable {
 		final RuntimeException unexpectedException = new RuntimeException();
 		// Test return value
 		MethodInterceptor mi = new MethodInterceptor() {
@@ -786,7 +786,7 @@ public abstract class AbstractAopProxyTests {
 
 	/**
 	 * Note that an introduction can't throw an unexpected checked exception,
-	 * as it's constained by the interface.
+	 * as it's constrained by the interface.
 	 */
 	@Test
 	public void testIntroductionThrowsUncheckedException() throws Throwable {

spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -161,7 +161,7 @@ public class CommonsPool2TargetSourceTests {
 			// desired
 		}
 
-		// lets now release an object and try to accquire a new one
+		// lets now release an object and try to acquire a new one
 		targetSource.releaseTarget(pooledInstances[9]);
 		pooledInstances[9] = targetSource.getTarget();
 
@@ -194,7 +194,7 @@ public class CommonsPool2TargetSourceTests {
 			// desired
 		}
 
-		// lets now release an object and try to accquire a new one
+		// lets now release an object and try to acquire a new one
 		targetSource.releaseTarget(pooledInstances[9]);
 		pooledInstances[9] = targetSource.getTarget();
 

spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -41,7 +41,7 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 		if (this.owningContext == null)
-			throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean");
+			throw new RuntimeException("Factory didn't call setApplicationContext before afterPropertiesSet on lifecycle bean");
 	}
 
 	@Override

spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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 @@ public class ComponentScanAnnotationTests {
 
 	@Test
 	public void noop() {
-		// no-op; the @ComponentScan-annotated MyConfig class below simply excercises
+		// no-op; the @ComponentScan-annotated MyConfig class below simply exercises
 		// available attributes of the annotation.
 	}
 }

spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java

@@ -64,7 +64,7 @@ public class LiveBeansViewTests {
 	}
 
 	@Test
-	public void registerUnregisterServeralContexts() throws MalformedObjectNameException {
+	public void registerUnregisterSeveralContexts() throws MalformedObjectNameException {
 		this.environment.setProperty(LiveBeansView.MBEAN_DOMAIN_PROPERTY_NAME, this.name.getMethodName());
 		ConfigurableApplicationContext context = createApplicationContext("app");
 		ConfigurableApplicationContext childContext = createApplicationContext("child");
@@ -80,7 +80,7 @@ public class LiveBeansViewTests {
 	}
 
 	@Test
-	public void registerUnregisterServeralContextsDifferentOrder() throws MalformedObjectNameException {
+	public void registerUnregisterSeveralContextsDifferentOrder() throws MalformedObjectNameException {
 		this.environment.setProperty(LiveBeansView.MBEAN_DOMAIN_PROPERTY_NAME, this.name.getMethodName());
 		ConfigurableApplicationContext context = createApplicationContext("app");
 		ConfigurableApplicationContext childContext = createApplicationContext("child");

spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -127,7 +127,7 @@ public class InterfaceBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAsse
 	private void assertNickName(MBeanAttributeInfo attr) {
 		assertNotNull("Nick Name should not be null", attr);
 		assertTrue("Nick Name should be writable", attr.isWritable());
-		assertTrue("Nick Name should be readab;e", attr.isReadable());
+		assertTrue("Nick Name should be readable", attr.isReadable());
 	}
 
 }

spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java

@@ -262,7 +262,7 @@ public class AnnotatedElementUtilsTests {
 		Class<?> element = SubSubClassWithInheritedComposedAnnotation.class;
 		String name = TX_NAME;
 		AnnotationAttributes attributes = getMergedAnnotationAttributes(element, name);
-		assertNotNull("AnnotationAttributtes for @Transactional on SubSubClassWithInheritedComposedAnnotation.", attributes);
+		assertNotNull("AnnotationAttributes for @Transactional on SubSubClassWithInheritedComposedAnnotation.", attributes);
 		// Verify contracts between utility methods:
 		assertTrue(isAnnotated(element, name));
 		assertFalse("readOnly flag for SubSubClassWithInheritedComposedAnnotation.", attributes.getBoolean("readOnly"));

spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -65,15 +65,15 @@ public class AspectJTypeFilterTests {
 		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassImplementingSomeInterface",
 				"java.lang.Object+");
 
-		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplemnentingSomeInterface",
+		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplementingSomeInterface",
 				"org.springframework.core.type.AspectJTypeFilterTests.SomeInterface+");
-		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplemnentingSomeInterface",
+		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplementingSomeInterface",
 				"org.springframework.core.type.AspectJTypeFilterTests.SomeClassExtendingSomeClass+");
-		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplemnentingSomeInterface",
+		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplementingSomeInterface",
 				"org.springframework.core.type.AspectJTypeFilterTests.SomeClass+");
-		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplemnentingSomeInterface",
+		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplementingSomeInterface",
 				"*+");
-		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplemnentingSomeInterface",
+		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplementingSomeInterface",
 				"java.lang.Object+");
 	}
 
@@ -100,7 +100,7 @@ public class AspectJTypeFilterTests {
 	}
 
 	@Test
-	public void annotationPatternNoMathces() throws Exception {
+	public void annotationPatternNoMatches() throws Exception {
 		assertNoMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassAnnotatedWithComponent",
 				"@org.springframework.stereotype.Repository *..*");
 	}
@@ -109,11 +109,11 @@ public class AspectJTypeFilterTests {
 	public void compositionPatternMatches() throws Exception {
 		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClass",
 				"!*..SomeOtherClass");
-		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplemnentingSomeInterface",
+		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplementingSomeInterface",
 				"org.springframework.core.type.AspectJTypeFilterTests.SomeInterface+ " +
 						"&& org.springframework.core.type.AspectJTypeFilterTests.SomeClass+ " +
 						"&& org.springframework.core.type.AspectJTypeFilterTests.SomeClassExtendingSomeClass+");
-		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplemnentingSomeInterface",
+		assertMatch("org.springframework.core.type.AspectJTypeFilterTests$SomeClassExtendingSomeClassExtendingSomeClassAndImplementingSomeInterface",
 				"org.springframework.core.type.AspectJTypeFilterTests.SomeInterface+ " +
 						"|| org.springframework.core.type.AspectJTypeFilterTests.SomeClass+ " +
 						"|| org.springframework.core.type.AspectJTypeFilterTests.SomeClassExtendingSomeClass+");
@@ -158,7 +158,7 @@ public class AspectJTypeFilterTests {
 	static class SomeClassImplementingSomeInterface implements SomeInterface {
 	}
 
-	static class SomeClassExtendingSomeClassExtendingSomeClassAndImplemnentingSomeInterface
+	static class SomeClassExtendingSomeClassExtendingSomeClassAndImplementingSomeInterface
 			extends SomeClassExtendingSomeClass implements SomeInterface {
 	}
 

spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java

@@ -85,7 +85,7 @@ public class ConcurrentReferenceHashMapTests {
 	}
 
 	@Test
-	public void shouldCreateWithInitialCapacityAndConcurrenyLevel() {
+	public void shouldCreateWithInitialCapacityAndConcurrentLevel() {
 		ConcurrentReferenceHashMap<Integer, String> map = new ConcurrentReferenceHashMap<>(16, 2);
 		assertThat(map.getSegmentsSize(), is(2));
 		assertThat(map.getSegment(0).getSize(), is(8));
@@ -173,11 +173,11 @@ public class ConcurrentReferenceHashMapTests {
 	}
 
 	@Test
-	public void shouldApplySupplimentalHash() {
+	public void shouldApplySupplementalHash() {
 		Integer key = 123;
 		this.map.put(key, "123");
-		assertThat(this.map.getSupplimentalHash(), is(not(key.hashCode())));
-		assertThat(this.map.getSupplimentalHash() >> 30 & 0xFF, is(not(0)));
+		assertThat(this.map.getSupplementalHash(), is(not(key.hashCode())));
+		assertThat(this.map.getSupplementalHash() >> 30 & 0xFF, is(not(0)));
 	}
 
 	@Test
@@ -240,7 +240,7 @@ public class ConcurrentReferenceHashMapTests {
 	}
 
 	@Test
-	public void shouldPergeOnPut() {
+	public void shouldPurgeOnPut() {
 		this.map = new TestWeakConcurrentCache<>(1, 0.75f, 1);
 		for (int i = 1; i <= 5; i++) {
 			this.map.put(i, String.valueOf(i));
@@ -559,7 +559,7 @@ public class ConcurrentReferenceHashMapTests {
 
 	private static class TestWeakConcurrentCache<K, V> extends ConcurrentReferenceHashMap<K, V> {
 
-		private int supplimentalHash;
+		private int supplementalHash;
 
 		private final LinkedList<MockReference<K, V>> queue = new LinkedList<>();
 
@@ -587,12 +587,12 @@ public class ConcurrentReferenceHashMapTests {
 				return super.getHash(o);
 			}
 			// For testing we want more control of the hash
-			this.supplimentalHash = super.getHash(o);
+			this.supplementalHash = super.getHash(o);
 			return o == null ? 0 : o.hashCode();
 		}
 
-		public int getSupplimentalHash() {
-			return this.supplimentalHash;
+		public int getSupplementalHash() {
+			return this.supplementalHash;
 		}
 
 		@Override

spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java

@@ -83,7 +83,7 @@ public class ExpressionStateTests extends AbstractExpressionTests {
 	}
 
 	@Test
-	public void testNoVariableInteference() {
+	public void testNoVariableInterference() {
 		ExpressionState state = getState();
 		TypedValue typedValue = state.lookupVariable("foo");
 		assertEquals(TypedValue.NULL, typedValue);

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java

@@ -172,7 +172,7 @@ public class CallMetaDataContext {
 	}
 
 	/**
-	 * Secify the name of the schema.
+	 * Specify the name of the schema.
 	 */
 	public void setSchemaName(@Nullable String schemaName) {
 		this.schemaName = schemaName;
@@ -625,7 +625,7 @@ public class CallMetaDataContext {
 		String schemaNameToUse;
 
 		// For Oracle where catalogs are not supported we need to reverse the schema name
-		// and the catalog name since the cataog is used for the package name
+		// and the catalog name since the catalog is used for the package name
 		if (this.metaDataProvider.isSupportsSchemasInProcedureCalls() &&
 				!this.metaDataProvider.isSupportsCatalogsInProcedureCalls()) {
 			schemaNameToUse = this.metaDataProvider.catalogNameToUse(getCatalogName());

spring-jdbc/src/test/java/org/springframework/jdbc/core/test/DatePerson.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -60,8 +60,8 @@ public class DatePerson {
 		return balance;
 	}
 
-	public void setBalance(BigDecimal balanace) {
-		this.balance = balanace;
+	public void setBalance(BigDecimal balance) {
+		this.balance = balance;
 	}
 
 }

spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java

@@ -60,8 +60,8 @@ public class Person {
 		return balance;
 	}
 
-	public void setBalance(BigDecimal balanace) {
-		this.balance = balanace;
+	public void setBalance(BigDecimal balance) {
+		this.balance = balance;
 	}
 
 }

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -44,7 +44,7 @@ public class ScriptUtilsIntegrationTests extends AbstractDatabaseInitializationT
 	}
 
 	@Test
-	public void executeSqlScriptContainingMuliLineComments() throws SQLException {
+	public void executeSqlScriptContainingMultiLineComments() throws SQLException {
 		executeSqlScript(db.getConnection(), resource("test-data-with-multi-line-comments.sql"));
 		assertUsersDatabaseCreated("Hoeller", "Brannen");
 	}

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java

@@ -149,7 +149,7 @@ public class ScriptUtilsUnitTests {
 	}
 
 	@Test  // SPR-9531
-	public void readAndSplitScriptContainingMuliLineComments() throws Exception {
+	public void readAndSplitScriptContainingMultiLineComments() throws Exception {
 		String script = readScript("test-data-with-multi-line-comments.sql");
 		List<String> statements = new ArrayList<>();
 		splitSqlScript(script, ';', statements);

spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -88,7 +88,7 @@ import org.springframework.util.ObjectUtils;
  * {@link javax.jms.TextMessage TextMessages}. Notice also how the
  * name of the {@code Message} handling method is different from the
  * {@link #ORIGINAL_DEFAULT_LISTENER_METHOD original} (this will have to
- * be configured in the attandant bean definition). Again, no {@code Message}
+ * be configured in the attendant bean definition). Again, no {@code Message}
  * will be sent back as the method returns {@code void}.
  *
  * <pre class="code">public interface TextMessageContentDelegate {

spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java

@@ -153,7 +153,7 @@ public class JmsInvokerServiceExporter extends RemoteInvocationBasedExporter
 	 * @param session the JMS session to use
 	 * @param result the invocation result
 	 * @return the message response to send
-	 * @throws javax.jms.JMSException if creating the messsage failed
+	 * @throws javax.jms.JMSException if creating the message failed
 	 */
 	protected Message createResponseMessage(Message request, Session session, RemoteInvocationResult result)
 			throws JMSException {

spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java

@@ -124,7 +124,7 @@ public class SimpleMessageConverter implements MessageConverter {
 
 	/**
 	 * Create a JMS BytesMessage for the given byte array.
-	 * @param bytes the byyte array to convert
+	 * @param bytes the byte array to convert
 	 * @param session current JMS session
 	 * @return the resulting message
 	 * @throws JMSException if thrown by JMS methods

spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -57,7 +57,7 @@ public class BeanFactoryDestinationResolver implements DestinationResolver, Bean
 	 * replaced by the {@link BeanFactory} that creates it (c.f. the
 	 * {@link BeanFactoryAware} contract). So only use this constructor if you
 	 * are using this class outside the context of a Spring IoC container.
-	 * @param beanFactory the bean factory to be used to lookup {@link javax.jms.Destination Destinatiosn}
+	 * @param beanFactory the bean factory to be used to lookup {@link javax.jms.Destination Destination}
 	 */
 	public BeanFactoryDestinationResolver(BeanFactory beanFactory) {
 		Assert.notNull(beanFactory, "BeanFactory is required");

spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -272,7 +272,7 @@ public class JmsTemplateTests {
 	}
 
 	/**
-	 * Test seding to a destination using the method
+	 * Test sending to a destination using the method
 	 * send(String d, MessageCreator messageCreator)
 	 */
 	@Test

spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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,7 +46,7 @@ public class JmsGatewaySupportTests {
 		gateway.afterPropertiesSet();
 		assertEquals("Correct ConnectionFactory", mockConnectionFactory, gateway.getConnectionFactory());
 		assertEquals("Correct JmsTemplate", mockConnectionFactory, gateway.getJmsTemplate().getConnectionFactory());
-		assertEquals("initGatway called", 1, test.size());
+		assertEquals("initGateway called", 1, test.size());
 	}
 
 	@Test

spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2018 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 static org.mockito.BDDMockito.*;
 public class JmsDestinationAccessorTests {
 
 	@Test
-	public void testChokesIfDestinationResolverIsetToNullExplcitly() throws Exception {
+	public void testChokesIfDestinationResolverIsetToNullExplicitly() throws Exception {
 		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
 
 		try {

spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageRequestReplyOperations.java

@@ -38,7 +38,7 @@ public interface DestinationResolvingMessageRequestReplyOperations<D> extends Me
 	 * Resolve the given destination name to a destination and send the given message,
 	 * receive a reply and return it.
 	 * @param destinationName the name of the target destination
-	 * @param requestMessage the mesage to send
+	 * @param requestMessage the message to send
 	 * @return the received message, possibly {@code null} if the message could not
 	 * be received, for example due to a timeout
 	 */

spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java

@@ -42,13 +42,13 @@ import static org.mockito.Mockito.*;
  */
 public class BrokerMessageHandlerTests {
 
-	private TestBrokerMesageHandler handler;
+	private TestBrokerMessageHandler handler;
 
 
 	@Before
 	public void setup() {
 		MockitoAnnotations.initMocks(this);
-		this.handler = new TestBrokerMesageHandler();
+		this.handler = new TestBrokerMessageHandler();
 	}
 
 
@@ -116,7 +116,7 @@ public class BrokerMessageHandlerTests {
 	}
 
 	@Test
-	public void publishBrokerUnavailableEventWhenAlreadyUnvailable() {
+	public void publishBrokerUnavailableEventWhenAlreadyUnavailable() {
 
 		this.handler.publishBrokerAvailableEvent();
 		this.handler.publishBrokerUnavailableEvent();
@@ -126,7 +126,7 @@ public class BrokerMessageHandlerTests {
 	}
 
 
-	private static class TestBrokerMesageHandler extends AbstractBrokerMessageHandler
+	private static class TestBrokerMessageHandler extends AbstractBrokerMessageHandler
 			implements ApplicationEventPublisher {
 
 		private final List<Message<?>> messages = new ArrayList<>();
@@ -134,7 +134,7 @@ public class BrokerMessageHandlerTests {
 		private final List<Boolean> availabilityEvents = new ArrayList<>();
 
 
-		private TestBrokerMesageHandler() {
+		private TestBrokerMessageHandler() {
 			super(mock(SubscribableChannel.class), mock(MessageChannel.class), mock(SubscribableChannel.class));
 			setApplicationEventPublisher(this);
 		}

spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java

@@ -106,7 +106,7 @@ public class ContentRequestMatchers {
 	}
 
 	/**
-	 * Get the body of the request as a UTF-8 string and appply the given {@link Matcher}.
+	 * Get the body of the request as a UTF-8 string and apply the given {@link Matcher}.
 	 */
 	public RequestMatcher string(final Matcher<? super String> matcher) {
 		return request -> {

spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java

@@ -533,25 +533,25 @@ public class MockHttpServletRequestTests {
 	}
 
 	@Test
-	public void httpHeaderRfcFormatedDate() {
+	public void httpHeaderRfcFormattedDate() {
 		request.addHeader(HttpHeaders.IF_MODIFIED_SINCE, "Tue, 21 Jul 2015 10:00:00 GMT");
 		assertEquals(1437472800000L, request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE));
 	}
 
 	@Test
-	public void httpHeaderFirstVariantFormatedDate() {
+	public void httpHeaderFirstVariantFormattedDate() {
 		request.addHeader(HttpHeaders.IF_MODIFIED_SINCE, "Tue, 21-Jul-15 10:00:00 GMT");
 		assertEquals(1437472800000L, request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE));
 	}
 
 	@Test
-	public void httpHeaderSecondVariantFormatedDate() {
+	public void httpHeaderSecondVariantFormattedDate() {
 		request.addHeader(HttpHeaders.IF_MODIFIED_SINCE, "Tue Jul 21 10:00:00 2015");
 		assertEquals(1437472800000L, request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE));
 	}
 
 	@Test(expected = IllegalArgumentException.class)
-	public void httpHeaderFormatedDateError() {
+	public void httpHeaderFormattedDateError() {
 		request.addHeader(HttpHeaders.IF_MODIFIED_SINCE, "This is not a date");
 		request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE);
 	}

spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -52,7 +52,7 @@ public class ProfileValueUtilsTests {
 	}
 
 	private void assertClassIsDisabled(Class<?> testClass) throws Exception {
-		assertFalse("Test class [" + testClass + "] should be disbled.",
+		assertFalse("Test class [" + testClass + "] should be disabled.",
 			ProfileValueUtils.isTestEnabledInThisEnvironment(testClass));
 	}
 

spring-test/src/test/java/org/springframework/test/context/cache/MethodLevelDirtiesContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -88,7 +88,7 @@ public class MethodLevelDirtiesContextTests {
 	@Test
 	@DirtiesContext
 	// test## prefix required for @FixMethodOrder.
-	public void test03_dirtyContextAferTestMethod() throws Exception {
+	public void test03_dirtyContextAfterTestMethod() throws Exception {
 		performAssertions(2);
 	}
 

spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -355,7 +355,7 @@ public class ActiveProfilesUtilsTests extends AbstractContextConfigurationUtilsT
 	private static class NoDefaultConstructorActiveProfilesResolver implements ActiveProfilesResolver {
 
 		@SuppressWarnings("unused")
-		NoDefaultConstructorActiveProfilesResolver(Object agument) {
+		NoDefaultConstructorActiveProfilesResolver(Object argument) {
 		}
 
 		@Override

spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java

@@ -79,7 +79,7 @@ public class HeaderAssertionTests {
 	}
 
 	@Test
-	public void valueEqualsWithMultipeValues() {
+	public void valueEqualsWithMultipleValues() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("foo", "bar");
 		headers.add("foo", "baz");

spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -45,7 +45,7 @@ import org.springframework.lang.Nullable;
  * in order to use a custom ConnectionManager instead of the connector's default.
  *
  * <p><b>NOTE:</b> In non-managed mode, a connector is not deployed on an
- * application server, or more specificially not interacting with an application
+ * application server, or more specifically not interacting with an application
  * server. Consequently, it cannot use a Java EE server's system contracts:
  * connection management, transaction management, and security management.
  * A custom ConnectionManager implementation has to be used for applying those

spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -45,7 +45,7 @@ public class JtaTransactionObject implements SmartTransactionObject {
 	/**
 	 * Create a new JtaTransactionObject for the given JTA UserTransaction.
 	 * @param userTransaction the JTA UserTransaction for the current transaction
-	 * (either a shared object or retrieved through a fresh per-transaction lookuip)
+	 * (either a shared object or retrieved through a fresh per-transaction lookup)
 	 */
 	public JtaTransactionObject(UserTransaction userTransaction) {
 		this.userTransaction = userTransaction;

spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -133,7 +133,7 @@ public abstract class ResourceHolderSupport implements ResourceHolder {
 
 	/**
 	 * Return the time to live for this object in milliseconds.
-	 * @return number of millseconds until expiration
+	 * @return number of milliseconds until expiration
 	 * @throws TransactionTimedOutException if the deadline has already been reached
 	 */
 	public long getTimeToLiveInMillis() throws TransactionTimedOutException{

spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java

@@ -67,7 +67,7 @@ public class ReactorClientHttpConnector implements ClientHttpConnector {
 	 * {@link reactor.netty.http.HttpResources}, which is recommended since
 	 * fixed, shared resources are favored for event loop concurrency. However,
 	 * consider declaring a {@link ReactorResourceFactory} bean with
-	 * {@code globaResources=true} in order to ensure the Reactor Netty global
+	 * {@code globalResources=true} in order to ensure the Reactor Netty global
 	 * resources are shut down when the Spring ApplicationContext is closed.
 	 * @param factory the resource factory to obtain the resources from
 	 * @param mapper a mapper for further initialization of the created client

spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java

@@ -128,7 +128,7 @@ public abstract class AbstractListenerWriteFlushProcessor<T> implements Processo
 	}
 
 	/**
-	 * Invoked when flusing is possible, either in the same thread after a check
+	 * Invoked when flushing is possible, either in the same thread after a check
 	 * via {@link #isWritePossible()}, or as a callback from the underlying
 	 * container.
 	 */

spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java

@@ -308,7 +308,7 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter {
 		 * Constructor with required information.
 		 * @param delegateRequest supplier for the current
 		 * {@link HttpServletRequestWrapper#getRequest() delegate request} which
-		 * may change during a forward (e.g. Tocat.
+		 * may change during a forward (e.g. Tomcat.
 		 * @param pathHelper the path helper instance
 		 * @param baseUrl the host, scheme, and port based on forwarded headers
 		 */

spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java

@@ -241,7 +241,7 @@ public abstract class CommonsFileUploadSupport {
 	/**
 	 * Parse the given List of Commons FileItems into a Spring MultipartParsingResult,
 	 * containing Spring MultipartFile instances and a Map of multipart parameter.
-	 * @param fileItems the Commons FileIterms to parse
+	 * @param fileItems the Commons FileItems to parse
 	 * @param encoding the encoding to use for form fields
 	 * @return the Spring MultipartParsingResult
 	 * @see CommonsMultipartFile#CommonsMultipartFile(org.apache.commons.fileupload.FileItem)

spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java

@@ -59,7 +59,7 @@ public class ServerHttpRequestTests {
 	}
 
 	@Test
-	public void queryParamsWithMulitpleValues() throws Exception {
+	public void queryParamsWithMultipleValues() throws Exception {
 		MultiValueMap<String, String> params = createHttpRequest("/path?a=1&a=2").getQueryParams();
 		assertEquals(1, params.size());
 		assertEquals(Arrays.asList("1", "2"), params.get("a"));

spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -114,7 +114,7 @@ public class HtmlUtilsTests {
 		assertEquals("'″' should be decoded to uni-code character 8243",
 				"" + (char) 8243, HtmlUtils.htmlUnescape("″"));
 
-		assertEquals("A not supported named reference leads should be ingnored",
+		assertEquals("A not supported named reference leads should be ignored",
 				"&prIme;", HtmlUtils.htmlUnescape("&prIme;"));
 
 		assertEquals("An empty reference '&;' should be survive the decoding",

spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java

@@ -158,10 +158,10 @@ public abstract class BodyInserters {
 
 		Assert.notNull(eventsPublisher, "Publisher must not be null");
 		return (serverResponse, context) -> {
-			ResolvableType elmentType = SSE_TYPE;
+			ResolvableType elementType = SSE_TYPE;
 			MediaType mediaType = MediaType.TEXT_EVENT_STREAM;
-			HttpMessageWriter<ServerSentEvent<T>> writer = findWriter(context, elmentType, mediaType);
-			return write(eventsPublisher, elmentType, mediaType, serverResponse, context, writer);
+			HttpMessageWriter<ServerSentEvent<T>> writer = findWriter(context, elementType, mediaType);
+			return write(eventsPublisher, elementType, mediaType, serverResponse, context, writer);
 		};
 	}
 

spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java

@@ -86,7 +86,7 @@ public class FreeMarkerConfigurer extends FreeMarkerConfigurationFactory
 
 	/**
 	 * Initialize FreeMarkerConfigurationFactory's Configuration
-	 * if not overridden by a pre-configured FreeMarker Configuation.
+	 * if not overridden by a pre-configured FreeMarker Configuration.
 	 * <p>Sets up a ClassTemplateLoader to use for loading Spring macros.
 	 * @see #createConfiguration
 	 * @see #setConfiguration

spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java

@@ -95,7 +95,7 @@ public class ResourceUrlProviderTests {
 	}
 
 	@Test
-	public void getVerionedResourceUrl() {
+	public void getVersionedResourceUrl() {
 		VersionResourceResolver versionResolver = new VersionResourceResolver();
 		versionResolver.setStrategyMap(Collections.singletonMap("/**", new ContentVersionStrategy()));
 		List<ResourceResolver> resolvers = new ArrayList<>();

spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java

@@ -164,7 +164,7 @@ public class ProducesRequestConditionTests {
 	}
 
 	@Test
-	public void compareToMultipleExpressionsAndMultipeAcceptHeaderValues() throws Exception {
+	public void compareToMultipleExpressionsAndMultipleAcceptHeaderValues() throws Exception {
 		ProducesRequestCondition condition1 = new ProducesRequestCondition("text/*", "text/plain");
 		ProducesRequestCondition condition2 = new ProducesRequestCondition("application/*", "application/xml");
 

spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java

@@ -109,7 +109,7 @@ public class FreeMarkerConfigurer extends FreeMarkerConfigurationFactory
 
 	/**
 	 * Initialize FreeMarkerConfigurationFactory's Configuration
-	 * if not overridden by a preconfigured FreeMarker Configuation.
+	 * if not overridden by a preconfigured FreeMarker Configuration.
 	 * <p>Sets up a ClassTemplateLoader to use for loading Spring macros.
 	 * @see #createConfiguration
 	 * @see #setConfiguration

spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002-2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.context;
 
 
@@ -26,7 +42,7 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 		if (this.owningContext == null)
-			throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean");
+			throw new RuntimeException("Factory didn't call setApplicationContext before afterPropertiesSet on lifecycle bean");
 	}
 
 	@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -195,7 +195,7 @@ public class ProducesRequestConditionTests {
 	}
 
 	@Test
-	public void compareToMultipleExpressionsAndMultipeAcceptHeaderValues() {
+	public void compareToMultipleExpressionsAndMultipleAcceptHeaderValues() {
 		ProducesRequestCondition condition1 = new ProducesRequestCondition("text/*", "text/plain");
 		ProducesRequestCondition condition2 = new ProducesRequestCondition("application/*", "application/xml");
 

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandlerTests.java

@@ -193,9 +193,9 @@ public class ReactiveTypeHandlerTests {
 		testSseResponse(false);
 	}
 
-	private void testSseResponse(boolean expectSseEimtter) throws Exception {
+	private void testSseResponse(boolean expectSseEmitter) throws Exception {
 		ResponseBodyEmitter emitter = handleValue(Flux.empty(), Flux.class, forClass(String.class));
-		assertEquals(expectSseEimtter, emitter instanceof SseEmitter);
+		assertEquals(expectSseEmitter, emitter instanceof SseEmitter);
 		resetRequest();
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -919,7 +919,7 @@ public class BindTagTests extends AbstractTagTests {
 		transform.setParent(message);
 		try {
 			transform.doStartTag();
-			fail("Tag can be executed outside BindTag and inside messagtag");
+			fail("Tag can be executed outside BindTag and inside messagetag");
 		}
 		catch (JspException e) {
 			// this is ok!

spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -270,7 +270,7 @@ public class BaseViewTests {
 	}
 
 	@Test
-	public void attributeCSVParsingIgoresTrailingComma() {
+	public void attributeCSVParsingIgnoresTrailingComma() {
 		AbstractView v = new ConcreteView();
 		v.setAttributesCSV("foo=[de],");
 		assertEquals(1, v.getStaticAttributes().size());

spring-websocket/src/main/java/org/springframework/web/socket/handler/PerConnectionWebSocketHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -38,7 +38,7 @@ import org.springframework.web.socket.WebSocketSession;
  * API method that expects a {@link WebSocketHandler}.
  *
  * <p>If initializing the target {@link WebSocketHandler} type requires a Spring
- * BeanFctory, then the {@link #setBeanFactory(BeanFactory)} property accordingly. Simply
+ * BeanFactory, then the {@link #setBeanFactory(BeanFactory)} property accordingly. Simply
  * declaring this class as a Spring bean will do that. Otherwise, {@link WebSocketHandler}
  * instances of the target type will be created using the default constructor.
  *

spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java

@@ -452,7 +452,7 @@ public class MessageBrokerBeanDefinitionParserTests {
 
 		for (Class<? extends  MessageHandler> subscriberType : subscriberTypes) {
 			MessageHandler subscriber = this.appContext.getBean(subscriberType);
-			assertNotNull("No subsription for " + subscriberType, subscriber);
+			assertNotNull("No subscription for " + subscriberType, subscriber);
 			assertTrue(channel.hasSubscription(subscriber));
 		}
 

src/docs/asciidoc/core/core-aop-api.adoc

@@ -293,7 +293,7 @@ state. They merely act on the method and arguments.
 Per-instance advice is appropriate for introductions, to support mixins. In this case,
 the advice adds state to the proxied object.
 
-Ypou can use a mix of shared and per-instance advice in the same AOP proxy.
+You can use a mix of shared and per-instance advice in the same AOP proxy.
 
 
 

src/docs/asciidoc/core/core-resources.adoc

@@ -391,7 +391,7 @@ be configured with a simple string for that resource, as the following example s
 ----
 ====
 
-Note that the resource path has no prefix. Consequetly, because the application context itself is
+Note that the resource path has no prefix. Consequently, because the application context itself is
 going to be used as the `ResourceLoader`, the resource itself is loaded through a
 `ClassPathResource`, a `FileSystemResource`, or a `ServletContextResource`,
 depending on the exact type of the context.

src/docs/asciidoc/data-access.adoc

@@ -582,7 +582,7 @@ transactions be created and then rolled back in response to the
 ----
 ====
 
-The following exampl shows an implementation of the preceding interface:
+The following example shows an implementation of the preceding interface:
 
 ====
 [source,java,indent=0]
@@ -1004,7 +1004,7 @@ transactional settings:
 [[transaction-declarative-txadvice-settings]]
 ==== <tx:advice/> Settings
 
-This section summarizes the various transactional settings that you can specifyi by using
+This section summarizes the various transactional settings that you can specify by using
 the `<tx:advice/>` tag. The default `<tx:advice/>` settings are:
 
 * The <<tx-propagation,propagation setting>> is `REQUIRED.`
@@ -1314,15 +1314,15 @@ properties of the `@Transactional` annotation:
 
 | `isolation`
 | `enum`: `Isolation`
-| Optional isolation level. Applies only to propagation valeus of `REQUIRED` or `REQUIRES_NEW`.
+| Optional isolation level. Applies only to propagation values of `REQUIRED` or `REQUIRES_NEW`.
 
 | `timeout`
 | `int` (in seconds of granularity)
-| Optional transaction timeout. Applies only to propagation valeus of `REQUIRED` or `REQUIRES_NEW`.
+| Optional transaction timeout. Applies only to propagation values of `REQUIRED` or `REQUIRES_NEW`.
 
 | `readOnly`
 | `boolean`
-| Read-write versus read-only transaction. Only applicable to valeus of `REQUIRED` or `REQUIRES_NEW`.
+| Read-write versus read-only transaction. Only applicable to values of `REQUIRED` or `REQUIRES_NEW`.
 
 | `rollbackFor`
 | Array of `Class` objects, which must be derived from `Throwable.`
@@ -2059,7 +2059,7 @@ per-transaction isolation levels, and proper resuming of transactions in all cas
 [[transaction-solutions-to-common-problems]]
 === Solutions to Common Problems
 
-This section describes solutions to some commmon problems.
+This section describes solutions to some common problems.
 
 
 [[transaction-solutions-to-common-problems-wrong-ptm]]
@@ -2375,7 +2375,7 @@ including error handling. It includes the following topics:
 * <<jdbc-statements-executing>>
 * <<jdbc-statements-querying>>
 * <<jdbc-updates>>
-* <<jdbc-auto-genereted-keys>>
+* <<jdbc-auto-generated-keys>>
 
 
 [[jdbc-JdbcTemplate]]
@@ -2522,7 +2522,7 @@ preceding code snippet as follows:
 ===== Updating (`INSERT`, `UPDATE`, and `DELETE`) with `JdbcTemplate`
 
 You can use the `update(..)` method to perform insert, update, and delete operations.
-Parameter values are usually provided as variable argumets or, alternatively, as an object array.
+Parameter values are usually provided as variable arguments or, alternatively, as an object array.
 
 The following example inserts a new entry:
 
@@ -2736,7 +2736,7 @@ placeholder ( `'?'`) arguments. The `NamedParameterJdbcTemplate` class wraps a
 `JdbcTemplate` and delegates to the wrapped `JdbcTemplate` to do much of its work. This
 section describes only those areas of the `NamedParameterJdbcTemplate` class that differ
 from the `JdbcTemplate` itself -- namely, programming JDBC statements by using named
-parameters. The following exampe shows how to use `NamedParameterJdbcTemplate`:
+parameters. The following example shows how to use `NamedParameterJdbcTemplate`:
 
 ====
 [source,java,indent=0]
@@ -3096,11 +3096,11 @@ The following example updates a column for a certain primary key:
 
 In the preceding example,
 an SQL statement has placeholders for row parameters. You can pass the parameter values
-in as varargs or ,alternatively, as an array of objects. Thus, you should explictly wrap primitives
+in as varargs or ,alternatively, as an array of objects. Thus, you should explicitly wrap primitives
 in the primitive wrapper classes, or you should use auto-boxing.
 
 
-[[jdbc-auto-genereted-keys]]
+[[jdbc-auto-generated-keys]]
 ==== Retrieving Auto-generated Keys
 
 An `update()` convenience method supports the retrieval of primary keys generated by the

src/docs/asciidoc/integration.adoc

@@ -980,7 +980,7 @@ The Spring Framework provides two choices for making calls to REST endpoints:
 * <<rest-resttemplate>>: The original Spring REST client with a synchronous, template
 method API.
 * <<web-reactive.adoc#webflux-client,WebClient>>: a non-blocking, reactive alternative
-that supports both synchrnous and asynchronous as well as streaming scenarios.
+that supports both synchronous and asynchronous as well as streaming scenarios.
 
 NOTE: As of 5.0, the non-blocking, reactive `WebClient` offers a modern alternative to the
 `RestTemplate` with efficient support for both synchronous and asynchronous as well as streaming
@@ -5094,7 +5094,7 @@ record to be filled by the JCA connector when the response is received. This rec
 then returned to the caller of the template.
 
 This property holds an implementation of the <<cci-record-creator,`RecordCreator` interface>>, to be used for
-that purpose. You must directly specity the `outputRecordCreator` property on
+that purpose. You must directly specify the `outputRecordCreator` property on
 the `CciTemplate`. The following example shows how to do so:
 
 ====