diff --git a/buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java b/buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java index 8e6aa9a6c8a9..d77fed6556c6 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/RepositoryTransformersExtension.java @@ -115,7 +115,7 @@ private List getSpringRepositories() { List springRepositories = new ArrayList<>(this.project.getRepositories() .withType(MavenArtifactRepository.class) .stream() - .filter(this::isSpringReposirory) + .filter(this::isSpringRepository) .toList()); Function bySnapshots = (repository) -> repository.getName() .contains("snapshot"); @@ -124,7 +124,7 @@ private List getSpringRepositories() { return springRepositories; } - private boolean isSpringReposirory(MavenArtifactRepository repository) { + private boolean isSpringRepository(MavenArtifactRepository repository) { return (repository.getName().startsWith("spring-")); } diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MavenMetadataVersionResolver.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MavenMetadataVersionResolver.java index 74dc6a57c5b8..ca7a4cf6554b 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MavenMetadataVersionResolver.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MavenMetadataVersionResolver.java @@ -117,7 +117,7 @@ private Set resolveVersions(String groupId, String artifactId, MavenArti } /** - * Retrives the configured credentials of the given {@code repository}. We cannot use + * Retrieves the configured credentials of the given {@code repository}. We cannot use * {@link MavenArtifactRepository#getCredentials()} as, if the repository has no * credentials, it has the unwanted side-effect of assigning an empty set of username * and password credentials to the repository which may cause subsequent "Username diff --git a/core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/container/ContainerImageMetadata.java b/core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/container/ContainerImageMetadata.java index 11e6a0160046..837b7ae6c665 100644 --- a/core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/container/ContainerImageMetadata.java +++ b/core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/container/ContainerImageMetadata.java @@ -26,7 +26,7 @@ * Primarily designed to be attached to {@link BeanDefinition BeanDefinitions} created in * support of Testcontainers or Docker Compose. * - * @param imageName the contaimer image name or {@code null} if the image name is not yet + * @param imageName the container image name or {@code null} if the image name is not yet * known * @author Phillip Webb * @since 3.4.0 diff --git a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java index f6ec890f703c..cabf431f1535 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java @@ -33,7 +33,7 @@ class FilteredIterableConfigurationPropertiesSource extends FilteredConfiguratio private ConfigurationPropertyName @Nullable [] filteredNames; - private int numerOfFilteredNames; + private int numberOfFilteredNames; FilteredIterableConfigurationPropertiesSource(IterableConfigurationPropertySource source, Predicate filter) { @@ -41,13 +41,13 @@ class FilteredIterableConfigurationPropertiesSource extends FilteredConfiguratio @Nullable ConfigurationPropertyName[] filterableNames = getFilterableNames(source); if (filterableNames != null) { this.filteredNames = new ConfigurationPropertyName[filterableNames.length]; - this.numerOfFilteredNames = 0; + this.numberOfFilteredNames = 0; for (ConfigurationPropertyName name : filterableNames) { if (name == null) { break; } if (filter.test(name)) { - this.filteredNames[this.numerOfFilteredNames++] = name; + this.filteredNames[this.numberOfFilteredNames++] = name; } } } @@ -68,7 +68,7 @@ class FilteredIterableConfigurationPropertiesSource extends FilteredConfiguratio @Override public Stream stream() { if (this.filteredNames != null) { - return Arrays.stream(this.filteredNames, 0, this.numerOfFilteredNames); + return Arrays.stream(this.filteredNames, 0, this.numberOfFilteredNames); } return getSource().stream().filter(getFilter()); } @@ -81,7 +81,7 @@ protected IterableConfigurationPropertySource getSource() { @Override public ConfigurationPropertyState containsDescendantOf(ConfigurationPropertyName name) { if (this.filteredNames != null) { - return ConfigurationPropertyState.search(this.filteredNames, 0, this.numerOfFilteredNames, + return ConfigurationPropertyState.search(this.filteredNames, 0, this.numberOfFilteredNames, name::isAncestorOf); } return ConfigurationPropertyState.search(this, name::isAncestorOf); diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/io/rest-client.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/io/rest-client.adoc index 05b8dafa5bc0..75dac2d919e9 100644 --- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/io/rest-client.adoc +++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/io/rest-client.adoc @@ -402,7 +402,7 @@ If you need to customize HTTP Service clients beyond basic properties, you can u For `RestClient` backed HTTP Service clients, you can declare a bean that implements javadoc:org.springframework.web.client.support.RestClientHttpServiceGroupConfigurer[]. For `WebClient` backed HTTP Service clients you can declare a bean that implements javadoc:org.springframework.web.reactive.function.client.support.WebClientHttpServiceGroupConfigurer[]. -Both work in the same way and will be automatically applied by Spring Boot's auto-configuraiton. +Both work in the same way and will be automatically applied by Spring Boot's auto-configuration. For example, the following configuration would add a group customizer that adds an HTTP header to each outgoing request containing the group name: diff --git a/module/spring-boot-health/src/main/java/org/springframework/boot/health/application/SslHealthIndicator.java b/module/spring-boot-health/src/main/java/org/springframework/boot/health/application/SslHealthIndicator.java index c8ca0933488b..5e49375488e1 100644 --- a/module/spring-boot-health/src/main/java/org/springframework/boot/health/application/SslHealthIndicator.java +++ b/module/spring-boot-health/src/main/java/org/springframework/boot/health/application/SslHealthIndicator.java @@ -58,13 +58,13 @@ public SslHealthIndicator(SslInfo sslInfo, Duration expiryThreshold) { protected void doHealthCheck(Health.Builder builder) throws Exception { List validCertificateChains = new ArrayList<>(); List invalidCertificateChains = new ArrayList<>(); - List expiringCerificateChains = new ArrayList<>(); + List expiringCertificateChains = new ArrayList<>(); for (BundleInfo bundle : this.sslInfo.getBundles()) { for (CertificateChainInfo certificateChain : bundle.getCertificateChains()) { if (containsOnlyValidCertificates(certificateChain)) { validCertificateChains.add(certificateChain); if (containsExpiringCertificate(certificateChain)) { - expiringCerificateChains.add(certificateChain); + expiringCertificateChains.add(certificateChain); } } else if (containsInvalidCertificate(certificateChain)) { @@ -73,7 +73,7 @@ else if (containsInvalidCertificate(certificateChain)) { } } builder.status((invalidCertificateChains.isEmpty()) ? Status.UP : Status.OUT_OF_SERVICE); - builder.withDetail("expiringChains", expiringCerificateChains); + builder.withDetail("expiringChains", expiringCertificateChains); builder.withDetail("invalidChains", invalidCertificateChains); builder.withDetail("validChains", validCertificateChains); } diff --git a/module/spring-boot-health/src/main/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/HealthEndpointConfiguration.java b/module/spring-boot-health/src/main/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/HealthEndpointConfiguration.java index e3cc1e145fe3..9fcf2e594707 100644 --- a/module/spring-boot-health/src/main/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/HealthEndpointConfiguration.java +++ b/module/spring-boot-health/src/main/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/HealthEndpointConfiguration.java @@ -84,10 +84,10 @@ HealthEndpointGroupMembershipValidator healthEndpointGroupMembershipValidator(He @Bean @ConditionalOnMissingBean - HealthEndpoint healthEndpoint(HealthContributorRegistry halthContributorRegistry, + HealthEndpoint healthEndpoint(HealthContributorRegistry healthContributorRegistry, ObjectProvider reactiveHealthContributorRegistry, HealthEndpointGroups groups, HealthEndpointProperties properties) { - return new HealthEndpoint(halthContributorRegistry, reactiveHealthContributorRegistry.getIfAvailable(), groups, + return new HealthEndpoint(healthContributorRegistry, reactiveHealthContributorRegistry.getIfAvailable(), groups, properties.getLogging().getSlowIndicatorThreshold()); } diff --git a/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/JacksonComponentModule.java b/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/JacksonComponentModule.java index 8383aca4c04e..58c752b59e4a 100644 --- a/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/JacksonComponentModule.java +++ b/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/JacksonComponentModule.java @@ -80,14 +80,14 @@ public void registerJacksonComponents() { BeanFactory beanFactory = this.beanFactory; while (beanFactory != null) { if (beanFactory instanceof ListableBeanFactory listableBeanFactory) { - addJackonComponentBeans(listableBeanFactory); + addJacksonComponentBeans(listableBeanFactory); } beanFactory = (beanFactory instanceof HierarchicalBeanFactory hierarchicalBeanFactory) ? hierarchicalBeanFactory.getParentBeanFactory() : null; } } - private void addJackonComponentBeans(ListableBeanFactory beanFactory) { + private void addJacksonComponentBeans(ListableBeanFactory beanFactory) { Map beans = beanFactory.getBeansWithAnnotation(JacksonComponent.class); for (Object bean : beans.values()) { addJacksonComponentBean(bean); diff --git a/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/MissingAlternativeUserDetailsManagerOrUserPropertiesConfigured.java b/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/MissingAlternativeUserDetailsManagerOrUserPropertiesConfigured.java index 0645697f3163..63b2d6dd6ed5 100644 --- a/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/MissingAlternativeUserDetailsManagerOrUserPropertiesConfigured.java +++ b/module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/MissingAlternativeUserDetailsManagerOrUserPropertiesConfigured.java @@ -22,7 +22,7 @@ import org.springframework.context.annotation.Condition; /** - * {@link Condition} used to check if security username or passowrd properties have been + * {@link Condition} used to check if security username or password properties have been * set or there are no alternatives to the user details manager available. * * @author Andy Wilkinson diff --git a/test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resource.java b/test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resource.java index 29756ce7b741..5f3c9b56c81f 100644 --- a/test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resource.java +++ b/test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resource.java @@ -21,7 +21,7 @@ /** * A resource that is to be made available in tests. * - * @param path the path of the resoure + * @param path the path of the resource * @param additional whether the resource should be made available in addition to those * that already exist elsewhere * @author Andy Wilkinson