From 7e9e2169fa2e9649fd1d34fc616368ab0df92e17 Mon Sep 17 00:00:00 2001 From: Nate Danner Date: Wed, 24 Apr 2024 23:00:16 +0000 Subject: [PATCH] refactor: Common static analysis issues Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.CommonStaticAnalysis?organizationId=TmV0ZmxpeCArIFNwcmluZw%3D%3D Co-authored-by: Moderne --- .../BinaryExceptionClassifierBuilder.java | 4 +-- .../classify/ClassifierAdapter.java | 2 +- .../classify/ClassifierSupport.java | 2 +- .../classify/PatternMatcher.java | 4 +-- .../classify/PatternMatchingClassifier.java | 3 +- .../classify/SubclassClassifier.java | 2 +- .../classify/util/MethodInvokerUtils.java | 4 +-- .../RecoverAnnotationRecoveryHandler.java | 1 - .../retry/backoff/BackOffPolicyBuilder.java | 2 +- .../retry/context/RetryContextSupport.java | 5 +-- .../interceptor/RetryInterceptorBuilder.java | 10 +++--- .../RetryOperationsInterceptor.java | 2 +- .../StatefulRetryOperationsInterceptor.java | 2 +- .../BinaryExceptionClassifierRetryPolicy.java | 2 +- .../policy/CircuitBreakerRetryPolicy.java | 2 +- .../retry/policy/CompositeRetryPolicy.java | 2 +- .../ExceptionClassifierRetryPolicy.java | 4 +-- .../retry/policy/MaxAttemptsRetryPolicy.java | 2 +- .../retry/policy/NeverRetryPolicy.java | 2 +- .../retry/policy/SimpleRetryPolicy.java | 4 +-- .../retry/support/DefaultRetryState.java | 6 ++-- .../retry/support/RetryTemplate.java | 2 +- .../BinaryExceptionClassifierTests.java | 4 +-- .../retry/ResourcelessTransactionManager.java | 2 +- .../retry/annotation/CircuitBreakerTests.java | 10 +++--- .../retry/annotation/EnableRetryTests.java | 36 +++++++++---------- .../EnableRetryWithBackoffTests.java | 10 +++--- .../EnableRetryWithListenersTests.java | 14 ++++---- .../RetryOperationsInterceptorTests.java | 2 +- .../retry/listener/RetryListenerTests.java | 5 +-- .../CircuitBreakerRetryTemplateTests.java | 3 +- .../ExceptionClassifierRetryPolicyTests.java | 2 +- .../policy/StatefulRetryIntegrationTests.java | 4 +-- .../retry/support/RetryTemplateTests.java | 4 +-- .../support/StatefulRecoveryRetryTests.java | 2 +- 35 files changed, 83 insertions(+), 84 deletions(-) diff --git a/src/main/java/org/springframework/classify/BinaryExceptionClassifierBuilder.java b/src/main/java/org/springframework/classify/BinaryExceptionClassifierBuilder.java index 8cc1de5d..e243d048 100644 --- a/src/main/java/org/springframework/classify/BinaryExceptionClassifierBuilder.java +++ b/src/main/java/org/springframework/classify/BinaryExceptionClassifierBuilder.java @@ -48,9 +48,9 @@ public class BinaryExceptionClassifierBuilder { * Building notation type (white list or black list) - null: has not selected yet - * true: white list - false: black list */ - private Boolean isWhiteList = null; + private Boolean isWhiteList; - private boolean traverseCauses = false; + private boolean traverseCauses; private final List> exceptionClasses = new ArrayList<>(); diff --git a/src/main/java/org/springframework/classify/ClassifierAdapter.java b/src/main/java/org/springframework/classify/ClassifierAdapter.java index 6d437e40..7939cbb4 100644 --- a/src/main/java/org/springframework/classify/ClassifierAdapter.java +++ b/src/main/java/org/springframework/classify/ClassifierAdapter.java @@ -78,7 +78,7 @@ public final void setDelegate(Object delegate) { this.invoker = MethodInvokerUtils .getMethodInvokerByAnnotation(org.springframework.classify.annotation.Classifier.class, delegate); if (this.invoker == null) { - this.invoker = MethodInvokerUtils.getMethodInvokerForSingleArgument(delegate); + this.invoker = MethodInvokerUtils.getMethodInvokerForSingleArgument(delegate); } Assert.state(this.invoker != null, "No single argument public method with or without " + "@Classifier was found in delegate of type " + delegate.getClass()); diff --git a/src/main/java/org/springframework/classify/ClassifierSupport.java b/src/main/java/org/springframework/classify/ClassifierSupport.java index 7168ab26..ecc5d748 100644 --- a/src/main/java/org/springframework/classify/ClassifierSupport.java +++ b/src/main/java/org/springframework/classify/ClassifierSupport.java @@ -27,7 +27,7 @@ @SuppressWarnings("serial") public class ClassifierSupport implements Classifier { - final private T defaultValue; + private final T defaultValue; /** * @param defaultValue the default value diff --git a/src/main/java/org/springframework/classify/PatternMatcher.java b/src/main/java/org/springframework/classify/PatternMatcher.java index 0efe91f0..08e03dcb 100644 --- a/src/main/java/org/springframework/classify/PatternMatcher.java +++ b/src/main/java/org/springframework/classify/PatternMatcher.java @@ -152,8 +152,8 @@ public static boolean match(String pattern, String str) { } // Find the pattern between padIdxStart & padIdxTmp in str between // strIdxStart & strIdxEnd - int patLength = (patIdxTmp - patIdxStart - 1); - int strLength = (strIdxEnd - strIdxStart + 1); + int patLength = patIdxTmp - patIdxStart - 1; + int strLength = strIdxEnd - strIdxStart + 1; int foundIdx = -1; strLoop: for (int i = 0; i <= strLength - patLength; i++) { for (int j = 0; j < patLength; j++) { diff --git a/src/main/java/org/springframework/classify/PatternMatchingClassifier.java b/src/main/java/org/springframework/classify/PatternMatchingClassifier.java index db4ad162..547b943f 100644 --- a/src/main/java/org/springframework/classify/PatternMatchingClassifier.java +++ b/src/main/java/org/springframework/classify/PatternMatchingClassifier.java @@ -67,8 +67,7 @@ public void setPatternMap(Map values) { */ @Override public T classify(String classifiable) { - T value = this.values.match(classifiable); - return value; + return this.values.match(classifiable); } } diff --git a/src/main/java/org/springframework/classify/SubclassClassifier.java b/src/main/java/org/springframework/classify/SubclassClassifier.java index dd138ffe..a0a4a73b 100644 --- a/src/main/java/org/springframework/classify/SubclassClassifier.java +++ b/src/main/java/org/springframework/classify/SubclassClassifier.java @@ -149,7 +149,7 @@ public C classify(T classifiable) { * Return the default value supplied in the constructor (default false). * @return C the default value */ - final public C getDefault() { + public final C getDefault() { return this.defaultValue; } diff --git a/src/main/java/org/springframework/classify/util/MethodInvokerUtils.java b/src/main/java/org/springframework/classify/util/MethodInvokerUtils.java index 2818796a..a31f3a72 100644 --- a/src/main/java/org/springframework/classify/util/MethodInvokerUtils.java +++ b/src/main/java/org/springframework/classify/util/MethodInvokerUtils.java @@ -112,7 +112,7 @@ public static MethodInvoker getMethodInvokerForInterface(Class cls, String me public static MethodInvoker getMethodInvokerByAnnotation(final Class annotationType, final Object target, final Class... expectedParamTypes) { MethodInvoker mi = MethodInvokerUtils.getMethodInvokerByAnnotation(annotationType, target); - final Class targetClass = (target instanceof Advised) ? ((Advised) target).getTargetSource().getTargetClass() + final Class targetClass = target instanceof Advised ? ((Advised) target).getTargetSource().getTargetClass() : target.getClass(); if (mi != null) { ReflectionUtils.doWithMethods(targetClass, method -> { @@ -151,7 +151,7 @@ public static MethodInvoker getMethodInvokerByAnnotation(final Class targetClass = (target instanceof Advised) ? ((Advised) target).getTargetSource().getTargetClass() + final Class targetClass = target instanceof Advised ? ((Advised) target).getTargetSource().getTargetClass() : target.getClass(); if (targetClass == null) { // Proxy with no target cannot have annotations diff --git a/src/main/java/org/springframework/retry/annotation/RecoverAnnotationRecoveryHandler.java b/src/main/java/org/springframework/retry/annotation/RecoverAnnotationRecoveryHandler.java index d798a863..11614776 100644 --- a/src/main/java/org/springframework/retry/annotation/RecoverAnnotationRecoveryHandler.java +++ b/src/main/java/org/springframework/retry/annotation/RecoverAnnotationRecoveryHandler.java @@ -288,7 +288,6 @@ private void optionallyFilterMethodsBy(Class returnClass) { } if (filteredMethods.size() > 0) { this.methods.clear(); - ; this.methods.putAll(filteredMethods); } } diff --git a/src/main/java/org/springframework/retry/backoff/BackOffPolicyBuilder.java b/src/main/java/org/springframework/retry/backoff/BackOffPolicyBuilder.java index 72c91855..b1e4f8be 100644 --- a/src/main/java/org/springframework/retry/backoff/BackOffPolicyBuilder.java +++ b/src/main/java/org/springframework/retry/backoff/BackOffPolicyBuilder.java @@ -70,7 +70,7 @@ * @author Tomaz Fernandes * @since 1.3.3 */ -public class BackOffPolicyBuilder { +public final class BackOffPolicyBuilder { private static final long DEFAULT_INITIAL_DELAY = 1000L; diff --git a/src/main/java/org/springframework/retry/context/RetryContextSupport.java b/src/main/java/org/springframework/retry/context/RetryContextSupport.java index baa7e1d8..1f58a91d 100644 --- a/src/main/java/org/springframework/retry/context/RetryContextSupport.java +++ b/src/main/java/org/springframework/retry/context/RetryContextSupport.java @@ -28,7 +28,7 @@ public class RetryContextSupport extends AttributeAccessorSupport implements Ret private final RetryContext parent; - private volatile boolean terminate = false; + private volatile boolean terminate; private volatile int count; @@ -73,8 +73,9 @@ public Throwable getLastThrowable() { */ public void registerThrowable(Throwable throwable) { this.lastException = throwable; - if (throwable != null) + if (throwable != null) { count++; + } } @Override diff --git a/src/main/java/org/springframework/retry/interceptor/RetryInterceptorBuilder.java b/src/main/java/org/springframework/retry/interceptor/RetryInterceptorBuilder.java index 82d41f0a..b2e10f30 100644 --- a/src/main/java/org/springframework/retry/interceptor/RetryInterceptorBuilder.java +++ b/src/main/java/org/springframework/retry/interceptor/RetryInterceptorBuilder.java @@ -196,8 +196,8 @@ public RetryInterceptorBuilder label(String label) { private RetryInterceptorBuilder() { } - public static class StatefulRetryInterceptorBuilder - extends RetryInterceptorBuilder { + public static final class StatefulRetryInterceptorBuilder + extends RetryInterceptorBuilder { private final StatefulRetryOperationsInterceptor interceptor = new StatefulRetryOperationsInterceptor(); @@ -308,8 +308,8 @@ private StatefulRetryInterceptorBuilder() { } - public static class CircuitBreakerInterceptorBuilder - extends RetryInterceptorBuilder { + public static final class CircuitBreakerInterceptorBuilder + extends RetryInterceptorBuilder { private final StatefulRetryOperationsInterceptor interceptor = new StatefulRetryOperationsInterceptor(); @@ -370,7 +370,7 @@ private CircuitBreakerInterceptorBuilder() { } - public static class StatelessRetryInterceptorBuilder extends RetryInterceptorBuilder { + public static final class StatelessRetryInterceptorBuilder extends RetryInterceptorBuilder { private final RetryOperationsInterceptor interceptor = new RetryOperationsInterceptor(); diff --git a/src/main/java/org/springframework/retry/interceptor/RetryOperationsInterceptor.java b/src/main/java/org/springframework/retry/interceptor/RetryOperationsInterceptor.java index 2fa20977..259acced 100644 --- a/src/main/java/org/springframework/retry/interceptor/RetryOperationsInterceptor.java +++ b/src/main/java/org/springframework/retry/interceptor/RetryOperationsInterceptor.java @@ -107,7 +107,7 @@ public Object doWithRetry(RetryContext context) throws Exception { }; - RecoveryCallback recoveryCallback = (this.recoverer != null) + RecoveryCallback recoveryCallback = this.recoverer != null ? new ItemRecovererCallback(invocation.getArguments(), this.recoverer) : null; try { return this.retryOperations.execute(retryCallback, recoveryCallback); diff --git a/src/main/java/org/springframework/retry/interceptor/StatefulRetryOperationsInterceptor.java b/src/main/java/org/springframework/retry/interceptor/StatefulRetryOperationsInterceptor.java index 6844eda7..9012fe0e 100644 --- a/src/main/java/org/springframework/retry/interceptor/StatefulRetryOperationsInterceptor.java +++ b/src/main/java/org/springframework/retry/interceptor/StatefulRetryOperationsInterceptor.java @@ -57,7 +57,7 @@ */ public class StatefulRetryOperationsInterceptor implements MethodInterceptor { - private transient final Log logger = LogFactory.getLog(getClass()); + private final transient Log logger = LogFactory.getLog(getClass()); private MethodArgumentsKeyGenerator keyGenerator; diff --git a/src/main/java/org/springframework/retry/policy/BinaryExceptionClassifierRetryPolicy.java b/src/main/java/org/springframework/retry/policy/BinaryExceptionClassifierRetryPolicy.java index b1b8c32e..7f109b86 100644 --- a/src/main/java/org/springframework/retry/policy/BinaryExceptionClassifierRetryPolicy.java +++ b/src/main/java/org/springframework/retry/policy/BinaryExceptionClassifierRetryPolicy.java @@ -53,7 +53,7 @@ public void close(RetryContext status) { @Override public void registerThrowable(RetryContext context, Throwable throwable) { - RetryContextSupport simpleContext = ((RetryContextSupport) context); + RetryContextSupport simpleContext = (RetryContextSupport) context; simpleContext.registerThrowable(throwable); } diff --git a/src/main/java/org/springframework/retry/policy/CircuitBreakerRetryPolicy.java b/src/main/java/org/springframework/retry/policy/CircuitBreakerRetryPolicy.java index e0ea2070..d1e3c0b2 100644 --- a/src/main/java/org/springframework/retry/policy/CircuitBreakerRetryPolicy.java +++ b/src/main/java/org/springframework/retry/policy/CircuitBreakerRetryPolicy.java @@ -187,7 +187,7 @@ public boolean isOpen() { retryable = this.policy.canRetry(this.context); } else if (time < this.openWindow) { - if (!hasAttribute(CIRCUIT_OPEN) || (Boolean) getAttribute(CIRCUIT_OPEN) == false) { + if (!hasAttribute(CIRCUIT_OPEN) || !(Boolean) getAttribute(CIRCUIT_OPEN)) { logger.trace("Opening circuit"); setAttribute(CIRCUIT_OPEN, true); this.start = System.currentTimeMillis(); diff --git a/src/main/java/org/springframework/retry/policy/CompositeRetryPolicy.java b/src/main/java/org/springframework/retry/policy/CompositeRetryPolicy.java index 6a97d15d..dfe937c8 100644 --- a/src/main/java/org/springframework/retry/policy/CompositeRetryPolicy.java +++ b/src/main/java/org/springframework/retry/policy/CompositeRetryPolicy.java @@ -38,7 +38,7 @@ public class CompositeRetryPolicy implements RetryPolicy { RetryPolicy[] policies = new RetryPolicy[0]; - private boolean optimistic = false; + private boolean optimistic; /** * Setter for optimistic. diff --git a/src/main/java/org/springframework/retry/policy/ExceptionClassifierRetryPolicy.java b/src/main/java/org/springframework/retry/policy/ExceptionClassifierRetryPolicy.java index 62741753..0f08fdc2 100644 --- a/src/main/java/org/springframework/retry/policy/ExceptionClassifierRetryPolicy.java +++ b/src/main/java/org/springframework/retry/policy/ExceptionClassifierRetryPolicy.java @@ -103,7 +103,7 @@ public void registerThrowable(RetryContext context, Throwable throwable) { private static class ExceptionClassifierRetryContext extends RetryContextSupport implements RetryPolicy { - final private Classifier exceptionClassifier; + private final Classifier exceptionClassifier; // Dynamic: depends on the latest exception: private RetryPolicy policy; @@ -111,7 +111,7 @@ private static class ExceptionClassifierRetryContext extends RetryContextSupport // Dynamic: depends on the policy: private RetryContext context; - final private Map contexts = new HashMap<>(); + private final Map contexts = new HashMap<>(); public ExceptionClassifierRetryContext(RetryContext parent, Classifier exceptionClassifier) { diff --git a/src/main/java/org/springframework/retry/policy/MaxAttemptsRetryPolicy.java b/src/main/java/org/springframework/retry/policy/MaxAttemptsRetryPolicy.java index 06db30df..0ff23162 100644 --- a/src/main/java/org/springframework/retry/policy/MaxAttemptsRetryPolicy.java +++ b/src/main/java/org/springframework/retry/policy/MaxAttemptsRetryPolicy.java @@ -39,7 +39,7 @@ public class MaxAttemptsRetryPolicy implements RetryPolicy { /** * The default limit to the number of attempts for a new policy. */ - public final static int DEFAULT_MAX_ATTEMPTS = 3; + public static final int DEFAULT_MAX_ATTEMPTS = 3; private volatile int maxAttempts; diff --git a/src/main/java/org/springframework/retry/policy/NeverRetryPolicy.java b/src/main/java/org/springframework/retry/policy/NeverRetryPolicy.java index 0ea75db9..0184dee6 100644 --- a/src/main/java/org/springframework/retry/policy/NeverRetryPolicy.java +++ b/src/main/java/org/springframework/retry/policy/NeverRetryPolicy.java @@ -81,7 +81,7 @@ public void registerThrowable(RetryContext context, Throwable throwable) { */ private static class NeverRetryContext extends RetryContextSupport { - private boolean finished = false; + private boolean finished; public NeverRetryContext(RetryContext parent) { super(parent); diff --git a/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java b/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java index bede5057..44069d94 100644 --- a/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java +++ b/src/main/java/org/springframework/retry/policy/SimpleRetryPolicy.java @@ -66,7 +66,7 @@ public class SimpleRetryPolicy implements RetryPolicy { /** * The default limit to the number of attempts for a new policy. */ - public final static int DEFAULT_MAX_ATTEMPTS = 3; + public static final int DEFAULT_MAX_ATTEMPTS = 3; private int maxAttempts; @@ -237,7 +237,7 @@ public void close(RetryContext status) { */ @Override public void registerThrowable(RetryContext context, Throwable throwable) { - SimpleRetryContext simpleContext = ((SimpleRetryContext) context); + SimpleRetryContext simpleContext = (SimpleRetryContext) context; simpleContext.registerThrowable(throwable); } diff --git a/src/main/java/org/springframework/retry/support/DefaultRetryState.java b/src/main/java/org/springframework/retry/support/DefaultRetryState.java index 798237f4..820da44a 100644 --- a/src/main/java/org/springframework/retry/support/DefaultRetryState.java +++ b/src/main/java/org/springframework/retry/support/DefaultRetryState.java @@ -27,11 +27,11 @@ */ public class DefaultRetryState implements RetryState { - final private Object key; + private final Object key; - final private boolean forceRefresh; + private final boolean forceRefresh; - final private Classifier rollbackClassifier; + private final Classifier rollbackClassifier; /** * Create a {@link DefaultRetryState} representing the state for a new retry attempt. diff --git a/src/main/java/org/springframework/retry/support/RetryTemplate.java b/src/main/java/org/springframework/retry/support/RetryTemplate.java index 512dcd41..0d9fe74c 100644 --- a/src/main/java/org/springframework/retry/support/RetryTemplate.java +++ b/src/main/java/org/springframework/retry/support/RetryTemplate.java @@ -318,7 +318,7 @@ protected T doExecute(RetryCallback retryCallback } Object label = retryCallback.getLabel(); - String labelMessage = (label != null) ? "; for: '" + label + "'" : ""; + String labelMessage = label != null ? "; for: '" + label + "'" : ""; /* * We allow the whole loop to be skipped if the policy or context already diff --git a/src/test/java/org/springframework/classify/BinaryExceptionClassifierTests.java b/src/test/java/org/springframework/classify/BinaryExceptionClassifierTests.java index 205a7fba..659309a4 100644 --- a/src/test/java/org/springframework/classify/BinaryExceptionClassifierTests.java +++ b/src/test/java/org/springframework/classify/BinaryExceptionClassifierTests.java @@ -115,7 +115,7 @@ public void testTypesProvidedInConstructorWithNonDefaultInCause() { } @SuppressWarnings("serial") - private class FooException extends IllegalStateException { + private final class FooException extends IllegalStateException { private FooException(String s) { super(s); @@ -128,7 +128,7 @@ private FooException(String s, Throwable t) { } @SuppressWarnings("serial") - private class BarException extends RuntimeException { + private final class BarException extends RuntimeException { private BarException() { super(); diff --git a/src/test/java/org/springframework/retry/ResourcelessTransactionManager.java b/src/test/java/org/springframework/retry/ResourcelessTransactionManager.java index e415714f..824bd357 100644 --- a/src/test/java/org/springframework/retry/ResourcelessTransactionManager.java +++ b/src/test/java/org/springframework/retry/ResourcelessTransactionManager.java @@ -78,7 +78,7 @@ protected void doCleanupAfterCompletion(Object transaction) { private static class ResourcelessTransaction { - private boolean active = false; + private boolean active; public boolean isActive() { return active; diff --git a/src/test/java/org/springframework/retry/annotation/CircuitBreakerTests.java b/src/test/java/org/springframework/retry/annotation/CircuitBreakerTests.java index b6236ce7..8c399194 100644 --- a/src/test/java/org/springframework/retry/annotation/CircuitBreakerTests.java +++ b/src/test/java/org/springframework/retry/annotation/CircuitBreakerTests.java @@ -50,14 +50,14 @@ public void vanilla() throws Exception { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(TestConfiguration.class); Service service = context.getBean(Service.class); assertThat(AopUtils.isAopProxy(service)).isTrue(); - assertThatExceptionOfType(Exception.class).isThrownBy(() -> service.service()); + assertThatExceptionOfType(Exception.class).isThrownBy(service::service); assertThat((Boolean) service.getContext().getAttribute(CircuitBreakerRetryPolicy.CIRCUIT_OPEN)).isFalse(); - assertThatExceptionOfType(Exception.class).isThrownBy(() -> service.service()); + assertThatExceptionOfType(Exception.class).isThrownBy(service::service); assertThat((Boolean) service.getContext().getAttribute(CircuitBreakerRetryPolicy.CIRCUIT_OPEN)).isFalse(); - assertThatExceptionOfType(Exception.class).isThrownBy(() -> service.service()); + assertThatExceptionOfType(Exception.class).isThrownBy(service::service); assertThat((Boolean) service.getContext().getAttribute(CircuitBreakerRetryPolicy.CIRCUIT_OPEN)).isTrue(); assertThat(service.getCount()).isEqualTo(3); - assertThatExceptionOfType(Exception.class).isThrownBy(() -> service.service()); + assertThatExceptionOfType(Exception.class).isThrownBy(service::service); // Not called again once circuit is open assertThat(service.getCount()).isEqualTo(3); service.expressionService(); @@ -162,7 +162,7 @@ interface Service { protected static class ServiceImpl implements Service { - int count = 0; + int count; RetryContext context; diff --git a/src/test/java/org/springframework/retry/annotation/EnableRetryTests.java b/src/test/java/org/springframework/retry/annotation/EnableRetryTests.java index b0a81837..b027788d 100644 --- a/src/test/java/org/springframework/retry/annotation/EnableRetryTests.java +++ b/src/test/java/org/springframework/retry/annotation/EnableRetryTests.java @@ -134,10 +134,10 @@ public void recovery() { service.service(); assertThat(service.getCount()).isEqualTo(3); assertThat(service.getCause()).isExactlyInstanceOf(RuntimeException.class); - assertThatIllegalArgumentException().isThrownBy(() -> service.service()); + assertThatIllegalArgumentException().isThrownBy(service::service); assertThat(service.getCount()).isEqualTo(6); assertThat(service.getCause()).isExactlyInstanceOf(RuntimeException.class); - assertThatIllegalStateException().isThrownBy(() -> service.service()); + assertThatIllegalStateException().isThrownBy(service::service); assertThat(service.getCount()).isEqualTo(7); assertThat(service.getCause()).isExactlyInstanceOf(RuntimeException.class); context.close(); @@ -174,7 +174,7 @@ public void type() { public void excludes() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(TestConfiguration.class); ExcludesService service = context.getBean(ExcludesService.class); - assertThatIllegalStateException().isThrownBy(() -> service.service()); + assertThatIllegalStateException().isThrownBy(service::service); assertThat(service.getCount()).isEqualTo(1); context.close(); } @@ -184,7 +184,7 @@ public void excludesOnly() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(TestConfiguration.class); ExcludesOnlyService service = context.getBean(ExcludesOnlyService.class); service.setExceptionToThrow(new IllegalStateException()); - assertThatExceptionOfType(Exception.class).isThrownBy(() -> service.service()); + assertThatExceptionOfType(Exception.class).isThrownBy(service::service); assertThat(service.getCount()).isEqualTo(1); service.setExceptionToThrow(new IllegalArgumentException()); @@ -257,7 +257,7 @@ public void testExpression() throws Exception { ExpressionService service = context.getBean(ExpressionService.class); service.service1(); assertThat(service.getCount()).isEqualTo(3); - assertThatExceptionOfType(Exception.class).isThrownBy(() -> service.service2()); + assertThatExceptionOfType(Exception.class).isThrownBy(service::service2); assertThat(service.getCount()).isEqualTo(4); service.service3(); assertThat(service.getCount()).isEqualTo(9); @@ -372,7 +372,7 @@ public Object postProcessAfterInitialization(final Object bean, String beanName) if (bean instanceof RecoverableService) { Advised advised = (Advised) bean; advised.addAdvice((MethodInterceptor) invocation -> { - if (invocation.getMethod().getName().equals("recover")) { + if ("recover".equals(invocation.getMethod().getName())) { ((RecoverableService) bean).setOtherAdviceCalled(); } return invocation.proceed(); @@ -562,7 +562,7 @@ RuntimeConfigs runtimeConfigs() { public static class RuntimeConfigs { - int count = 0; + int count; public int getMaxAttempts() { this.count++; @@ -588,7 +588,7 @@ public double getMult() { protected static class Service { - private int count = 0; + private int count; @Retryable(RuntimeException.class) public void service() { @@ -605,7 +605,7 @@ public int getCount() { protected static class MultiService { - private int count = 0; + private int count; @Retryable(retryFor = RuntimeException.class) public void service() { @@ -635,7 +635,7 @@ public int getCount() { protected static class RecoverableService { - private int count = 0; + private int count; private Throwable cause; @@ -701,7 +701,7 @@ public boolean isOtherAdviceCalled() { @Retryable(retryFor = RuntimeException.class) protected static class RetryableService { - private int count = 0; + private int count; public void service() { if (this.count++ < 2) { @@ -717,7 +717,7 @@ public int getCount() { protected static class ExcludesService { - private int count = 0; + private int count; @Retryable(retryFor = RuntimeException.class, noRetryFor = IllegalStateException.class) public void service() { @@ -734,7 +734,7 @@ public int getCount() { protected static class ExcludesOnlyService { - private int count = 0; + private int count; private RuntimeException exceptionToThrow; @@ -767,7 +767,7 @@ public void noRetryRecovery(Throwable ex) throws Throwable { protected static class StatefulService { - private int count = 0; + private int count; @Retryable(stateful = true) public void service(int value) { @@ -784,7 +784,7 @@ public int getCount() { static class InterceptableService { - private int count = 0; + private int count; @Retryable(interceptor = "retryInterceptor") public void service() { @@ -801,7 +801,7 @@ public int getCount() { static class ExpressionService { - private int count = 0; + private int count; @Retryable(exceptionExpression = "message.contains('this can be retried')") public void service1() { @@ -886,7 +886,7 @@ public static interface TheInterface { public static class TheClass implements TheInterface { - private int count = 0; + private int count; private boolean recovered; @@ -972,7 +972,7 @@ public static interface NotAnnotatedInterface { @Retryable public static class RetryableImplementation implements NotAnnotatedInterface { - private int count = 0; + private int count; @Override public void service1() { diff --git a/src/test/java/org/springframework/retry/annotation/EnableRetryWithBackoffTests.java b/src/test/java/org/springframework/retry/annotation/EnableRetryWithBackoffTests.java index e10458db..14f56353 100644 --- a/src/test/java/org/springframework/retry/annotation/EnableRetryWithBackoffTests.java +++ b/src/test/java/org/springframework/retry/annotation/EnableRetryWithBackoffTests.java @@ -149,7 +149,7 @@ private List getPeriods() { protected static class Service { - private int count = 0; + private int count; @Retryable(backoff = @Backoff(delay = 1000)) public void service() { @@ -167,7 +167,7 @@ public int getCount() { @Retryable(backoff = @Backoff(delay = 1000, maxDelay = 2000)) protected static class RandomService { - private int count = 0; + private int count; public void service() { if (count++ < 2) { @@ -183,7 +183,7 @@ public int getCount() { protected static class ExponentialService { - private int count = 0; + private int count; @Retryable(backoff = @Backoff(delay = 1000, maxDelay = 2000, multiplier = 1.1)) public void service() { @@ -200,7 +200,7 @@ public int getCount() { protected static class ExponentialRandomService { - private int count = 0; + private int count; @Retryable(backoff = @Backoff(delay = 1000, maxDelay = 2000, multiplier = 1.1, random = true)) public void service(int value) { @@ -217,7 +217,7 @@ public int getCount() { protected static class ExponentialRandomExpressionService { - private int count = 0; + private int count; @Retryable(backoff = @Backoff(delay = 1000, maxDelay = 2000, multiplier = 1.1, randomExpression = "#{true}")) public void service(int value) { diff --git a/src/test/java/org/springframework/retry/annotation/EnableRetryWithListenersTests.java b/src/test/java/org/springframework/retry/annotation/EnableRetryWithListenersTests.java index 39ddfd2e..0717f413 100644 --- a/src/test/java/org/springframework/retry/annotation/EnableRetryWithListenersTests.java +++ b/src/test/java/org/springframework/retry/annotation/EnableRetryWithListenersTests.java @@ -70,7 +70,7 @@ public void excludedListeners() { @EnableRetry(proxyTargetClass = true) protected static class TestConfiguration { - private int count = 0; + private int count; @Bean public Service service() { @@ -94,9 +94,9 @@ public void close(RetryContext context, RetryCallback void close(RetryContext context, RetryCallback void close(RetryContext context, RetryCallback list = new ArrayList<>(); @@ -194,8 +194,9 @@ public void close(RetryContext context, RetryCallback { - if (count++ < 1) + if (count++ < 1) { throw new RuntimeException("Retry!"); + } return null; }); assertThat(count).isEqualTo(2); diff --git a/src/test/java/org/springframework/retry/policy/CircuitBreakerRetryTemplateTests.java b/src/test/java/org/springframework/retry/policy/CircuitBreakerRetryTemplateTests.java index b1fceca9..78899eed 100644 --- a/src/test/java/org/springframework/retry/policy/CircuitBreakerRetryTemplateTests.java +++ b/src/test/java/org/springframework/retry/policy/CircuitBreakerRetryTemplateTests.java @@ -170,8 +170,7 @@ public int getAttempts() { if (!this.status.hasAttribute("attempts")) { this.status.setAttribute("attempts", 0); } - int attempts = (Integer) this.status.getAttribute("attempts"); - return attempts; + return (Integer) this.status.getAttribute("attempts"); } public void setAttemptsBeforeSuccess(int attemptsBeforeSuccess) { diff --git a/src/test/java/org/springframework/retry/policy/ExceptionClassifierRetryPolicyTests.java b/src/test/java/org/springframework/retry/policy/ExceptionClassifierRetryPolicyTests.java index d14b5061..04afe19d 100644 --- a/src/test/java/org/springframework/retry/policy/ExceptionClassifierRetryPolicyTests.java +++ b/src/test/java/org/springframework/retry/policy/ExceptionClassifierRetryPolicyTests.java @@ -97,7 +97,7 @@ public void testClassifierOperates() { } - int count = 0; + int count; @SuppressWarnings("serial") @Test diff --git a/src/test/java/org/springframework/retry/policy/StatefulRetryIntegrationTests.java b/src/test/java/org/springframework/retry/policy/StatefulRetryIntegrationTests.java index 940e246e..3387a5f9 100644 --- a/src/test/java/org/springframework/retry/policy/StatefulRetryIntegrationTests.java +++ b/src/test/java/org/springframework/retry/policy/StatefulRetryIntegrationTests.java @@ -138,7 +138,7 @@ public void testExponentialBackOffIsExponential() { }, context -> null, retryState); } catch (Exception e) { - assertThat(e.getMessage().equals("Fail")).isTrue(); + assertThat("Fail".equals(e.getMessage())).isTrue(); } } assertThat(times).hasSize(3); @@ -174,7 +174,7 @@ public void testExternalRetryWithFailAndNoRetryWhenKeyIsNull() throws Throwable */ private static final class MockRetryCallback implements RetryCallback { - int attempts = 0; + int attempts; RetryContext context; diff --git a/src/test/java/org/springframework/retry/support/RetryTemplateTests.java b/src/test/java/org/springframework/retry/support/RetryTemplateTests.java index 1828cb3e..ee578d83 100644 --- a/src/test/java/org/springframework/retry/support/RetryTemplateTests.java +++ b/src/test/java/org/springframework/retry/support/RetryTemplateTests.java @@ -57,7 +57,7 @@ public class RetryTemplateTests { RetryContext context; - int count = 0; + int count; @Test public void testSuccessfulRetry() throws Throwable { @@ -329,7 +329,7 @@ public void onSuccess(RetryContext context, RetryCallba }); AtomicBoolean first = new AtomicBoolean(true); AtomicInteger callCount = new AtomicInteger(); - template.execute((ctx) -> { + template.execute(ctx -> { callCount.incrementAndGet(); return first.getAndSet(false) ? "bad" : "good"; }); diff --git a/src/test/java/org/springframework/retry/support/StatefulRecoveryRetryTests.java b/src/test/java/org/springframework/retry/support/StatefulRecoveryRetryTests.java index 89eeb9fa..7d19d6cb 100644 --- a/src/test/java/org/springframework/retry/support/StatefulRecoveryRetryTests.java +++ b/src/test/java/org/springframework/retry/support/StatefulRecoveryRetryTests.java @@ -42,7 +42,7 @@ public class StatefulRecoveryRetryTests { private final RetryTemplate retryTemplate = new RetryTemplate(); - private int count = 0; + private int count; private final List list = new ArrayList<>();