From bfb49c7249316604ca86e64070bc35f2575c5cb8 Mon Sep 17 00:00:00 2001 From: Hanope Date: Mon, 19 Nov 2018 12:43:58 +0900 Subject: [PATCH 1/2] Fix typos See gh-2019 --- .../intercept/MethodInvocation.java | 2 +- .../aop/aspectj/AbstractAspectJAdvice.java | 2 +- .../AbstractAspectJAdvisorFactoryTests.java | 10 +++---- ...elegatingIntroductionInterceptorTests.java | 2 +- .../beans/BeanWrapperImpl.java | 2 +- .../beans/factory/support/AutowireUtils.java | 2 +- .../support/BeanDefinitionBuilder.java | 2 +- .../support/BeanDefinitionResource.java | 2 +- .../beans/BeanWrapperTests.java | 2 +- .../javamail/InternetAddressEditorTests.java | 2 +- .../context/MessageSourceAware.java | 2 +- .../context/annotation/PropertySource.java | 2 +- .../AbstractSlsbInvokerInterceptor.java | 2 +- .../jmx/export/MBeanExportOperations.java | 2 +- .../jmx/export/MBeanExporter.java | 2 +- .../MethodNameBasedMBeanInfoAssembler.java | 2 +- .../notification/NotificationPublisher.java | 2 +- .../jndi/JndiObjectLocator.java | 2 +- .../AtAspectJAnnotationBindingTests.java | 2 +- .../aop/framework/AbstractAopProxyTests.java | 6 ++-- .../target/CommonsPool2TargetSourceTests.java | 4 +-- .../context/LifecycleContextBean.java | 2 +- .../ComponentScanAnnotationTests.java | 2 +- .../context/support/LiveBeansViewTests.java | 4 +-- ...aceBasedMBeanInfoAssemblerMappedTests.java | 2 +- .../org/springframework/asm/ClassReader.java | 28 +++++++++---------- .../springframework/cglib/proxy/Enhancer.java | 2 +- .../AnnotatedElementUtilsTests.java | 2 +- .../core/type/AspectJTypeFilterTests.java | 18 ++++++------ .../util/ConcurrentReferenceHashMapTests.java | 18 ++++++------ .../expression/spel/ExpressionStateTests.java | 2 +- .../core/metadata/CallMetaDataContext.java | 4 +-- .../jdbc/core/test/DatePerson.java | 4 +-- .../jdbc/core/test/Person.java | 4 +-- .../init/ScriptUtilsIntegrationTests.java | 2 +- .../datasource/init/ScriptUtilsUnitTests.java | 2 +- .../adapter/MessageListenerAdapter.java | 2 +- .../remoting/JmsInvokerServiceExporter.java | 2 +- .../converter/SimpleMessageConverter.java | 2 +- .../BeanFactoryDestinationResolver.java | 2 +- .../jms/core/JmsTemplateTests.java | 2 +- .../core/support/JmsGatewaySupportTests.java | 2 +- .../JmsDestinationAccessorTests.java | 2 +- ...esolvingMessageRequestReplyOperations.java | 2 +- .../broker/BrokerMessageHandlerTests.java | 10 +++---- .../client/match/ContentRequestMatchers.java | 2 +- .../mock/web/MockHttpServletRequestTests.java | 8 +++--- .../annotation/ProfileValueUtilsTests.java | 2 +- .../cache/MethodLevelDirtiesContextTests.java | 2 +- .../support/ActiveProfilesUtilsTests.java | 2 +- .../reactive/server/HeaderAssertionTests.java | 2 +- .../support/LocalConnectionFactoryBean.java | 2 +- .../transaction/jta/JtaTransactionObject.java | 2 +- .../support/ResourceHolderSupport.java | 2 +- .../reactive/ReactorClientHttpConnector.java | 2 +- .../AbstractListenerWriteFlushProcessor.java | 2 +- .../web/filter/ForwardedHeaderFilter.java | 2 +- .../commons/CommonsFileUploadSupport.java | 2 +- .../reactive/ServerHttpRequestTests.java | 2 +- .../web/util/HtmlUtilsTests.java | 2 +- .../web/reactive/function/BodyInserters.java | 6 ++-- .../view/freemarker/FreeMarkerConfigurer.java | 2 +- .../resource/ResourceUrlProviderTests.java | 2 +- .../ProducesRequestConditionTests.java | 2 +- .../view/freemarker/FreeMarkerConfigurer.java | 2 +- .../context/LifecycleContextBean.java | 2 +- .../ProducesRequestConditionTests.java | 2 +- .../annotation/ReactiveTypeHandlerTests.java | 4 +-- .../web/servlet/tags/BindTagTests.java | 2 +- .../web/servlet/view/BaseViewTests.java | 2 +- .../PerConnectionWebSocketHandler.java | 2 +- ...essageBrokerBeanDefinitionParserTests.java | 2 +- src/docs/asciidoc/core/core-aop-api.adoc | 2 +- src/docs/asciidoc/core/core-resources.adoc | 2 +- src/docs/asciidoc/data-access.adoc | 22 +++++++-------- src/docs/asciidoc/integration.adoc | 4 +-- 76 files changed, 137 insertions(+), 137 deletions(-) diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/MethodInvocation.java b/spring-aop/src/main/java/org/aopalliance/intercept/MethodInvocation.java index 6314824d76..cb467ff885 100644 --- a/spring-aop/src/main/java/org/aopalliance/intercept/MethodInvocation.java +++ b/spring-aop/src/main/java/org/aopalliance/intercept/MethodInvocation.java @@ -32,7 +32,7 @@ public interface MethodInvocation extends Invocation { /** * Get the method being called. - *

This method is a frienly implementation of the + *

This method is a friendly implementation of the * {@link Joinpoint#getStaticPart()} method (same result). * @return the method being called */ diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java index 57b73ed659..5c22ed46e1 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java +++ b/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(); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java index 46f27fdde0..3a0ca52ce7 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java +++ b/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; } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java index fa90846d9b..d3a71d45ee 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java @@ -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)); diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java index bfdd245603..109fbca842 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java +++ b/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() { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java index dc7612dd61..14ee8d0cfb 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java @@ -158,7 +158,7 @@ abstract class AutowireUtils { * on the given method itself. *

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}. * 

{@code public static  T createProxy(Class clazz)}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java index 2ef54e82cc..6bb75e0768 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java +++ b/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); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java index 59dc126761..96dfcffde3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java +++ b/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"); diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index c4251bbc78..2d32c51124 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/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)); diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java index fff03d58a6..9e9939d5f8 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java @@ -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()); } diff --git a/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java b/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java index 00ab3cb21e..09912708e1 100644 --- a/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java +++ b/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java @@ -38,7 +38,7 @@ public interface MessageSourceAware extends Aware { *

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); diff --git a/spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java b/spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java index 9214b369a9..397b8b28f2 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java @@ -138,7 +138,7 @@ import org.springframework.core.io.support.PropertySourceFactory; * last. * *

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. diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java index e62e74b017..0db401da6e 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java +++ b/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 diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java index 8eab53dbac..a315c39c04 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java @@ -23,7 +23,7 @@ import javax.management.ObjectName; * accessed by application developers during application runtime. * *

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 diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java index 6759d88b55..971b7d8d0a 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java +++ b/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}. *

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 diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java index 38f6583e78..94d53f6fce 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java @@ -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<>(); diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java index 85e6feae91..057b87eefb 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java @@ -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. * *

