From 8321887d6aa9e00fba9a63b4f603f48b9c69cad4 Mon Sep 17 00:00:00 2001 From: Christoph Dreis Date: Tue, 11 Jul 2023 08:23:38 +0200 Subject: [PATCH 1/2] Fix typos See gh-36306 --- .../actuate/autoconfigure/metrics/AutoTimeProperties.java | 2 +- .../web/exchanges/reactive/HttpExchangesWebFilter.java | 4 ++-- .../web/exchanges/servlet/HttpExchangesFilter.java | 4 ++-- .../oauth2/resource/OAuth2ResourceServerProperties.java | 4 ++-- .../devtools/MyContainersConfiguration.java | 2 +- .../dynamicproperties/MyContainersConfiguration.java | 2 +- .../ServiceConnectionAutoConfigurationRegistrar.java | 8 ++++---- .../boot/context/properties/bind/Bindable.java | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/AutoTimeProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/AutoTimeProperties.java index 66840a728a..17a924f1b3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/AutoTimeProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/AutoTimeProperties.java @@ -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; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/reactive/HttpExchangesWebFilter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/reactive/HttpExchangesWebFilter.java index 25662726a7..411bc8faf1 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/reactive/HttpExchangesWebFilter.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/reactive/HttpExchangesWebFilter.java @@ -83,10 +83,10 @@ public class HttpExchangesWebFilter implements WebFilter, Ordered { 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(); diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/servlet/HttpExchangesFilter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/servlet/HttpExchangesFilter.java index 5fe3a561d7..e182cc1f02 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/servlet/HttpExchangesFilter.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/servlet/HttpExchangesFilter.java @@ -83,7 +83,7 @@ public class HttpExchangesFilter extends OncePerRequestFilter implements Ordered 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); @@ -91,7 +91,7 @@ public class HttpExchangesFilter extends OncePerRequestFilter implements Ordered } 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); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java index 04e3c03a9a..926466698d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java @@ -92,8 +92,8 @@ public class OAuth2ResourceServerProperties { return this.jwsAlgorithms; } - public void setJwsAlgorithms(List jwsAlgortithms) { - this.jwsAlgorithms = jwsAlgortithms; + public void setJwsAlgorithms(List jwsAlgorithms) { + this.jwsAlgorithms = jwsAlgorithms; } public String getIssuerUri() { diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.java index c005a9bace..b03c52b414 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.java +++ b/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"); } diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.java index a1d4bcc714..fb839227f0 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/dynamicproperties/MyContainersConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.test.context.DynamicPropertyRegistry; 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); diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java index f03ed2960d..8e9be4c322 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java @@ -68,15 +68,15 @@ class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitio private Set getAnnotations(ConfigurableListableBeanFactory beanFactory, String beanName, BeanDefinition beanDefinition) { - Set annoations = new LinkedHashSet<>(); - annoations.addAll(beanFactory.findAllAnnotationsOnBean(beanName, ServiceConnection.class, false)); + Set 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) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Bindable.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Bindable.java index c5a7dfcd1a..d40937abb3 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Bindable.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Bindable.java @@ -230,7 +230,7 @@ public final class Bindable { } /** - * 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 From d2912c64427c2c04fda96d8a117bb67a23009358 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 17 Jul 2023 09:40:57 +0200 Subject: [PATCH 2/2] Update copyright year of changed files See gh-36306 --- .../boot/actuate/autoconfigure/metrics/AutoTimeProperties.java | 2 +- .../boot/actuate/web/exchanges/servlet/HttpExchangesFilter.java | 2 +- .../oauth2/resource/OAuth2ResourceServerProperties.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/AutoTimeProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/AutoTimeProperties.java index 17a924f1b3..0015a31389 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/AutoTimeProperties.java +++ b/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. diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/servlet/HttpExchangesFilter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/servlet/HttpExchangesFilter.java index e182cc1f02..8ac9cc951f 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/servlet/HttpExchangesFilter.java +++ b/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. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java index 926466698d..61c4787932 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java +++ b/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.