From 9ac7ef0c4cd8318bc9db006689c794dcac28fd84 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sat, 7 Oct 2023 14:05:47 +0900 Subject: [PATCH] Polish --- .../dynatrace/DynatracePropertiesConfigAdapter.java | 2 +- .../autoconfigure/tracing/BraveAutoConfiguration.java | 2 +- .../tracing/CompositePropagationFactory.java | 6 ++---- .../boot/autoconfigure/codec/CodecProperties.java | 2 +- .../boot/autoconfigure/graphql/GraphQlProperties.java | 2 +- .../boot/autoconfigure/hateoas/HateoasProperties.java | 2 +- .../boot/autoconfigure/rsocket/RSocketProperties.java | 2 +- .../autoconfigure/web/reactive/WebFluxProperties.java | 2 +- .../boot/autoconfigure/web/servlet/WebMvcProperties.java | 2 +- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../src/docs/asciidoc/features/testing.adoc | 8 ++++---- .../spring-boot-docs/src/docs/asciidoc/web/servlet.adoc | 2 +- .../boot/cli/command/init/InitCommandTests.java | 6 +++--- .../boot/maven/DependencyFilterMojoTests.java | 2 +- 14 files changed, 20 insertions(+), 22 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapter.java index 74d74affc9..bbdc14db56 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapter.java @@ -97,7 +97,7 @@ class DynatracePropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapt @Override public boolean exportMeterMetadata() { - return (get(v2(V2::isExportMeterMetadata), DynatraceConfig.super::exportMeterMetadata)); + return get(v2(V2::isExportMeterMetadata), DynatraceConfig.super::exportMeterMetadata); } private Function v1(Function getter) { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java index 3fde9bb60b..47d65fe69c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java @@ -211,7 +211,7 @@ public class BraveAutoConfiguration { // There's a chicken-and-egg problem here: to create a builder, we need a // factory. But the CompositePropagationFactory needs data from the builder. // We create a throw-away builder with a throw-away factory, and then copy the - // config to the real builder + // config to the real builder. FactoryBuilder throwAwayBuilder = BaggagePropagation.newFactoryBuilder(createThrowAwayFactory()); baggagePropagationCustomizers.orderedStream() .forEach((customizer) -> customizer.customize(throwAwayBuilder)); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactory.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactory.java index 30b9aa0a0f..4e3b09b1e9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactory.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactory.java @@ -85,8 +85,7 @@ class CompositePropagationFactory extends Propagation.Factory { } /** - * Creates a new {@link CompositePropagationFactory}, which uses the given - * {@code injectionTypes} for injection and {@code extractionTypes} for extraction. + * Creates a new {@link CompositePropagationFactory}. * @param properties the propagation properties * @return the {@link CompositePropagationFactory} */ @@ -95,8 +94,7 @@ class CompositePropagationFactory extends Propagation.Factory { } /** - * Creates a new {@link CompositePropagationFactory}, which uses the given - * {@code injectionTypes} for injection and {@code extractionTypes} for extraction. + * Creates a new {@link CompositePropagationFactory}. * @param properties the propagation properties * @param baggageManager the baggage manager to use, or {@code null} * @param localFields the local fields, or {@code null} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java index 692b8bb817..b63034b9d4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java @@ -20,7 +20,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.util.unit.DataSize; /** - * {@link ConfigurationProperties properties} for reactive codecs. + * {@link ConfigurationProperties Properties} for reactive codecs. * * @author Brian Clozel * @since 2.2.1 diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java index 68ddfb07a7..046155b1aa 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java @@ -22,7 +22,7 @@ import java.util.Arrays; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * {@link ConfigurationProperties properties} for Spring GraphQL. + * {@link ConfigurationProperties Properties} for Spring GraphQL. * * @author Brian Clozel * @since 2.7.0 diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HateoasProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HateoasProperties.java index e6ca03f24e..b0f369a8a4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HateoasProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HateoasProperties.java @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.hateoas; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * {@link ConfigurationProperties properties} for Spring HATEOAS. + * {@link ConfigurationProperties Properties} for Spring HATEOAS. * * @author Phillip Webb * @author Andy Wilkinson diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketProperties.java index 10096dfdda..bba90f2f7e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketProperties.java @@ -25,7 +25,7 @@ import org.springframework.boot.web.server.Ssl; import org.springframework.util.unit.DataSize; /** - * {@link ConfigurationProperties properties} for RSocket support. + * {@link ConfigurationProperties Properties} for RSocket support. * * @author Brian Clozel * @author Chris Bono diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java index 0b9c5ccc74..0d0f2359c2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java @@ -20,7 +20,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.util.StringUtils; /** - * {@link ConfigurationProperties properties} for Spring WebFlux. + * {@link ConfigurationProperties Properties} for Spring WebFlux. * * @author Brian Clozel * @author Vedran Pavic diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java index afdf35f650..9945241d3e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java @@ -27,7 +27,7 @@ import org.springframework.util.Assert; import org.springframework.validation.DefaultMessageCodesResolver; /** - * {@link ConfigurationProperties properties} for Spring MVC. + * {@link ConfigurationProperties Properties} for Spring MVC. * * @author Phillip Webb * @author Sébastien Deleuze diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 74402a1f31..de2c0208b8 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -816,7 +816,7 @@ bom { library("Kotlin Serialization", "1.6.0") { group("org.jetbrains.kotlinx") { imports = [ - "kotlinx-serialization-bom" + "kotlinx-serialization-bom" ] } } diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc index 1015b354bf..6192363636 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc @@ -594,7 +594,7 @@ If that is not what you want, you can disable transaction management for a test include::code:MyTransactionalTests[] -If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `DataJpaTest`. +If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `@DataJpaTest`. (See "<>".) @@ -612,7 +612,7 @@ By default, Data JDBC tests are transactional and roll back at the end of each t See the {spring-framework-docs}/testing.html#testcontext-tx-enabling-transactions[relevant section] in the Spring Framework Reference Documentation for more details. If that is not what you want, you can disable transaction management for a test or for the whole test class as <>. -If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `DataJpaTest`. +If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `@DataJpaTest`. (See "<>".) @@ -620,7 +620,7 @@ If you prefer your test to run against a real database, you can use the `@AutoCo [[features.testing.spring-boot-applications.autoconfigured-spring-data-r2dbc]] ==== Auto-configured Data R2DBC Tests `@DataR2dbcTest` is similar to `@DataJdbcTest` but is for tests that use Spring Data R2DBC repositories. -By default, it configures an in-memory embedded database, a `R2dbcEntityTemplate`, and Spring Data R2DBC repositories. +By default, it configures an in-memory embedded database, an `R2dbcEntityTemplate`, and Spring Data R2DBC repositories. Regular `@Component` and `@ConfigurationProperties` beans are not scanned when the `@DataR2dbcTest` annotation is used. `@EnableConfigurationProperties` can be used to include `@ConfigurationProperties` beans. @@ -628,7 +628,7 @@ TIP: A list of the auto-configurations that are enabled by `@DataR2dbcTest` can By default, Data R2DBC tests are not transactional. -If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `DataJpaTest`. +If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `@DataJpaTest`. (See "<>".) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc index 86ed5fbc32..f279e15f4f 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc @@ -264,7 +264,7 @@ Most standard media types are supported out-of-the-box, but you can also define As of Spring Framework 5.3, Spring MVC supports two strategies for matching request paths to controllers. By default, Spring Boot uses the `PathPatternParser` strategy. `PathPatternParser` is an https://spring.io/blog/2020/06/30/url-matching-with-pathpattern-in-spring-mvc[optimized implementation] but comes with some restrictions compared to the `AntPathMatcher` strategy. -`PathPatternParser` restricts usage of {spring-framework-docs}/web.html#mvc-ann-requestmapping-uri-templates[some path patterns variants]. +`PathPatternParser` restricts usage of {spring-framework-docs}/web.html#mvc-ann-requestmapping-uri-templates[some path pattern variants]. It is also incompatible with configuring the `DispatcherServlet` with a path prefix (configprop:spring.mvc.servlet.path[]). The strategy can be configured using the configprop:spring.mvc.pathmatch.matching-strategy[] configuration property, as shown in the following example: diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java index 0cec49d98d..1abe746cd3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java @@ -80,7 +80,7 @@ class InitCommandTests extends AbstractHttpClientMockTests { @Test void generateProject() throws Exception { - String fileName = UUID.randomUUID().toString() + ".zip"; + String fileName = UUID.randomUUID() + ".zip"; File file = new File(fileName); assertThat(file).as("file should not exist").doesNotExist(); MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/zip", fileName); @@ -175,7 +175,7 @@ class InitCommandTests extends AbstractHttpClientMockTests { @Test void generateProjectAndExtractUnsupportedArchive(@TempDir File tempDir) throws Exception { - String fileName = UUID.randomUUID().toString() + ".zip"; + String fileName = UUID.randomUUID() + ".zip"; File file = new File(fileName); assertThat(file).as("file should not exist").doesNotExist(); try { @@ -193,7 +193,7 @@ class InitCommandTests extends AbstractHttpClientMockTests { @Test void generateProjectAndExtractUnknownContentType(@TempDir File tempDir) { - String fileName = UUID.randomUUID().toString() + ".zip"; + String fileName = UUID.randomUUID() + ".zip"; File file = new File(fileName); assertThat(file).as("file should not exist").doesNotExist(); try { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java index 39aa828ea2..f7a893e460 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java @@ -137,7 +137,7 @@ class DependencyFilterMojoTests { } private static File createArtifactFile(String jarType) { - Path jarPath = temp.resolve(UUID.randomUUID().toString() + ".jar"); + Path jarPath = temp.resolve(UUID.randomUUID() + ".jar"); Manifest manifest = new Manifest(); manifest.getMainAttributes().putValue("Manifest-Version", "1.0"); if (jarType != null) {