Skip to content

Commit 89285eb

Browse files
committed
Merge pull request #46508 from shchae04
* pr/46508: Correct "intial" to "initial" Closes gh-46508
2 parents 8651c84 + eaf7dc2 commit 89285eb

File tree

10 files changed

+24
-24
lines changed

10 files changed

+24
-24
lines changed

module/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthEndpointSupportTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ protected final R createRegistry(String name, C contributor) {
360360
return createRegistry((registrations) -> registrations.accept(name, contributor));
361361
}
362362

363-
protected abstract R createRegistry(Consumer<BiConsumer<String, C>> intialRegistrations);
363+
protected abstract R createRegistry(Consumer<BiConsumer<String, C>> initialRegistrations);
364364

365365
protected abstract C createContributor(Health health);
366366

module/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthEndpointTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ protected HealthEndpoint create(HealthContributorRegistry registry, HealthEndpoi
111111

112112
@Override
113113
protected HealthContributorRegistry createRegistry(
114-
Consumer<BiConsumer<String, HealthContributor>> intialRegistrations) {
115-
return new DefaultHealthContributorRegistry(Collections.emptyList(), intialRegistrations);
114+
Consumer<BiConsumer<String, HealthContributor>> initialRegistrations) {
115+
return new DefaultHealthContributorRegistry(Collections.emptyList(), initialRegistrations);
116116
}
117117

118118
@Override

module/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthEndpointWebExtensionTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ protected HealthEndpointWebExtension create(HealthContributorRegistry registry,
104104

105105
@Override
106106
protected HealthContributorRegistry createRegistry(
107-
Consumer<BiConsumer<String, HealthContributor>> intialRegistrations) {
108-
return new DefaultHealthContributorRegistry(Collections.emptyList(), intialRegistrations);
107+
Consumer<BiConsumer<String, HealthContributor>> initialRegistrations) {
108+
return new DefaultHealthContributorRegistry(Collections.emptyList(), initialRegistrations);
109109
}
110110

111111
@Override

module/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ReactiveHealthEndpointWebExtensionTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ protected ReactiveHealthEndpointWebExtension create(ReactiveHealthContributorReg
108108

109109
@Override
110110
protected ReactiveHealthContributorRegistry createRegistry(
111-
Consumer<BiConsumer<String, ReactiveHealthContributor>> intialRegistrations) {
112-
return new DefaultReactiveHealthContributorRegistry(Collections.emptyList(), intialRegistrations);
111+
Consumer<BiConsumer<String, ReactiveHealthContributor>> initialRegistrations) {
112+
return new DefaultReactiveHealthContributorRegistry(Collections.emptyList(), initialRegistrations);
113113
}
114114

115115
@Override

module/spring-boot-health/src/main/java/org/springframework/boot/health/registry/AbstractRegistry.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ abstract class AbstractRegistry<C, E> {
4949

5050
AbstractRegistry(BiFunction<String, C, E> entryAdapter,
5151
Collection<? extends HealthContributorNameValidator> nameValidators,
52-
Consumer<BiConsumer<String, C>> intialRegistrations) {
52+
Consumer<BiConsumer<String, C>> initialRegistrations) {
5353
this.nameValidators = (nameValidators != null) ? List.copyOf(nameValidators) : Collections.emptyList();
5454
this.entryAdapter = entryAdapter;
5555
Map<String, C> contributors = new LinkedHashMap<>();
56-
if (intialRegistrations != null) {
57-
intialRegistrations.accept((name, contributor) -> registerContributor(contributors, name, contributor));
56+
if (initialRegistrations != null) {
57+
initialRegistrations.accept((name, contributor) -> registerContributor(contributors, name, contributor));
5858
}
5959
this.contributors = Collections.unmodifiableMap(contributors);
6060
}

module/spring-boot-health/src/main/java/org/springframework/boot/health/registry/DefaultHealthContributorRegistry.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public DefaultHealthContributorRegistry() {
4343
/**
4444
* Create a new {@link DefaultHealthContributorRegistry} instance.
4545
* @param nameValidators the name validators to apply
46-
* @param intialRegistrations callback to setup any initial registrations
46+
* @param initialRegistrations callback to setup any initial registrations
4747
*/
4848
public DefaultHealthContributorRegistry(Collection<? extends HealthContributorNameValidator> nameValidators,
49-
Consumer<BiConsumer<String, HealthContributor>> intialRegistrations) {
50-
super(Entry::new, nameValidators, intialRegistrations);
49+
Consumer<BiConsumer<String, HealthContributor>> initialRegistrations) {
50+
super(Entry::new, nameValidators, initialRegistrations);
5151
}
5252

5353
@Override

module/spring-boot-health/src/main/java/org/springframework/boot/health/registry/DefaultReactiveHealthContributorRegistry.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public DefaultReactiveHealthContributorRegistry() {
4343
/**
4444
* Create a new {@link DefaultReactiveHealthContributorRegistry} instance.
4545
* @param nameValidators the name validators to apply
46-
* @param intialRegistrations callback to setup any initial registrations
46+
* @param initialRegistrations callback to setup any initial registrations
4747
*/
4848
public DefaultReactiveHealthContributorRegistry(Collection<? extends HealthContributorNameValidator> nameValidators,
49-
Consumer<BiConsumer<String, ReactiveHealthContributor>> intialRegistrations) {
50-
super(Entry::new, nameValidators, intialRegistrations);
49+
Consumer<BiConsumer<String, ReactiveHealthContributor>> initialRegistrations) {
50+
super(Entry::new, nameValidators, initialRegistrations);
5151
}
5252

5353
@Override

module/spring-boot-health/src/test/java/org/springframework/boot/health/registry/AbstractHealthContributorRegistryTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ void streamStreamsContributors() {
127127

128128
@Test
129129
void nameValidatorsValidateMapKeys() {
130-
assertThatIllegalStateException().isThrownBy(() -> createRegistry(testValidator(), (intialRegistrations) -> {
131-
intialRegistrations.accept("ok", mockHealthIndicator());
132-
intialRegistrations.accept("fail", mockHealthIndicator());
130+
assertThatIllegalStateException().isThrownBy(() -> createRegistry(testValidator(), (initialRegistrations) -> {
131+
initialRegistrations.accept("ok", mockHealthIndicator());
132+
initialRegistrations.accept("fail", mockHealthIndicator());
133133
})).withMessage("Failed validation");
134134
}
135135

@@ -147,7 +147,7 @@ private List<HealthContributorNameValidator> testValidator() {
147147

148148
protected abstract AbstractRegistry<C, E> createRegistry(
149149
Collection<? extends HealthContributorNameValidator> nameValidators,
150-
Consumer<BiConsumer<String, C>> intialRegistrations);
150+
Consumer<BiConsumer<String, C>> initialRegistrations);
151151

152152
protected abstract C mockHealthIndicator();
153153

module/spring-boot-health/src/test/java/org/springframework/boot/health/registry/DefaultHealthContributorRegistryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class DefaultHealthContributorRegistryTests
3838
@Override
3939
protected AbstractRegistry<HealthContributor, Entry> createRegistry(
4040
Collection<? extends HealthContributorNameValidator> nameValidators,
41-
Consumer<BiConsumer<String, HealthContributor>> intialRegistrations) {
42-
return new DefaultHealthContributorRegistry(nameValidators, intialRegistrations);
41+
Consumer<BiConsumer<String, HealthContributor>> initialRegistrations) {
42+
return new DefaultHealthContributorRegistry(nameValidators, initialRegistrations);
4343
}
4444

4545
@Override

module/spring-boot-health/src/test/java/org/springframework/boot/health/registry/DefaultReactiveHealthContributorRegistryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class DefaultReactiveHealthContributorRegistryTests
3838
@Override
3939
protected AbstractRegistry<ReactiveHealthContributor, Entry> createRegistry(
4040
Collection<? extends HealthContributorNameValidator> nameValidators,
41-
Consumer<BiConsumer<String, ReactiveHealthContributor>> intialRegistrations) {
42-
return new DefaultReactiveHealthContributorRegistry(nameValidators, intialRegistrations);
41+
Consumer<BiConsumer<String, ReactiveHealthContributor>> initialRegistrations) {
42+
return new DefaultReactiveHealthContributorRegistry(nameValidators, initialRegistrations);
4343
}
4444

4545
@Override

0 commit comments

Comments
 (0)