Polishing

Author: sbrannen

spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java

@@ -532,7 +532,7 @@ public boolean isSingletonCurrentlyInCreation(@Nullable String beanName) {
 
 	/**
 	 * Callback before singleton creation.
-	 * <p>The default implementation register the singleton as currently in creation.
+	 * <p>The default implementation registers the singleton as currently in creation.
 	 * @param beanName the name of the singleton about to be created
 	 * @see #isSingletonCurrentlyInCreation
 	 */

spring-core/src/main/java/org/springframework/core/retry/RetryTemplate.java

@@ -214,10 +214,10 @@ private void checkIfTimeoutExceeded(long timeout, long startTime, long sleepTime
 			long elapsedTime = System.currentTimeMillis() + sleepTime - startTime;
 			if (elapsedTime >= timeout) {
 				String message = (sleepTime > 0 ? """
-						Retry policy for operation '%s' would exceed timeout (%d ms) due \
-						to pending sleep time (%d ms); preemptively aborting execution"""
+						Retry policy for operation '%s' would exceed timeout (%dms) due \
+						to pending sleep time (%dms); preemptively aborting execution"""
 								.formatted(retryable.getName(), timeout, sleepTime) :
-						"Retry policy for operation '%s' exceeded timeout (%d ms); aborting execution"
+						"Retry policy for operation '%s' exceeded timeout (%dms); aborting execution"
 								.formatted(retryable.getName(), timeout));
 				RetryException retryException = new RetryException(message, exceptions.removeLast());
 				exceptions.forEach(retryException::addSuppressed);

spring-core/src/test/java/org/springframework/core/retry/RetryTemplateTests.java

@@ -476,7 +476,7 @@ void retryWithTimeoutExceededAfterInitialFailure() throws Exception {
 			assertThat(invocationCount).hasValue(0);
 			assertThatExceptionOfType(RetryException.class)
 					.isThrownBy(() -> retryTemplate.execute(retryable))
-					.withMessageMatching("Retry policy for operation '.+?' exceeded timeout \\(5 ms\\); aborting execution")
+					.withMessageMatching("Retry policy for operation '.+?' exceeded timeout \\(5ms\\); aborting execution")
 					.withCause(new CustomException("Boom 1"))
 					.satisfies(throwable -> inOrder.verify(retryListener).onRetryPolicyTimeout(
 							eq(retryPolicy), eq(retryable), eq(throwable)));
@@ -503,8 +503,8 @@ void retryWithTimeoutExceededAfterFirstDelayButBeforeFirstRetry() throws Excepti
 			assertThatExceptionOfType(RetryException.class)
 					.isThrownBy(() -> retryTemplate.execute(retryable))
 					.withMessageMatching("""
-							Retry policy for operation '.+?' would exceed timeout \\(5 ms\\) \
-							due to pending sleep time \\(10 ms\\); preemptively aborting execution\
+							Retry policy for operation '.+?' would exceed timeout \\(5ms\\) \
+							due to pending sleep time \\(10ms\\); preemptively aborting execution\
 							""")
 					.withCause(new CustomException("Boom 1"))
 					.satisfies(throwable -> inOrder.verify(retryListener).onRetryPolicyTimeout(
@@ -535,7 +535,7 @@ void retryWithTimeoutExceededAfterFirstRetry() throws Exception {
 			assertThat(invocationCount).hasValue(0);
 			assertThatExceptionOfType(RetryException.class)
 					.isThrownBy(() -> retryTemplate.execute(retryable))
-					.withMessageMatching("Retry policy for operation '.+?' exceeded timeout \\(20 ms\\); aborting execution")
+					.withMessageMatching("Retry policy for operation '.+?' exceeded timeout \\(20ms\\); aborting execution")
 					.withCause(new CustomException("Boom 2"))
 					.satisfies(throwable -> {
 						inOrder.verify(retryListener).beforeRetry(retryPolicy, retryable);
@@ -570,7 +570,7 @@ void retryWithTimeoutExceededAfterSecondRetry() throws Exception {
 			assertThat(invocationCount).hasValue(0);
 			assertThatExceptionOfType(RetryException.class)
 					.isThrownBy(() -> retryTemplate.execute(retryable))
-					.withMessageMatching("Retry policy for operation '.+?' exceeded timeout \\(20 ms\\); aborting execution")
+					.withMessageMatching("Retry policy for operation '.+?' exceeded timeout \\(20ms\\); aborting execution")
 					.withCause(new CustomException("Boom 3"))
 					.satisfies(throwable -> {
 						var counter = new AtomicInteger(1);