diff --git a/pom.xml b/pom.xml index 49ef023..62663b2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,11 +32,11 @@ UTF-8 UTF-8 - 1.9.22.1 - 3.26.3 - 5.11.3 - 2.24.2 - 5.14.2 + 1.9.24 + 3.27.3 + 5.12.2 + 2.24.3 + 5.17.0 6.0.23 1.10.13 @@ -187,12 +187,12 @@ io.spring.javaformat spring-javaformat-maven-plugin - 0.0.43 + 0.0.44 org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 org.apache.maven.plugins @@ -212,7 +212,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 + 3.5.3 com.gradle @@ -306,7 +306,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.6.0 + 1.7.0 ${project.build.directory} oss diff --git a/src/main/java/org/springframework/retry/RetryContext.java b/src/main/java/org/springframework/retry/RetryContext.java index 167d07c..49ff338 100644 --- a/src/main/java/org/springframework/retry/RetryContext.java +++ b/src/main/java/org/springframework/retry/RetryContext.java @@ -87,8 +87,7 @@ public interface RetryContext extends AttributeAccessor { * Accessor for the parent context if retry blocks are nested. * @return the parent or null if there is none. */ - @Nullable - RetryContext getParent(); + @Nullable RetryContext getParent(); /** * Counts the number of retry attempts. Before the first attempt this counter is zero, @@ -104,7 +103,6 @@ public interface RetryContext extends AttributeAccessor { * enclosing policy decides not to provide it (e.g. because of concerns about memory * usage). */ - @Nullable - Throwable getLastThrowable(); + @Nullable Throwable getLastThrowable(); } diff --git a/src/main/java/org/springframework/retry/support/RetrySynchronizationManager.java b/src/main/java/org/springframework/retry/support/RetrySynchronizationManager.java index 92ba6b7..0111839 100644 --- a/src/main/java/org/springframework/retry/support/RetrySynchronizationManager.java +++ b/src/main/java/org/springframework/retry/support/RetrySynchronizationManager.java @@ -71,8 +71,7 @@ public final class RetrySynchronizationManager { * Public accessor for the locally enclosing {@link RetryContext}. * @return the current retry context, or null if there isn't one */ - @Nullable - public static RetryContext getContext() { + @Nullable public static RetryContext getContext() { if (useThreadLocal) { return context.get(); } @@ -88,8 +87,7 @@ public final class RetrySynchronizationManager { * @param context the new context to register * @return the old context if there was one */ - @Nullable - public static RetryContext register(RetryContext context) { + @Nullable public static RetryContext register(RetryContext context) { if (useThreadLocal) { RetryContext oldContext = getContext(); RetrySynchronizationManager.context.set(context); @@ -107,8 +105,7 @@ public final class RetrySynchronizationManager { * {@link RetryOperations} implementations. * @return the old value if there was one. */ - @Nullable - public static RetryContext clear() { + @Nullable public static RetryContext clear() { RetryContext value = getContext(); RetryContext parent = value == null ? null : value.getParent(); if (useThreadLocal) {