Merge branch '3.1.x'

Closes gh-36420

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/AutoTimeProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -32,7 +32,7 @@ public final class AutoTimeProperties {
 	private boolean enabled = true;
 
 	/**
-	 * Whether to publish percentile histrograms.
+	 * Whether to publish percentile histograms.
 	 */
 	private boolean percentilesHistogram;
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/reactive/HttpExchangesWebFilter.java

@@ -83,10 +83,10 @@ private Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain,
 
 	private void addExchangeOnCommit(ServerWebExchange exchange, PrincipalAndSession principalAndSession) {
 		RecordableServerHttpRequest sourceRequest = new RecordableServerHttpRequest(exchange.getRequest());
-		HttpExchange.Started startedHtppExchange = HttpExchange.start(sourceRequest);
+		HttpExchange.Started startedHttpExchange = HttpExchange.start(sourceRequest);
 		exchange.getResponse().beforeCommit(() -> {
 			RecordableServerHttpResponse sourceResponse = new RecordableServerHttpResponse(exchange.getResponse());
-			HttpExchange finishedExchange = startedHtppExchange.finish(sourceResponse,
+			HttpExchange finishedExchange = startedHttpExchange.finish(sourceResponse,
 					principalAndSession::getPrincipal, principalAndSession::getSessionId, this.includes);
 			this.repository.add(finishedExchange);
 			return Mono.empty();

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/servlet/HttpExchangesFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -83,15 +83,15 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 			return;
 		}
 		RecordableServletHttpRequest sourceRequest = new RecordableServletHttpRequest(request);
-		HttpExchange.Started startedHtppExchange = HttpExchange.start(sourceRequest);
+		HttpExchange.Started startedHttpExchange = HttpExchange.start(sourceRequest);
 		int status = HttpStatus.INTERNAL_SERVER_ERROR.value();
 		try {
 			filterChain.doFilter(request, response);
 			status = response.getStatus();
 		}
 		finally {
 			RecordableServletHttpResponse sourceResponse = new RecordableServletHttpResponse(response, status);
-			HttpExchange finishedExchange = startedHtppExchange.finish(sourceResponse, request::getUserPrincipal,
+			HttpExchange finishedExchange = startedHttpExchange.finish(sourceResponse, request::getUserPrincipal,
 					() -> getSessionId(request), this.includes);
 			this.repository.add(finishedExchange);
 		}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -92,8 +92,8 @@ public List<String> getJwsAlgorithms() {
 			return this.jwsAlgorithms;
 		}
 
-		public void setJwsAlgorithms(List<String> jwsAlgortithms) {
-			this.jwsAlgorithms = jwsAlgortithms;
+		public void setJwsAlgorithms(List<String> jwsAlgorithms) {
+			this.jwsAlgorithms = jwsAlgorithms;
 		}
 
 		public String getIssuerUri() {

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.java

@@ -27,7 +27,7 @@ public class MyContainersConfiguration {
 
 	@Bean
 	@RestartScope
-	public MongoDBContainer monogDbContainer() {
+	public MongoDBContainer mongoDbContainer() {
 		return new MongoDBContainer("mongo:5.0");
 	}
 

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.java

@@ -26,7 +26,7 @@
 public class MyContainersConfiguration {
 
 	@Bean
-	public MongoDBContainer monogDbContainer(DynamicPropertyRegistry properties) {
+	public MongoDBContainer mongoDbContainer(DynamicPropertyRegistry properties) {
 		MongoDBContainer container = new MongoDBContainer("mongo:5.0");
 		properties.add("spring.data.mongodb.host", container::getHost);
 		properties.add("spring.data.mongodb.port", container::getFirstMappedPort);

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java

@@ -68,15 +68,15 @@ private void registerBeanDefinitions(ConfigurableListableBeanFactory beanFactory
 
 	private Set<ServiceConnection> getAnnotations(ConfigurableListableBeanFactory beanFactory, String beanName,
 			BeanDefinition beanDefinition) {
-		Set<ServiceConnection> annoations = new LinkedHashSet<>();
-		annoations.addAll(beanFactory.findAllAnnotationsOnBean(beanName, ServiceConnection.class, false));
+		Set<ServiceConnection> annotations = new LinkedHashSet<>();
+		annotations.addAll(beanFactory.findAllAnnotationsOnBean(beanName, ServiceConnection.class, false));
 		if (beanDefinition instanceof TestcontainerBeanDefinition testcontainerBeanDefinition) {
 			testcontainerBeanDefinition.getAnnotations()
 				.stream(ServiceConnection.class)
 				.map(MergedAnnotation::synthesize)
-				.forEach(annoations::add);
+				.forEach(annotations::add);
 		}
-		return annoations;
+		return annotations;
 	}
 
 	private BeanDefinition getBeanDefinition(ConfigurableListableBeanFactory beanFactory, String beanName) {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Bindable.java

@@ -230,7 +230,7 @@ public Bindable<T> withBindRestrictions(BindRestriction... additionalRestriction
 	}
 
 	/**
-	 * Create an updated {@link Bindable} instance with a specifc bind method. To use
+	 * Create an updated {@link Bindable} instance with a specific bind method. To use
 	 * {@link BindMethod#VALUE_OBJECT value object binding}, the current instance must not
 	 * have an existing or supplied value.
 	 * @param bindMethod the method to use to bind the bindable