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 @@ -360,7 +360,7 @@ protected final R createRegistry(String name, C contributor) {
return createRegistry((registrations) -> registrations.accept(name, contributor));
}

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

protected abstract C createContributor(Health health);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ protected HealthEndpoint create(HealthContributorRegistry registry, HealthEndpoi

@Override
protected HealthContributorRegistry createRegistry(
Consumer<BiConsumer<String, HealthContributor>> intialRegistrations) {
return new DefaultHealthContributorRegistry(Collections.emptyList(), intialRegistrations);
Consumer<BiConsumer<String, HealthContributor>> initialRegistrations) {
return new DefaultHealthContributorRegistry(Collections.emptyList(), initialRegistrations);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ protected HealthEndpointWebExtension create(HealthContributorRegistry registry,

@Override
protected HealthContributorRegistry createRegistry(
Consumer<BiConsumer<String, HealthContributor>> intialRegistrations) {
return new DefaultHealthContributorRegistry(Collections.emptyList(), intialRegistrations);
Consumer<BiConsumer<String, HealthContributor>> initialRegistrations) {
return new DefaultHealthContributorRegistry(Collections.emptyList(), initialRegistrations);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ protected ReactiveHealthEndpointWebExtension create(ReactiveHealthContributorReg

@Override
protected ReactiveHealthContributorRegistry createRegistry(
Consumer<BiConsumer<String, ReactiveHealthContributor>> intialRegistrations) {
return new DefaultReactiveHealthContributorRegistry(Collections.emptyList(), intialRegistrations);
Consumer<BiConsumer<String, ReactiveHealthContributor>> initialRegistrations) {
return new DefaultReactiveHealthContributorRegistry(Collections.emptyList(), initialRegistrations);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ abstract class AbstractRegistry<C, E> {

AbstractRegistry(BiFunction<String, C, E> entryAdapter,
Collection<? extends HealthContributorNameValidator> nameValidators,
Consumer<BiConsumer<String, C>> intialRegistrations) {
Consumer<BiConsumer<String, C>> initialRegistrations) {
this.nameValidators = (nameValidators != null) ? List.copyOf(nameValidators) : Collections.emptyList();
this.entryAdapter = entryAdapter;
Map<String, C> contributors = new LinkedHashMap<>();
if (intialRegistrations != null) {
intialRegistrations.accept((name, contributor) -> registerContributor(contributors, name, contributor));
if (initialRegistrations != null) {
initialRegistrations.accept((name, contributor) -> registerContributor(contributors, name, contributor));
}
this.contributors = Collections.unmodifiableMap(contributors);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ public DefaultHealthContributorRegistry() {
/**
* Create a new {@link DefaultHealthContributorRegistry} instance.
* @param nameValidators the name validators to apply
* @param intialRegistrations callback to setup any initial registrations
* @param initialRegistrations callback to setup any initial registrations
*/
public DefaultHealthContributorRegistry(Collection<? extends HealthContributorNameValidator> nameValidators,
Consumer<BiConsumer<String, HealthContributor>> intialRegistrations) {
super(Entry::new, nameValidators, intialRegistrations);
Consumer<BiConsumer<String, HealthContributor>> initialRegistrations) {
super(Entry::new, nameValidators, initialRegistrations);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ public DefaultReactiveHealthContributorRegistry() {
/**
* Create a new {@link DefaultReactiveHealthContributorRegistry} instance.
* @param nameValidators the name validators to apply
* @param intialRegistrations callback to setup any initial registrations
* @param initialRegistrations callback to setup any initial registrations
*/
public DefaultReactiveHealthContributorRegistry(Collection<? extends HealthContributorNameValidator> nameValidators,
Consumer<BiConsumer<String, ReactiveHealthContributor>> intialRegistrations) {
super(Entry::new, nameValidators, intialRegistrations);
Consumer<BiConsumer<String, ReactiveHealthContributor>> initialRegistrations) {
super(Entry::new, nameValidators, initialRegistrations);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ void streamStreamsContributors() {

@Test
void nameValidatorsValidateMapKeys() {
assertThatIllegalStateException().isThrownBy(() -> createRegistry(testValidator(), (intialRegistrations) -> {
intialRegistrations.accept("ok", mockHealthIndicator());
intialRegistrations.accept("fail", mockHealthIndicator());
assertThatIllegalStateException().isThrownBy(() -> createRegistry(testValidator(), (initialRegistrations) -> {
initialRegistrations.accept("ok", mockHealthIndicator());
initialRegistrations.accept("fail", mockHealthIndicator());
})).withMessage("Failed validation");
}

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

protected abstract AbstractRegistry<C, E> createRegistry(
Collection<? extends HealthContributorNameValidator> nameValidators,
Consumer<BiConsumer<String, C>> intialRegistrations);
Consumer<BiConsumer<String, C>> initialRegistrations);

protected abstract C mockHealthIndicator();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class DefaultHealthContributorRegistryTests
@Override
protected AbstractRegistry<HealthContributor, Entry> createRegistry(
Collection<? extends HealthContributorNameValidator> nameValidators,
Consumer<BiConsumer<String, HealthContributor>> intialRegistrations) {
return new DefaultHealthContributorRegistry(nameValidators, intialRegistrations);
Consumer<BiConsumer<String, HealthContributor>> initialRegistrations) {
return new DefaultHealthContributorRegistry(nameValidators, initialRegistrations);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class DefaultReactiveHealthContributorRegistryTests
@Override
protected AbstractRegistry<ReactiveHealthContributor, Entry> createRegistry(
Collection<? extends HealthContributorNameValidator> nameValidators,
Consumer<BiConsumer<String, ReactiveHealthContributor>> intialRegistrations) {
return new DefaultReactiveHealthContributorRegistry(nameValidators, intialRegistrations);
Consumer<BiConsumer<String, ReactiveHealthContributor>> initialRegistrations) {
return new DefaultReactiveHealthContributorRegistry(nameValidators, initialRegistrations);
}

@Override
Expand Down