diff --git a/SUPPORT.adoc b/SUPPORT.adoc index 28ee9c36aca..cecbe28a748 100755 --- a/SUPPORT.adoc +++ b/SUPPORT.adoc @@ -13,7 +13,7 @@ reproduces the problem. == Stack Overflow The Spring Boot community monitors the https://stackoverflow.com/tags/spring-boot[`spring-boot`] tag on Stack Overflow. Before -asking a question, please familiar yourself with Stack Overflow's +asking a question, please familiarize yourself with Stack Overflow's https://stackoverflow.com/help/how-to-ask[advice on how to ask a good question]. == Gitter diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosPropertiesConfigAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosPropertiesConfigAdapter.java index 1b753108d06..0a946f13c7f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosPropertiesConfigAdapter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosPropertiesConfigAdapter.java @@ -21,7 +21,7 @@ import io.micrometer.kairos.KairosConfig; import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryPropertiesConfigAdapter; /** - * Adapter to convert {@link KairosProperties} to an {@link KairosConfig}. + * Adapter to convert {@link KairosProperties} to a {@link KairosConfig}. * * @author Stephane Nicoll */ diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java index 819cdeabef1..ff619497c5b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java @@ -41,7 +41,7 @@ class AppOpticsPropertiesConfigAdapterTests } @Test - void whenPropertiesUrisIsSetAdapterUriReturnsIt() { + void whenPropertiesUriIsSetAdapterUriReturnsIt() { AppOpticsProperties properties = createProperties(); properties.setUri("https://appoptics.example.com/v1/measurements"); assertThat(createConfigAdapter(properties).uri()).isEqualTo("https://appoptics.example.com/v1/measurements"); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java index 42b92de2068..a08be99a48f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceMetricsExportAutoConfigurationTests.java @@ -116,16 +116,16 @@ class DynatraceMetricsExportAutoConfigurationTests { @Bean DynatraceConfig customConfig() { return (key) -> { - if ("dynatrace.uri".equals(key)) { + switch (key) { + case "dynatrace.uri": return "https://dynatrace.example.com"; - } - if ("dynatrace.apiToken".equals(key)) { + case "dynatrace.apiToken": return "abcde"; - } - if ("dynatrace.deviceId".equals(key)) { + case "dynatrace.deviceId": return "test"; + default: + return null; } - return null; }; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosPropertiesConfigAdapterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosPropertiesConfigAdapterTests.java index 777e28fd181..711069faff7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosPropertiesConfigAdapterTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosPropertiesConfigAdapterTests.java @@ -41,7 +41,7 @@ class KairosPropertiesConfigAdapterTests } @Test - void whenPropertiesUrisIsSetAdapterUriReturnsIt() { + void whenPropertiesUriIsSetAdapterUriReturnsIt() { KairosProperties properties = createProperties(); properties.setUri("https://kairos.example.com:8080/api/v1/datapoints"); assertThat(createConfigAdapter(properties).uri()) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java index 64f453e0107..d02ab8998a3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java @@ -134,8 +134,8 @@ public class SessionAutoConfiguration { } /** - * Customization log for {@link SpringSessionRememberMeServices} that is only - * instantiated when Spring Security is on the classpath. + * Customization for {@link SpringSessionRememberMeServices} that is only instantiated + * when Spring Security is on the classpath. */ static class RememberMeServicesCookieSerializerCustomizer { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java index 24857bd289b..c061ec33923 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java @@ -290,7 +290,7 @@ abstract class AbstractJpaAutoConfigurationTests { static class TestFilterRegistrationConfiguration { @Bean - FilterRegistrationBean OpenEntityManagerInViewFilterFilterRegistrationBean() { + FilterRegistrationBean openEntityManagerInViewFilterFilterRegistrationBean() { return new FilterRegistrationBean<>(); } diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix/configuration-metadata.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix/configuration-metadata.adoc index a88db8e2dd7..1a1764e8cd8 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix/configuration-metadata.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix/configuration-metadata.adoc @@ -779,7 +779,7 @@ In order to document default values for properties in the class above, you could {"properties": [ { "name": "acme.messaging.addresses", - "defaultValue": ["a, b"] + "defaultValue": ["a", "b"] }, { "name": "acme.messaging.container-type", diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index 60d938fb9ae..ccc99713d00 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -683,7 +683,7 @@ The following `HealthIndicators` are auto-configured by Spring Boot when appropr | Checks that an Elasticsearch cluster is up. | {spring-boot-actuator-module-code}/hazelcast/HazelcastHealthIndicator.java[`HazelcastHealthIndicator`] -| Checks that an Hazelcast server is up. +| Checks that a Hazelcast server is up. | {spring-boot-actuator-module-code}/influx/InfluxDbHealthIndicator.java[`InfluxDbHealthIndicator`] | Checks that an InfluxDB server is up. diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index db5ad2d4d30..81f44749fcf 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -3984,7 +3984,7 @@ You can configure the uri and credentials to use by setting the `spring.data.neo spring.data.neo4j.password=secret ---- -You can take full control over the session creation by either adding a `org.neo4j.ogm.config.Configuration` bean or a `org.neo4j.ogm.session.SessionFactory` bean. +You can take full control over the session creation by adding either an `org.neo4j.ogm.config.Configuration` bean or an `org.neo4j.ogm.session.SessionFactory` bean. diff --git a/spring-boot-project/spring-boot-starters/README.adoc b/spring-boot-project/spring-boot-starters/README.adoc index ca624a7ddd0..d22781221cf 100644 --- a/spring-boot-project/spring-boot-starters/README.adoc +++ b/spring-boot-project/spring-boot-starters/README.adoc @@ -148,7 +148,7 @@ do as they were designed before this was clarified. | https://orika-mapper.github.io/orika-docs/[Orika] | https://github.com/akihyro/orika-spring-boot-starter -| https://pebbletemplates.io/[Pebbles Templates] +| https://pebbletemplates.io/[Pebble Templates] | https://github.com/PebbleTemplates/pebble | https://picocli.info/[picocli] diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java index e1507399a00..8f488ec50f0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java @@ -134,10 +134,12 @@ public class BootJar extends Jar implements BootArchive { classpath); } + @Override public void setClasspath(Object classpath) { this.classpath = getProject().files(classpath); } + @Override public void setClasspath(FileCollection classpath) { this.classpath = getProject().files(classpath); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java index de1328da431..555efafc20b 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java @@ -130,7 +130,7 @@ public class Binder { * @param propertyEditorInitializer initializer used to configure the property editors * that can convert values (or {@code null} if no initialization is required). Often * used to call {@link ConfigurableListableBeanFactory#copyRegisteredEditorsTo}. - * @param defaultBindHandler the default bind handler to use if non is specified when + * @param defaultBindHandler the default bind handler to use if none is specified when * binding * @since 2.2.0 */ @@ -469,7 +469,7 @@ public class Binder { * Create a new {@link Binder} instance from the specified environment. * @param environment the environment source (must have attached * {@link ConfigurationPropertySources}) - * @param defaultBindHandler the default bind handler to use if non is specified when + * @param defaultBindHandler the default bind handler to use if none is specified when * binding * @return a {@link Binder} instance * @since 2.2.0 diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BinderTests.java index c2c03d114bc..8a7ffb8b625 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BinderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BinderTests.java @@ -211,7 +211,7 @@ class BinderTests { } @Test - void bindWhenHasCustomDefultHandlerShouldTriggerOnSuccess() { + void bindWhenHasCustomDefaultHandlerShouldTriggerOnSuccess() { this.sources.add(new MockConfigurationPropertySource("foo.value", "bar", "line1")); BindHandler handler = mock(BindHandler.class, Answers.CALLS_REAL_METHODS); Binder binder = new Binder(this.sources, null, null, null, handler); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessorTests.java index 356c457a86b..1148850804f 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessorTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessorTests.java @@ -170,8 +170,8 @@ class SpringApplicationJsonEnvironmentPostProcessorTests { assertThat(this.environment.getPropertySources()).containsSequence(custom, json, servlet, jndi); } - private void testServletPropertySource(String servletContextPropertySourceName) { - this.environment.getPropertySources().addFirst(getPropertySource(servletContextPropertySourceName, "servlet")); + private void testServletPropertySource(String servletPropertySourceName) { + this.environment.getPropertySources().addFirst(getPropertySource(servletPropertySourceName, "servlet")); TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment, "SPRING_APPLICATION_JSON={\"foo\":\"bar\"}"); this.processor.postProcessEnvironment(this.environment, null);