spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-10 11:29:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1.x'

Browse Source 
Closes gh-52087
This commit is contained in:
Stéphane Nicoll
2026-10-07 16:07:28 +02:00
parent 2523a7e3ee 20548c07a0
commit ab09d113fe
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-grpc-client/src/main/java/org/springframework/boot/grpc/client/autoconfigure/ServiceConfig.java
+2 -1
View File
@@ -87,7 +87,8 @@ public record ServiceConfig(@Nullable List<LoadBalancingConfig> loadbalancing, @
}
static String durationString(Duration duration) {
return duration.getSeconds() + "." + duration.getNano() + "s";
return (duration.getNano() == 0) ? "%ds".formatted(duration.getSeconds())
: "%d.%09ds".formatted(duration.getSeconds(), duration.getNano());
}
static String bytesString(DataSize dataSize) {
module/spring-boot-grpc-client/src/test/java/org/springframework/boot/grpc/client/autoconfigure/ServiceConfigTests.java
+2 -2
View File
@@ -255,7 +255,7 @@ class ServiceConfigTests {
method: m-one
retry:
max-attempts: 2
initial-backoff: 1m
initial-backoff: 50ms
max-backoff: 1h
backoff-multiplier: 2.5
per-attempt-receive-timeout: 2s
@@ -268,7 +268,7 @@ class ServiceConfigTests {
Map<String, ?> serviceMethodMap = getServiceMethodMap(map, true);
Object methodInfo = serviceMethodMap.get("s-one/m-one");
assertThat(methodInfo).extracting("retryPolicy.maxAttempts").isEqualTo(2);
assertThat(methodInfo).extracting("retryPolicy.initialBackoffNanos").isEqualTo(Duration.ofMinutes(1).toNanos());
assertThat(methodInfo).extracting("retryPolicy.initialBackoffNanos").isEqualTo(Duration.ofMillis(50).toNanos());
assertThat(methodInfo).extracting("retryPolicy.maxBackoffNanos").isEqualTo(Duration.ofHours(1).toNanos());
assertThat(methodInfo).extracting("retryPolicy.backoffMultiplier").isEqualTo(2.5);
assertThat(methodInfo).extracting("retryPolicy.perAttemptRecvTimeoutNanos")