Skip to content

Commit 1acb02d

Browse files
committed
Merge pull request #37745 from izeye
* gh-37745: Polish "Polish" Polish Closes gh-37745
2 parents 5a1abb7 + 5a75fae commit 1acb02d

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
2020
import org.springframework.util.unit.DataSize;
2121

2222
/**
23-
* {@link ConfigurationProperties properties} for reactive codecs.
23+
* {@link ConfigurationProperties Properties} for reactive codecs.
2424
*
2525
* @author Brian Clozel
2626
* @since 2.2.1

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.springframework.boot.context.properties.ConfigurationProperties;
2323

2424
/**
25-
* {@link ConfigurationProperties properties} for Spring GraphQL.
25+
* {@link ConfigurationProperties Properties} for Spring GraphQL.
2626
*
2727
* @author Brian Clozel
2828
* @since 2.7.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HateoasProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
import org.springframework.boot.context.properties.ConfigurationProperties;
2020

2121
/**
22-
* {@link ConfigurationProperties properties} for Spring HATEOAS.
22+
* {@link ConfigurationProperties Properties} for Spring HATEOAS.
2323
*
2424
* @author Phillip Webb
2525
* @author Andy Wilkinson

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
2525
import org.springframework.util.unit.DataSize;
2626

2727
/**
28-
* {@link ConfigurationProperties properties} for RSocket support.
28+
* {@link ConfigurationProperties Properties} for RSocket support.
2929
*
3030
* @author Brian Clozel
3131
* @author Chris Bono

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.springframework.util.StringUtils;
2222

2323
/**
24-
* {@link ConfigurationProperties properties} for Spring WebFlux.
24+
* {@link ConfigurationProperties Properties} for Spring WebFlux.
2525
*
2626
* @author Brian Clozel
2727
* @since 2.0.0

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.validation.DefaultMessageCodesResolver;
2929

3030
/**
31-
* {@link ConfigurationProperties properties} for Spring MVC.
31+
* {@link ConfigurationProperties Properties} for Spring MVC.
3232
*
3333
* @author Phillip Webb
3434
* @author Sébastien Deleuze

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ void listServiceCapabilitiesV2() throws Exception {
8282

8383
@Test
8484
void generateProject() throws Exception {
85-
String fileName = UUID.randomUUID().toString() + ".zip";
85+
String fileName = UUID.randomUUID() + ".zip";
8686
File file = new File(fileName);
8787
assertThat(file.exists()).as("file should not exist").isFalse();
8888
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/zip", fileName);
@@ -177,7 +177,7 @@ void generateProjectFileSavedAsFileByDefault() throws Exception {
177177

178178
@Test
179179
void generateProjectAndExtractUnsupportedArchive(@TempDir File tempDir) throws Exception {
180-
String fileName = UUID.randomUUID().toString() + ".zip";
180+
String fileName = UUID.randomUUID() + ".zip";
181181
File file = new File(fileName);
182182
assertThat(file.exists()).as("file should not exist").isFalse();
183183
try {
@@ -195,7 +195,7 @@ void generateProjectAndExtractUnsupportedArchive(@TempDir File tempDir) throws E
195195

196196
@Test
197197
void generateProjectAndExtractUnknownContentType(@TempDir File tempDir) throws Exception {
198-
String fileName = UUID.randomUUID().toString() + ".zip";
198+
String fileName = UUID.randomUUID() + ".zip";
199199
File file = new File(fileName);
200200
assertThat(file.exists()).as("file should not exist").isFalse();
201201
try {

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ If that is not what you want, you can disable transaction management for a test
562562

563563
include::code:MyTransactionalTests[]
564564

565-
If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `DataJpaTest`.
565+
If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `@DataJpaTest`.
566566
(See "<<features#features.testing.spring-boot-applications.autoconfigured-spring-data-jpa>>".)
567567

568568

@@ -580,23 +580,23 @@ By default, Data JDBC tests are transactional and roll back at the end of each t
580580
See the {spring-framework-docs}/testing.html#testcontext-tx-enabling-transactions[relevant section] in the Spring Framework Reference Documentation for more details.
581581
If that is not what you want, you can disable transaction management for a test or for the whole test class as <<features#features.testing.spring-boot-applications.autoconfigured-jdbc,shown in the JDBC example>>.
582582

583-
If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `DataJpaTest`.
583+
If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `@DataJpaTest`.
584584
(See "<<features#features.testing.spring-boot-applications.autoconfigured-spring-data-jpa>>".)
585585

586586

587587

588588
[[features.testing.spring-boot-applications.autoconfigured-spring-data-r2dbc]]
589589
==== Auto-configured Data R2DBC Tests
590590
`@DataR2dbcTest` is similar to `@DataJdbcTest` but is for tests that use Spring Data R2DBC repositories.
591-
By default, it configures an in-memory embedded database, a `R2dbcEntityTemplate`, and Spring Data R2DBC repositories.
591+
By default, it configures an in-memory embedded database, an `R2dbcEntityTemplate`, and Spring Data R2DBC repositories.
592592
Regular `@Component` and `@ConfigurationProperties` beans are not scanned when the `@DataR2dbcTest` annotation is used.
593593
`@EnableConfigurationProperties` can be used to include `@ConfigurationProperties` beans.
594594

595595
TIP: A list of the auto-configurations that are enabled by `@DataR2dbcTest` can be <<test-auto-configuration#appendix.test-auto-configuration,found in the appendix>>.
596596

597597
By default, Data R2DBC tests are not transactional.
598598

599-
If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `DataJpaTest`.
599+
If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `@DataJpaTest`.
600600
(See "<<features#features.testing.spring-boot-applications.autoconfigured-spring-data-jpa>>".)
601601

602602

spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/servlet.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ Alternatively, rather than open all suffix patterns, it is more secure to only s
276276
As of Spring Framework 5.3, Spring MVC supports two strategies for matching request paths to controllers.
277277
By default, Spring Boot uses the `PathPatternParser` strategy.
278278
`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.
279-
`PathPatternParser` restricts usage of {spring-framework-docs}/web.html#mvc-ann-requestmapping-uri-templates[some path patterns variants].
279+
`PathPatternParser` restricts usage of {spring-framework-docs}/web.html#mvc-ann-requestmapping-uri-templates[some path pattern variants].
280280
It is also incompatible with suffix pattern matching (configprop:spring.mvc.pathmatch.use-suffix-pattern[deprecated], configprop:spring.mvc.pathmatch.use-registered-suffix-pattern[deprecated]) and configuring the `DispatcherServlet` with a path prefix (configprop:spring.mvc.servlet.path[]).
281281

282282
The strategy can be configured using the configprop:spring.mvc.pathmatch.matching-strategy[] configuration property, as shown in the following example:

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -137,7 +137,7 @@ private static Artifact createArtifact(String groupId, String artifactId, String
137137
}
138138

139139
private static File createArtifactFile(String jarType) {
140-
Path jarPath = temp.resolve(UUID.randomUUID().toString() + ".jar");
140+
Path jarPath = temp.resolve(UUID.randomUUID() + ".jar");
141141
Manifest manifest = new Manifest();
142142
manifest.getMainAttributes().putValue("Manifest-Version", "1.0");
143143
if (jarType != null) {

0 commit comments

Comments
 (0)