Each managed resource instance will have a distinct instance of a * {@code NotificationPublisher} implementation. This instance will keep diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java index f513299a94..c609e48750 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java @@ -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) diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java index c5f789ecf7..899278f8b5 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java +++ b/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"); } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java index 3883d35cdc..82a31a0076 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java +++ b/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 { diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java index 2c032f5eb7..874c88496a 100644 --- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java @@ -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(); diff --git a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java index 96f39c3296..6e847906ec 100644 --- a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java +++ b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java @@ -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 diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java index 2325b36f66..f78b9db970 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java @@ -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. } } diff --git a/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java b/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java index a9bba5006c..09a103c901 100644 --- a/spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java +++ b/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"); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java index c668c22d4c..ca46cdd9c4 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java @@ -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()); } } diff --git a/spring-core/src/main/java/org/springframework/asm/ClassReader.java b/spring-core/src/main/java/org/springframework/asm/ClassReader.java index 4c7e04237e..70425fce01 100644 --- a/spring-core/src/main/java/org/springframework/asm/ClassReader.java +++ b/spring-core/src/main/java/org/springframework/asm/ClassReader.java @@ -524,7 +524,7 @@ public class ClassReader { classVisitor.visit( readInt(cpInfoOffsets[1] - 7), accessFlags, thisClass, signature, superClass, interfaces); - // Visit the SourceFile and SourceDebugExtenstion attributes. + // Visit the SourceFile and SourceDebugExtension attributes. if ((parsingOptions & SKIP_DEBUG) == 0 && (sourceFile != null || sourceDebugExtension != null)) { classVisitor.visitSource(sourceFile, sourceDebugExtension); @@ -2973,10 +2973,10 @@ public class ClassReader { } // Parse the method descriptor, one argument type descriptor at each iteration. Start by // skipping the first method descriptor character, which is always '('. - int currentMethodDescritorOffset = 1; + int currentMethodDescriptorOffset = 1; while (true) { - int currentArgumentDescriptorStartOffset = currentMethodDescritorOffset; - switch (methodDescriptor.charAt(currentMethodDescritorOffset++)) { + int currentArgumentDescriptorStartOffset = currentMethodDescriptorOffset; + switch (methodDescriptor.charAt(currentMethodDescriptorOffset++)) { case 'Z': case 'C': case 'B': @@ -2994,26 +2994,26 @@ public class ClassReader { locals[numLocal++] = Opcodes.DOUBLE; break; case '[': - while (methodDescriptor.charAt(currentMethodDescritorOffset) == '[') { - ++currentMethodDescritorOffset; + while (methodDescriptor.charAt(currentMethodDescriptorOffset) == '[') { + ++currentMethodDescriptorOffset; } - if (methodDescriptor.charAt(currentMethodDescritorOffset) == 'L') { - ++currentMethodDescritorOffset; - while (methodDescriptor.charAt(currentMethodDescritorOffset) != ';') { - ++currentMethodDescritorOffset; + if (methodDescriptor.charAt(currentMethodDescriptorOffset) == 'L') { + ++currentMethodDescriptorOffset; + while (methodDescriptor.charAt(currentMethodDescriptorOffset) != ';') { + ++currentMethodDescriptorOffset; } } locals[numLocal++] = methodDescriptor.substring( - currentArgumentDescriptorStartOffset, ++currentMethodDescritorOffset); + currentArgumentDescriptorStartOffset, ++currentMethodDescriptorOffset); break; case 'L': - while (methodDescriptor.charAt(currentMethodDescritorOffset) != ';') { - ++currentMethodDescritorOffset; + while (methodDescriptor.charAt(currentMethodDescriptorOffset) != ';') { + ++currentMethodDescriptorOffset; } locals[numLocal++] = methodDescriptor.substring( - currentArgumentDescriptorStartOffset + 1, currentMethodDescritorOffset++); + currentArgumentDescriptorStartOffset + 1, currentMethodDescriptorOffset++); break; default: context.currentFrameLocalCount = numLocal; diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java index 98fe3a99db..92053f1308 100644 --- a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java +++ b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java @@ -335,7 +335,7 @@ public class Enhancer extends AbstractClassGenerator { } /** - * Set whether methods called from within the proxy's constructer + * Set whether methods called from within the proxy's constructor * will be intercepted. The default value is true. Unintercepted methods * will call the method of the proxy's base class, if it exists. * @param interceptDuringConstruction whether to intercept methods called from the constructor diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java index 80d7201f30..9ec75fc32d 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java +++ b/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")); diff --git a/spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java b/spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java index 66b64e0e3f..82e734da07 100644 --- a/spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java @@ -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 { } diff --git a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java index ac4dd2dee9..ab5e739cac 100644 --- a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java +++ b/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 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 extends ConcurrentReferenceHashMap { - private int supplimentalHash; + private int supplementalHash; private final LinkedList> 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 diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java index 0bd8828b98..c83f99183e 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java +++ b/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); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java index 99fa5bf2d8..8be4c72f8c 100755 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java +++ b/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()); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/DatePerson.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/DatePerson.java index d465ea4ab6..3d82ae782c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/DatePerson.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/DatePerson.java @@ -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; } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java index d494347e59..538b9b5b41 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/Person.java +++ b/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; } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java index 7bd998b133..4f5323903c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java @@ -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"); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java index 3ffc5df631..80f44ff57f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java +++ b/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 statements = new ArrayList<>(); splitSqlScript(script, ';', statements); diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java index 2486452530..45ed9cca65 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java @@ -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}. * * 

public interface TextMessageContentDelegate {
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
index 2e9795fbc5..4439113531 100644
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
+++ b/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 {
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
index fae059aba3..2e2f91b136 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
+++ b/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
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
index a1e2b6e762..427783f20c 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
@@ -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");
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
index 970c45c295..fb8dc9a13b 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
@@ -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
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
index 09675b2e4f..d9b3206264 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
@@ -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
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java
index dd44cf3994..e2fcf47936 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java
@@ -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 {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageRequestReplyOperations.java b/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageRequestReplyOperations.java
index 34dd6def79..b2b68029d1 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageRequestReplyOperations.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageRequestReplyOperations.java
@@ -38,7 +38,7 @@ public interface DestinationResolvingMessageRequestReplyOperations 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
 	 */
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java
index 4b0853cc50..288d4fd329 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java
+++ b/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> messages = new ArrayList<>();
@@ -134,7 +134,7 @@ public class BrokerMessageHandlerTests {
 		private final List availabilityEvents = new ArrayList<>();
 
 
-		private TestBrokerMesageHandler() {
+		private TestBrokerMessageHandler() {
 			super(mock(SubscribableChannel.class), mock(MessageChannel.class), mock(SubscribableChannel.class));
 			setApplicationEventPublisher(this);
 		}
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
index 30a099f0b1..04d71d380a 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
+++ b/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 matcher) {
 		return request -> {
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
index eec905b530..d9fc351a6b 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
+++ b/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);
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
index da461beec0..9f87aabbe0 100644
--- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
@@ -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));
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/MethodLevelDirtiesContextTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/MethodLevelDirtiesContextTests.java
index 2c0daefb5d..306a0f6b19 100644
--- a/spring-test/src/test/java/org/springframework/test/context/cache/MethodLevelDirtiesContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/cache/MethodLevelDirtiesContextTests.java
@@ -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);
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java
index 44ec44f936..a725626213 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java
@@ -355,7 +355,7 @@ public class ActiveProfilesUtilsTests extends AbstractContextConfigurationUtilsT
 	private static class NoDefaultConstructorActiveProfilesResolver implements ActiveProfilesResolver {
 
 		@SuppressWarnings("unused")
-		NoDefaultConstructorActiveProfilesResolver(Object agument) {
+		NoDefaultConstructorActiveProfilesResolver(Object argument) {
 		}
 
 		@Override
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java
index 584d23eb1b..0f29e0aa57 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/HeaderAssertionTests.java
+++ b/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");
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
index 88badca7f7..2c51700273 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
@@ -45,7 +45,7 @@ import org.springframework.lang.Nullable;
  * in order to use a custom ConnectionManager instead of the connector's default.
  *
  * 
NOTE: 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
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
index a70814d1f1..d22f9b2a34 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
@@ -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;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
index 513135b0f5..b59bcd103c 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
@@ -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{
diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java
index 70ca7bba8a..86d638f294 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpConnector.java
+++ b/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
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java
index 0ae3115d09..4787fd1ad5 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java
@@ -128,7 +128,7 @@ public abstract class AbstractListenerWriteFlushProcessor 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.
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
index a08e0b6f71..65b4059801 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java
+++ b/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
 		 */
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
index 8bf2e75dbc..6c61a8aa56 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
+++ b/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)
diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java
index aba35e99c1..b40874eb72 100644
--- a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java
+++ b/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 params = createHttpRequest("/path?a=1&a=2").getQueryParams();
 		assertEquals(1, params.size());
 		assertEquals(Arrays.asList("1", "2"), params.get("a"));
diff --git a/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
index 2a3aed4283..82e84ba1ff 100644
--- a/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
@@ -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",
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java
index 2cdf4ab709..010da86da5 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java
+++ b/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> writer = findWriter(context, elmentType, mediaType);
-			return write(eventsPublisher, elmentType, mediaType, serverResponse, context, writer);
+			HttpMessageWriter> writer = findWriter(context, elementType, mediaType);
+			return write(eventsPublisher, elementType, mediaType, serverResponse, context, writer);
 		};
 	}
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java
index a7c4325f71..ba0b8425e0 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java
+++ b/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.
 	 * 
Sets up a ClassTemplateLoader to use for loading Spring macros.
 	 * @see #createConfiguration
 	 * @see #setConfiguration
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java
index 25c44e06de..f7c3690cf7 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java
+++ b/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 resolvers = new ArrayList<>();
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java
index d56e411e50..decb13d342 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java
+++ b/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");
 
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 3b1d8e611d..79e25efef9 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
@@ -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.
 	 * 
Sets up a ClassTemplateLoader to use for loading Spring macros.
 	 * @see #createConfiguration
 	 * @see #setConfiguration
diff --git a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
index 37d4c9715f..be6091f1a9 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -26,7 +26,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
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
index f4d41d8f06..d6eec382c4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
@@ -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");
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandlerTests.java
index 45d3b95c5e..00209203d3 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandlerTests.java
+++ b/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();
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
index 87334a976b..e9dcdac91b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
@@ -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!
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
index ad10f2d3d1..c3a259bfd3 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
@@ -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());
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/handler/PerConnectionWebSocketHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/handler/PerConnectionWebSocketHandler.java
index 0647f92bf4..157f8b93e6 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/handler/PerConnectionWebSocketHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/handler/PerConnectionWebSocketHandler.java
@@ -38,7 +38,7 @@ import org.springframework.web.socket.WebSocketSession;
  * API method that expects a {@link WebSocketHandler}.
  *
  * 
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.
  *
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
index ff91441b93..7153afab89 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
@@ -452,7 +452,7 @@ public class MessageBrokerBeanDefinitionParserTests {
 
 		for (Class subscriberType : subscriberTypes) {
 			MessageHandler subscriber = this.appContext.getBean(subscriberType);
-			assertNotNull("No subsription for " + subscriberType, subscriber);
+			assertNotNull("No subscription for " + subscriberType, subscriber);
 			assertTrue(channel.hasSubscription(subscriber));
 		}
 
diff --git a/src/docs/asciidoc/core/core-aop-api.adoc b/src/docs/asciidoc/core/core-aop-api.adoc
index 67b0e7f0ec..c1f75e0aae 100644
--- a/src/docs/asciidoc/core/core-aop-api.adoc
+++ b/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.
 
 
 
diff --git a/src/docs/asciidoc/core/core-resources.adoc b/src/docs/asciidoc/core/core-resources.adoc
index 372d7bd11c..c88dd9cffd 100644
--- a/src/docs/asciidoc/core/core-resources.adoc
+++ b/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.
diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc
index bb0e7555d5..c26a6a3f4c 100644
--- a/src/docs/asciidoc/data-access.adoc
+++ b/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]]
 ====  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 `` tag. The default `` settings are:
 
 * The <> 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-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
diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index c493051ab5..c7168f8d83 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -980,7 +980,7 @@ The Spring Framework provides two choices for making calls to REST endpoints:
 * <>: The original Spring REST client with a synchronous, template
 method API.
 * <>: 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 <>, 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:
 
 ====

From 7b6f2f8fb3ec6ecb73ccdd03b5de146c07a0f767 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll 
Date: Mon, 19 Nov 2018 08:41:35 +0100
Subject: [PATCH 2/2] Polish contribution

Closes gh-2019
---
 ...elegatingIntroductionInterceptorTests.java |  2 +-
 .../javamail/InternetAddressEditorTests.java  |  2 +-
 .../context/MessageSourceAware.java           |  2 +-
 .../jmx/export/MBeanExportOperations.java     |  2 +-
 .../MethodNameBasedMBeanInfoAssembler.java    |  2 +-
 .../notification/NotificationPublisher.java   |  2 +-
 .../jndi/JndiObjectLocator.java               |  2 +-
 .../target/CommonsPool2TargetSourceTests.java |  2 +-
 .../context/LifecycleContextBean.java         |  2 +-
 .../ComponentScanAnnotationTests.java         |  2 +-
 ...aceBasedMBeanInfoAssemblerMappedTests.java |  2 +-
 .../org/springframework/asm/ClassReader.java  | 28 +++++++++----------
 .../springframework/cglib/proxy/Enhancer.java |  2 +-
 .../core/type/AspectJTypeFilterTests.java     |  2 +-
 .../jdbc/core/test/DatePerson.java            |  2 +-
 .../init/ScriptUtilsIntegrationTests.java     |  2 +-
 .../adapter/MessageListenerAdapter.java       |  2 +-
 .../BeanFactoryDestinationResolver.java       |  2 +-
 .../jms/core/JmsTemplateTests.java            |  2 +-
 .../core/support/JmsGatewaySupportTests.java  |  2 +-
 .../JmsDestinationAccessorTests.java          |  2 +-
 .../annotation/ProfileValueUtilsTests.java    |  2 +-
 .../cache/MethodLevelDirtiesContextTests.java |  2 +-
 .../support/ActiveProfilesUtilsTests.java     |  2 +-
 .../support/LocalConnectionFactoryBean.java   |  2 +-
 .../transaction/jta/JtaTransactionObject.java |  2 +-
 .../support/ResourceHolderSupport.java        |  2 +-
 .../web/util/HtmlUtilsTests.java              |  2 +-
 .../context/LifecycleContextBean.java         | 16 +++++++++++
 .../ProducesRequestConditionTests.java        |  2 +-
 .../web/servlet/tags/BindTagTests.java        |  2 +-
 .../web/servlet/view/BaseViewTests.java       |  2 +-
 .../PerConnectionWebSocketHandler.java        |  2 +-
 33 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
index d3a71d45ee..072b709374 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
+++ b/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.
diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
index 9e9939d5f8..25b73a7684 100644
--- a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
+++ b/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.
diff --git a/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java b/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java
index 09912708e1..9b8cfea5bb 100644
--- a/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java
+++ b/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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java
index a315c39c04..9a3c5fe7a7 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportOperations.java
+++ b/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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java
index 94d53f6fce..cd668caf47 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java
+++ b/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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java
index 057b87eefb..e151587a73 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java
+++ b/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.
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
index c609e48750..32b2ba19ba 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
+++ b/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.
diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java
index 874c88496a..b71d898d01 100644
--- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java
+++ b/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.
diff --git a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
index 6e847906ec..4798fd5699 100644
--- a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java
index f78b9db970..906786f147 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java
+++ b/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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
index ca46cdd9c4..c074d3a410 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
+++ b/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.
diff --git a/spring-core/src/main/java/org/springframework/asm/ClassReader.java b/spring-core/src/main/java/org/springframework/asm/ClassReader.java
index 70425fce01..4c7e04237e 100644
--- a/spring-core/src/main/java/org/springframework/asm/ClassReader.java
+++ b/spring-core/src/main/java/org/springframework/asm/ClassReader.java
@@ -524,7 +524,7 @@ public class ClassReader {
     classVisitor.visit(
         readInt(cpInfoOffsets[1] - 7), accessFlags, thisClass, signature, superClass, interfaces);
 
-    // Visit the SourceFile and SourceDebugExtension attributes.
+    // Visit the SourceFile and SourceDebugExtenstion attributes.
     if ((parsingOptions & SKIP_DEBUG) == 0
         && (sourceFile != null || sourceDebugExtension != null)) {
       classVisitor.visitSource(sourceFile, sourceDebugExtension);
@@ -2973,10 +2973,10 @@ public class ClassReader {
     }
     // Parse the method descriptor, one argument type descriptor at each iteration. Start by
     // skipping the first method descriptor character, which is always '('.
-    int currentMethodDescriptorOffset = 1;
+    int currentMethodDescritorOffset = 1;
     while (true) {
-      int currentArgumentDescriptorStartOffset = currentMethodDescriptorOffset;
-      switch (methodDescriptor.charAt(currentMethodDescriptorOffset++)) {
+      int currentArgumentDescriptorStartOffset = currentMethodDescritorOffset;
+      switch (methodDescriptor.charAt(currentMethodDescritorOffset++)) {
         case 'Z':
         case 'C':
         case 'B':
@@ -2994,26 +2994,26 @@ public class ClassReader {
           locals[numLocal++] = Opcodes.DOUBLE;
           break;
         case '[':
-          while (methodDescriptor.charAt(currentMethodDescriptorOffset) == '[') {
-            ++currentMethodDescriptorOffset;
+          while (methodDescriptor.charAt(currentMethodDescritorOffset) == '[') {
+            ++currentMethodDescritorOffset;
           }
-          if (methodDescriptor.charAt(currentMethodDescriptorOffset) == 'L') {
-            ++currentMethodDescriptorOffset;
-            while (methodDescriptor.charAt(currentMethodDescriptorOffset) != ';') {
-              ++currentMethodDescriptorOffset;
+          if (methodDescriptor.charAt(currentMethodDescritorOffset) == 'L') {
+            ++currentMethodDescritorOffset;
+            while (methodDescriptor.charAt(currentMethodDescritorOffset) != ';') {
+              ++currentMethodDescritorOffset;
             }
           }
           locals[numLocal++] =
               methodDescriptor.substring(
-                  currentArgumentDescriptorStartOffset, ++currentMethodDescriptorOffset);
+                  currentArgumentDescriptorStartOffset, ++currentMethodDescritorOffset);
           break;
         case 'L':
-          while (methodDescriptor.charAt(currentMethodDescriptorOffset) != ';') {
-            ++currentMethodDescriptorOffset;
+          while (methodDescriptor.charAt(currentMethodDescritorOffset) != ';') {
+            ++currentMethodDescritorOffset;
           }
           locals[numLocal++] =
               methodDescriptor.substring(
-                  currentArgumentDescriptorStartOffset + 1, currentMethodDescriptorOffset++);
+                  currentArgumentDescriptorStartOffset + 1, currentMethodDescritorOffset++);
           break;
         default:
           context.currentFrameLocalCount = numLocal;
diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java
index 92053f1308..98fe3a99db 100644
--- a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java
+++ b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java
@@ -335,7 +335,7 @@ public class Enhancer extends AbstractClassGenerator {
 	}
 
 	/**
-	 * Set whether methods called from within the proxy's constructor
+	 * Set whether methods called from within the proxy's constructer
 	 * will be intercepted. The default value is true. Unintercepted methods
 	 * will call the method of the proxy's base class, if it exists.
 	 * @param interceptDuringConstruction whether to intercept methods called from the constructor
diff --git a/spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java b/spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java
index 82e734da07..2000f53027 100644
--- a/spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java
+++ b/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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/DatePerson.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/DatePerson.java
index 3d82ae782c..58503502d5 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/test/DatePerson.java
+++ b/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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java
index 4f5323903c..cb0f8466bd 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java
+++ b/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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
index 45ed9cca65..e2938f4e30 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
+++ b/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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
index 427783f20c..a4f28b6743 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
+++ b/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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
index fb8dc9a13b..e1ee1ab3b8 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
+++ b/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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
index d9b3206264..fe8d92d284 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
+++ b/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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java
index e2fcf47936..d535dabaf5 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/destination/JmsDestinationAccessorTests.java
+++ b/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.
diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
index 9f87aabbe0..75466c6b23 100644
--- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
+++ b/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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/MethodLevelDirtiesContextTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/MethodLevelDirtiesContextTests.java
index 306a0f6b19..2e1b272fd2 100644
--- a/spring-test/src/test/java/org/springframework/test/context/cache/MethodLevelDirtiesContextTests.java
+++ b/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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java
index a725626213..c45601437b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java
+++ b/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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
index 2c51700273..4b389b38ce 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
+++ b/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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
index d22f9b2a34..656d26e2c6 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
+++ b/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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
index b59bcd103c..42918a8f20 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
+++ b/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.
diff --git a/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
index 82e84ba1ff..66fe351bb8 100644
--- a/spring-web/src/test/java/org/springframework/web/util/HtmlUtilsTests.java
+++ b/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.
diff --git a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
index be6091f1a9..966d64a498 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/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;
 
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
index d6eec382c4..3d532b43a5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java
+++ b/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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
index e9dcdac91b..52cd3989b8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
+++ b/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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
index c3a259bfd3..4be59fd854 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
+++ b/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.
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/handler/PerConnectionWebSocketHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/handler/PerConnectionWebSocketHandler.java
index 157f8b93e6..b38eefc887 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/handler/PerConnectionWebSocketHandler.java
+++ b/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.