diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java index d20693b2d2..602290d559 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; */ class MockHttpSessionTests { - private MockHttpSession session = new MockHttpSession(); + private final MockHttpSession session = new MockHttpSession(); @Test diff --git a/spring-test/src/test/java/org/springframework/test/context/TestContextConcurrencyTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextConcurrencyTests.java index 80548d015c..4194f243b3 100644 --- a/spring-test/src/test/java/org/springframework/test/context/TestContextConcurrencyTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/TestContextConcurrencyTests.java @@ -118,7 +118,7 @@ class TestContextConcurrencyTests { private static class TrackingListener implements TestExecutionListener { - private ThreadLocal methodName = new ThreadLocal<>(); + private final ThreadLocal methodName = new ThreadLocal<>(); @Override diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/ContextCacheTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/ContextCacheTests.java index 202af4bb4b..c454e72ad9 100644 --- a/spring-test/src/test/java/org/springframework/test/context/cache/ContextCacheTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/cache/ContextCacheTests.java @@ -47,7 +47,7 @@ import static org.springframework.test.context.cache.ContextCacheTestUtils.asser */ class ContextCacheTests { - private ContextCache contextCache = new DefaultContextCache(); + private final ContextCache contextCache = new DefaultContextCache(); @BeforeEach diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java index 59f037e199..2c6627c0c6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeoutTests.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock; */ public class SpringFailOnTimeoutTests { - private Statement statement = mock(Statement.class); + private final Statement statement = mock(Statement.class); @Test diff --git a/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java b/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java index 6765927413..7260f3182d 100644 --- a/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java +++ b/spring-test/src/test/java/org/springframework/test/util/subpackage/Component.java @@ -68,16 +68,16 @@ public class Component { int add(int... args) { int sum = 0; - for (int i = 0; i < args.length; i++) { - sum += args[i]; + for (int arg : args) { + sum += arg; } return sum; } int multiply(Integer... args) { int product = 1; - for (int i = 0; i < args.length; i++) { - product *= args[i]; + for (Integer arg : args) { + product *= arg; } return product; } diff --git a/spring-test/src/test/java/org/springframework/test/web/Person.java b/spring-test/src/test/java/org/springframework/test/web/Person.java index 2282b70dc3..5184cd0a9c 100644 --- a/spring-test/src/test/java/org/springframework/test/web/Person.java +++ b/spring-test/src/test/java/org/springframework/test/web/Person.java @@ -70,10 +70,9 @@ public class Person { if (this == other) { return true; } - if (!(other instanceof Person)) { + if (!(other instanceof Person otherPerson)) { return false; } - Person otherPerson = (Person) other; return (ObjectUtils.nullSafeEquals(this.name, otherPerson.name) && ObjectUtils.nullSafeEquals(this.someDouble, otherPerson.someDouble) && ObjectUtils.nullSafeEquals(this.someBoolean, otherPerson.someBoolean)); diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java index d99265f36a..b56aebe8eb 100644 --- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java +++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java @@ -45,8 +45,12 @@ class Person { @Override public boolean equals(Object other) { - if (this == other) return true; - if (other == null || getClass() != other.getClass()) return false; + if (this == other) { + return true; + } + if (other == null || getClass() != other.getClass()) { + return false; + } Person person = (Person) other; return getName().equals(person.getName()); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java index c7c3cab677..e7ff36a4cf 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java @@ -347,7 +347,7 @@ public class PrintingResultHandlerTests { private String printedHeading; - private Map> printedValues = new HashMap<>(); + private final Map> printedValues = new HashMap<>(); @Override public void printHeading(String heading) { diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java index aac7d7985b..b67aeb493e 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java @@ -117,9 +117,7 @@ public class EncodedUriTests { @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { - if (bean instanceof RequestMappingHandlerMapping) { - RequestMappingHandlerMapping requestMappingHandlerMapping = (RequestMappingHandlerMapping) bean; - + if (bean instanceof RequestMappingHandlerMapping requestMappingHandlerMapping) { // URL decode after request mapping, not before. requestMappingHandlerMapping.setUrlDecode(false); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/HttpOptionsTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/HttpOptionsTests.java index 508c697c67..97f8f5a457 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/HttpOptionsTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/HttpOptionsTests.java @@ -86,7 +86,7 @@ public class HttpOptionsTests { @Controller private static class MyController { - private AtomicInteger counter = new AtomicInteger(); + private final AtomicInteger counter = new AtomicInteger(); @RequestMapping(value = "/myUrl", method = RequestMethod.OPTIONS) diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java index a18759bba8..e98278f98c 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FrameworkExtensionTests.java @@ -85,7 +85,7 @@ public class FrameworkExtensionTests { */ private static class TestRequestPostProcessor implements RequestPostProcessor { - private HttpHeaders headers = new HttpHeaders(); + private final HttpHeaders headers = new HttpHeaders(); public TestRequestPostProcessor foo(String value) {