Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ private List<MavenArtifactRepository> getSpringRepositories() {
List<MavenArtifactRepository> springRepositories = new ArrayList<>(this.project.getRepositories()
.withType(MavenArtifactRepository.class)
.stream()
.filter(this::isSpringReposirory)
.filter(this::isSpringRepository)
.toList());
Function<MavenArtifactRepository, Boolean> bySnapshots = (repository) -> repository.getName()
.contains("snapshot");
Expand All @@ -124,7 +124,7 @@ private List<MavenArtifactRepository> getSpringRepositories() {
return springRepositories;
}

private boolean isSpringReposirory(MavenArtifactRepository repository) {
private boolean isSpringRepository(MavenArtifactRepository repository) {
return (repository.getName().startsWith("spring-"));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private Set<String> 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ class FilteredIterableConfigurationPropertiesSource extends FilteredConfiguratio

private ConfigurationPropertyName @Nullable [] filteredNames;

private int numerOfFilteredNames;
private int numberOfFilteredNames;

FilteredIterableConfigurationPropertiesSource(IterableConfigurationPropertySource source,
Predicate<ConfigurationPropertyName> filter) {
super(source, filter);
@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;
}
}
}
Expand All @@ -68,7 +68,7 @@ class FilteredIterableConfigurationPropertiesSource extends FilteredConfiguratio
@Override
public Stream<ConfigurationPropertyName> 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());
}
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ public SslHealthIndicator(SslInfo sslInfo, Duration expiryThreshold) {
protected void doHealthCheck(Health.Builder builder) throws Exception {
List<CertificateChainInfo> validCertificateChains = new ArrayList<>();
List<CertificateChainInfo> invalidCertificateChains = new ArrayList<>();
List<CertificateChainInfo> expiringCerificateChains = new ArrayList<>();
List<CertificateChainInfo> 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)) {
Expand All @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ HealthEndpointGroupMembershipValidator healthEndpointGroupMembershipValidator(He

@Bean
@ConditionalOnMissingBean
HealthEndpoint healthEndpoint(HealthContributorRegistry halthContributorRegistry,
HealthEndpoint healthEndpoint(HealthContributorRegistry healthContributorRegistry,
ObjectProvider<ReactiveHealthContributorRegistry> reactiveHealthContributorRegistry,
HealthEndpointGroups groups, HealthEndpointProperties properties) {
return new HealthEndpoint(halthContributorRegistry, reactiveHealthContributorRegistry.getIfAvailable(), groups,
return new HealthEndpoint(healthContributorRegistry, reactiveHealthContributorRegistry.getIfAvailable(), groups,
properties.getLogging().getSlowIndicatorThreshold());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Object> beans = beanFactory.getBeansWithAnnotation(JacksonComponent.class);
for (Object bean : beans.values()) {
addJacksonComponentBean(bean);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down