root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Improve toString of ExponentialBackOff 

Closes gh-32061
This commit is contained in:
Stéphane Nicoll 2024-01-19 12:10:36 +01:00
parent 7e511931b3
commit 9c6e55939e
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spring-core/src/main/java/org/springframework/util/backoff/ExponentialBackOff.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,6 +16,8 @@
package org.springframework.util.backoff; package org.springframework.util.backoff;
import java.util.StringJoiner;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
@ -212,6 +214,16 @@ public class ExponentialBackOff implements BackOff {
"or equal to 1. A multiplier of 1 is equivalent to a fixed interval."); "or equal to 1. A multiplier of 1 is equivalent to a fixed interval.");
} }
@Override
public String toString() {
return new StringJoiner(", ", ExponentialBackOff.class.getSimpleName() + "{", "}")
.add("initialInterval=" + this.initialInterval)
.add("multiplier=" + this.multiplier)
.add("maxInterval=" + this.maxInterval)
.add("maxElapsedTime=" + this.maxElapsedTime)
.add("maxAttempts=" + this.maxAttempts)
.toString();
}
private class ExponentialBackOffExecution implements BackOffExecution { private class ExponentialBackOffExecution implements BackOffExecution {
@ -255,11 +267,12 @@ public class ExponentialBackOff implements BackOff {
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder("ExponentialBackOff{"); String currentIntervalDescription = this.currentInterval < 0 ? "n/a" : this.currentInterval + "ms";
sb.append("currentInterval=").append(this.currentInterval < 0 ? "n/a" : this.currentInterval + "ms"); return new StringJoiner(", ", ExponentialBackOffExecution.class.getSimpleName() + "{", "}")
sb.append(", multiplier=").append(getMultiplier()); .add("currentInterval=" + currentIntervalDescription)
sb.append('}'); .add("multiplier=" + getMultiplier())
return sb.toString(); .add("attempts=" + this.attempts)
.toString();
} }
} }

10
spring-core/src/test/java/org/springframework/util/ExponentialBackOffTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -127,14 +127,14 @@ class ExponentialBackOffTests {
} }
@Test @Test
void toStringContent() { void executionToStringContent() {
ExponentialBackOff backOff = new ExponentialBackOff(2000L, 2.0); ExponentialBackOff backOff = new ExponentialBackOff(2000L, 2.0);
BackOffExecution execution = backOff.start(); BackOffExecution execution = backOff.start();
assertThat(execution.toString()).isEqualTo("ExponentialBackOff{currentInterval=n/a, multiplier=2.0}"); assertThat(execution.toString()).isEqualTo("ExponentialBackOffExecution{currentInterval=n/a, multiplier=2.0, attempts=0}");
execution.nextBackOff(); execution.nextBackOff();
assertThat(execution.toString()).isEqualTo("ExponentialBackOff{currentInterval=2000ms, multiplier=2.0}"); assertThat(execution.toString()).isEqualTo("ExponentialBackOffExecution{currentInterval=2000ms, multiplier=2.0, attempts=1}");
execution.nextBackOff(); execution.nextBackOff();
assertThat(execution.toString()).isEqualTo("ExponentialBackOff{currentInterval=4000ms, multiplier=2.0}"); assertThat(execution.toString()).isEqualTo("ExponentialBackOffExecution{currentInterval=4000ms, multiplier=2.0, attempts=2}");
} }
@Test @Test