Skip to content

Commit afa38f5

Browse files
committed
Merge pull request #2019 from Hanope
* pr/2019: Polish contribution Fix typos
2 parents 729ce41 + 7b6f2f8 commit afa38f5

File tree

74 files changed

+168
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+168
-152
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public interface MethodInvocation extends Invocation {
3232

3333
/**
3434
* Get the method being called.
35-
* <p>This method is a frienly implementation of the
35+
* <p>This method is a friendly implementation of the
3636
* {@link Joinpoint#getStaticPart()} method (same result).
3737
* @return the method being called
3838
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedenceInformation, Serializable {
6464

6565
/**
66-
* Key used in ReflectiveMethodInvocation userAtributes map for the current joinpoint.
66+
* Key used in ReflectiveMethodInvocation userAttributes map for the current joinpoint.
6767
*/
6868
protected static final String JOIN_POINT_KEY = JoinPoint.class.getName();
6969

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ public void setAge(int a) {}
758758

759759
@Around(value="setAge(age)",argNames="age")
760760
// @ArgNames({"age"}) // AMC needs more work here? ignoring pjp arg... ok??
761-
// argNames should be suported in Around as it is in Pointcut
761+
// argNames should be supported in Around as it is in Pointcut
762762
public void changeReturnType(ProceedingJoinPoint pjp, int age) throws Throwable {
763763
pjp.proceed(new Object[] {age*2});
764764
}
@@ -884,12 +884,12 @@ public int preventExecution(ProceedingJoinPoint pjp) {
884884
@Aspect
885885
abstract class AbstractMakeModifiable {
886886

887-
public interface MutableModifable extends Modifiable {
887+
public interface MutableModifiable extends Modifiable {
888888

889889
void markDirty();
890890
}
891891

892-
public static class ModifiableImpl implements MutableModifable {
892+
public static class ModifiableImpl implements MutableModifiable {
893893

894894
private boolean modified;
895895

@@ -911,7 +911,7 @@ public void markDirty() {
911911

912912
@Before(value="execution(void set*(*)) && this(modifiable) && args(newValue)", argNames="modifiable,newValue")
913913
public void recordModificationIfSetterArgumentDiffersFromOldValue(
914-
JoinPoint jp, MutableModifable mixin, Object newValue) {
914+
JoinPoint jp, MutableModifiable mixin, Object newValue) {
915915

916916
/*
917917
* We use the mixin to check and, if necessary, change,
@@ -972,7 +972,7 @@ class MakeITestBeanModifiable extends AbstractMakeModifiable {
972972

973973
@DeclareParents(value = "org.springframework.tests.sample.beans.ITestBean+",
974974
defaultImpl=ModifiableImpl.class)
975-
public static MutableModifable mixin;
975+
public static MutableModifiable mixin;
976976

977977
}
978978

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -157,7 +157,7 @@ public long getTimeStamp() {
157157
TimeStamped ts = (TimeStamped) pf.getProxy();
158158

159159
assertThat(ts, instanceOf(TimeStamped.class));
160-
// Shoulnd't proxy framework interfaces
160+
// Shouldn't proxy framework interfaces
161161
assertTrue(!(ts instanceof MethodInterceptor));
162162
assertTrue(!(ts instanceof IntroductionInterceptor));
163163

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ protected void setIntrospectionClass(Class<?> clazz) {
166166
}
167167

168168
/**
169-
* Obtain a lazily initializted CachedIntrospectionResults instance
169+
* Obtain a lazily initialized CachedIntrospectionResults instance
170170
* for the wrapped object.
171171
*/
172172
private CachedIntrospectionResults getCachedIntrospectionResults() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public static Object resolveAutowiringValue(Object autowiringValue, Class<?> req
158158
* on the given method itself.
159159
* <p>For example, given a factory method with the following signature, if
160160
* {@code resolveReturnTypeForFactoryMethod()} is invoked with the reflected
161-
* method for {@code creatProxy()} and an {@code Object[]} array containing
161+
* method for {@code createProxy()} and an {@code Object[]} array containing
162162
* {@code MyService.class}, {@code resolveReturnTypeForFactoryMethod()} will
163163
* infer that the target return type is {@code MyService}.
164164
* <pre class="code">{@code public static <T> T createProxy(Class<T> clazz)}</pre>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public BeanDefinitionBuilder setAutowireMode(int autowireMode) {
278278
}
279279

280280
/**
281-
* Set the depency check mode for this definition.
281+
* Set the dependency check mode for this definition.
282282
*/
283283
public BeanDefinitionBuilder setDependencyCheck(int dependencyCheck) {
284284
this.beanDefinition.setDependencyCheck(dependencyCheck);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class BeanDefinitionResource extends AbstractResource {
3939

4040
/**
4141
* Create a new BeanDefinitionResource.
42-
* @param beanDefinition the BeanDefinition objectto wrap
42+
* @param beanDefinition the BeanDefinition object to wrap
4343
*/
4444
public BeanDefinitionResource(BeanDefinition beanDefinition) {
4545
Assert.notNull(beanDefinition, "BeanDefinition must not be null");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void setValidAndInvalidPropertyValuesShouldContainExceptionDetails() {
8989
catch (PropertyBatchUpdateException ex) {
9090
assertTrue("Must contain 2 exceptions", ex.getExceptionCount() == 2);
9191
// Test validly set property matches
92-
assertTrue("Vaid set property must stick", target.getName().equals(newName));
92+
assertTrue("Valid set property must stick", target.getName().equals(newName));
9393
assertTrue("Invalid set property must retain old value", target.getAge() == 0);
9494
assertTrue("New value of dodgy setter must be available through exception",
9595
ex.getPropertyAccessException("touchy").getPropertyChangeEvent().getNewValue().equals(invalidTouchy));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2015 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ public void allWhitespace() {
5858
}
5959

6060
@Test
61-
public void simpleGoodAddess() {
61+
public void simpleGoodAddress() {
6262
editor.setAsText(SIMPLE);
6363
assertEquals("Simple email address failed", SIMPLE, editor.getAsText());
6464
}

0 commit comments

Comments
 (0)