From 29898c73d32c05dd5c5c9d067d8bcc4923939e86 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sun, 8 May 2016 19:42:05 +0900 Subject: [PATCH] Remove superflous `if` in MockitoPostProcessor The `if` in registerSpies() is not required as it's covered by the Assert check. Closes gh-5889 --- .../boot/test/mock/mockito/MockitoPostProcessor.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java index 113da46e452..93b92095f2e 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java @@ -246,12 +246,10 @@ public class MockitoPostProcessor extends InstantiationAwareBeanPostProcessorAda private void registerSpies(SpyDefinition definition, Field field, String[] existingBeans) { - if (field != null) { - Assert.state(field == null || existingBeans.length == 1, - "Unable to register spy bean " + definition.getClassToSpy().getName() - + " expected a single existing bean to replace but found " - + new TreeSet(Arrays.asList(existingBeans))); - } + Assert.state(field == null || existingBeans.length == 1, + "Unable to register spy bean " + definition.getClassToSpy().getName() + + " expected a single existing bean to replace but found " + + new TreeSet(Arrays.asList(existingBeans))); for (String beanName : existingBeans) { registerSpy(definition, field, beanName); }