Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typos in source files

Browse Source 
Closes gh-24746
This commit is contained in:
Qimiao Chen
2020-03-21 03:06:52 +08:00
committed by GitHub
parent 331b14bb0b
commit 09b36380cd
6 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 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.
@@ -28,7 +28,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests that poitncut matching is correct with generic method parameter.
* Tests that pointcut matching is correct with generic method parameter.
* See SPR-3904 for more details.
*
* @author Ramnivas Laddad

6
spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibiltyTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -84,11 +84,11 @@ class AnnotationBackCompatibiltyTests {
@Retention(RetentionPolicy.RUNTIME)
@interface DefaultValueAnnotation {
@AliasFor("enumAlais")
@AliasFor("enumAlias")
TestEnum enumValue() default TestEnum.ONE;
@AliasFor("enumValue")
TestEnum enumAlais() default TestEnum.ONE;
TestEnum enumAlias() default TestEnum.ONE;
}

40
spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java
View File

@@ -382,26 +382,28 @@ class AnnotationTypeMappingsTests {
}
@Test
void resolveMirrorsWhenHasWithMulipleRoutesToAliasReturnsMirrors() {
AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(MulipleRoutesToAliasA.class);
AnnotationTypeMapping mappingsA = getMapping(mappings, MulipleRoutesToAliasA.class);
void resolveMirrorsWhenHasWithMultipleRoutesToAliasReturnsMirrors() {
AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(
MultipleRoutesToAliasA.class);
AnnotationTypeMapping mappingsA = getMapping(mappings, MultipleRoutesToAliasA.class);
assertThat(mappingsA.getMirrorSets().size()).isZero();
AnnotationTypeMapping mappingsB = getMapping(mappings, MulipleRoutesToAliasB.class);
AnnotationTypeMapping mappingsB = getMapping(mappings, MultipleRoutesToAliasB.class);
assertThat(getNames(mappingsB.getMirrorSets().get(0))).containsExactly("b1", "b2", "b3");
AnnotationTypeMapping mappingsC = getMapping(mappings, MulipleRoutesToAliasC.class);
AnnotationTypeMapping mappingsC = getMapping(mappings, MultipleRoutesToAliasC.class);
assertThat(getNames(mappingsC.getMirrorSets().get(0))).containsExactly("c1", "c2");
}
@Test
void getAliasMappingWhenHasWithMulipleRoutesToAliasReturnsMappedAttributes() {
AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(MulipleRoutesToAliasA.class);
AnnotationTypeMapping mappingsA = getMapping(mappings, MulipleRoutesToAliasA.class);
void getAliasMappingWhenHasWithMultipleRoutesToAliasReturnsMappedAttributes() {
AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(
MultipleRoutesToAliasA.class);
AnnotationTypeMapping mappingsA = getMapping(mappings, MultipleRoutesToAliasA.class);
assertThat(getAliasMapping(mappingsA, 0)).isNull();
AnnotationTypeMapping mappingsB = getMapping(mappings, MulipleRoutesToAliasB.class);
AnnotationTypeMapping mappingsB = getMapping(mappings, MultipleRoutesToAliasB.class);
assertThat(getAliasMapping(mappingsB, 0).getName()).isEqualTo("a1");
assertThat(getAliasMapping(mappingsB, 1).getName()).isEqualTo("a1");
assertThat(getAliasMapping(mappingsB, 2).getName()).isEqualTo("a1");
AnnotationTypeMapping mappingsC = getMapping(mappings, MulipleRoutesToAliasC.class);
AnnotationTypeMapping mappingsC = getMapping(mappings, MultipleRoutesToAliasC.class);
assertThat(getAliasMapping(mappingsC, 0).getName()).isEqualTo("a1");
assertThat(getAliasMapping(mappingsC, 1).getName()).isEqualTo("a1");
}
@@ -867,7 +869,7 @@ class AnnotationTypeMappingsTests {
}
@Retention(RetentionPolicy.RUNTIME)
@interface MulipleRoutesToAliasC {
@interface MultipleRoutesToAliasC {
@AliasFor("c2")
String c1() default "";
@@ -877,24 +879,24 @@ class AnnotationTypeMappingsTests {
}
@Retention(RetentionPolicy.RUNTIME)
@MulipleRoutesToAliasC
@interface MulipleRoutesToAliasB {
@MultipleRoutesToAliasC
@interface MultipleRoutesToAliasB {
@AliasFor(annotation = MulipleRoutesToAliasC.class, attribute = "c2")
@AliasFor(annotation = MultipleRoutesToAliasC.class, attribute = "c2")
String b1() default "";
@AliasFor(annotation = MulipleRoutesToAliasC.class, attribute = "c2")
@AliasFor(annotation = MultipleRoutesToAliasC.class, attribute = "c2")
String b2() default "";
@AliasFor(annotation = MulipleRoutesToAliasC.class, attribute = "c1")
@AliasFor(annotation = MultipleRoutesToAliasC.class, attribute = "c1")
String b3() default "";
}
@Retention(RetentionPolicy.RUNTIME)
@MulipleRoutesToAliasB
@interface MulipleRoutesToAliasA {
@MultipleRoutesToAliasB
@interface MultipleRoutesToAliasA {
@AliasFor(annotation = MulipleRoutesToAliasB.class, attribute = "b2")
@AliasFor(annotation = MultipleRoutesToAliasB.class, attribute = "b2")
String a1() default "";
}

4
spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -157,7 +157,7 @@ public abstract class AbstractMethodMessageHandler<T>
}
/**
* Configure custom return value handlers for handler metohds.
* Configure custom return value handlers for handler methods.
*/
public void setReturnValueHandlerConfigurer(ReturnValueHandlerConfigurer configurer) {
Assert.notNull(configurer, "ReturnValueHandlerConfigurer is required");

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 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.
@@ -169,7 +169,7 @@ class ActiveProfilesUtilsTests extends AbstractContextConfigurationUtilsTests {
*/
@Test
void resolveActiveProfilesWithOverridenInheritedResolver() {
assertResolvedProfiles(OverridenInheritedFooActiveProfilesResolverTestCase.class, "bar");
assertResolvedProfiles(OverriddenInheritedFooActiveProfilesResolverTestCase.class, "bar");
}
/**
@@ -304,7 +304,7 @@ class ActiveProfilesUtilsTests extends AbstractContextConfigurationUtilsTests {
}
@ActiveProfiles(resolver = BarActiveProfilesResolver.class, inheritProfiles = false)
private static class OverridenInheritedFooActiveProfilesResolverTestCase extends
private static class OverriddenInheritedFooActiveProfilesResolverTestCase extends
InheritedFooActiveProfilesResolverTestCase {
}

4
spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 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.
@@ -282,7 +282,7 @@ class DirtiesContextTestExecutionListenerTests {
}
@Test
void beforeAndAfterTestClassForDirtiesContextDeclaredViaMetaAnnotationWithOverridenAttributes()
void beforeAndAfterTestClassForDirtiesContextDeclaredViaMetaAnnotationWithOverriddenAttributes()
throws Exception {
Class<?> clazz = DirtiesContextViaMetaAnnotationWithOverridenAttributes.class;
BDDMockito.<Class<?>> given(testContext.getTestClass()).willReturn(clazz);