From c7921468fc506a60649aee8d4f977cfd2a2dc4da Mon Sep 17 00:00:00 2001 From: izeye Date: Sun, 28 Nov 2021 22:50:10 +0900 Subject: [PATCH] Polish See gh-28836 --- .../autoconfigure/OnEndpointElementCondition.java | 2 +- .../info/InfoContributorAutoConfigurationTests.java | 10 ++++------ .../src/docs/asciidoc/actuator/endpoints.adoc | 4 ++-- .../java/org/springframework/boot/info/JavaInfo.java | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java index ad9d1edc1df9..a9b9a3f7dd06 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java @@ -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 .defaults.enabled} property, matching if it * is {@code true} or if it is not configured. * @param context the condition context diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java index 16aab168f988..3e62f7073426 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java @@ -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") diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc index b0cf62275a85..bcb77b2bbd26 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc @@ -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..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. diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/JavaInfo.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/JavaInfo.java index 75851490f67d..f5d029f8269d 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/JavaInfo.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/JavaInfo.java @@ -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 {