Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4.x' into 2.5.x

Browse Source 
Closes gh-28424
This commit is contained in:
Phillip Webb
2021-10-21 11:27:29 -07:00
parent a3182e453c 2f6651c3cb
commit daf36dff55
24 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
View File

@@ -881,12 +881,12 @@ public class RabbitProperties {
private Boolean mandatory;
/**
* Timeout for `receive()` operations.
* Timeout for {@code receive()} operations.
*/
private Duration receiveTimeout;
/**
* Timeout for `sendAndReceive()` operations.
* Timeout for {@code sendAndReceive()} operations.
*/
private Duration replyTimeout;

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java
View File

@@ -98,7 +98,7 @@ public class BatchProperties {
/**
* Comma-separated list of job names to execute on startup (for instance,
* `job1,job2`). By default, all Jobs found in the context are executed.
* {@code "job1,job2"}). By default, all Jobs found in the context are executed.
*/
private String names = "";

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisUrlSyntaxFailureAnalyzer.java
View File

@@ -46,7 +46,7 @@ class RedisUrlSyntaxFailureAnalyzer extends AbstractFailureAnalyzer<RedisUrlSynt
}
if (!"redis".equals(uri.getScheme()) && !"rediss".equals(uri.getScheme())) {
return new FailureAnalysis(getUnsupportedSchemeDescription(cause.getUrl(), uri.getScheme()),
"Use the scheme 'redis://` for insecure or `rediss://` for secure Redis standalone configuration.",
"Use the scheme 'redis://' for insecure or 'rediss://' for secure Redis standalone configuration.",
cause);
}
}

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java
View File

@@ -45,7 +45,7 @@ public class JacksonProperties {
/**
* Date format string or a fully-qualified date format class name. For instance,
* `yyyy-MM-dd HH:mm:ss`.
* {@code "yyyy-MM-dd HH:mm:ss"}.
*/
private String dateFormat;

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java
View File

@@ -37,7 +37,7 @@ public class MailProperties {
private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
/**
* SMTP server host. For instance, `smtp.example.com`.
* SMTP server host. For instance, {@code "smtp.example.com"}.
*/
private String host;

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NonUniqueSessionRepositoryFailureAnalyzer.java
View File

@@ -37,7 +37,7 @@ class NonUniqueSessionRepositoryFailureAnalyzer extends AbstractFailureAnalyzer<
StringBuilder action = new StringBuilder();
action.append(String.format("Consider any of the following:%n"));
action.append(
String.format(" - Define the `spring.session.store-type` property to the store you want to use%n"));
String.format(" - Define the 'spring.session.store-type' property to the store you want to use%n"));
action.append(String.format(" - Review your classpath and remove the unwanted store implementation(s)%n"));
return new FailureAnalysis(message.toString(), action.toString(), cause);
}

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
View File

@@ -927,7 +927,7 @@ public class ServerProperties {
/**
* Name of the HTTP header from which the remote IP is extracted. For
* instance, `X-FORWARDED-FOR`.
* instance, {@code "X-FORWARDED-FOR"}.
*/
private String remoteIpHeader;

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

@@ -82,17 +82,17 @@ public class WebFluxProperties {
public static class Format {
/**
* Date format to use, for example `dd/MM/yyyy`.
* Date format to use, for example {@code "dd/MM/yyyy"}.
*/
private String date;
/**
* Time format to use, for example `HH:mm:ss`.
* Time format to use, for example {@code "HH:mm:ss"}.
*/
private String time;
/**
* Date-time format to use, for example `yyyy-MM-dd HH:mm:ss`.
* Date-time format to use, for example {@code "yyyy-MM-dd HH:mm:ss"}.
*/
private String dateTime;

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

@@ -42,7 +42,7 @@ import org.springframework.validation.DefaultMessageCodesResolver;
public class WebMvcProperties {
/**
* Formatting strategy for message codes. For instance, `PREFIX_ERROR_CODE`.
* Formatting strategy for message codes. For instance, {@code PREFIX_ERROR_CODE}.
*/
private DefaultMessageCodesResolver.Format messageCodesResolverFormat;
@@ -488,17 +488,17 @@ public class WebMvcProperties {
public static class Format {
/**
* Date format to use, for example `dd/MM/yyyy`.
* Date format to use, for example {@code "dd/MM/yyyy"}.
*/
private String date;
/**
* Time format to use, for example `HH:mm:ss`.
* Time format to use, for example {@code "HH:mm:ss"}.
*/
private String time;
/**
* Date-time format to use, for example `yyyy-MM-dd HH:mm:ss`.
* Date-time format to use, for example {@code "yyyy-MM-dd HH:mm:ss"}.
*/
private String dateTime;

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisUrlSyntaxFailureAnalyzerTests.java
View File

@@ -43,7 +43,7 @@ class RedisUrlSyntaxFailureAnalyzerTests {
FailureAnalysis analysis = new RedisUrlSyntaxFailureAnalyzer().analyze(exception);
assertThat(analysis.getDescription()).contains("The URL 'http://127.0.0.1:26379/mymaster' is not valid")
.contains("The scheme 'http' is not supported");
assertThat(analysis.getAction()).contains("Use the scheme 'redis://` for insecure or `rediss://` for secure");
assertThat(analysis.getAction()).contains("Use the scheme 'redis://' for insecure or 'rediss://' for secure");
}
@Test