Skip to content

Commit c792146

Browse files
izeyesnicoll
authored andcommitted
Polish
See gh-28836
1 parent 88aa849 commit c792146

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected ConditionOutcome getEndpointOutcome(ConditionContext context, String e
6969
}
7070

7171
/**
72-
* Return the default outcome that should be used if not property is set. By default
72+
* Return the default outcome that should be used if property is not set. By default
7373
* this method will use the {@code <prefix>.defaults.enabled} property, matching if it
7474
* is {@code true} or if it is not configured.
7575
* @param context the condition context

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,10 @@ void defaultInfoContributorsDisabledWithPrerequisitesInPlace() {
7676

7777
@Test
7878
void defaultInfoContributorsDisabledWithCustomOne() {
79-
this.contextRunner.withPropertyValues("management.info.defaults.enabled=false")
80-
.withUserConfiguration(CustomInfoContributorConfiguration.class).run((context) -> {
81-
assertThat(context).hasSingleBean(InfoContributor.class);
82-
assertThat(context.getBean(InfoContributor.class))
83-
.isSameAs(context.getBean("customInfoContributor"));
84-
});
79+
this.contextRunner.withUserConfiguration(CustomInfoContributorConfiguration.class).run((context) -> {
80+
assertThat(context).hasSingleBean(InfoContributor.class);
81+
assertThat(context.getBean(InfoContributor.class)).isSameAs(context.getBean("customInfoContributor"));
82+
});
8583
}
8684

8785
@SuppressWarnings("unchecked")

spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ When appropriate, Spring auto-configures the following `InfoContributor` beans:
11471147

11481148
[cols="1,4,8,4"]
11491149
|===
1150-
| ID | Name | Description | Prequisites
1150+
| ID | Name | Description | Prerequisites
11511151

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

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

11801180
The `build` and `git` info contributors are enabled by default.

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/JavaInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public String getVersion() {
8181
}
8282

8383
/**
84-
* Information about the Java Virtual Machine) the application is running in.
84+
* Information about the Java Virtual Machine the application is running in.
8585
*/
8686
public static class JavaVirtualMachineInfo {
8787

0 commit comments

Comments
 (0)