Skip to content

Commit 09b3638

Browse files
chenqimiaochenqimiao
authored
Fix typos in source files
Closes gh-24746
1 parent 331b14b commit 09b3638

File tree

6 files changed

+33
-31
lines changed

6 files changed

+33
-31
lines changed

‎spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2020 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.
@@ -28,7 +28,7 @@
2828
import static org.assertj.core.api.Assertions.assertThat;
2929

3030
/**
31-
* Tests that poitncut matching is correct with generic method parameter.
31+
* Tests that pointcut matching is correct with generic method parameter.
3232
* See SPR-3904 for more details.
3333
*
3434
* @author Ramnivas Laddad

‎spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibiltyTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2020 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.
@@ -84,11 +84,11 @@ static class WithMetaMetaTestAnnotation1AndMetaTestAnnotation2 {
8484
@Retention(RetentionPolicy.RUNTIME)
8585
@interface DefaultValueAnnotation {
8686

87-
@AliasFor("enumAlais")
87+
@AliasFor("enumAlias")
8888
TestEnum enumValue() default TestEnum.ONE;
8989

9090
@AliasFor("enumValue")
91-
TestEnum enumAlais() default TestEnum.ONE;
91+
TestEnum enumAlias() default TestEnum.ONE;
9292

9393
}
9494

‎spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -382,26 +382,28 @@ void resolveMirrorsWhenHasDifferentValuesThrowsException() {
382382
}
383383

384384
@Test
385-
void resolveMirrorsWhenHasWithMulipleRoutesToAliasReturnsMirrors() {
386-
AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(MulipleRoutesToAliasA.class);
387-
AnnotationTypeMapping mappingsA = getMapping(mappings, MulipleRoutesToAliasA.class);
385+
void resolveMirrorsWhenHasWithMultipleRoutesToAliasReturnsMirrors() {
386+
AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(
387+
MultipleRoutesToAliasA.class);
388+
AnnotationTypeMapping mappingsA = getMapping(mappings, MultipleRoutesToAliasA.class);
388389
assertThat(mappingsA.getMirrorSets().size()).isZero();
389-
AnnotationTypeMapping mappingsB = getMapping(mappings, MulipleRoutesToAliasB.class);
390+
AnnotationTypeMapping mappingsB = getMapping(mappings, MultipleRoutesToAliasB.class);
390391
assertThat(getNames(mappingsB.getMirrorSets().get(0))).containsExactly("b1", "b2", "b3");
391-
AnnotationTypeMapping mappingsC = getMapping(mappings, MulipleRoutesToAliasC.class);
392+
AnnotationTypeMapping mappingsC = getMapping(mappings, MultipleRoutesToAliasC.class);
392393
assertThat(getNames(mappingsC.getMirrorSets().get(0))).containsExactly("c1", "c2");
393394
}
394395

395396
@Test
396-
void getAliasMappingWhenHasWithMulipleRoutesToAliasReturnsMappedAttributes() {
397-
AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(MulipleRoutesToAliasA.class);
398-
AnnotationTypeMapping mappingsA = getMapping(mappings, MulipleRoutesToAliasA.class);
397+
void getAliasMappingWhenHasWithMultipleRoutesToAliasReturnsMappedAttributes() {
398+
AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(
399+
MultipleRoutesToAliasA.class);
400+
AnnotationTypeMapping mappingsA = getMapping(mappings, MultipleRoutesToAliasA.class);
399401
assertThat(getAliasMapping(mappingsA, 0)).isNull();
400-
AnnotationTypeMapping mappingsB = getMapping(mappings, MulipleRoutesToAliasB.class);
402+
AnnotationTypeMapping mappingsB = getMapping(mappings, MultipleRoutesToAliasB.class);
401403
assertThat(getAliasMapping(mappingsB, 0).getName()).isEqualTo("a1");
402404
assertThat(getAliasMapping(mappingsB, 1).getName()).isEqualTo("a1");
403405
assertThat(getAliasMapping(mappingsB, 2).getName()).isEqualTo("a1");
404-
AnnotationTypeMapping mappingsC = getMapping(mappings, MulipleRoutesToAliasC.class);
406+
AnnotationTypeMapping mappingsC = getMapping(mappings, MultipleRoutesToAliasC.class);
405407
assertThat(getAliasMapping(mappingsC, 0).getName()).isEqualTo("a1");
406408
assertThat(getAliasMapping(mappingsC, 1).getName()).isEqualTo("a1");
407409
}
@@ -867,7 +869,7 @@ static class WithDefaultValueAliasPair {
867869
}
868870

869871
@Retention(RetentionPolicy.RUNTIME)
870-
@interface MulipleRoutesToAliasC {
872+
@interface MultipleRoutesToAliasC {
871873

872874
@AliasFor("c2")
873875
String c1() default "";
@@ -877,24 +879,24 @@ static class WithDefaultValueAliasPair {
877879
}
878880

879881
@Retention(RetentionPolicy.RUNTIME)
880-
@MulipleRoutesToAliasC
881-
@interface MulipleRoutesToAliasB {
882+
@MultipleRoutesToAliasC
883+
@interface MultipleRoutesToAliasB {
882884

883-
@AliasFor(annotation = MulipleRoutesToAliasC.class, attribute = "c2")
885+
@AliasFor(annotation = MultipleRoutesToAliasC.class, attribute = "c2")
884886
String b1() default "";
885887

886-
@AliasFor(annotation = MulipleRoutesToAliasC.class, attribute = "c2")
888+
@AliasFor(annotation = MultipleRoutesToAliasC.class, attribute = "c2")
887889
String b2() default "";
888890

889-
@AliasFor(annotation = MulipleRoutesToAliasC.class, attribute = "c1")
891+
@AliasFor(annotation = MultipleRoutesToAliasC.class, attribute = "c1")
890892
String b3() default "";
891893
}
892894

893895
@Retention(RetentionPolicy.RUNTIME)
894-
@MulipleRoutesToAliasB
895-
@interface MulipleRoutesToAliasA {
896+
@MultipleRoutesToAliasB
897+
@interface MultipleRoutesToAliasA {
896898

897-
@AliasFor(annotation = MulipleRoutesToAliasB.class, attribute = "b2")
899+
@AliasFor(annotation = MultipleRoutesToAliasB.class, attribute = "b2")
898900
String a1() default "";
899901
}
900902

‎spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2020 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 ArgumentResolverConfigurer getArgumentResolverConfigurer() {
157157
}
158158

159159
/**
160-
* Configure custom return value handlers for handler metohds.
160+
* Configure custom return value handlers for handler methods.
161161
*/
162162
public void setReturnValueHandlerConfigurer(ReturnValueHandlerConfigurer configurer) {
163163
Assert.notNull(configurer, "ReturnValueHandlerConfigurer is required");

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2020 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.
@@ -169,7 +169,7 @@ void resolveActiveProfilesWithMergedInheritedResolver() {
169169
*/
170170
@Test
171171
void resolveActiveProfilesWithOverridenInheritedResolver() {
172-
assertResolvedProfiles(OverridenInheritedFooActiveProfilesResolverTestCase.class, "bar");
172+
assertResolvedProfiles(OverriddenInheritedFooActiveProfilesResolverTestCase.class, "bar");
173173
}
174174

175175
/**
@@ -304,7 +304,7 @@ private static class MergedInheritedFooActiveProfilesResolverTestCase extends
304304
}
305305

306306
@ActiveProfiles(resolver = BarActiveProfilesResolver.class, inheritProfiles = false)
307-
private static class OverridenInheritedFooActiveProfilesResolverTestCase extends
307+
private static class OverriddenInheritedFooActiveProfilesResolverTestCase extends
308308
InheritedFooActiveProfilesResolverTestCase {
309309
}
310310

‎spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2020 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.
@@ -282,7 +282,7 @@ void beforeAndAfterTestClassForDirtiesContextDeclaredViaMetaAnnotationWithOverri
282282
}
283283

284284
@Test
285-
void beforeAndAfterTestClassForDirtiesContextDeclaredViaMetaAnnotationWithOverridenAttributes()
285+
void beforeAndAfterTestClassForDirtiesContextDeclaredViaMetaAnnotationWithOverriddenAttributes()
286286
throws Exception {
287287
Class<?> clazz = DirtiesContextViaMetaAnnotationWithOverridenAttributes.class;
288288
BDDMockito.<Class<?>> given(testContext.getTestClass()).willReturn(clazz);

0 commit comments

Comments
 (0)