Skip to content

Fix typos in source files #24746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -28,7 +28,7 @@
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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -84,11 +84,11 @@ static class WithMetaMetaTestAnnotation1AndMetaTestAnnotation2 {
@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;

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -382,26 +382,28 @@ void resolveMirrorsWhenHasDifferentValuesThrowsException() {
}

@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");
}
Expand Down Expand Up @@ -867,7 +869,7 @@ static class WithDefaultValueAliasPair {
}

@Retention(RetentionPolicy.RUNTIME)
@interface MulipleRoutesToAliasC {
@interface MultipleRoutesToAliasC {

@AliasFor("c2")
String c1() default "";
Expand All @@ -877,24 +879,24 @@ static class WithDefaultValueAliasPair {
}

@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 "";
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -157,7 +157,7 @@ public ArgumentResolverConfigurer getArgumentResolverConfigurer() {
}

/**
* 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");
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -169,7 +169,7 @@ void resolveActiveProfilesWithMergedInheritedResolver() {
*/
@Test
void resolveActiveProfilesWithOverridenInheritedResolver() {
assertResolvedProfiles(OverridenInheritedFooActiveProfilesResolverTestCase.class, "bar");
assertResolvedProfiles(OverriddenInheritedFooActiveProfilesResolverTestCase.class, "bar");
}

/**
Expand Down Expand Up @@ -304,7 +304,7 @@ private static class MergedInheritedFooActiveProfilesResolverTestCase extends
}

@ActiveProfiles(resolver = BarActiveProfilesResolver.class, inheritProfiles = false)
private static class OverridenInheritedFooActiveProfilesResolverTestCase extends
private static class OverriddenInheritedFooActiveProfilesResolverTestCase extends
InheritedFooActiveProfilesResolverTestCase {
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -282,7 +282,7 @@ void beforeAndAfterTestClassForDirtiesContextDeclaredViaMetaAnnotationWithOverri
}

@Test
void beforeAndAfterTestClassForDirtiesContextDeclaredViaMetaAnnotationWithOverridenAttributes()
void beforeAndAfterTestClassForDirtiesContextDeclaredViaMetaAnnotationWithOverriddenAttributes()
throws Exception {
Class<?> clazz = DirtiesContextViaMetaAnnotationWithOverridenAttributes.class;
BDDMockito.<Class<?>> given(testContext.getTestClass()).willReturn(clazz);
Expand Down