Merge pull request #28836 from izeye

* pr/28836:
  Polish

Closes gh-28836
pull/28902/head
Stephane Nicoll 3 years ago
commit 10251c1516

@ -69,7 +69,7 @@ public abstract class OnEndpointElementCondition extends SpringBootCondition {
}
/**
* 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

@ -76,12 +76,10 @@ class InfoContributorAutoConfigurationTests {
@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")

@ -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`]
@ -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.

@ -81,7 +81,7 @@ public class JavaInfo {
}
/**
* 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 {

Loading…
Cancel
Save