Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Polish #28836

Closed
wants to merge 1 commit into from
Closed

Polish #28836

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -69,7 +69,7 @@ protected ConditionOutcome getEndpointOutcome(ConditionContext context, String e
}

/**
* Return the default outcome that should be used if not property is set. By default
* Return the default outcome that should be used if property is not set. By default
* this method will use the {@code <prefix>.defaults.enabled} property, matching if it
* is {@code true} or if it is not configured.
* @param context the condition context
Expand Down
Expand Up @@ -76,12 +76,10 @@ void defaultInfoContributorsDisabledWithPrerequisitesInPlace() {

@Test
void defaultInfoContributorsDisabledWithCustomOne() {
this.contextRunner.withPropertyValues("management.info.defaults.enabled=false")
.withUserConfiguration(CustomInfoContributorConfiguration.class).run((context) -> {
assertThat(context).hasSingleBean(InfoContributor.class);
assertThat(context.getBean(InfoContributor.class))
.isSameAs(context.getBean("customInfoContributor"));
});
this.contextRunner.withUserConfiguration(CustomInfoContributorConfiguration.class).run((context) -> {
assertThat(context).hasSingleBean(InfoContributor.class);
assertThat(context.getBean(InfoContributor.class)).isSameAs(context.getBean("customInfoContributor"));
});
}

@SuppressWarnings("unchecked")
Expand Down
Expand Up @@ -52,7 +52,7 @@ public interface Producible<E extends Enum<E> & Producible<E>> {
* of &#42;&#47;&#42; is provided, or if the accept header is missing. Only one value
* can be marked as default. If no value is marked, then the value with the highest
* {@link Enum#ordinal() ordinal} is used as the default.
* @return if this value
* @return if this value should be used as the default value
* @since 2.5.6
*/
default boolean isDefault() {
Expand Down
Expand Up @@ -1147,7 +1147,7 @@ When appropriate, Spring auto-configures the following `InfoContributor` beans:

[cols="1,4,8,4"]
|===
| ID | Name | Description | Prequisites
| ID | Name | Description | Prerequisites

| `build`
| {spring-boot-actuator-module-code}/info/BuildInfoContributor.java[`BuildInfoContributor`]
Expand All @@ -1174,7 +1174,7 @@ When appropriate, Spring auto-configures the following `InfoContributor` beans:
Whether or not an individual contributor is enabled is controlled by its `management.info.<id>.enabled` property.
Different contributors have different defaults for this property, depending on their prerequisites and the nature of the information that they expose.

With no prequisites to indicate that they should be enabled, the `env` and `java` contributors are disabled by default.
With no prerequisites to indicate that they should be enabled, the `env` and `java` contributors are disabled by default.
You can enable them by setting the configprop:management.info.env.enabled[] or configprop:management.info.java.enabled[] properties to `true`.

The `build` and `git` info contributors are enabled by default.
Expand Down
Expand Up @@ -81,7 +81,7 @@ public String getVersion() {
}

/**
* Information about the Java Virtual Machine) the application is running in.
* Information about the Java Virtual Machine the application is running in.
*/
public static class JavaVirtualMachineInfo {

Expand Down