diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java index 3a6d9b35632..69b54a9dc18 100644 --- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java @@ -1495,15 +1495,15 @@ abstract class AbstractPropertyAccessorTests { accessor.setPropertyValues(pvs); assertThat(target.getArray()[0]).isEqualTo(tb5); assertThat(target.getArray()[1]).isEqualTo(tb4); - assertThat((target.getList().get(0))).isEqualTo(tb3); - assertThat((target.getList().get(1))).isEqualTo(tb2); - assertThat((target.getList().get(2))).isEqualTo(tb0); - assertThat((target.getList().get(3))).isNull(); - assertThat((target.getList().get(4))).isEqualTo(tb1); - assertThat((target.getMap().get("key1"))).isEqualTo(tb1); - assertThat((target.getMap().get("key2"))).isEqualTo(tb0); - assertThat((target.getMap().get("key5"))).isEqualTo(tb4); - assertThat((target.getMap().get("key9"))).isEqualTo(tb5); + assertThat(target.getList().get(0)).isEqualTo(tb3); + assertThat(target.getList().get(1)).isEqualTo(tb2); + assertThat(target.getList().get(2)).isEqualTo(tb0); + assertThat(target.getList().get(3)).isNull(); + assertThat(target.getList().get(4)).isEqualTo(tb1); + assertThat(target.getMap().get("key1")).isEqualTo(tb1); + assertThat(target.getMap().get("key2")).isEqualTo(tb0); + assertThat(target.getMap().get("key5")).isEqualTo(tb4); + assertThat(target.getMap().get("key9")).isEqualTo(tb5); assertThat(accessor.getPropertyValue("array[0]")).isEqualTo(tb5); assertThat(accessor.getPropertyValue("array[1]")).isEqualTo(tb4); assertThat(accessor.getPropertyValue("list[0]")).isEqualTo(tb3); diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index ad1fa210599..1cd9b19f489 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -264,7 +264,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests { accessor.setPropertyValue("object", tb); assertThat(target.value).isSameAs(tb); assertThat(target.getObject()).containsSame(tb); - assertThat(((Optional) accessor.getPropertyValue("object"))).containsSame(tb); + assertThat((Optional) accessor.getPropertyValue("object")).containsSame(tb); assertThat(target.value.getName()).isEqualTo("x"); assertThat(target.getObject().get().getName()).isEqualTo("x"); assertThat(accessor.getPropertyValue("object.name")).isEqualTo("x"); @@ -272,7 +272,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests { accessor.setPropertyValue("object.name", "y"); assertThat(target.value).isSameAs(tb); assertThat(target.getObject()).containsSame(tb); - assertThat(((Optional) accessor.getPropertyValue("object"))).containsSame(tb); + assertThat((Optional) accessor.getPropertyValue("object")).containsSame(tb); assertThat(target.value.getName()).isEqualTo("y"); assertThat(target.getObject().get().getName()).isEqualTo("y"); assertThat(accessor.getPropertyValue("object.name")).isEqualTo("y"); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java index 8b630f9e39d..ca7b35bc826 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java @@ -71,7 +71,7 @@ class YamlMapFactoryBeanTests { new ByteArrayResource("foo:\n spam: bar".getBytes())); assertThat(this.factory.getObject()).hasSize(1); - assertThat(((Map) this.factory.getObject().get("foo"))).hasSize(2); + assertThat((Map) this.factory.getObject().get("foo")).hasSize(2); } @Test diff --git a/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java b/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java index 49530d62608..c6d0e93acfb 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/SimpleMailMessageTests.java @@ -133,10 +133,10 @@ class SimpleMailMessageTests { // Null object is not equal message1 = new SimpleMailMessage(); message2 = null; - assertThat((message1.equals(message2))).isFalse(); + assertThat(message1.equals(message2)).isFalse(); // Different class is not equal - assertThat((message1.equals(new Object()))).isFalse(); + assertThat(message1.equals(new Object())).isFalse(); // Equal values are equal message1 = new SimpleMailMessage(); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java index ee1a31ee0ec..cf467bf3a7f 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java @@ -101,12 +101,12 @@ class BeanNamePointcutTests { assertThat(this.testFactoryBean1.get("myKey")).isEqualTo("myValue"); assertThat(this.counterAspect.getCount()).as("Advice not executed: must have been").isEqualTo(2); FactoryBean fb = (FactoryBean) ctx.getBean("&testFactoryBean1"); - assertThat((fb)).as("FactoryBean itself must *not* be advised").isNotInstanceOf(Advised.class); + assertThat(fb).as("FactoryBean itself must *not* be advised").isNotInstanceOf(Advised.class); } @Test void matchingFactoryBeanItself() { - assertThat((this.testFactoryBean2)).as("Matching bean must *not* be advised (proxied)").isNotInstanceOf(Advised.class); + assertThat(this.testFactoryBean2).as("Matching bean must *not* be advised (proxied)").isNotInstanceOf(Advised.class); FactoryBean fb = (FactoryBean) ctx.getBean("&testFactoryBean2"); assertThat(fb).as("FactoryBean itself must be advised").isInstanceOf(Advised.class); assertThat(Map.class.isAssignableFrom(fb.getObjectType())).isTrue(); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java index 3efb7f590ca..e49bcac4c39 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java @@ -1526,7 +1526,7 @@ class XmlBeanFactoryTests { new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArray"); assertThat(bean.array).isInstanceOf(int[].class); - assertThat(((int[]) bean.array)).hasSize(1); + assertThat((int[]) bean.array).hasSize(1); assertThat(((int[]) bean.array)[0]).isEqualTo(1); } @@ -1536,7 +1536,7 @@ class XmlBeanFactoryTests { new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("indexedConstructorArray"); assertThat(bean.array).isInstanceOf(int[].class); - assertThat(((int[]) bean.array)).hasSize(1); + assertThat((int[]) bean.array).hasSize(1); assertThat(((int[]) bean.array)[0]).isEqualTo(1); } @@ -1546,7 +1546,7 @@ class XmlBeanFactoryTests { new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT); ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArrayNoType"); assertThat(bean.array).isInstanceOf(String[].class); - assertThat(((String[]) bean.array)).isEmpty(); + assertThat((String[]) bean.array).isEmpty(); } @Test @@ -1557,7 +1557,7 @@ class XmlBeanFactoryTests { bd.setLenientConstructorResolution(false); ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArrayNoType"); assertThat(bean.array).isInstanceOf(String[].class); - assertThat(((String[]) bean.array)).isEmpty(); + assertThat((String[]) bean.array).isEmpty(); } @Test diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java index 00ee7e4825f..55cbdf413bd 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java @@ -479,7 +479,7 @@ class ClassPathBeanDefinitionScannerTests { int initialBeanCount = context.getBeanDefinitionCount(); int scannedBeanCount = scanner.scan(BASE_PACKAGE); assertThat(scannedBeanCount).isGreaterThanOrEqualTo(12); - assertThat((context.getBeanDefinitionCount() - initialBeanCount)).isEqualTo(scannedBeanCount); + assertThat(context.getBeanDefinitionCount() - initialBeanCount).isEqualTo(scannedBeanCount); int addedBeanCount = scanner.scan("org.springframework.aop.aspectj.annotation"); assertThat(context.getBeanDefinitionCount()).isEqualTo((initialBeanCount + scannedBeanCount + addedBeanCount)); } diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java index bb28e0f3ec1..d410d44de6e 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/support/BitsCronFieldTests.java @@ -106,9 +106,9 @@ class BitsCronFieldTests { @Test void names() { - assertThat(((BitsCronField)CronField.parseMonth("JAN,FEB,MAR,APR,MAY,JUN,JUL,AUG,SEP,OCT,NOV,DEC"))) + assertThat((BitsCronField)CronField.parseMonth("JAN,FEB,MAR,APR,MAY,JUN,JUL,AUG,SEP,OCT,NOV,DEC")) .has(clear(0)).has(setRange(1, 12)); - assertThat(((BitsCronField)CronField.parseDaysOfWeek("SUN,MON,TUE,WED,THU,FRI,SAT"))) + assertThat((BitsCronField)CronField.parseDaysOfWeek("SUN,MON,TUE,WED,THU,FRI,SAT")) .has(clear(0)).has(setRange(1, 7)); } diff --git a/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java index 09deb980d77..03205ad34ec 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java @@ -969,7 +969,7 @@ class DefaultConversionServiceTests { MethodParameter parameter = new MethodParameter(method, 0); TypeDescriptor descriptor = new TypeDescriptor(parameter); Object actual = conversionService.convert("1,2,3", TypeDescriptor.valueOf(String.class), descriptor); - assertThat(((Optional>) actual)).contains(List.of(1, 2, 3)); + assertThat((Optional>) actual).contains(List.of(1, 2, 3)); } @Test diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index 3108ac78a05..4d8a21bdf5d 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -335,7 +335,7 @@ class GenericConversionServiceTests { TypeDescriptor sourceType = TypeDescriptor.forObject(list); TypeDescriptor targetType = TypeDescriptor.valueOf(String[].class); assertThat(conversionService.canConvert(sourceType, targetType)).isTrue(); - assertThat(((String[]) conversionService.convert(list, sourceType, targetType))).isEmpty(); + assertThat((String[]) conversionService.convert(list, sourceType, targetType)).isEmpty(); } @Test diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java index cdfd6a3f06b..7371be1aa5a 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java @@ -1439,22 +1439,22 @@ class EvaluationTests extends AbstractExpressionTests { ctx.setVariable("wobble", 3); e = parser.parseExpression("#wobble++"); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(3); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(3); int r = e.getValue(ctx, int.class); assertThat(r).isEqualTo(3); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(4); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(4); e = parser.parseExpression("--#wobble"); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(4); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(4); r = e.getValue(ctx, int.class); assertThat(r).isEqualTo(3); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(3); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(3); e = parser.parseExpression("#wobble=34"); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(3); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(3); r = e.getValue(ctx, int.class); assertThat(r).isEqualTo(34); - assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(34); + assertThat((Integer) ctx.lookupVariable("wobble")).isEqualTo(34); // Projection expectFailNotIncrementable(parser, ctx, "({1,2,3}.![#isEven(#this)])++"); // projection would be {false,true,false} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java index 0467f7be166..4ebcf4c3c1d 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java @@ -87,8 +87,8 @@ class JdbcTemplateQueryTests { given(this.resultSet.getObject(1)).willReturn(11, 12); List> li = this.template.queryForList(sql); assertThat(li).as("All rows returned").hasSize(2); - assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11); - assertThat(((Integer) li.get(1).get("age"))).as("Second row is Integer").isEqualTo(12); + assertThat((Integer) li.get(0).get("age")).as("First row is Integer").isEqualTo(11); + assertThat((Integer) li.get(1).get("age")).as("Second row is Integer").isEqualTo(12); verify(this.resultSet).close(); verify(this.statement).close(); verify(this.connection).close(); @@ -112,7 +112,7 @@ class JdbcTemplateQueryTests { given(this.resultSet.getObject(1)).willReturn(11); List> li = this.template.queryForList(sql); assertThat(li).as("All rows returned").hasSize(1); - assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11); + assertThat((Integer) li.get(0).get("age")).as("First row is Integer").isEqualTo(11); verify(this.resultSet).close(); verify(this.statement).close(); verify(this.connection).close(); @@ -303,8 +303,8 @@ class JdbcTemplateQueryTests { given(this.resultSet.getObject(1)).willReturn(11, 12); List> li = this.template.queryForList(sql, 3); assertThat(li).as("All rows returned").hasSize(2); - assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11); - assertThat(((Integer) li.get(1).get("age"))).as("Second row is Integer").isEqualTo(12); + assertThat((Integer) li.get(0).get("age")).as("First row is Integer").isEqualTo(11); + assertThat((Integer) li.get(1).get("age")).as("Second row is Integer").isEqualTo(12); verify(this.preparedStatement).setObject(1, 3); verify(this.resultSet).close(); verify(this.preparedStatement).close(); @@ -330,7 +330,7 @@ class JdbcTemplateQueryTests { given(this.resultSet.getObject(1)).willReturn(11); List> li = this.template.queryForList(sql, 3); assertThat(li).as("All rows returned").hasSize(1); - assertThat(((Integer) li.get(0).get("age"))).as("First row is Integer").isEqualTo(11); + assertThat((Integer) li.get(0).get("age")).as("First row is Integer").isEqualTo(11); verify(this.preparedStatement).setObject(1, 3); verify(this.resultSet).close(); verify(this.preparedStatement).close(); @@ -356,7 +356,7 @@ class JdbcTemplateQueryTests { given(this.resultSet.next()).willReturn(true, false); given(this.resultSet.getObject(1)).willReturn(11); Map map = this.template.queryForMap(sql, 3); - assertThat(((Integer) map.get("age"))).as("Row is Integer").isEqualTo(11); + assertThat((Integer) map.get("age")).as("Row is Integer").isEqualTo(11); verify(this.preparedStatement).setObject(1, 3); verify(this.resultSet).close(); verify(this.preparedStatement).close(); diff --git a/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java b/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java index 289dd98a8ea..45abc5607a6 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java @@ -474,7 +474,7 @@ class MethodJmsListenerEndpointTests { private Method getListenerMethod(String methodName, Class... parameterTypes) { Method method = ReflectionUtils.findMethod(JmsEndpointSampleBean.class, methodName, parameterTypes); - assertThat(("no method found with name " + methodName + " and parameters " + Arrays.toString(parameterTypes))).isNotNull(); + assertThat("no method found with name " + methodName + " and parameters " + Arrays.toString(parameterTypes)).isNotNull(); return method; } diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java index 184e5e7f07b..37a1ffb435b 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java @@ -78,7 +78,7 @@ class SimpleMessageConverterTests { SimpleMessageConverter converter = new SimpleMessageConverter(); Message msg = converter.toMessage(content, session); - assertThat(((byte[]) converter.fromMessage(msg))).hasSize(content.length); + assertThat((byte[]) converter.fromMessage(msg)).hasSize(content.length); verify(message).writeBytes(content); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java index a97597c53af..55a6678c802 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactoryTests.java @@ -190,7 +190,7 @@ class DefaultMessageHandlerMethodFactoryTests { private Method getListenerMethod(String methodName, Class... parameterTypes) { Method method = ReflectionUtils.findMethod(SampleBean.class, methodName, parameterTypes); - assertThat(("no method found with name " + methodName + " and parameters " + Arrays.toString(parameterTypes))).isNotNull(); + assertThat("no method found with name " + methodName + " and parameters " + Arrays.toString(parameterTypes)).isNotNull(); return method; } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolverTests.java index 3c2646e1f66..62214e0ba5b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolverTests.java @@ -133,7 +133,7 @@ class PayloadMethodArgumentResolverTests { Message emptyStringMessage = MessageBuilder.withPayload(" ").build(); assertThat(this.resolver.resolveArgument(this.paramAnnotatedNotRequired, emptyStringMessage)).isNull(); - assertThat(((Optional) this.resolver.resolveArgument(this.paramOptional, emptyStringMessage))).isEmpty(); + assertThat((Optional) this.resolver.resolveArgument(this.paramOptional, emptyStringMessage)).isEmpty(); Message emptyOptionalMessage = MessageBuilder.withPayload(Optional.empty()).build(); assertThat(this.resolver.resolveArgument(this.paramAnnotatedNotRequired, emptyOptionalMessage)).isNull(); diff --git a/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java b/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java index 71a06307393..96def23148a 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java @@ -85,7 +85,7 @@ class EscapedErrorsTests { FieldError ageError = errors.getFieldError("age"); assertThat(ageError.getDefaultMessage()).as("Age error message escaped").isEqualTo("message: <tag>"); assertThat(ageError.getCode()).as("Age error code not escaped").isEqualTo("AGE_NOT_SET "); - assertThat((Integer.valueOf(0))).as("Age value not escaped").isEqualTo(errors.getFieldValue("age")); + assertThat(Integer.valueOf(0)).as("Age value not escaped").isEqualTo(errors.getFieldValue("age")); FieldError ageErrorInList = errors.getFieldErrors("age").get(0); assertThat(ageError.getDefaultMessage()).as("Same name error in list") .isEqualTo(ageErrorInList.getDefaultMessage()); diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java index 11d1bb646d6..86415f98aee 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java @@ -538,7 +538,7 @@ class RequestParamMethodArgumentResolverTests { request.addParameter("name", "123"); result = resolver.resolveArgument(param, null, webRequest, binderFactory); assertThat(result.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) result)).contains(123); + assertThat((Optional) result).contains(123); } @Test @@ -554,7 +554,7 @@ class RequestParamMethodArgumentResolverTests { result = resolver.resolveArgument(param, null, webRequest, binderFactory); assertThat(result.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) result)).isNotPresent(); + assertThat((Optional) result).isNotPresent(); } @Test @@ -587,7 +587,7 @@ class RequestParamMethodArgumentResolverTests { result = resolver.resolveArgument(param, null, webRequest, binderFactory); assertThat(result.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) result)).isNotPresent(); + assertThat((Optional) result).isNotPresent(); } @Test @@ -604,7 +604,7 @@ class RequestParamMethodArgumentResolverTests { request.addParameter("name", "123", "456"); result = resolver.resolveArgument(param, null, webRequest, binderFactory); assertThat(result.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) result)).contains(Arrays.asList("123", "456")); + assertThat((Optional) result).contains(Arrays.asList("123", "456")); } @Test @@ -620,7 +620,7 @@ class RequestParamMethodArgumentResolverTests { result = resolver.resolveArgument(param, null, webRequest, binderFactory); assertThat(result.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) result)).isNotPresent(); + assertThat((Optional) result).isNotPresent(); } @Test diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java index 0b1e97ef941..7dd6b794891 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java @@ -150,7 +150,7 @@ class PathVariableMethodArgumentResolverTests { StepVerifier.create(mono) .consumeNextWith(value -> { assertThat(value).isInstanceOf(Optional.class); - assertThat(((Optional) value)).isNotPresent(); + assertThat((Optional) value).isNotPresent(); }) .expectComplete() .verify(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java index 65df88385a9..02037dfe768 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java @@ -120,7 +120,7 @@ class RequestAttributeMethodArgumentResolverTests { assertThat(mono.block()).isNotNull(); assertThat(mono.block().getClass()).isEqualTo(Optional.class); - assertThat(((Optional) mono.block())).isNotPresent(); + assertThat((Optional) mono.block()).isNotPresent(); ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer(); initializer.setConversionService(new DefaultFormattingConversionService()); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java index f7a9e83b9ad..efa9d904218 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java @@ -123,15 +123,15 @@ class DispatcherServletTests { @Test void configuredDispatcherServlets() { - assertThat((simpleDispatcherServlet.getNamespace())).as("Correct namespace") + assertThat(simpleDispatcherServlet.getNamespace()).as("Correct namespace") .isEqualTo("simple" + FrameworkServlet.DEFAULT_NAMESPACE_SUFFIX); - assertThat((FrameworkServlet.SERVLET_CONTEXT_PREFIX + "simple")).as("Correct attribute") + assertThat(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "simple").as("Correct attribute") .isEqualTo(simpleDispatcherServlet.getServletContextAttributeName()); assertThat(simpleDispatcherServlet.getWebApplicationContext()).as("Context published") .isSameAs(getServletContext().getAttribute(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "simple")); assertThat(complexDispatcherServlet.getNamespace()).as("Correct namespace").isEqualTo("test"); - assertThat((FrameworkServlet.SERVLET_CONTEXT_PREFIX + "complex")).as("Correct attribute") + assertThat(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "complex").as("Correct attribute") .isEqualTo(complexDispatcherServlet.getServletContextAttributeName()); assertThat(getServletContext().getAttribute(FrameworkServlet.SERVLET_CONTEXT_PREFIX + "complex")).as("Context not published") .isNull(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java index 4440ed88d48..807937b2541 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java @@ -128,7 +128,7 @@ public abstract class AbstractRequestAttributesArgumentResolverTests { Object actual = testResolveArgument(param, factory); assertThat(actual).isNotNull(); assertThat(actual.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) actual)).isNotPresent(); + assertThat((Optional) actual).isNotPresent(); Foo foo = new Foo(); this.webRequest.setAttribute("foo", foo, getScope()); @@ -136,7 +136,7 @@ public abstract class AbstractRequestAttributesArgumentResolverTests { actual = testResolveArgument(param, factory); assertThat(actual).isNotNull(); assertThat(actual.getClass()).isEqualTo(Optional.class); - assertThat(((Optional) actual)).isPresent(); + assertThat((Optional) actual).isPresent(); assertThat(((Optional) actual).get()).isSameAs(foo); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java index c8f19384044..3a3c5d111d5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java @@ -823,7 +823,7 @@ class HttpEntityMethodProcessorMockTests { } if (lastModified != -1) { assertThat(servletResponse.getHeaderValues(HttpHeaders.LAST_MODIFIED)).hasSize(1); - assertThat((servletResponse.getDateHeader(HttpHeaders.LAST_MODIFIED) / 1000)).isEqualTo((lastModified / 1000)); + assertThat(servletResponse.getDateHeader(HttpHeaders.LAST_MODIFIED) / 1000).isEqualTo((lastModified / 1000)); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index 1f0d8349e79..70166f3e50a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -385,8 +385,8 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(session).isNotNull(); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); request = new MockHttpServletRequest("POST", "/myPage"); request.setSession(session); @@ -395,8 +395,8 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(request.getAttribute("viewName")).isEqualTo("page2"); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); } @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -418,8 +418,8 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(session).isNotNull(); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); request = new MockHttpServletRequest("POST", "/myPage"); request.setSession(session); @@ -428,8 +428,8 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(request.getAttribute("viewName")).isEqualTo("page2"); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); } @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -448,9 +448,9 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(session).isNotNull(); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); - assertThat(((Map) session.getAttribute("model"))).containsKey("testBeanList"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("testBeanList"); request = new MockHttpServletRequest("POST", "/myPage"); request.setSession(session); @@ -459,9 +459,9 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(request.getAttribute("viewName")).isEqualTo("page2"); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); - assertThat(((Map) session.getAttribute("model"))).containsKey("testBeanList"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("testBeanList"); } @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -480,9 +480,9 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(session).isNotNull(); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); - assertThat(((Map) session.getAttribute("model"))).containsKey("testBeanList"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("testBeanList"); request = new MockHttpServletRequest("POST", "/myPage"); request.setSession(session); @@ -491,9 +491,9 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl assertThat(request.getAttribute("viewName")).isEqualTo("page2"); assertThat(session.getAttribute("object1")).isNotNull(); assertThat(session.getAttribute("object2")).isNotNull(); - assertThat(((Map) session.getAttribute("model"))).containsKey("object1"); - assertThat(((Map) session.getAttribute("model"))).containsKey("object2"); - assertThat(((Map) session.getAttribute("model"))).containsKey("testBeanList"); + assertThat((Map) session.getAttribute("model")).containsKey("object1"); + assertThat((Map) session.getAttribute("model")).containsKey("object2"); + assertThat((Map) session.getAttribute("model")).containsKey("testBeanList"); } @PathPatternsParameterizedTest diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java index 6db01e4fd5c..0a791adb639 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java @@ -238,7 +238,7 @@ class MessageTagTests extends AbstractTagTests { tag.setText("testtext"); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); assertThat(tag.doEndTag()).as("Correct doEndTag return value").isEqualTo(Tag.EVAL_PAGE); - assertThat((message.toString())).as("Correct message").isEqualTo("test message"); + assertThat(message.toString()).as("Correct message").isEqualTo("test message"); } @Test diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java index e3b2af9ab0e..0bff8ce3a32 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java @@ -267,8 +267,8 @@ class StompSubProtocolHandlerTests { assertThat(this.session.getSentMessages()).hasSize(1); WebSocketMessage textMessage = this.session.getSentMessages().get(0); - assertThat(((String) textMessage.getPayload())).contains("destination:/user/queue/foo\n"); - assertThat(((String) textMessage.getPayload())).doesNotContain(SimpMessageHeaderAccessor.ORIGINAL_DESTINATION); + assertThat((String) textMessage.getPayload()).contains("destination:/user/queue/foo\n"); + assertThat((String) textMessage.getPayload()).doesNotContain(SimpMessageHeaderAccessor.ORIGINAL_DESTINATION); } // SPR-12475