diff --git a/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java index 25cabd6788c..6b116a61b16 100644 --- a/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java @@ -63,8 +63,7 @@ class AopNamespaceHandlerScopeIntegrationTests { @Test void singletonScoping() throws Exception { assertThat(AopUtils.isAopProxy(singletonScoped)).as("Should be AOP proxy").isTrue(); - boolean condition = singletonScoped instanceof TestBean; - assertThat(condition).as("Should be target class proxy").isTrue(); + assertThat(singletonScoped instanceof TestBean).as("Should be target class proxy").isTrue(); String rob = "Rob Harrop"; String bram = "Bram Smeets"; assertThat(singletonScoped.getName()).isEqualTo(rob); @@ -82,12 +81,10 @@ class AopNamespaceHandlerScopeIntegrationTests { RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(oldRequest)); assertThat(AopUtils.isAopProxy(requestScoped)).as("Should be AOP proxy").isTrue(); - boolean condition = requestScoped instanceof TestBean; - assertThat(condition).as("Should be target class proxy").isTrue(); + assertThat(requestScoped instanceof TestBean).as("Should be target class proxy").isTrue(); assertThat(AopUtils.isAopProxy(testBean)).as("Should be AOP proxy").isTrue(); - boolean condition1 = testBean instanceof TestBean; - assertThat(condition1).as("Regular bean should be JDK proxy").isFalse(); + assertThat(testBean instanceof TestBean).as("Regular bean should be JDK proxy").isFalse(); String rob = "Rob Harrop"; String bram = "Bram Smeets"; @@ -112,14 +109,12 @@ class AopNamespaceHandlerScopeIntegrationTests { RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request)); assertThat(AopUtils.isAopProxy(sessionScoped)).as("Should be AOP proxy").isTrue(); - boolean condition1 = sessionScoped instanceof TestBean; - assertThat(condition1).as("Should not be target class proxy").isFalse(); + assertThat(sessionScoped instanceof TestBean).as("Should not be target class proxy").isFalse(); assertThat(sessionScopedAlias).isSameAs(sessionScoped); assertThat(AopUtils.isAopProxy(testBean)).as("Should be AOP proxy").isTrue(); - boolean condition = testBean instanceof TestBean; - assertThat(condition).as("Regular bean should be JDK proxy").isFalse(); + assertThat(testBean instanceof TestBean).as("Regular bean should be JDK proxy").isFalse(); String rob = "Rob Harrop"; String bram = "Bram Smeets"; diff --git a/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java index 8192cb4ddf3..2cf24f4612c 100644 --- a/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java @@ -168,8 +168,7 @@ class AdvisorAutoProxyCreatorIntegrationTests { BeanFactory bf = getBeanFactory(); Object bean = bf.getBean(TXMANAGER_BEAN_NAME); - boolean condition = bean instanceof CallCountingTransactionManager; - assertThat(condition).isTrue(); + assertThat(bean instanceof CallCountingTransactionManager).isTrue(); CallCountingTransactionManager txMan = (CallCountingTransactionManager) bf.getBean(TXMANAGER_BEAN_NAME); Rollback rb = (Rollback) bf.getBean("rollback"); diff --git a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java index c61aeac4f9e..f3d17888e39 100644 --- a/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java @@ -185,8 +185,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { // should be dynamic proxy, implementing both interfaces assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue(); - boolean condition = bean instanceof AnotherScopeTestInterface; - assertThat(condition).isTrue(); + assertThat(bean instanceof AnotherScopeTestInterface).isTrue(); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -207,8 +206,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { // should be a class-based proxy assertThat(AopUtils.isCglibProxy(bean)).isTrue(); - boolean condition = bean instanceof RequestScopedTestBean; - assertThat(condition).isTrue(); + assertThat(bean instanceof RequestScopedTestBean).isTrue(); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -250,8 +248,7 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { // should be dynamic proxy, implementing both interfaces assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue(); - boolean condition = bean instanceof AnotherScopeTestInterface; - assertThat(condition).isTrue(); + assertThat(bean instanceof AnotherScopeTestInterface).isTrue(); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -278,10 +275,8 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { // should be a class-based proxy assertThat(AopUtils.isCglibProxy(bean)).isTrue(); - boolean condition1 = bean instanceof ScopedTestBean; - assertThat(condition1).isTrue(); - boolean condition = bean instanceof SessionScopedTestBean; - assertThat(condition).isTrue(); + assertThat(bean instanceof ScopedTestBean).isTrue(); + assertThat(bean instanceof SessionScopedTestBean).isTrue(); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); diff --git a/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java index 7a64cfa8ab2..abd55766ad0 100644 --- a/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java +++ b/integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java @@ -166,8 +166,7 @@ class ClassPathBeanDefinitionScannerScopeIntegrationTests { // should be dynamic proxy, implementing both interfaces assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue(); - boolean condition = bean instanceof AnotherScopeTestInterface; - assertThat(condition).isTrue(); + assertThat(bean instanceof AnotherScopeTestInterface).isTrue(); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -188,8 +187,7 @@ class ClassPathBeanDefinitionScannerScopeIntegrationTests { // should be a class-based proxy assertThat(AopUtils.isCglibProxy(bean)).isTrue(); - boolean condition = bean instanceof RequestScopedTestBean; - assertThat(condition).isTrue(); + assertThat(bean instanceof RequestScopedTestBean).isTrue(); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -231,8 +229,7 @@ class ClassPathBeanDefinitionScannerScopeIntegrationTests { // should be dynamic proxy, implementing both interfaces assertThat(AopUtils.isJdkDynamicProxy(bean)).isTrue(); - boolean condition = bean instanceof AnotherScopeTestInterface; - assertThat(condition).isTrue(); + assertThat(bean instanceof AnotherScopeTestInterface).isTrue(); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); @@ -259,10 +256,8 @@ class ClassPathBeanDefinitionScannerScopeIntegrationTests { // should be a class-based proxy assertThat(AopUtils.isCglibProxy(bean)).isTrue(); - boolean condition1 = bean instanceof ScopedTestBean; - assertThat(condition1).isTrue(); - boolean condition = bean instanceof SessionScopedTestBean; - assertThat(condition).isTrue(); + assertThat(bean instanceof ScopedTestBean).isTrue(); + assertThat(bean instanceof SessionScopedTestBean).isTrue(); assertThat(bean.getName()).isEqualTo(DEFAULT_NAME); bean.setName(MODIFIED_NAME); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java index 58f8937c613..39d92248ff2 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java @@ -63,8 +63,7 @@ class AspectJPointcutAdvisorTests { 1, "someBean"); assertThat(ajpa.getAspectMetadata().getPerClausePointcut()).isNotSameAs(Pointcut.TRUE); - boolean condition = ajpa.getAspectMetadata().getPerClausePointcut() instanceof AspectJExpressionPointcut; - assertThat(condition).isTrue(); + assertThat(ajpa.getAspectMetadata().getPerClausePointcut() instanceof AspectJExpressionPointcut).isTrue(); assertThat(ajpa.isPerInstance()).isTrue(); assertThat(ajpa.getAspectMetadata().getPerClausePointcut().getClassFilter().matches(TestBean.class)).isTrue(); diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java index 7e81831b6f3..7b407939964 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java @@ -54,8 +54,7 @@ class ExposeBeanNameAdvisorsTests { pf.addAdvisor(ExposeBeanNameAdvisors.createAdvisorWithoutIntroduction(beanName)); ITestBean proxy = (ITestBean) pf.getProxy(); - boolean condition = proxy instanceof NamedBean; - assertThat(condition).as("No introduction").isFalse(); + assertThat(proxy instanceof NamedBean).as("No introduction").isFalse(); // Requires binding proxy.getAge(); } @@ -69,8 +68,7 @@ class ExposeBeanNameAdvisorsTests { pf.addAdvisor(ExposeBeanNameAdvisors.createAdvisorIntroducingNamedBean(beanName)); ITestBean proxy = (ITestBean) pf.getProxy(); - boolean condition = proxy instanceof NamedBean; - assertThat(condition).as("Introduction was made").isTrue(); + assertThat(proxy instanceof NamedBean).as("Introduction was made").isTrue(); // Requires binding proxy.getAge(); diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java index fb1a20c9f92..58d5212d890 100644 --- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java +++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/factory/xml/AbstractBeanFactoryTests.java @@ -90,8 +90,7 @@ public abstract class AbstractBeanFactoryTests { // The dummy business method will throw an exception if the // necessary callbacks weren't invoked in the right order. lb.businessMethod(); - boolean condition = !lb.isDestroyed(); - assertThat(condition).as("Not destroyed").isTrue(); + assertThat(!lb.isDestroyed()).as("Not destroyed").isTrue(); } @Test @@ -161,8 +160,7 @@ public abstract class AbstractBeanFactoryTests { tb2.setAge(2); assertThat(tb1.getAge()).as("1 age independent = 1").isEqualTo(1); assertThat(tb2.getAge()).as("2 age independent = 2").isEqualTo(2); - boolean condition = !tb1.equals(tb2); - assertThat(condition).as("object equal now false").isTrue(); + assertThat(!tb1.equals(tb2)).as("object equal now false").isTrue(); } @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 320d001faa4..984e235bab6 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,12 +133,10 @@ class SimpleMailMessageTests { // Null object is not equal message1 = new SimpleMailMessage(); message2 = null; - boolean condition1 = !(message1.equals(message2)); - assertThat(condition1).isTrue(); + assertThat(!(message1.equals(message2))).isTrue(); // Different class is not equal - boolean condition = !(message1.equals(new Object())); - assertThat(condition).isTrue(); + assertThat(!(message1.equals(new Object()))).isTrue(); // Equal values are equal message1 = new SimpleMailMessage(); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java index b405c2be679..a3a7cde5849 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java @@ -66,8 +66,7 @@ class BeanNamePointcutAtAspectTests { @Test void matchingBeanName() { - boolean condition = testBean1 instanceof Advised; - assertThat(condition).as("Expected a proxy").isTrue(); + assertThat(testBean1 instanceof Advised).as("Expected a proxy").isTrue(); // Call two methods to test for SPR-3953-like condition testBean1.setAge(20); @@ -77,8 +76,7 @@ class BeanNamePointcutAtAspectTests { @Test void nonMatchingBeanName() { - boolean condition = testBean3 instanceof Advised; - assertThat(condition).as("Didn't expect a proxy").isFalse(); + assertThat(testBean3 instanceof Advised).as("Didn't expect a proxy").isFalse(); testBean3.setAge(20); assertThat(counterAspect.count).isEqualTo(0); @@ -96,8 +94,7 @@ class BeanNamePointcutAtAspectTests { ITestBean proxyTestBean = factory.getProxy(); - boolean condition = proxyTestBean instanceof Advised; - assertThat(condition).as("Expected a proxy").isTrue(); + assertThat(proxyTestBean instanceof Advised).as("Expected a proxy").isTrue(); proxyTestBean.setAge(20); assertThat(myCounterAspect.count).as("Programmatically created proxy shouldn't match bean()").isEqualTo(0); } 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 d5fe95d30e9..031b914bf75 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 @@ -75,8 +75,7 @@ class BeanNamePointcutTests { @Test void matchingBeanName() { - boolean condition = this.testBean1 instanceof Advised; - assertThat(condition).as("Matching bean must be advised (proxied)").isTrue(); + assertThat(this.testBean1 instanceof Advised).as("Matching bean must be advised (proxied)").isTrue(); // Call two methods to test for SPR-3953-like condition this.testBean1.setAge(20); this.testBean1.setName(""); @@ -85,37 +84,31 @@ class BeanNamePointcutTests { @Test void nonMatchingBeanName() { - boolean condition = this.testBean2 instanceof Advised; - assertThat(condition).as("Non-matching bean must *not* be advised (proxied)").isFalse(); + assertThat(this.testBean2 instanceof Advised).as("Non-matching bean must *not* be advised (proxied)").isFalse(); this.testBean2.setAge(20); assertThat(this.counterAspect.getCount()).as("Advice must *not* have been executed").isEqualTo(0); } @Test void nonMatchingNestedBeanName() { - boolean condition = this.testBeanContainingNestedBean.getDoctor() instanceof Advised; - assertThat(condition).as("Non-matching bean must *not* be advised (proxied)").isFalse(); + assertThat(this.testBeanContainingNestedBean.getDoctor() instanceof Advised).as("Non-matching bean must *not* be advised (proxied)").isFalse(); } @Test void matchingFactoryBeanObject() { - boolean condition1 = this.testFactoryBean1 instanceof Advised; - assertThat(condition1).as("Matching bean must be advised (proxied)").isTrue(); + assertThat(this.testFactoryBean1 instanceof Advised).as("Matching bean must be advised (proxied)").isTrue(); assertThat(this.testFactoryBean1.get("myKey")).isEqualTo("myValue"); 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"); - boolean condition = !(fb instanceof Advised); - assertThat(condition).as("FactoryBean itself must *not* be advised").isTrue(); + assertThat(!(fb instanceof Advised)).as("FactoryBean itself must *not* be advised").isTrue(); } @Test void matchingFactoryBeanItself() { - boolean condition1 = !(this.testFactoryBean2 instanceof Advised); - assertThat(condition1).as("Matching bean must *not* be advised (proxied)").isTrue(); + assertThat(!(this.testFactoryBean2 instanceof Advised)).as("Matching bean must *not* be advised (proxied)").isTrue(); FactoryBean fb = (FactoryBean) ctx.getBean("&testFactoryBean2"); - boolean condition = fb instanceof Advised; - assertThat(condition).as("FactoryBean itself must be advised").isTrue(); + assertThat(fb instanceof Advised).as("FactoryBean itself must be advised").isTrue(); assertThat(Map.class.isAssignableFrom(fb.getObjectType())).isTrue(); assertThat(Map.class.isAssignableFrom(fb.getObjectType())).isTrue(); assertThat(this.counterAspect.getCount()).as("Advice not executed: must have been").isEqualTo(2); @@ -123,10 +116,8 @@ class BeanNamePointcutTests { @Test void pointcutAdvisorCombination() { - boolean condition = this.interceptThis instanceof Advised; - assertThat(condition).as("Matching bean must be advised (proxied)").isTrue(); - boolean condition1 = this.dontInterceptThis instanceof Advised; - assertThat(condition1).as("Non-matching bean must *not* be advised (proxied)").isFalse(); + assertThat(this.interceptThis instanceof Advised).as("Matching bean must be advised (proxied)").isTrue(); + assertThat(this.dontInterceptThis instanceof Advised).as("Non-matching bean must *not* be advised (proxied)").isFalse(); interceptThis.setAge(20); assertThat(testInterceptor.interceptionCount).isEqualTo(1); dontInterceptThis.setAge(20); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java index 19722814897..c617eaf4316 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java @@ -61,8 +61,7 @@ class PropertyDependentAspectTests { private void checkXmlAspect(String appContextFile) { ApplicationContext context = new ClassPathXmlApplicationContext(appContextFile, getClass()); ICounter counter = (ICounter) context.getBean("counter"); - boolean condition = counter instanceof Advised; - assertThat(condition).as("Proxy didn't get created").isTrue(); + assertThat(counter instanceof Advised).as("Proxy didn't get created").isTrue(); counter.increment(); JoinPointMonitorAspect callCountingAspect = (JoinPointMonitorAspect)context.getBean("monitoringAspect"); @@ -73,8 +72,7 @@ class PropertyDependentAspectTests { private void checkAtAspectJAspect(String appContextFile) { ApplicationContext context = new ClassPathXmlApplicationContext(appContextFile, getClass()); ICounter counter = (ICounter) context.getBean("counter"); - boolean condition = counter instanceof Advised; - assertThat(condition).as("Proxy didn't get created").isTrue(); + assertThat(counter instanceof Advised).as("Proxy didn't get created").isTrue(); counter.increment(); JoinPointMonitorAtAspectJAspect callCountingAspect = (JoinPointMonitorAtAspectJAspect)context.getBean("monitoringAspect"); diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java index 1d00aa02680..579b8120a90 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java @@ -97,8 +97,7 @@ class MethodLocatingFactoryBeanTests { factory.setBeanFactory(beanFactory); Object result = factory.getObject(); assertThat(result).isNotNull(); - boolean condition = result instanceof Method; - assertThat(condition).isTrue(); + assertThat(result instanceof Method).isTrue(); Method method = (Method) result; assertThat(method.invoke("Bingo")).isEqualTo("Bingo"); } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java index b4c6c3a7c0c..45318e3d696 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java @@ -854,8 +854,7 @@ abstract class AbstractAopProxyTests { assertThat(proxied.getAge()).isEqualTo(10); assertThat(mba.getCalls()).isEqualTo(1); - boolean condition = proxied instanceof Advised; - assertThat(condition).as("Cannot be cast to Advised").isFalse(); + assertThat(proxied instanceof Advised).as("Cannot be cast to Advised").isFalse(); } @Test diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java index e0efad450d1..3bd93e1dc14 100644 --- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests.java @@ -121,13 +121,11 @@ class CommonsPool2TargetSourceTests { void proxySerializableWithoutConfigMixin() throws Exception { Person pooled = (Person) beanFactory.getBean("pooledPerson"); - boolean condition1 = ((Advised) pooled).getTargetSource() instanceof CommonsPool2TargetSource; - assertThat(condition1).isTrue(); + assertThat(((Advised) pooled).getTargetSource() instanceof CommonsPool2TargetSource).isTrue(); //((Advised) pooled).setTargetSource(new SingletonTargetSource(new SerializablePerson())); Person serialized = SerializationTestUtils.serializeAndDeserialize(pooled); - boolean condition = ((Advised) serialized).getTargetSource() instanceof SingletonTargetSource; - assertThat(condition).isTrue(); + assertThat(((Advised) serialized).getTargetSource() instanceof SingletonTargetSource).isTrue(); serialized.setAge(25); assertThat(serialized.getAge()).isEqualTo(25); } @@ -206,10 +204,8 @@ class CommonsPool2TargetSourceTests { Object first = targetSource.getTarget(); Object second = targetSource.getTarget(); - boolean condition1 = first instanceof SerializablePerson; - assertThat(condition1).isTrue(); - boolean condition = second instanceof SerializablePerson; - assertThat(condition).isTrue(); + assertThat(first instanceof SerializablePerson).isTrue(); + assertThat(second instanceof SerializablePerson).isTrue(); assertThat(second).isEqualTo(first); targetSource.releaseTarget(first); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java index 67f98a29d57..c7a86fce6ea 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java @@ -79,8 +79,7 @@ class ClassPathFactoryBeanDefinitionScannerTests { Object bean = context.getBean("requestScopedInstance"); //5 assertThat(AopUtils.isCglibProxy(bean)).isTrue(); - boolean condition = bean instanceof ScopedObject; - assertThat(condition).isTrue(); + assertThat(bean instanceof ScopedObject).isTrue(); QualifiedClientBean clientBean = context.getBean("clientBean", QualifiedClientBean.class); assertThat(clientBean.testBean).isSameAs(context.getBean("publicInstance")); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java index 33b9c663d99..4599faa03e7 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java @@ -401,8 +401,7 @@ class CommonAnnotationBeanPostProcessorTests { bf.getBean("annotatedBean2"); } catch (BeanCreationException ex) { - boolean condition = ex.getRootCause() instanceof NoSuchBeanDefinitionException; - assertThat(condition).isTrue(); + assertThat(ex.getRootCause() instanceof NoSuchBeanDefinitionException).isTrue(); NoSuchBeanDefinitionException innerEx = (NoSuchBeanDefinitionException) ex.getRootCause(); assertThat(innerEx.getBeanName()).isEqualTo("testBean9"); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java index 44f73e0e409..fb0feaffa58 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java @@ -457,8 +457,7 @@ class ConfigurationClassPostProcessorTests { pp.postProcessBeanFactory(beanFactory); Foo foo = beanFactory.getBean(Foo.class); - boolean condition = foo instanceof ExtendedFoo; - assertThat(condition).isTrue(); + assertThat(foo instanceof ExtendedFoo).isTrue(); Bar bar = beanFactory.getBean(Bar.class); assertThat(bar.foo).isSameAs(foo); } @@ -473,8 +472,7 @@ class ConfigurationClassPostProcessorTests { pp.postProcessBeanFactory(beanFactory); Foo foo = beanFactory.getBean(Foo.class); - boolean condition = foo instanceof ExtendedAgainFoo; - assertThat(condition).isTrue(); + assertThat(foo instanceof ExtendedAgainFoo).isTrue(); Bar bar = beanFactory.getBean(Bar.class); assertThat(bar.foo).isSameAs(foo); } @@ -504,8 +502,7 @@ class ConfigurationClassPostProcessorTests { pp.postProcessBeanFactory(beanFactory); Foo foo = beanFactory.getBean(Foo.class); - boolean condition = foo instanceof ExtendedFoo; - assertThat(condition).isTrue(); + assertThat(foo instanceof ExtendedFoo).isTrue(); Bar bar = beanFactory.getBean(Bar.class); assertThat(bar.foo).isSameAs(foo); } @@ -519,8 +516,7 @@ class ConfigurationClassPostProcessorTests { beanFactory.addBeanPostProcessor(new AutowiredAnnotationBeanPostProcessor()); Foo foo = beanFactory.getBean(Foo.class); - boolean condition = foo instanceof ExtendedFoo; - assertThat(condition).isTrue(); + assertThat(foo instanceof ExtendedFoo).isTrue(); Bar bar = beanFactory.getBean(Bar.class); assertThat(bar.foo).isSameAs(foo); } @@ -536,8 +532,7 @@ class ConfigurationClassPostProcessorTests { pp.postProcessBeanFactory(beanFactory); ITestBean injected = beanFactory.getBean("consumer", ScopedProxyConsumer.class).testBean; - boolean condition = injected instanceof ScopedObject; - assertThat(condition).isTrue(); + assertThat(injected instanceof ScopedObject).isTrue(); assertThat(injected).isSameAs(beanFactory.getBean("scopedClass")); assertThat(injected).isSameAs(beanFactory.getBean(ITestBean.class)); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java index 01be9631453..7f102afbbf0 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java @@ -44,8 +44,7 @@ class SimpleConfigTests { assertThat(value).isEqualTo("bar"); Future future = fooService.asyncFoo(1); - boolean condition = future instanceof FutureTask; - assertThat(condition).isTrue(); + assertThat(future instanceof FutureTask).isTrue(); assertThat(future.get()).isEqualTo("bar"); assertThat(serviceInvocationCounter.getCount()).isEqualTo(2); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java index b0fcf32a68c..3060011c5a1 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java @@ -153,16 +153,14 @@ class ScopingTests { // get hidden bean Object bean = ctx.getBean("scopedTarget." + beanName); - boolean condition = bean instanceof ScopedObject; - assertThat(condition).isFalse(); + assertThat(bean instanceof ScopedObject).isFalse(); } @Test void scopedProxyConfiguration() { TestBean singleton = (TestBean) ctx.getBean("singletonWithScopedInterfaceDep"); ITestBean spouse = singleton.getSpouse(); - boolean condition = spouse instanceof ScopedObject; - assertThat(condition).as("scoped bean is not wrapped by the scoped-proxy").isTrue(); + assertThat(spouse instanceof ScopedObject).as("scoped bean is not wrapped by the scoped-proxy").isTrue(); String beanName = "scopedProxyInterface"; @@ -194,8 +192,7 @@ class ScopingTests { void scopedProxyConfigurationWithClasses() { TestBean singleton = (TestBean) ctx.getBean("singletonWithScopedClassDep"); ITestBean spouse = singleton.getSpouse(); - boolean condition = spouse instanceof ScopedObject; - assertThat(condition).as("scoped bean is not wrapped by the scoped-proxy").isTrue(); + assertThat(spouse instanceof ScopedObject).as("scoped bean is not wrapped by the scoped-proxy").isTrue(); String beanName = "scopedProxyClass"; diff --git a/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java b/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java index ca33007666c..74603e2c75e 100644 --- a/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java +++ b/spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java @@ -67,15 +67,13 @@ class LocaleContextHolderTests { LocaleContextHolder.setLocale(Locale.GERMAN); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMAN); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getDefault()); - boolean condition1 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition1).isFalse(); + assertThat(LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext).isFalse(); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMAN); LocaleContextHolder.setLocale(Locale.GERMANY); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMANY); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getDefault()); - boolean condition = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition).isFalse(); + assertThat(LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext).isFalse(); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMANY); LocaleContextHolder.setLocale(null); @@ -94,16 +92,14 @@ class LocaleContextHolderTests { LocaleContextHolder.setTimeZone(TimeZone.getTimeZone("GMT+1")); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.getDefault()); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); - boolean condition1 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition1).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext).isTrue(); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isNull(); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); LocaleContextHolder.setTimeZone(TimeZone.getTimeZone("GMT+2")); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.getDefault()); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); - boolean condition = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext).isTrue(); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isNull(); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); @@ -123,46 +119,40 @@ class LocaleContextHolderTests { LocaleContextHolder.setLocale(Locale.GERMANY); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMANY); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getDefault()); - boolean condition5 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition5).isFalse(); + assertThat(LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext).isFalse(); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMANY); LocaleContextHolder.setTimeZone(TimeZone.getTimeZone("GMT+1")); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMANY); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); - boolean condition3 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition3).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext).isTrue(); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMANY); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); LocaleContextHolder.setLocale(Locale.GERMAN); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMAN); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); - boolean condition2 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition2).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext).isTrue(); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMAN); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+1")); LocaleContextHolder.setTimeZone(null); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMAN); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getDefault()); - boolean condition4 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition4).isFalse(); + assertThat(LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext).isFalse(); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMAN); LocaleContextHolder.setTimeZone(TimeZone.getTimeZone("GMT+2")); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.GERMAN); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); - boolean condition1 = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition1).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext).isTrue(); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isEqualTo(Locale.GERMAN); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); LocaleContextHolder.setLocale(null); assertThat(LocaleContextHolder.getLocale()).isEqualTo(Locale.getDefault()); assertThat(LocaleContextHolder.getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); - boolean condition = LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext; - assertThat(condition).isTrue(); + assertThat(LocaleContextHolder.getLocaleContext() instanceof TimeZoneAwareLocaleContext).isTrue(); assertThat(LocaleContextHolder.getLocaleContext().getLocale()).isNull(); assertThat(((TimeZoneAwareLocaleContext) LocaleContextHolder.getLocaleContext()).getTimeZone()).isEqualTo(TimeZone.getTimeZone("GMT+2")); diff --git a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java index 3a046926cd1..14f8b1bd2f6 100644 --- a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java @@ -53,22 +53,19 @@ class JeeNamespaceHandlerEventTests { @Test void jndiLookupComponentEventReceived() { ComponentDefinition component = this.eventListener.getComponentDefinition("simple"); - boolean condition = component instanceof BeanComponentDefinition; - assertThat(condition).isTrue(); + assertThat(component instanceof BeanComponentDefinition).isTrue(); } @Test void localSlsbComponentEventReceived() { ComponentDefinition component = this.eventListener.getComponentDefinition("simpleLocalEjb"); - boolean condition = component instanceof BeanComponentDefinition; - assertThat(condition).isTrue(); + assertThat(component instanceof BeanComponentDefinition).isTrue(); } @Test void remoteSlsbComponentEventReceived() { ComponentDefinition component = this.eventListener.getComponentDefinition("simpleRemoteEjb"); - boolean condition = component instanceof BeanComponentDefinition; - assertThat(condition).isTrue(); + assertThat(component instanceof BeanComponentDefinition).isTrue(); } } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java index 3b4cc37530f..94bf645a174 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java @@ -86,8 +86,7 @@ class ModelMBeanNotificationPublisherTests { publisher.sendNotification(notification); assertThat(mbean.getActualNotification()).isNotNull(); - boolean condition = mbean.getActualNotification() instanceof AttributeChangeNotification; - assertThat(condition).isTrue(); + assertThat(mbean.getActualNotification() instanceof AttributeChangeNotification).isTrue(); assertThat(mbean.getActualNotification()).as("The exact same Notification is not being passed through from the publisher to the mbean.").isSameAs(notification); assertThat(mbean.getActualNotification().getSource()).as("The 'source' property of the Notification is not being set to the ObjectName of the associated MBean.").isSameAs(objectName); } @@ -102,8 +101,7 @@ class ModelMBeanNotificationPublisherTests { publisher.sendNotification(notification); assertThat(mbean.getActualNotification()).isNotNull(); - boolean condition = mbean.getActualNotification() instanceof AttributeChangeNotification; - assertThat(condition).isTrue(); + assertThat(mbean.getActualNotification() instanceof AttributeChangeNotification).isTrue(); assertThat(mbean.getActualNotification()).as("The exact same Notification is not being passed through from the publisher to the mbean.").isSameAs(notification); assertThat(mbean.getActualNotification().getSource()).as("The 'source' property of the Notification is *wrongly* being set to the ObjectName of the associated MBean.").isSameAs(this); } diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java index d9e580a819f..552b68f55d4 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java @@ -210,8 +210,7 @@ class JndiObjectFactoryBeanTests { jof.setJndiName("foo"); jof.setProxyInterface(ITestBean.class); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject() instanceof ITestBean).isTrue(); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getAge()).isEqualTo(0); proxy.setAge(99); @@ -247,8 +246,7 @@ class JndiObjectFactoryBeanTests { jof.setProxyInterface(ITestBean.class); jof.setLookupOnStartup(false); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject() instanceof ITestBean).isTrue(); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getName()).isNull(); assertThat(tb.getAge()).isEqualTo(0); @@ -276,8 +274,7 @@ class JndiObjectFactoryBeanTests { jof.setProxyInterface(ITestBean.class); jof.setCache(false); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject() instanceof ITestBean).isTrue(); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getName()).isEqualTo("tb"); assertThat(tb.getAge()).isEqualTo(1); @@ -307,8 +304,7 @@ class JndiObjectFactoryBeanTests { jof.setLookupOnStartup(false); jof.setCache(false); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject() instanceof ITestBean).isTrue(); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getName()).isNull(); assertThat(tb.getAge()).isEqualTo(0); @@ -347,8 +343,7 @@ class JndiObjectFactoryBeanTests { jof.setExpectedType(TestBean.class); jof.setProxyInterface(ITestBean.class); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject() instanceof ITestBean).isTrue(); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getAge()).isEqualTo(0); proxy.setAge(99); @@ -384,8 +379,7 @@ class JndiObjectFactoryBeanTests { jof.setProxyInterface(ITestBean.class); jof.setExposeAccessContext(true); jof.afterPropertiesSet(); - boolean condition = jof.getObject() instanceof ITestBean; - assertThat(condition).isTrue(); + assertThat(jof.getObject() instanceof ITestBean).isTrue(); ITestBean proxy = (ITestBean) jof.getObject(); assertThat(tb.getAge()).isEqualTo(0); proxy.setAge(99); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java index a77e9d299a0..2efe49e61bd 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java @@ -331,8 +331,7 @@ class ScheduledAnnotationBeanPostProcessorTests { assertThat(task.getExpression()).isEqualTo("0 0 0-4,6-23 * * ?"); Trigger trigger = task.getTrigger(); assertThat(trigger).isNotNull(); - boolean condition = trigger instanceof CronTrigger; - assertThat(condition).isTrue(); + assertThat(trigger instanceof CronTrigger).isTrue(); CronTrigger cronTrigger = (CronTrigger) trigger; ZonedDateTime dateTime = ZonedDateTime.of(2013, 4, 15, 4, 0, 0, 0, ZoneId.of("GMT+10")); Instant lastScheduledExecution = dateTime.toInstant(); diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java index 45a1a8186b4..7b1cb562a90 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java @@ -93,8 +93,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe assertThat(aca.getApplicationContext()).as("has had context set").isSameAs(applicationContext); Object aca2 = applicationContext.getBean("aca-prototype"); assertThat(aca).as("NOT Same instance").isNotSameAs(aca2); - boolean condition = !applicationContext.isSingleton("aca-prototype"); - assertThat(condition).as("Says is prototype").isTrue(); + assertThat(!applicationContext.isSingleton("aca-prototype")).as("Says is prototype").isTrue(); } @Test @@ -128,8 +127,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe @Test protected void closeTriggersDestroy() { LifecycleBean lb = (LifecycleBean) applicationContext.getBean("lifecycle"); - boolean condition = !lb.isDestroyed(); - assertThat(condition).as("Not destroyed").isTrue(); + assertThat(!lb.isDestroyed()).as("Not destroyed").isTrue(); applicationContext.close(); if (applicationContext.getParent() != null) { ((ConfigurableApplicationContext) applicationContext.getParent()).close(); diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java index 5db262260b7..0066de212e8 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java @@ -643,8 +643,7 @@ class AnnotatedElementUtilsTests { } } assertThat(bridgeMethod != null && bridgeMethod.isBridge()).isTrue(); - boolean condition = bridgedMethod != null && !bridgedMethod.isBridge(); - assertThat(condition).isTrue(); + assertThat(bridgedMethod != null && !bridgedMethod.isBridge()).isTrue(); AnnotationAttributes attributes = findMergedAnnotationAttributes(bridgeMethod, Order.class); assertThat(attributes).as("Should find @Order on StringGenericParameter.getFor() bridge method").isNotNull(); diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java index 70f92da662a..f4090dfb6ba 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java @@ -184,8 +184,7 @@ class CollectionToCollectionConverterTests { private void testCollectionConversionToArrayList(Collection aSource) { Object myConverted = (new CollectionToCollectionConverter(new GenericConversionService())).convert( aSource, TypeDescriptor.forObject(aSource), TypeDescriptor.forObject(new ArrayList())); - boolean condition = myConverted instanceof ArrayList; - assertThat(condition).isTrue(); + assertThat(myConverted instanceof ArrayList).isTrue(); assertThat(((ArrayList) myConverted)).hasSameSizeAs(aSource); } diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java index 41eee5a7d91..6a00adc5f86 100644 --- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java +++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java @@ -57,8 +57,7 @@ class AutoPopulatingListTests { for (int x = 0; x < 10; x++) { Object element = list.get(x); assertThat(list.get(x)).as("Element is null").isNotNull(); - boolean condition = element instanceof TestObject; - assertThat(condition).as("Element is incorrect type").isTrue(); + assertThat(element instanceof TestObject).as("Element is incorrect type").isTrue(); assertThat(element).isNotSameAs(lastElement); lastElement = element; } @@ -68,14 +67,10 @@ class AutoPopulatingListTests { list.add(11, helloWorld); assertThat(list).element(11, InstanceOfAssertFactories.STRING).isEqualTo(helloWorld); - boolean condition3 = list.get(10) instanceof TestObject; - assertThat(condition3).isTrue(); - boolean condition2 = list.get(12) instanceof TestObject; - assertThat(condition2).isTrue(); - boolean condition1 = list.get(13) instanceof TestObject; - assertThat(condition1).isTrue(); - boolean condition = list.get(20) instanceof TestObject; - assertThat(condition).isTrue(); + assertThat(list.get(10) instanceof TestObject).isTrue(); + assertThat(list.get(12) instanceof TestObject).isTrue(); + assertThat(list.get(13) instanceof TestObject).isTrue(); + assertThat(list.get(20) instanceof TestObject).isTrue(); } private void doTestWithElementFactory(AutoPopulatingList list) { diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java index fcf85f6a8d4..29083c9d94f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java @@ -117,8 +117,7 @@ class JdbcTemplateTests { assertThat(this.template.getDataSource()).as("datasource ok").isSameAs(this.dataSource); assertThat(this.template.isIgnoreWarnings()).as("ignores warnings by default").isTrue(); this.template.setIgnoreWarnings(false); - boolean condition = !this.template.isIgnoreWarnings(); - assertThat(condition).as("can set NOT to ignore warnings").isTrue(); + assertThat(!this.template.isIgnoreWarnings()).as("can set NOT to ignore warnings").isTrue(); } @Test @@ -1126,8 +1125,7 @@ class JdbcTemplateTests { given(this.callableStatement.getUpdateCount()).willReturn(-1); given(this.callableStatement.getObject(1)).willReturn("X"); - boolean condition = !this.template.isResultsMapCaseInsensitive(); - assertThat(condition).as("default should have been NOT case insensitive").isTrue(); + assertThat(!this.template.isResultsMapCaseInsensitive()).as("default should have been NOT case insensitive").isTrue(); this.template.setResultsMapCaseInsensitive(true); assertThat(this.template.isResultsMapCaseInsensitive()).as("now it should have been set to case insensitive").isTrue(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java index cb2cb8ae545..6acd0cbfc50 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java @@ -94,8 +94,7 @@ class CallMetaDataContextTests { assertThat(inParameters).as("Wrong number of matched in parameter values").hasSize(2); assertThat(inParameters.containsKey("id")).as("in parameter value missing").isTrue(); assertThat(inParameters.containsKey("name")).as("in out parameter value missing").isTrue(); - boolean condition = !inParameters.containsKey("customer_no"); - assertThat(condition).as("out parameter value matched").isTrue(); + assertThat(!inParameters.containsKey("customer_no")).as("out parameter value matched").isTrue(); List names = context.getOutParameterNames(); assertThat(names).as("Wrong number of out parameters").hasSize(2); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java index 2e7660b6560..d09fbc255ea 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java @@ -104,14 +104,10 @@ class TableMetaDataContextTests { List values = context.matchInParameterValuesWithInsertColumns(map); assertThat(values.size()).as("wrong number of parameters: ").isEqualTo(4); - boolean condition3 = values.get(0) instanceof Number; - assertThat(condition3).as("id not wrapped with type info").isTrue(); - boolean condition2 = values.get(1) instanceof String; - assertThat(condition2).as("name not wrapped with type info").isTrue(); - boolean condition1 = values.get(2) instanceof SqlParameterValue; - assertThat(condition1).as("date wrapped with type info").isTrue(); - boolean condition = values.get(3) instanceof SqlParameterValue; - assertThat(condition).as("version wrapped with type info").isTrue(); + assertThat(values.get(0) instanceof Number).as("id not wrapped with type info").isTrue(); + assertThat(values.get(1) instanceof String).as("name not wrapped with type info").isTrue(); + assertThat(values.get(2) instanceof SqlParameterValue).as("date wrapped with type info").isTrue(); + assertThat(values.get(3) instanceof SqlParameterValue).as("version wrapped with type info").isTrue(); verify(metaDataResultSet, atLeastOnce()).next(); verify(columnsResultSet, atLeastOnce()).next(); verify(metaDataResultSet).close(); diff --git a/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java b/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java index fd254a20efd..946ba05cc53 100644 --- a/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessorTests.java @@ -107,8 +107,7 @@ class JmsListenerAnnotationBeanPostProcessorTests { assertThat(endpoint.getClass()).as("Wrong endpoint type").isEqualTo(MethodJmsListenerEndpoint.class); MethodJmsListenerEndpoint methodEndpoint = (MethodJmsListenerEndpoint) endpoint; assertThat(AopUtils.isJdkDynamicProxy(methodEndpoint.getBean())).isTrue(); - boolean condition = methodEndpoint.getBean() instanceof SimpleService; - assertThat(condition).isTrue(); + assertThat(methodEndpoint.getBean() instanceof SimpleService).isTrue(); assertThat(methodEndpoint.getMethod()).isEqualTo(SimpleService.class.getMethod("handleIt", String.class, String.class)); assertThat(methodEndpoint.getMostSpecificMethod()).isEqualTo(InterfaceProxyTestBean.class.getMethod("handleIt", String.class, String.class)); @@ -129,8 +128,7 @@ class JmsListenerAnnotationBeanPostProcessorTests { assertThat(endpoint.getClass()).as("Wrong endpoint type").isEqualTo(MethodJmsListenerEndpoint.class); MethodJmsListenerEndpoint methodEndpoint = (MethodJmsListenerEndpoint) endpoint; assertThat(AopUtils.isCglibProxy(methodEndpoint.getBean())).isTrue(); - boolean condition = methodEndpoint.getBean() instanceof ClassProxyTestBean; - assertThat(condition).isTrue(); + assertThat(methodEndpoint.getBean() instanceof ClassProxyTestBean).isTrue(); assertThat(methodEndpoint.getMethod()).isEqualTo(ClassProxyTestBean.class.getMethod("handleIt", String.class, String.class)); assertThat(methodEndpoint.getMostSpecificMethod()).isEqualTo(ClassProxyTestBean.class.getMethod("handleIt", String.class, String.class)); diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java index f511021c748..2a35de3056e 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java @@ -170,8 +170,7 @@ class MessageListenerAdapterTests { @Override protected void handleListenerException(Throwable ex) { assertThat(ex).as("The Throwable passed to the handleListenerException(..) method must never be null.").isNotNull(); - boolean condition = ex instanceof ListenerExecutionFailedException; - assertThat(condition).as("The Throwable passed to the handleListenerException(..) method must be of type [ListenerExecutionFailedException].").isTrue(); + assertThat(ex instanceof ListenerExecutionFailedException).as("The Throwable passed to the handleListenerException(..) method must be of type [ListenerExecutionFailedException].").isTrue(); ListenerExecutionFailedException lefx = (ListenerExecutionFailedException) ex; Throwable cause = lefx.getCause(); assertThat(cause).as("The cause of a ListenerExecutionFailedException must be preserved.").isNotNull(); @@ -187,8 +186,7 @@ class MessageListenerAdapterTests { void thatTheDefaultMessageConverterisIndeedTheSimpleMessageConverter() { MessageListenerAdapter adapter = new MessageListenerAdapter(); assertThat(adapter.getMessageConverter()).as("The default [MessageConverter] must never be null.").isNotNull(); - boolean condition = adapter.getMessageConverter() instanceof SimpleMessageConverter; - assertThat(condition).as("The default [MessageConverter] must be of the type [SimpleMessageConverter]").isTrue(); + assertThat(adapter.getMessageConverter() instanceof SimpleMessageConverter).as("The default [MessageConverter] must be of the type [SimpleMessageConverter]").isTrue(); } @Test diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java index cee197b51cf..58e69d4b467 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java @@ -67,8 +67,7 @@ class HeadersMethodArgumentResolverTests { MethodParameter param = this.resolvable.annotPresent(Headers.class).arg(Map.class, String.class, Object.class); Object resolved = this.resolver.resolveArgument(param, this.message); - boolean condition = resolved instanceof Map; - assertThat(condition).isTrue(); + assertThat(resolved instanceof Map).isTrue(); @SuppressWarnings("unchecked") Map headers = (Map) resolved; assertThat(headers.get("foo")).isEqualTo("bar"); @@ -84,8 +83,7 @@ class HeadersMethodArgumentResolverTests { void resolveArgumentMessageHeaders() throws Exception { Object resolved = this.resolver.resolveArgument(this.resolvable.arg(MessageHeaders.class), this.message); - boolean condition = resolved instanceof MessageHeaders; - assertThat(condition).isTrue(); + assertThat(resolved instanceof MessageHeaders).isTrue(); MessageHeaders headers = (MessageHeaders) resolved; assertThat(headers.get("foo")).isEqualTo("bar"); } @@ -95,8 +93,7 @@ class HeadersMethodArgumentResolverTests { MethodParameter param = this.resolvable.arg(MessageHeaderAccessor.class); Object resolved = this.resolver.resolveArgument(param, this.message); - boolean condition = resolved instanceof MessageHeaderAccessor; - assertThat(condition).isTrue(); + assertThat(resolved instanceof MessageHeaderAccessor).isTrue(); MessageHeaderAccessor headers = (MessageHeaderAccessor) resolved; assertThat(headers.getHeader("foo")).isEqualTo("bar"); } @@ -106,8 +103,7 @@ class HeadersMethodArgumentResolverTests { MethodParameter param = this.resolvable.arg(TestMessageHeaderAccessor.class); Object resolved = this.resolver.resolveArgument(param, this.message); - boolean condition = resolved instanceof TestMessageHeaderAccessor; - assertThat(condition).isTrue(); + assertThat(resolved instanceof TestMessageHeaderAccessor).isTrue(); TestMessageHeaderAccessor headers = (TestMessageHeaderAccessor) resolved; assertThat(headers.getHeader("foo")).isEqualTo("bar"); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java index 7e2b2fc2c13..63883c57c3c 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java @@ -226,11 +226,9 @@ class MessageMethodArgumentResolverTests { this.resolver = new MessageMethodArgumentResolver(new MappingJackson2MessageConverter()); Object actual = this.resolver.resolveArgument(parameter, inMessage); - boolean condition1 = actual instanceof Message; - assertThat(condition1).isTrue(); + assertThat(actual instanceof Message).isTrue(); Message outMessage = (Message) actual; - boolean condition = outMessage.getPayload() instanceof Foo; - assertThat(condition).isTrue(); + assertThat(outMessage.getPayload() instanceof Foo).isTrue(); assertThat(((Foo) outMessage.getPayload()).getFoo()).isEqualTo("bar"); } diff --git a/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java index bbf87165faa..9427658874d 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java @@ -96,8 +96,7 @@ public abstract class AbstractMarshallerTests { DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder(); DOMResult domResult = new DOMResult(); marshaller.marshal(flights, domResult); - boolean condition = domResult.getNode() instanceof Document; - assertThat(condition).as("DOMResult does not contain a Document").isTrue(); + assertThat(domResult.getNode() instanceof Document).as("DOMResult does not contain a Document").isTrue(); Document result = (Document) domResult.getNode(); Document expected = builder.newDocument(); Element flightsElement = expected.createElementNS("http://samples.springframework.org/flight", "tns:flights"); diff --git a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java index 8b4959c3e1b..54b50d45e1a 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java @@ -91,23 +91,20 @@ class JndiJtaTransactionManagerTests { assertThat(ptm.getUserTransaction()).isEqualTo(ut); } else { - boolean condition = ptm.getUserTransaction() instanceof UserTransactionAdapter; - assertThat(condition).isTrue(); + assertThat(ptm.getUserTransaction() instanceof UserTransactionAdapter).isTrue(); UserTransactionAdapter uta = (UserTransactionAdapter) ptm.getUserTransaction(); assertThat(uta.getTransactionManager()).isEqualTo(tm); } TransactionTemplate tt = new TransactionTemplate(ptm); - boolean condition1 = !TransactionSynchronizationManager.isSynchronizationActive(); - assertThat(condition1).isTrue(); + assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); tt.executeWithoutResult(status -> { // something transactional assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); }); - boolean condition = !TransactionSynchronizationManager.isSynchronizationActive(); - assertThat(condition).isTrue(); + assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); @@ -142,16 +139,14 @@ class JndiJtaTransactionManagerTests { assertThat(ptm.getTransactionManager()).isEqualTo(tm); TransactionTemplate tt = new TransactionTemplate(ptm); - boolean condition1 = !TransactionSynchronizationManager.isSynchronizationActive(); - assertThat(condition1).isTrue(); + assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); tt.executeWithoutResult(status -> { // something transactional assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isTrue(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); }); - boolean condition = !TransactionSynchronizationManager.isSynchronizationActive(); - assertThat(condition).isTrue(); + assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); verify(ut).begin(); @@ -175,8 +170,7 @@ class JndiJtaTransactionManagerTests { TransactionTemplate tt = new TransactionTemplate(ptm); assertThat(ptm.getTransactionSynchronization()).isEqualTo(JtaTransactionManager.SYNCHRONIZATION_ALWAYS); - boolean condition1 = !TransactionSynchronizationManager.isSynchronizationActive(); - assertThat(condition1).isTrue(); + assertThat(!TransactionSynchronizationManager.isSynchronizationActive()).isTrue(); assertThat(TransactionSynchronizationManager.isCurrentTransactionReadOnly()).isFalse(); tt.executeWithoutResult(status -> { // something transactional diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java index 323f415676d..3f311f60994 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java @@ -204,8 +204,7 @@ class ServletRequestDataBinderTests { request.addParameter("test_age", "" + 50); ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); - boolean condition = !pvs.contains("forname"); - assertThat(condition).as("Didn't find normal when given prefix").isTrue(); + assertThat(!pvs.contains("forname")).as("Didn't find normal when given prefix").isTrue(); assertThat(pvs.contains("test_forname")).as("Did treat prefix as normal when not given prefix").isTrue(); pvs = new ServletRequestParameterPropertyValues(request, "test"); @@ -227,8 +226,7 @@ class ServletRequestDataBinderTests { ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); assertThat(pvs.getPropertyValues().length).as("Found 1 parameter").isEqualTo(1); - boolean condition = pvs.getPropertyValue("forname").getValue() instanceof String[]; - assertThat(condition).as("Found array value").isTrue(); + assertThat(pvs.getPropertyValue("forname").getValue() instanceof String[]).as("Found array value").isTrue(); String[] values = (String[]) pvs.getPropertyValue("forname").getValue(); assertThat(Arrays.asList(original)).as("Correct values").isEqualTo(Arrays.asList(values)); } @@ -241,8 +239,7 @@ class ServletRequestDataBinderTests { assertThat(pvs.contains("forname")).as("Contains forname").isTrue(); assertThat(pvs.contains("surname")).as("Contains surname").isTrue(); assertThat(pvs.contains("age")).as("Contains age").isTrue(); - boolean condition1 = !pvs.contains("tory"); - assertThat(condition1).as("Doesn't contain tory").isTrue(); + assertThat(!pvs.contains("tory")).as("Doesn't contain tory").isTrue(); PropertyValue[] ps = pvs.getPropertyValues(); Map m = new HashMap<>(); @@ -252,8 +249,7 @@ class ServletRequestDataBinderTests { for (PropertyValue element : ps) { Object val = m.get(element.getName()); assertThat(val).as("Can't have unexpected value").isNotNull(); - boolean condition = val instanceof String; - assertThat(condition).as("Val i string").isTrue(); + assertThat(val instanceof String).as("Val i string").isTrue(); assertThat(val.equals(element.getValue())).as("val matches expected").isTrue(); m.remove(element.getName()); } diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java index a3194bad383..febd27fb4b9 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java @@ -307,8 +307,7 @@ class WebRequestDataBinderTests { request.addParameter("test_age", "" + 50); ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); - boolean condition = !pvs.contains("forname"); - assertThat(condition).as("Didn't find normal when given prefix").isTrue(); + assertThat(!pvs.contains("forname")).as("Didn't find normal when given prefix").isTrue(); assertThat(pvs.contains("test_forname")).as("Did treat prefix as normal when not given prefix").isTrue(); pvs = new ServletRequestParameterPropertyValues(request, "test"); @@ -323,8 +322,7 @@ class WebRequestDataBinderTests { assertThat(pvs.contains("forname")).as("Contains forname").isTrue(); assertThat(pvs.contains("surname")).as("Contains surname").isTrue(); assertThat(pvs.contains("age")).as("Contains age").isTrue(); - boolean condition1 = !pvs.contains("tory"); - assertThat(condition1).as("Doesn't contain tory").isTrue(); + assertThat(!pvs.contains("tory")).as("Doesn't contain tory").isTrue(); PropertyValue[] pvArray = pvs.getPropertyValues(); Map m = new HashMap<>(); @@ -334,8 +332,7 @@ class WebRequestDataBinderTests { for (PropertyValue pv : pvArray) { Object val = m.get(pv.getName()); assertThat(val).as("Can't have unexpected value").isNotNull(); - boolean condition = val instanceof String; - assertThat(condition).as("Val i string").isTrue(); + assertThat(val instanceof String).as("Val i string").isTrue(); assertThat(val.equals(pv.getValue())).as("val matches expected").isTrue(); m.remove(pv.getName()); } @@ -357,8 +354,7 @@ class WebRequestDataBinderTests { ServletRequestParameterPropertyValues pvs = new ServletRequestParameterPropertyValues(request); assertThat(pvs.getPropertyValues().length).as("Found 1 parameter").isEqualTo(1); - boolean condition = pvs.getPropertyValue("forname").getValue() instanceof String[]; - assertThat(condition).as("Found array value").isTrue(); + assertThat(pvs.getPropertyValue("forname").getValue() instanceof String[]).as("Found array value").isTrue(); String[] values = (String[]) pvs.getPropertyValue("forname").getValue(); assertThat(Arrays.asList(original)).as("Correct values").isEqualTo(Arrays.asList(values)); } diff --git a/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java b/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java index 76be45f3801..b2f1da1037f 100644 --- a/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/ContextLoaderInitializerTests.java @@ -55,8 +55,7 @@ class ContextLoaderInitializerTests { void register() throws ServletException { initializer.onStartup(servletContext); - boolean condition1 = eventListener instanceof ContextLoaderListener; - assertThat(condition1).isTrue(); + assertThat(eventListener instanceof ContextLoaderListener).isTrue(); ContextLoaderListener cll = (ContextLoaderListener) eventListener; cll.contextInitialized(new ServletContextEvent(servletContext)); @@ -64,8 +63,7 @@ class ContextLoaderInitializerTests { .getRequiredWebApplicationContext(servletContext); assertThat(applicationContext.containsBean(BEAN_NAME)).isTrue(); - boolean condition = applicationContext.getBean(BEAN_NAME) instanceof MyBean; - assertThat(condition).isTrue(); + assertThat(applicationContext.getBean(BEAN_NAME) instanceof MyBean).isTrue(); } private class MyMockServletContext extends MockServletContext { diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java index 46915025398..813b4b04732 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java @@ -104,8 +104,7 @@ class RequestScopeTests { String name = "requestScopedFactoryBean"; assertThat(request.getAttribute(name)).isNull(); TestBean bean = (TestBean) this.beanFactory.getBean(name); - boolean condition = request.getAttribute(name) instanceof FactoryBean; - assertThat(condition).isTrue(); + assertThat(request.getAttribute(name) instanceof FactoryBean).isTrue(); assertThat(this.beanFactory.getBean(name)).isSameAs(bean); } diff --git a/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java b/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java index 5b5308481be..53cea4e239d 100644 --- a/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java @@ -50,8 +50,7 @@ class SpringBeanAutowiringSupportTests { InjectionTarget target = new InjectionTarget(); SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(target, sc); - boolean condition = target.testBean instanceof TestBean; - assertThat(condition).isTrue(); + assertThat(target.testBean instanceof TestBean).isTrue(); assertThat(target.name).isEqualTo("tb"); } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java index 5187589f951..b44eccead4a 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java @@ -80,8 +80,7 @@ class CookieValueMethodArgumentResolverTests { void resolveCookieDefaultValue() throws Exception { Object result = resolver.resolveArgument(paramNamedDefaultValueString, null, webRequest, null); - boolean condition = result instanceof String; - assertThat(condition).isTrue(); + assertThat(result instanceof String).isTrue(); assertThat(result).as("Invalid result").isEqualTo("bar"); } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java index 05979e951be..eb0d4491dc0 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java @@ -91,8 +91,7 @@ class RequestHeaderMapMethodArgumentResolverTests { Object result = resolver.resolveArgument(paramMap, null, webRequest, null); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result instanceof Map).isTrue(); assertThat(result).as("Invalid result").isEqualTo(expected); } @@ -111,8 +110,7 @@ class RequestHeaderMapMethodArgumentResolverTests { Object result = resolver.resolveArgument(paramMultiValueMap, null, webRequest, null); - boolean condition = result instanceof MultiValueMap; - assertThat(condition).isTrue(); + assertThat(result instanceof MultiValueMap).isTrue(); assertThat(result).as("Invalid result").isEqualTo(expected); } @@ -131,8 +129,7 @@ class RequestHeaderMapMethodArgumentResolverTests { Object result = resolver.resolveArgument(paramHttpHeaders, null, webRequest, null); - boolean condition = result instanceof HttpHeaders; - assertThat(condition).isTrue(); + assertThat(result instanceof HttpHeaders).isTrue(); assertThat(result).as("Invalid result").isEqualTo(expected); } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java index e580e1d73f8..185c2d30610 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java @@ -82,8 +82,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(Map.class, String.class, String.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result instanceof Map).isTrue(); assertThat(result).as("Invalid result").isEqualTo(expected); } @@ -101,8 +100,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annotPresent(RequestParam.class).arg(MultiValueMap.class, String.class, String.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof MultiValueMap; - assertThat(condition).isTrue(); + assertThat(result instanceof MultiValueMap).isTrue(); assertThat(result).as("Invalid result").isEqualTo(expected); } @@ -119,8 +117,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(Map.class, String.class, MultipartFile.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result instanceof Map).isTrue(); Map resultMap = (Map) result; assertThat(resultMap).hasSize(2); assertThat(resultMap.get("mfile")).isEqualTo(expected1); @@ -142,8 +139,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(MultiValueMap.class, String.class, MultipartFile.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof MultiValueMap; - assertThat(condition).isTrue(); + assertThat(result instanceof MultiValueMap).isTrue(); MultiValueMap resultMap = (MultiValueMap) result; assertThat(resultMap).hasSize(2); assertThat(resultMap.get("mfilelist")).containsExactly(expected1, expected2); @@ -164,8 +160,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(Map.class, String.class, Part.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result instanceof Map).isTrue(); Map resultMap = (Map) result; assertThat(resultMap).hasSize(2); assertThat(resultMap.get("mfile")).isEqualTo(expected1); @@ -188,8 +183,7 @@ class RequestParamMapMethodArgumentResolverTests { MethodParameter param = this.testMethod.annot(requestParam().noName()).arg(MultiValueMap.class, String.class, Part.class); Object result = resolver.resolveArgument(param, null, webRequest, null); - boolean condition = result instanceof MultiValueMap; - assertThat(condition).isTrue(); + assertThat(result instanceof MultiValueMap).isTrue(); MultiValueMap resultMap = (MultiValueMap) result; assertThat(resultMap).hasSize(2); assertThat(resultMap.get("mfilelist")).containsExactly(expected1, expected2); diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java index 575ce8e6eb8..31e6b2807b1 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java @@ -104,8 +104,7 @@ class SessionAttributesHandlerTests { assertThat(sessionAttributeStore.retrieveAttribute(request, "attr1")).isEqualTo("value1"); assertThat(sessionAttributeStore.retrieveAttribute(request, "attr2")).isEqualTo("value2"); - boolean condition = sessionAttributeStore.retrieveAttribute(request, "attr3") instanceof TestBean; - assertThat(condition).isTrue(); + assertThat(sessionAttributeStore.retrieveAttribute(request, "attr3") instanceof TestBean).isTrue(); } diff --git a/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java b/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java index c5e4c71e08e..4427bdbc72c 100644 --- a/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/adapter/WebHttpHandlerBuilderTests.java @@ -66,8 +66,7 @@ class WebHttpHandlerBuilderTests { context.refresh(); HttpHandler httpHandler = WebHttpHandlerBuilder.applicationContext(context).build(); - boolean condition = httpHandler instanceof HttpWebHandlerAdapter; - assertThat(condition).isTrue(); + assertThat(httpHandler instanceof HttpWebHandlerAdapter).isTrue(); assertThat(((HttpWebHandlerAdapter) httpHandler).getApplicationContext()).isSameAs(context); MockServerHttpRequest request = MockServerHttpRequest.get("/").build(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java index 4186e8123f1..104dce6aa6c 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java @@ -114,8 +114,7 @@ class DelegatingWebFluxConfigurationTests { verify(webFluxConfigurer).configureArgumentResolvers(any()); assertThat(initializer).isNotNull(); - boolean condition = initializer.getValidator() instanceof LocalValidatorFactoryBean; - assertThat(condition).isTrue(); + assertThat(initializer.getValidator() instanceof LocalValidatorFactoryBean).isTrue(); assertThat(initializer.getConversionService()).isSameAs(formatterRegistry.getValue()); assertThat(codecsConfigurer.getValue().getReaders()).hasSize(16); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java index 5bc98628961..c233511e4db 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java @@ -79,8 +79,7 @@ class ResourceHandlerFunctionTests { Mono result = responseMono.flatMap(response -> { assertThat(response.statusCode()).isEqualTo(HttpStatus.OK); - boolean condition = response instanceof EntityResponse; - assertThat(condition).isTrue(); + assertThat(response instanceof EntityResponse).isTrue(); @SuppressWarnings("unchecked") EntityResponse entityResponse = (EntityResponse) response; assertThat(entityResponse.entity()).isEqualTo(this.resource); @@ -116,8 +115,7 @@ class ResourceHandlerFunctionTests { Mono result = responseMono.flatMap(response -> { assertThat(response.statusCode()).isEqualTo(HttpStatus.OK); - boolean condition = response instanceof EntityResponse; - assertThat(condition).isTrue(); + assertThat(response instanceof EntityResponse).isTrue(); @SuppressWarnings("unchecked") EntityResponse entityResponse = (EntityResponse) response; assertThat(entityResponse.entity().getFilename()).isEqualTo(this.resource.getFilename()); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java index 81837a85ef4..f7191cc3756 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/EncodedResourceResolverTests.java @@ -85,8 +85,7 @@ class EncodedResourceResolverTests { assertThat(actual.getDescription()).isEqualTo(getResource(file + ".gz").getDescription()); assertThat(actual.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition = actual instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(actual instanceof HttpResource).isTrue(); HttpHeaders headers = ((HttpResource) actual).getResponseHeaders(); assertThat(headers.getFirst(HttpHeaders.CONTENT_ENCODING)).isEqualTo("gzip"); assertThat(headers.getFirst(HttpHeaders.VARY)).isEqualTo("Accept-Encoding"); @@ -103,8 +102,7 @@ class EncodedResourceResolverTests { assertThat(actual.getDescription()).isEqualTo(getResource("foo.css.gz").getDescription()); assertThat(actual.getFilename()).isEqualTo(getResource("foo.css").getFilename()); - boolean condition = actual instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(actual instanceof HttpResource).isTrue(); } @Test @@ -121,8 +119,7 @@ class EncodedResourceResolverTests { assertThat(resolved.getDescription()).isEqualTo(getResource(file + ".gz").getDescription()); assertThat(resolved.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition = resolved instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(resolved instanceof HttpResource).isTrue(); // 2. Resolve unencoded resource @@ -131,8 +128,7 @@ class EncodedResourceResolverTests { assertThat(resolved.getDescription()).isEqualTo(getResource(file).getDescription()); assertThat(resolved.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition1 = resolved instanceof HttpResource; - assertThat(condition1).isFalse(); + assertThat(resolved instanceof HttpResource).isFalse(); } @Test // SPR-13149 diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java index e4a12adf389..81b6908ad62 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java @@ -16,8 +16,6 @@ package org.springframework.web.reactive.result.condition; -import java.util.Collection; - import org.junit.jupiter.api.Test; import org.springframework.web.server.ServerWebExchange; @@ -147,8 +145,7 @@ class HeadersRequestConditionTests { HeadersRequestCondition condition2 = new HeadersRequestCondition("foo=baz"); HeadersRequestCondition result = condition1.combine(condition2); - Collection conditions = result.getContent(); - assertThat(conditions).hasSize(2); + assertThat(result.getContent()).hasSize(2); } @Test diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java index 4ffc7eab4c9..034e02c3b9b 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java @@ -16,8 +16,6 @@ package org.springframework.web.reactive.result.condition; -import java.util.Collection; - import org.junit.jupiter.api.Test; import org.springframework.web.server.ServerWebExchange; @@ -138,8 +136,7 @@ class ParamsRequestConditionTests { ParamsRequestCondition condition2 = new ParamsRequestCondition("foo=baz"); ParamsRequestCondition result = condition1.combine(condition2); - Collection conditions = result.getContent(); - assertThat(conditions).hasSize(2); + assertThat(result.getContent()).hasSize(2); } } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java index 56b93eb1458..c86e53b8525 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java @@ -113,8 +113,7 @@ class CookieValueMethodArgumentResolverTests { MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/")); Object result = this.resolver.resolveArgument(this.cookieStringParameter, this.bindingContext, exchange).block(); - boolean condition = result instanceof String; - assertThat(condition).isTrue(); + assertThat(result instanceof String).isTrue(); assertThat(result).isEqualTo("bar"); } 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 7d27a87398e..5c98de20cd7 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 @@ -149,8 +149,7 @@ class PathVariableMethodArgumentResolverTests { StepVerifier.create(mono) .consumeNextWith(value -> { - boolean condition = value instanceof Optional; - assertThat(condition).isTrue(); + assertThat(value instanceof Optional).isTrue(); assertThat(((Optional) value)).isNotPresent(); }) .expectComplete() 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 ed036374144..5fb98a364f5 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 @@ -154,8 +154,7 @@ class RequestAttributeMethodArgumentResolverTests { this.exchange.getAttributes().put("fooMono", singleMono); mono = this.resolver.resolveArgument(param, new BindingContext(), this.exchange); Object value = mono.block(Duration.ZERO); - boolean condition = value instanceof Mono; - assertThat(condition).isTrue(); + assertThat(value instanceof Mono).isTrue(); assertThat(((Mono) value).block(Duration.ZERO)).isSameAs(foo); // No attribute --> Mono.empty diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java index 23b261ed9fc..c06302b32ec 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java @@ -90,8 +90,7 @@ class RequestHeaderMapMethodArgumentResolverTests { Mono mono = resolver.resolveArgument(paramMap, null, exchange); Object result = mono.block(); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result instanceof Map).isTrue(); assertThat(result).as("Invalid result").isEqualTo(expected); } @@ -130,8 +129,7 @@ class RequestHeaderMapMethodArgumentResolverTests { Mono mono = resolver.resolveArgument(paramHttpHeaders, null, exchange); Object result = mono.block(); - boolean condition = result instanceof HttpHeaders; - assertThat(condition).isTrue(); + assertThat(result instanceof HttpHeaders).isTrue(); assertThat(result).as("Invalid result").isEqualTo(expected); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java index 162f1ededd2..dc35e181977 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java @@ -73,8 +73,7 @@ class RequestParamMapMethodArgumentResolverTests { void resolveMapArgumentWithQueryString() { MethodParameter param = this.testMethod.annot(requestParam().name("")).arg(Map.class); Object result= resolve(param, MockServerWebExchange.from(MockServerHttpRequest.get("/path?foo=bar"))); - boolean condition = result instanceof Map; - assertThat(condition).isTrue(); + assertThat(result instanceof Map).isTrue(); assertThat(result).isEqualTo(Collections.singletonMap("foo", "bar")); } @@ -84,8 +83,7 @@ class RequestParamMapMethodArgumentResolverTests { ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/path?foo=bar&foo=baz")); Object result= resolve(param, exchange); - boolean condition = result instanceof MultiValueMap; - assertThat(condition).isTrue(); + assertThat(result instanceof MultiValueMap).isTrue(); assertThat(result).isEqualTo(Collections.singletonMap("foo", Arrays.asList("bar", "baz"))); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java index 29a4d41595a..9b9acb4896b 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandlerTests.java @@ -98,8 +98,7 @@ class SessionAttributesHandlerTests { assertThat(session.getAttributes().get("attr1")).isEqualTo("value1"); assertThat(session.getAttributes().get("attr2")).isEqualTo("value2"); - boolean condition = session.getAttributes().get("attr3") instanceof TestBean; - assertThat(condition).isTrue(); + assertThat(session.getAttributes().get("attr3") instanceof TestBean).isTrue(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java index e45498abd76..ce6858088b3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java @@ -70,16 +70,14 @@ class ContextLoaderTests { listener.contextInitialized(event); String contextAttr = WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE; WebApplicationContext context = (WebApplicationContext) sc.getAttribute(contextAttr); - boolean condition1 = context instanceof XmlWebApplicationContext; - assertThat(condition1).as("Correct WebApplicationContext exposed in ServletContext").isTrue(); + assertThat(context instanceof XmlWebApplicationContext).as("Correct WebApplicationContext exposed in ServletContext").isTrue(); assertThat(WebApplicationContextUtils.getRequiredWebApplicationContext(sc)).isInstanceOf( XmlWebApplicationContext.class); LifecycleBean lb = (LifecycleBean) context.getBean("lifecycle"); assertThat(context.containsBean("father")).as("Has father").isTrue(); assertThat(context.containsBean("rod")).as("Has rod").isTrue(); assertThat(context.containsBean("kerry")).as("Has kerry").isTrue(); - boolean condition = !lb.isDestroyed(); - assertThat(condition).as("Not destroyed").isTrue(); + assertThat(!lb.isDestroyed()).as("Not destroyed").isTrue(); assertThat(context.containsBean("beans1.bean1")).isFalse(); assertThat(context.containsBean("beans1.bean2")).isFalse(); listener.contextDestroyed(event); @@ -241,8 +239,7 @@ class ContextLoaderTests { listener.contextInitialized(event); String contextAttr = WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE; WebApplicationContext wc = (WebApplicationContext) sc.getAttribute(contextAttr); - boolean condition = wc instanceof SimpleWebApplicationContext; - assertThat(condition).as("Correct WebApplicationContext exposed in ServletContext").isTrue(); + assertThat(wc instanceof SimpleWebApplicationContext).as("Correct WebApplicationContext exposed in ServletContext").isTrue(); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java index 70694c3d29e..76187793a3e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java @@ -112,8 +112,7 @@ class DelegatingWebMvcConfigurationTests { assertThat(initializer).isNotNull(); assertThat(initializer.getConversionService()).isSameAs(conversionService.getValue()); - boolean condition = initializer.getValidator() instanceof LocalValidatorFactoryBean; - assertThat(condition).isTrue(); + assertThat(initializer.getValidator() instanceof LocalValidatorFactoryBean).isTrue(); assertThat(resolvers.getValue()).isEmpty(); assertThat(handlers.getValue()).isEmpty(); assertThat(adapter.getMessageConverters()).isEqualTo(converters.getValue()); @@ -171,12 +170,9 @@ class DelegatingWebMvcConfigurationTests { verify(webMvcConfigurer).configureHandlerExceptionResolvers(exceptionResolvers.capture()); assertThat(exceptionResolvers.getValue()).hasSize(3); - boolean condition2 = exceptionResolvers.getValue().get(0) instanceof ExceptionHandlerExceptionResolver; - assertThat(condition2).isTrue(); - boolean condition1 = exceptionResolvers.getValue().get(1) instanceof ResponseStatusExceptionResolver; - assertThat(condition1).isTrue(); - boolean condition = exceptionResolvers.getValue().get(2) instanceof DefaultHandlerExceptionResolver; - assertThat(condition).isTrue(); + assertThat(exceptionResolvers.getValue().get(0) instanceof ExceptionHandlerExceptionResolver).isTrue(); + assertThat(exceptionResolvers.getValue().get(1) instanceof ResponseStatusExceptionResolver).isTrue(); + assertThat(exceptionResolvers.getValue().get(2) instanceof DefaultHandlerExceptionResolver).isTrue(); assertThat(converters.getValue()).isNotEmpty(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java index da3c3d74fe6..20f020e95e5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java @@ -202,8 +202,7 @@ class InterceptorRegistryTests { private void verifyWebInterceptor(HandlerInterceptor interceptor, TestWebRequestInterceptor webInterceptor) throws Exception { - boolean condition = interceptor instanceof WebRequestHandlerInterceptorAdapter; - assertThat(condition).isTrue(); + assertThat(interceptor instanceof WebRequestHandlerInterceptorAdapter).isTrue(); interceptor.preHandle(this.request, this.response, null); assertThat(webInterceptor.preHandleInvoked).isTrue(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java index a28d822ac27..afa7ada90ed 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java @@ -198,13 +198,11 @@ class WebMvcConfigurationSupportTests { ConversionService conversionService = initializer.getConversionService(); assertThat(conversionService).isNotNull(); - boolean condition1 = conversionService instanceof FormattingConversionService; - assertThat(condition1).isTrue(); + assertThat(conversionService instanceof FormattingConversionService).isTrue(); Validator validator = initializer.getValidator(); assertThat(validator).isNotNull(); - boolean condition = validator instanceof LocalValidatorFactoryBean; - assertThat(condition).isTrue(); + assertThat(validator instanceof LocalValidatorFactoryBean).isTrue(); DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(adapter); @SuppressWarnings("unchecked") diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java index 750b00cbdb2..e6d959037d4 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java @@ -93,8 +93,7 @@ class LocaleResolverTests { else { assertThat(localeContext.getLocale()).isEqualTo(Locale.UK); } - boolean condition2 = localeContext instanceof TimeZoneAwareLocaleContext; - assertThat(condition2).isTrue(); + assertThat(localeContext instanceof TimeZoneAwareLocaleContext).isTrue(); assertThat(((TimeZoneAwareLocaleContext) localeContext).getTimeZone()).isNull(); if (localeContextResolver instanceof AbstractLocaleContextResolver) { @@ -122,16 +121,14 @@ class LocaleResolverTests { new SimpleTimeZoneAwareLocaleContext(Locale.GERMANY, TimeZone.getTimeZone("GMT+2"))); localeContext = localeContextResolver.resolveLocaleContext(request); assertThat(localeContext.getLocale()).isEqualTo(Locale.GERMANY); - boolean condition1 = localeContext instanceof TimeZoneAwareLocaleContext; - assertThat(condition1).isTrue(); + assertThat(localeContext instanceof TimeZoneAwareLocaleContext).isTrue(); assertThat(TimeZone.getTimeZone("GMT+2")).isEqualTo(((TimeZoneAwareLocaleContext) localeContext).getTimeZone()); localeContextResolver.setLocaleContext(request, response, new SimpleTimeZoneAwareLocaleContext(null, TimeZone.getTimeZone("GMT+3"))); localeContext = localeContextResolver.resolveLocaleContext(request); assertThat(localeContext.getLocale()).isEqualTo(Locale.UK); - boolean condition = localeContext instanceof TimeZoneAwareLocaleContext; - assertThat(condition).isTrue(); + assertThat(localeContext instanceof TimeZoneAwareLocaleContext).isTrue(); assertThat(TimeZone.getTimeZone("GMT+3")).isEqualTo(((TimeZoneAwareLocaleContext) localeContext).getTimeZone()); if (localeContextResolver instanceof AbstractLocaleContextResolver) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java index b8f9a873480..5bf15d57bdf 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java @@ -16,11 +16,8 @@ package org.springframework.web.servlet.mvc.condition; -import java.util.Collection; - import org.junit.jupiter.api.Test; -import org.springframework.web.servlet.mvc.condition.HeadersRequestCondition.HeaderExpression; import org.springframework.web.testfixture.servlet.MockHttpServletRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -160,8 +157,7 @@ class HeadersRequestConditionTests { HeadersRequestCondition condition2 = new HeadersRequestCondition("foo=baz"); HeadersRequestCondition result = condition1.combine(condition2); - Collection conditions = result.getContent(); - assertThat(conditions).hasSize(2); + assertThat(result.getContent()).hasSize(2); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java index ec2f2699ced..9fad66b032d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ParamsRequestConditionTests.java @@ -16,11 +16,8 @@ package org.springframework.web.servlet.mvc.condition; -import java.util.Collection; - import org.junit.jupiter.api.Test; -import org.springframework.web.servlet.mvc.condition.ParamsRequestCondition.ParamExpression; import org.springframework.web.testfixture.servlet.MockHttpServletRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -149,8 +146,7 @@ class ParamsRequestConditionTests { ParamsRequestCondition condition2 = new ParamsRequestCondition("foo=baz"); ParamsRequestCondition result = condition1.combine(condition2); - Collection conditions = result.getContent(); - assertThat(conditions).hasSize(2); + assertThat(result.getContent()).hasSize(2); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java index 2caff0a8c78..81501971a0a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java @@ -396,8 +396,7 @@ class RequestPartMethodArgumentResolverTests { webRequest = new ServletWebRequest(request); Object actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null); - boolean condition1 = actualValue instanceof Optional; - assertThat(condition1).isTrue(); + assertThat(actualValue instanceof Optional).isTrue(); assertThat(((Optional) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected)); actualValue = resolver.resolveArgument(optionalMultipartFileList, null, webRequest, null); @@ -439,8 +438,7 @@ class RequestPartMethodArgumentResolverTests { webRequest = new ServletWebRequest(request); Object actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null); - boolean condition1 = actualValue instanceof Optional; - assertThat(condition1).isTrue(); + assertThat(actualValue instanceof Optional).isTrue(); assertThat(((Optional) actualValue).get()).as("Invalid result").isEqualTo(expected); actualValue = resolver.resolveArgument(optionalPart, null, webRequest, null); @@ -484,8 +482,7 @@ class RequestPartMethodArgumentResolverTests { webRequest = new ServletWebRequest(request); Object actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null); - boolean condition1 = actualValue instanceof Optional; - assertThat(condition1).isTrue(); + assertThat(actualValue instanceof Optional).isTrue(); assertThat(((Optional) actualValue).get()).as("Invalid result").isEqualTo(Collections.singletonList(expected)); actualValue = resolver.resolveArgument(optionalPartList, null, webRequest, null); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java index bc781962083..3fcb82e2ded 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandlerTests.java @@ -398,10 +398,8 @@ class ResponseEntityExceptionHandlerTests { servlet.service(this.servletRequest, this.servletResponse); } catch (ServletException ex) { - boolean condition1 = ex.getCause() instanceof IllegalStateException; - assertThat(condition1).isTrue(); - boolean condition = ex.getCause().getCause() instanceof ServletRequestBindingException; - assertThat(condition).isTrue(); + assertThat(ex.getCause() instanceof IllegalStateException).isTrue(); + assertThat(ex.getCause().getCause() instanceof ServletRequestBindingException).isTrue(); } } 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 6d4366d1cad..bf3cb7c8f74 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 @@ -2644,8 +2644,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl public String myOtherHandle(TB tb, BindingResult errors, ExtendedModelMap model, MySpecialArg arg) { TestBean tbReal = (TestBean) tb; tbReal.setName("myName"); - boolean condition = model.get("ITestBean") instanceof DerivedTestBean; - assertThat(condition).isTrue(); + assertThat(model.get("ITestBean") instanceof DerivedTestBean).isTrue(); assertThat(arg).isNotNull(); return super.myHandle(tbReal, errors, model); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java index 580bdd213c9..cc2be20440c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/EncodedResourceResolverTests.java @@ -78,8 +78,7 @@ class EncodedResourceResolverTests { assertThat(actual.getDescription()).isEqualTo(getResource(file + ".gz").getDescription()); assertThat(actual.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition = actual instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(actual instanceof HttpResource).isTrue(); HttpHeaders headers = ((HttpResource) actual).getResponseHeaders(); assertThat(headers.getFirst(HttpHeaders.CONTENT_ENCODING)).isEqualTo("gzip"); assertThat(headers.getFirst(HttpHeaders.VARY)).isEqualTo("Accept-Encoding"); @@ -95,8 +94,7 @@ class EncodedResourceResolverTests { assertThat(resolved.getDescription()).isEqualTo(getResource("foo.css.gz").getDescription()); assertThat(resolved.getFilename()).isEqualTo(getResource("foo.css").getFilename()); - boolean condition = resolved instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(resolved instanceof HttpResource).isTrue(); } @Test @@ -110,8 +108,7 @@ class EncodedResourceResolverTests { assertThat(resolved.getDescription()).isEqualTo(getResource(file + ".gz").getDescription()); assertThat(resolved.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition = resolved instanceof HttpResource; - assertThat(condition).isTrue(); + assertThat(resolved instanceof HttpResource).isTrue(); // 2. Resolve unencoded resource request = new MockHttpServletRequest("GET", "/js/foo.js"); @@ -119,8 +116,7 @@ class EncodedResourceResolverTests { assertThat(resolved.getDescription()).isEqualTo(getResource(file).getDescription()); assertThat(resolved.getFilename()).isEqualTo(getResource(file).getFilename()); - boolean condition1 = resolved instanceof HttpResource; - assertThat(condition1).isFalse(); + assertThat(resolved instanceof HttpResource).isFalse(); } @Test // SPR-13149 diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java index c9315345e40..9f802f94172 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java @@ -92,8 +92,7 @@ class AnnotationConfigDispatcherServletInitializerTests { ((AnnotationConfigWebApplicationContext) wac).refresh(); assertThat(wac.containsBean("bean")).isTrue(); - boolean condition = wac.getBean("bean") instanceof MyBean; - assertThat(condition).isTrue(); + assertThat(wac.getBean("bean") instanceof MyBean).isTrue(); assertThat(servletRegistrations).hasSize(1); assertThat(servletRegistrations.get(SERVLET_NAME)).isNotNull(); @@ -161,8 +160,7 @@ class AnnotationConfigDispatcherServletInitializerTests { ((AnnotationConfigWebApplicationContext) wac).refresh(); assertThat(wac.containsBean("bean")).isTrue(); - boolean condition = wac.getBean("bean") instanceof MyBean; - assertThat(condition).isTrue(); + assertThat(wac.getBean("bean") instanceof MyBean).isTrue(); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java index 46862aac8fb..bed0a51ec3d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java @@ -67,8 +67,7 @@ class DispatcherServletInitializerTests { WebApplicationContext servletContext = servlet.getWebApplicationContext(); assertThat(servletContext.containsBean("bean")).isTrue(); - boolean condition = servletContext.getBean("bean") instanceof MyBean; - assertThat(condition).isTrue(); + assertThat(servletContext.getBean("bean") instanceof MyBean).isTrue(); assertThat(registrations).hasSize(1); assertThat(registrations.get(SERVLET_NAME)).isNotNull(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java index a34ddcc7e97..be5c73a111b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java @@ -65,8 +65,7 @@ class BindTagTests extends AbstractTagTests { assertThat(status.getExpression()).as("Correct expression").isNull(); assertThat(status.getValue()).as("Correct value").isNull(); assertThat(status.getDisplayValue()).as("Correct displayValue").isEmpty(); - boolean condition = !status.isError(); - assertThat(condition).as("Correct isError").isTrue(); + assertThat(!status.isError()).as("Correct isError").isTrue(); assertThat(status.getErrorCodes()).as("Correct errorCodes").isEmpty(); assertThat(status.getErrorMessages()).as("Correct errorMessages").isEmpty(); assertThat(status.getErrorCode()).as("Correct errorCode").isEmpty(); @@ -480,8 +479,7 @@ class BindTagTests extends AbstractTagTests { BindStatus status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE); assertThat(status).as("Has status variable").isNotNull(); assertThat(status.getExpression()).as("Correct expression").isEqualTo("array[0]"); - boolean condition = status.getValue() instanceof TestBean; - assertThat(condition).as("Value is TestBean").isTrue(); + assertThat(status.getValue() instanceof TestBean).as("Value is TestBean").isTrue(); assertThat(((TestBean) status.getValue()).getName()).as("Correct value").isEqualTo("name0"); assertThat(status.isError()).as("Correct isError").isTrue(); assertThat(status.getErrorCodes()).as("Correct errorCodes").hasSize(2); @@ -508,8 +506,7 @@ class BindTagTests extends AbstractTagTests { BindStatus status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE); assertThat(status).as("Has status variable").isNotNull(); assertThat(status.getExpression()).as("Correct expression").isEqualTo("map[key1]"); - boolean condition = status.getValue() instanceof TestBean; - assertThat(condition).as("Value is TestBean").isTrue(); + assertThat(status.getValue() instanceof TestBean).as("Value is TestBean").isTrue(); assertThat(((TestBean) status.getValue()).getName()).as("Correct value").isEqualTo("name4"); assertThat(status.isError()).as("Correct isError").isTrue(); assertThat(status.getErrorCodes()).as("Correct errorCodes").hasSize(2); @@ -544,8 +541,7 @@ class BindTagTests extends AbstractTagTests { assertThat(status).as("Has status variable").isNotNull(); assertThat(status.getExpression()).as("Correct expression").isEqualTo("array[0]"); // because of the custom editor getValue() should return a String - boolean condition = status.getValue() instanceof String; - assertThat(condition).as("Value is TestBean").isTrue(); + assertThat(status.getValue() instanceof String).as("Value is TestBean").isTrue(); assertThat(status.getValue()).as("Correct value").isEqualTo("something"); } @@ -563,8 +559,7 @@ class BindTagTests extends AbstractTagTests { tag.doStartTag(); BindStatus status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE); assertThat(status.getExpression()).isEqualTo("doctor"); - boolean condition = status.getValue() instanceof NestedTestBean; - assertThat(condition).isTrue(); + assertThat(status.getValue() instanceof NestedTestBean).isTrue(); assertThat(status.getDisplayValue()).contains("juergen&eva"); } @@ -579,8 +574,7 @@ class BindTagTests extends AbstractTagTests { tag.doStartTag(); BindStatus status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE); assertThat(status.getExpression()).isEqualTo("someSet"); - boolean condition = status.getValue() instanceof Set; - assertThat(condition).isTrue(); + assertThat(status.getValue() instanceof Set).isTrue(); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java index 9efac426627..bde121d2722 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java @@ -49,20 +49,16 @@ class HtmlEscapeTagTests extends AbstractTagTests { testTag.setPageContext(pc); testTag.doStartTag(); - boolean condition7 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition7).as("Correct default").isTrue(); - boolean condition6 = !testTag.isHtmlEscape(); - assertThat(condition6).as("Correctly applied").isTrue(); + assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isTrue(); + assertThat(!testTag.isHtmlEscape()).as("Correctly applied").isTrue(); tag.setDefaultHtmlEscape(true); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue(); assertThat(testTag.isHtmlEscape()).as("Correctly applied").isTrue(); tag.setDefaultHtmlEscape(false); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); - boolean condition5 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition5).as("Correctly disabled").isTrue(); - boolean condition4 = !testTag.isHtmlEscape(); - assertThat(condition4).as("Correctly applied").isTrue(); + assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isTrue(); + assertThat(!testTag.isHtmlEscape()).as("Correctly applied").isTrue(); tag.setDefaultHtmlEscape(true); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); @@ -71,19 +67,15 @@ class HtmlEscapeTagTests extends AbstractTagTests { assertThat(testTag.isHtmlEscape()).as("Correctly applied").isTrue(); testTag.setHtmlEscape(false); assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue(); - boolean condition3 = !testTag.isHtmlEscape(); - assertThat(condition3).as("Correctly applied").isTrue(); + assertThat(!testTag.isHtmlEscape()).as("Correctly applied").isTrue(); tag.setDefaultHtmlEscape(false); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); testTag.setHtmlEscape(true); - boolean condition2 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition2).as("Correctly disabled").isTrue(); + assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isTrue(); assertThat(testTag.isHtmlEscape()).as("Correctly applied").isTrue(); testTag.setHtmlEscape(false); - boolean condition1 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition1).as("Correctly disabled").isTrue(); - boolean condition = !testTag.isHtmlEscape(); - assertThat(condition).as("Correctly applied").isTrue(); + assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isTrue(); + assertThat(!testTag.isHtmlEscape()).as("Correctly applied").isTrue(); } @Test @@ -96,15 +88,13 @@ class HtmlEscapeTagTests extends AbstractTagTests { tag.setPageContext(pc); tag.doStartTag(); - boolean condition1 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition1).as("Correct default").isTrue(); + assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isTrue(); tag.setDefaultHtmlEscape(true); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue(); tag.setDefaultHtmlEscape(false); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); - boolean condition = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition).as("Correctly disabled").isTrue(); + assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isTrue(); } @Test @@ -116,15 +106,13 @@ class HtmlEscapeTagTests extends AbstractTagTests { tag.doStartTag(); sc.addInitParameter(WebUtils.HTML_ESCAPE_CONTEXT_PARAM, "false"); - boolean condition1 = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition1).as("Correct default").isTrue(); + assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correct default").isTrue(); tag.setDefaultHtmlEscape(true); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); assertThat(tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly enabled").isTrue(); tag.setDefaultHtmlEscape(false); assertThat(tag.doStartTag()).as("Correct doStartTag return value").isEqualTo(Tag.EVAL_BODY_INCLUDE); - boolean condition = !tag.getRequestContext().isDefaultHtmlEscape(); - assertThat(condition).as("Correctly disabled").isTrue(); + assertThat(!tag.getRequestContext().isDefaultHtmlEscape()).as("Correctly disabled").isTrue(); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java index c5549971449..f7772229cb7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java @@ -346,8 +346,7 @@ class ErrorsTagTests extends AbstractFormTagTests { int result = this.tag.doStartTag(); assertThat(result).isEqualTo(BodyTag.EVAL_BODY_BUFFERED); assertThat(getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE)).isNotNull(); - boolean condition = getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE) instanceof List; - assertThat(condition).isTrue(); + assertThat(getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE) instanceof List).isTrue(); String bodyContent = "Foo"; this.tag.setBodyContent(new MockBodyContent(bodyContent, getWriter())); this.tag.doEndTag(); @@ -367,8 +366,7 @@ class ErrorsTagTests extends AbstractFormTagTests { int result = this.tag.doStartTag(); assertThat(result).isEqualTo(BodyTag.EVAL_BODY_BUFFERED); assertThat(getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE)).isNotNull(); - boolean condition = getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE) instanceof List; - assertThat(condition).isTrue(); + assertThat(getPageContext().getAttribute(ErrorsTag.MESSAGES_ATTRIBUTE) instanceof List).isTrue(); String bodyContent = "Foo"; this.tag.setBodyContent(new MockBodyContent(bodyContent, getWriter())); this.tag.doEndTag(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java index 4c6ce19f117..a3abcaacfde 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java @@ -176,8 +176,7 @@ class ViewResolverTests { model.put("tb", tb); view.render(model, this.request, this.response); assertThat(tb.equals(this.request.getAttribute("tb"))).as("Correct tb attribute").isTrue(); - boolean condition = this.request.getAttribute("rc") instanceof RequestContext; - assertThat(condition).as("Correct rc attribute").isTrue(); + assertThat(this.request.getAttribute("rc") instanceof RequestContext).as("Correct rc attribute").isTrue(); view = vr.resolveViewName("redirect:myUrl", Locale.getDefault()); assertThat(view.getClass()).as("Correct view class").isEqualTo(RedirectView.class); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java index 9476cd68d77..06899268932 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java @@ -83,8 +83,7 @@ class HandlersBeanDefinitionParserTests { assertThat(handlersMap).hasSize(2); for (HandlerMapping hm : handlersMap.values()) { - boolean condition2 = hm instanceof SimpleUrlHandlerMapping; - assertThat(condition2).isTrue(); + assertThat(hm instanceof SimpleUrlHandlerMapping).isTrue(); SimpleUrlHandlerMapping shm = (SimpleUrlHandlerMapping) hm; if (shm.getUrlMap().containsKey("/foo")) { @@ -94,11 +93,9 @@ class HandlersBeanDefinitionParserTests { unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), FooWebSocketHandler.class); HandshakeHandler handshakeHandler = handler.getHandshakeHandler(); assertThat(handshakeHandler).isNotNull(); - boolean condition1 = handshakeHandler instanceof DefaultHandshakeHandler; - assertThat(condition1).isTrue(); + assertThat(handshakeHandler instanceof DefaultHandshakeHandler).isTrue(); assertThat(handler.getHandshakeInterceptors()).isNotEmpty(); - boolean condition = handler.getHandshakeInterceptors().get(0) instanceof OriginHandshakeInterceptor; - assertThat(condition).isTrue(); + assertThat(handler.getHandshakeInterceptors().get(0) instanceof OriginHandshakeInterceptor).isTrue(); } else { assertThat(shm.getUrlMap()).containsOnlyKeys("/test"); @@ -107,11 +104,9 @@ class HandlersBeanDefinitionParserTests { unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), TestWebSocketHandler.class); HandshakeHandler handshakeHandler = handler.getHandshakeHandler(); assertThat(handshakeHandler).isNotNull(); - boolean condition1 = handshakeHandler instanceof DefaultHandshakeHandler; - assertThat(condition1).isTrue(); + assertThat(handshakeHandler instanceof DefaultHandshakeHandler).isTrue(); assertThat(handler.getHandshakeInterceptors()).isNotEmpty(); - boolean condition = handler.getHandshakeInterceptors().get(0) instanceof OriginHandshakeInterceptor; - assertThat(condition).isTrue(); + assertThat(handler.getHandshakeInterceptors().get(0) instanceof OriginHandshakeInterceptor).isTrue(); } } } @@ -122,8 +117,7 @@ class HandlersBeanDefinitionParserTests { HandlerMapping handlerMapping = this.appContext.getBean(HandlerMapping.class); assertThat(handlerMapping).isNotNull(); - boolean condition2 = handlerMapping instanceof SimpleUrlHandlerMapping; - assertThat(condition2).isTrue(); + assertThat(handlerMapping instanceof SimpleUrlHandlerMapping).isTrue(); SimpleUrlHandlerMapping urlHandlerMapping = (SimpleUrlHandlerMapping) handlerMapping; assertThat(urlHandlerMapping.getOrder()).isEqualTo(2); @@ -133,8 +127,7 @@ class HandlersBeanDefinitionParserTests { unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), FooWebSocketHandler.class); HandshakeHandler handshakeHandler = handler.getHandshakeHandler(); assertThat(handshakeHandler).isNotNull(); - boolean condition1 = handshakeHandler instanceof TestHandshakeHandler; - assertThat(condition1).isTrue(); + assertThat(handshakeHandler instanceof TestHandshakeHandler).isTrue(); List interceptors = handler.getHandshakeInterceptors(); assertThat(interceptors).extracting("class") .containsExactlyInAnyOrder(FooTestInterceptor.class, BarTestInterceptor.class, OriginHandshakeInterceptor.class); @@ -144,8 +137,7 @@ class HandlersBeanDefinitionParserTests { unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), TestWebSocketHandler.class); handshakeHandler = handler.getHandshakeHandler(); assertThat(handshakeHandler).isNotNull(); - boolean condition = handshakeHandler instanceof TestHandshakeHandler; - assertThat(condition).isTrue(); + assertThat(handshakeHandler instanceof TestHandshakeHandler).isTrue(); interceptors = handler.getHandshakeInterceptors(); assertThat(interceptors).extracting("class") .containsExactlyInAnyOrder(FooTestInterceptor.class, BarTestInterceptor.class, OriginHandshakeInterceptor.class);