Merge branch '5.3.x'

sbrannen · sbrannen · commit 0fb9de5d0e6d · 2022-07-13T16:36:01.000+02:00
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -280,7 +280,7 @@ void copyPropertiesHonorsGenericTypeMatchesForUpperBoundedWildcard() {
 	 * {@code Number} can NOT be copied to {@code Integer}.
 	 */
 	@Test
-	void copyPropertiesDoesNotCopyeFromSuperTypeToSubType() {
+	void copyPropertiesDoesNotCopyFromSuperTypeToSubType() {
 		NumberHolder numberHolder = new NumberHolder();
 		numberHolder.setNumber(Integer.valueOf(42));
 		IntegerHolder integerHolder = new IntegerHolder();
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ParserStrategyUtilsTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ParserStrategyUtilsTests.java
@@ -75,7 +75,7 @@ public void instantiateClassWhenHasNoArgsConstructorCallsAware() {
 	}
 
 	@Test
-	public void instantiateClassWhenHasSingleContructorInjectsParams() {
+	public void instantiateClassWhenHasSingleConstructorInjectsParams() {
 		ArgsConstructor instance = instantiateClass(ArgsConstructor.class);
 		assertThat(instance.environment).isSameAs(this.environment);
 		assertThat(instance.beanFactory).isSameAs(this.registry);
@@ -84,7 +84,7 @@ public void instantiateClassWhenHasSingleContructorInjectsParams() {
 	}
 
 	@Test
-	public void instantiateClassWhenHasSingleContructorAndAwareInjectsParamsAndCallsAware() {
+	public void instantiateClassWhenHasSingleConstructorAndAwareInjectsParamsAndCallsAware() {
 		ArgsConstructorAndAware instance = instantiateClass(ArgsConstructorAndAware.class);
 		assertThat(instance.environment).isSameAs(this.environment);
 		assertThat(instance.setEnvironment).isSameAs(this.environment);
@@ -104,7 +104,7 @@ public void instantiateClassWhenHasMultipleConstructorsUsesNoArgsConstructor() {
 	}
 
 	@Test
-	public void instantiateClassWhenHasMutlipleConstructorsAndNotDefaultThrowsException() {
+	public void instantiateClassWhenHasMultipleConstructorsAndNotDefaultThrowsException() {
 		assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->
 				instantiateClass(MultipleConstructorsWithNoDefault.class));
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibilityTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationBackCompatibilityTests.java
@@ -29,7 +29,7 @@
  * @author Phillip Webb
  * @since 5.2
  */
-class AnnotationBackCompatibiltyTests {
+class AnnotationBackCompatibilityTests {
 
 	@Test
 	void multiplRoutesToMetaAnnotation() {
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationsScannerTests.java
@@ -123,7 +123,7 @@ void inheritedAnnotationsStrategyOnClassHierarchyScansInCorrectOrder() {
 	}
 
 	@Test
-	void inheritedAnnotationsStrategyOnClassWhenHasAnnotationOnBothClassesIncudesOnlyOne() {
+	void inheritedAnnotationsStrategyOnClassWhenHasAnnotationOnBothClassesIncludesOnlyOne() {
 		Class<?> source = WithSingleSuperclassAndDoubleInherited.class;
 		assertThat(Arrays.stream(source.getAnnotations()).map(
 				Annotation::annotationType).map(Class::getName)).containsExactly(
diff --git a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
@@ -239,7 +239,7 @@ void getActiveProfiles_fromSystemProperties_withMultipleProfiles() {
 	}
 
 	@Test
-	void getActiveProfiles_fromSystemProperties_withMulitpleProfiles_withWhitespace() {
+	void getActiveProfiles_fromSystemProperties_withMultipleProfiles_withWhitespace() {
 		System.setProperty(ACTIVE_PROFILES_PROPERTY_NAME, " bar , baz "); // notice whitespace
 		assertThat(environment.getActiveProfiles()).contains("bar", "baz");
 		System.clearProperty(ACTIVE_PROFILES_PROPERTY_NAME);
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
@@ -139,13 +139,13 @@ public void testSetListElementValue() {
 	}
 
 	@Test
-	public void testSetGenericListElementValueTypeCoersion() {
+	public void testSetGenericListElementValueTypeCoercion() {
 		// TODO currently failing since setValue does a getValue and "Wien" string != PlaceOfBirth - check with andy
 		setValue("placesLivedList[0]", "Wien");
 	}
 
 	@Test
-	public void testSetGenericListElementValueTypeCoersionOK() {
+	public void testSetGenericListElementValueTypeCoercionOK() {
 		setValue("booleanList[0]", "true", Boolean.TRUE);
 	}
 
@@ -171,12 +171,12 @@ public void testIndexingIntoUnsupportedType() {
 	}
 
 	@Test
-	public void testSetPropertyTypeCoersion() {
+	public void testSetPropertyTypeCoercion() {
 		setValue("publicBoolean", "true", Boolean.TRUE);
 	}
 
 	@Test
-	public void testSetPropertyTypeCoersionThroughSetter() {
+	public void testSetPropertyTypeCoercionThroughSetter() {
 		setValue("SomeProperty", "true", Boolean.TRUE);
 	}
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookupTests.java
@@ -73,9 +73,9 @@ public void setDataSourcesIsAnIdempotentOperation() throws Exception {
 	@Test
 	public void addingDataSourcePermitsOverride() throws Exception {
 		Map<String, DataSource> dataSources = new HashMap<>();
-		StubDataSource overridenDataSource = new StubDataSource();
+		StubDataSource overriddenDataSource = new StubDataSource();
 		StubDataSource expectedDataSource = new StubDataSource();
-		dataSources.put(DATA_SOURCE_NAME, overridenDataSource);
+		dataSources.put(DATA_SOURCE_NAME, overriddenDataSource);
 		MapDataSourceLookup lookup = new MapDataSourceLookup();
 		lookup.setDataSources(dataSources);
 		lookup.addDataSource(DATA_SOURCE_NAME, expectedDataSource); // must override existing entry
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DatabaseStartupValidatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DatabaseStartupValidatorTests.java
@@ -80,7 +80,7 @@ void shouldUseJdbc4IsValidByDefault() throws Exception {
 	}
 
 	@Test
-	void shouldCallValidatonTwiceWhenNotValid() throws Exception {
+	void shouldCallValidationTwiceWhenNotValid() throws Exception {
 		given(connection.isValid(1)).willReturn(false, true);
 
 		validator.afterPropertiesSet();
@@ -90,7 +90,7 @@ void shouldCallValidatonTwiceWhenNotValid() throws Exception {
 	}
 
 	@Test
-	void shouldCallValidatonTwiceInCaseOfException() throws Exception {
+	void shouldCallValidationTwiceInCaseOfException() throws Exception {
 		given(connection.isValid(1)).willThrow(new SQLException("Test")).willReturn(true);
 
 		validator.afterPropertiesSet();
@@ -118,7 +118,7 @@ void useValidationQueryInsteadOfIsValid() throws Exception {
 
 	@Test
 	@SuppressWarnings("deprecation")
-	void shouldExecuteValidatonTwiceOnError() throws Exception {
+	void shouldExecuteValidationTwiceOnError() throws Exception {
 		String validationQuery = "SELECT NOW() FROM DUAL";
 		Statement statement = mock(Statement.class);
 		given(connection.createStatement()).willReturn(statement);
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java
@@ -70,7 +70,7 @@ public void createWithSubscribeNativeHeaders() {
 	}
 
 	@Test
-	public void createWithUnubscribeNativeHeaders() {
+	public void createWithUnsubscribeNativeHeaders() {
 		MultiValueMap<String, String> extHeaders = new LinkedMultiValueMap<>();
 		extHeaders.add(StompHeaderAccessor.STOMP_ID_HEADER, "s1");
 
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
@@ -126,7 +126,7 @@ public void unmarshalPartialStaxSourceXmlStreamReader() throws Exception {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void unmarshalAnXmlReferingToAWrappedXmlElementDecl() throws Exception {
+	public void unmarshalAnXmlReferringToAWrappedXmlElementDecl() throws Exception {
 		// SPR-10714
 		unmarshaller = new Jaxb2Marshaller();
 		unmarshaller.setPackagesToScan(new String[] { "org.springframework.oxm.jaxb" });
diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/lookup/MapConnectionFactoryLookupUnitTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/lookup/MapConnectionFactoryLookupUnitTests.java
@@ -35,7 +35,7 @@ public class MapConnectionFactoryLookupUnitTests {
 	private static final String CONNECTION_FACTORY_NAME = "connectionFactory";
 
 	@Test
-	public void getConnectionFactorysReturnsUnmodifiableMap() {
+	public void getConnectionFactoriesReturnsUnmodifiableMap() {
 		MapConnectionFactoryLookup lookup = new MapConnectionFactoryLookup();
 		Map<String, ConnectionFactory> connectionFactories = lookup.getConnectionFactories();
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/AutowiredConfigurationErrorsIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/AutowiredConfigurationErrorsIntegrationTests.java
@@ -72,7 +72,7 @@ class AutowiredConfigurationErrorsIntegrationTests {
 		AutowiredRepeatedTestMethod.class,
 		AutowiredParameterizedTestMethod.class
 	})
-	void autowiredTestMethodsTestTemplateMethodsAndLifecyleMethods(Class<?> testClass) {
+	void autowiredTestMethodsTestTemplateMethodsAndLifecycleMethods(Class<?> testClass) {
 		testEventsFor(testClass)
 			.assertStatistics(stats -> stats.started(1).succeeded(0).failed(1))
 			.assertThatEvents().haveExactly(1,
@@ -111,7 +111,7 @@ void autowiredAndNonAutowiredTestMethods() {
 		NonStaticAutowiredBeforeAllMethod.class,
 		NonStaticAutowiredAfterAllMethod.class
 	})
-	void autowiredNonStaticClassLevelLifecyleMethods(Class<?> testClass) {
+	void autowiredNonStaticClassLevelLifecycleMethods(Class<?> testClass) {
 		containerEventsFor(testClass)
 			.assertStatistics(stats -> stats.started(2).succeeded(1).failed(1))
 			.assertThatEvents().haveExactly(1,
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
@@ -168,7 +168,7 @@ void resolveActiveProfilesWithMergedInheritedResolver() {
 	 * @since 4.0
 	 */
 	@Test
-	void resolveActiveProfilesWithOverridenInheritedResolver() {
+	void resolveActiveProfilesWithOverriddenInheritedResolver() {
 		assertResolvedProfiles(OverriddenInheritedFooActiveProfilesResolverTestCase.class, "bar");
 	}
 
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
@@ -249,7 +249,7 @@ void declaredViaMetaAnnotationWithOverrides() throws Exception {
 
 		@Test
 		void declaredViaMetaAnnotationWithOverriddenAttributes() throws Exception {
-			assertAfterClass(DirtiesContextViaMetaAnnotationWithOverridenAttributes.class);
+			assertAfterClass(DirtiesContextViaMetaAnnotationWithOverriddenAttributes.class);
 		}
 	}
 
@@ -447,7 +447,7 @@ void test() {
 	}
 
 	@MetaDirtyWithOverrides(classMode = AFTER_CLASS, hierarchyMode = EXHAUSTIVE)
-	static class DirtiesContextViaMetaAnnotationWithOverridenAttributes {
+	static class DirtiesContextViaMetaAnnotationWithOverriddenAttributes {
 
 		void test() {
 		}
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java
@@ -75,7 +75,7 @@ public void controllerAdviceWithClassArgument() {
 	@Test
 	public void configurerConsumers() {
 		TestConsumer<ArgumentResolverConfigurer> argumentResolverConsumer = new TestConsumer<>();
-		TestConsumer<RequestedContentTypeResolverBuilder> contenTypeResolverConsumer = new TestConsumer<>();
+		TestConsumer<RequestedContentTypeResolverBuilder> contentTypeResolverConsumer = new TestConsumer<>();
 		TestConsumer<CorsRegistry> corsRegistryConsumer = new TestConsumer<>();
 		TestConsumer<FormatterRegistry> formatterConsumer = new TestConsumer<>();
 		TestConsumer<ServerCodecConfigurer> codecsConsumer = new TestConsumer<>();
@@ -84,7 +84,7 @@ public void configurerConsumers() {
 
 		new DefaultControllerSpec(new MyController())
 				.argumentResolvers(argumentResolverConsumer)
-				.contentTypeResolver(contenTypeResolverConsumer)
+				.contentTypeResolver(contentTypeResolverConsumer)
 				.corsMappings(corsRegistryConsumer)
 				.formatters(formatterConsumer)
 				.httpMessageCodecs(codecsConsumer)
@@ -93,7 +93,7 @@ public void configurerConsumers() {
 				.build();
 
 		assertThat(argumentResolverConsumer.getValue()).isNotNull();
-		assertThat(contenTypeResolverConsumer.getValue()).isNotNull();
+		assertThat(contentTypeResolverConsumer.getValue()).isNotNull();
 		assertThat(corsRegistryConsumer.getValue()).isNotNull();
 		assertThat(formatterConsumer.getValue()).isNotNull();
 		assertThat(codecsConsumer.getValue()).isNotNull();
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingDataBindingIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingDataBindingIntegrationTests.java
@@ -110,8 +110,8 @@ public String handleDateParam(@RequestParam Date date) {
 		}
 
 		@ModelAttribute
-		public Mono<Foo> addFooAttribute(@PathVariable("id") Optional<Long> optiponalId) {
-			return optiponalId.map(id -> Mono.just(new Foo(id))).orElse(Mono.empty());
+		public Mono<Foo> addFooAttribute(@PathVariable("id") Optional<Long> optionalId) {
+			return optionalId.map(id -> Mono.just(new Foo(id))).orElse(Mono.empty());
 		}
 
 		@PostMapping("/foos/{id}")
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
@@ -335,7 +335,7 @@ public void defaultLocaleResolverConfiguration() {
 	}
 
 	@Test
-	public void defaultThemeResolverfiguration() {
+	public void defaultThemeResolverConfiguration() {
 		ApplicationContext context = initContext(WebConfig.class);
 		ThemeResolver themeResolver = context.getBean(THEME_RESOLVER_BEAN_NAME, ThemeResolver.class);
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
@@ -184,7 +184,7 @@ void matchCustomCondition() {
 	}
 
 	@Test
-	void compareToWithImpicitVsExplicitHttpMethodDeclaration() {
+	void compareToWithImplicitVsExplicitHttpMethodDeclaration() {
 		RequestMappingInfo noMethods = RequestMappingInfo.paths().build();
 		RequestMappingInfo oneMethod = RequestMappingInfo.paths().methods(GET).build();
 		RequestMappingInfo oneMethodOneParam = RequestMappingInfo.paths().methods(GET).params("foo").build();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
@@ -222,7 +222,7 @@ public void createQueryStringOneParam() throws JspException {
 	}
 
 	@Test
-	public void createQueryStringOneParamForExsistingQueryString() throws JspException {
+	public void createQueryStringOneParamForExistingQueryString() throws JspException {
 		List<Param> params = new ArrayList<>();
 		Set<String> usedParams = new HashSet<>();
 

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public void instantiateClassWhenHasNoArgsConstructorCallsAware() {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`@Test`
`78`		`- public void instantiateClassWhenHasSingleContructorInjectsParams() {`
	`78`	`+ public void instantiateClassWhenHasSingleConstructorInjectsParams() {`
`79`	`79`	`ArgsConstructor instance = instantiateClass(ArgsConstructor.class);`
`80`	`80`	`assertThat(instance.environment).isSameAs(this.environment);`
`81`	`81`	`assertThat(instance.beanFactory).isSameAs(this.registry);`
`@@ -84,7 +84,7 @@ public void instantiateClassWhenHasSingleContructorInjectsParams() {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Test`
`87`		`- public void instantiateClassWhenHasSingleContructorAndAwareInjectsParamsAndCallsAware() {`
	`87`	`+ public void instantiateClassWhenHasSingleConstructorAndAwareInjectsParamsAndCallsAware() {`
`88`	`88`	`ArgsConstructorAndAware instance = instantiateClass(ArgsConstructorAndAware.class);`
`89`	`89`	`assertThat(instance.environment).isSameAs(this.environment);`
`90`	`90`	`assertThat(instance.setEnvironment).isSameAs(this.environment);`
`@@ -104,7 +104,7 @@ public void instantiateClassWhenHasMultipleConstructorsUsesNoArgsConstructor() {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`@Test`
`107`		`- public void instantiateClassWhenHasMutlipleConstructorsAndNotDefaultThrowsException() {`
	`107`	`+ public void instantiateClassWhenHasMultipleConstructorsAndNotDefaultThrowsException() {`
`108`	`108`	`assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->`
`109`	`109`	`instantiateClass(MultipleConstructorsWithNoDefault.class));`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ void inheritedAnnotationsStrategyOnClassHierarchyScansInCorrectOrder() {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Test`
`126`		`- void inheritedAnnotationsStrategyOnClassWhenHasAnnotationOnBothClassesIncudesOnlyOne() {`
	`126`	`+ void inheritedAnnotationsStrategyOnClassWhenHasAnnotationOnBothClassesIncludesOnlyOne() {`
`127`	`127`	`Class<?> source = WithSingleSuperclassAndDoubleInherited.class;`
`128`	`128`	`assertThat(Arrays.stream(source.getAnnotations()).map(`
`129`	`129`	`Annotation::annotationType).map(Class::getName)).containsExactly(`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ void getActiveProfiles_fromSystemProperties_withMultipleProfiles() {`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`@Test`
`242`		`- void getActiveProfiles_fromSystemProperties_withMulitpleProfiles_withWhitespace() {`
	`242`	`+ void getActiveProfiles_fromSystemProperties_withMultipleProfiles_withWhitespace() {`
`243`	`243`	`System.setProperty(ACTIVE_PROFILES_PROPERTY_NAME, " bar , baz "); // notice whitespace`
`244`	`244`	`assertThat(environment.getActiveProfiles()).contains("bar", "baz");`
`245`	`245`	`System.clearProperty(ACTIVE_PROFILES_PROPERTY_NAME);`
Original file line number	Diff line number	Diff line change
`@@ -139,13 +139,13 @@ public void testSetListElementValue() {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`@Test`
`142`		`- public void testSetGenericListElementValueTypeCoersion() {`
	`142`	`+ public void testSetGenericListElementValueTypeCoercion() {`
`143`	`143`	`// TODO currently failing since setValue does a getValue and "Wien" string != PlaceOfBirth - check with andy`
`144`	`144`	`setValue("placesLivedList[0]", "Wien");`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`@Test`
`148`		`- public void testSetGenericListElementValueTypeCoersionOK() {`
	`148`	`+ public void testSetGenericListElementValueTypeCoercionOK() {`
`149`	`149`	`setValue("booleanList[0]", "true", Boolean.TRUE);`
`150`	`150`	`}`
`151`	`151`
`@@ -171,12 +171,12 @@ public void testIndexingIntoUnsupportedType() {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`@Test`
`174`		`- public void testSetPropertyTypeCoersion() {`
	`174`	`+ public void testSetPropertyTypeCoercion() {`
`175`	`175`	`setValue("publicBoolean", "true", Boolean.TRUE);`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`@Test`
`179`		`- public void testSetPropertyTypeCoersionThroughSetter() {`
	`179`	`+ public void testSetPropertyTypeCoercionThroughSetter() {`
`180`	`180`	`setValue("SomeProperty", "true", Boolean.TRUE);`
`181`	`181`	`}`
`182`	`182`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void createWithSubscribeNativeHeaders() {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Test`
`73`		`- public void createWithUnubscribeNativeHeaders() {`
	`73`	`+ public void createWithUnsubscribeNativeHeaders() {`
`74`	`74`	`MultiValueMap<String, String> extHeaders = new LinkedMultiValueMap<>();`
`75`	`75`	`extHeaders.add(StompHeaderAccessor.STOMP_ID_HEADER, "s1");`
`76`	`76`