diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java index a3c18bf6255..5849a539905 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java @@ -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 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 diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibiltyTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibiltyTests.java index 39f1bdd6fe4..d65ffb0ed7f 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibiltyTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibiltyTests.java @@ -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 @@ 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; } diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java index 412e9c51a97..950054ef4d5 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java @@ -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"); } @@ -867,7 +869,7 @@ static class WithDefaultValueAliasPair { } @Retention(RetentionPolicy.RUNTIME) - @interface MulipleRoutesToAliasC { + @interface MultipleRoutesToAliasC { @AliasFor("c2") String c1() default ""; @@ -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 ""; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java index a92fc40d129..210175caee9 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java @@ -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 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"); 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 cc48df48857..b192b34ee24 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-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 @@ void resolveActiveProfilesWithMergedInheritedResolver() { */ @Test void resolveActiveProfilesWithOverridenInheritedResolver() { - assertResolvedProfiles(OverridenInheritedFooActiveProfilesResolverTestCase.class, "bar"); + assertResolvedProfiles(OverriddenInheritedFooActiveProfilesResolverTestCase.class, "bar"); } /** @@ -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 { } diff --git a/spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java b/spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java index d142372eb2e..1096f4758c0 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java @@ -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 @@ void beforeAndAfterTestClassForDirtiesContextDeclaredViaMetaAnnotationWithOverri } @Test - void beforeAndAfterTestClassForDirtiesContextDeclaredViaMetaAnnotationWithOverridenAttributes() + void beforeAndAfterTestClassForDirtiesContextDeclaredViaMetaAnnotationWithOverriddenAttributes() throws Exception { Class clazz = DirtiesContextViaMetaAnnotationWithOverridenAttributes.class; BDDMockito.> given(testContext.getTestClass()).willReturn(clazz);