Polishing

Author: jhoeller

spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java

@@ -2200,7 +2200,7 @@ public void testPrototypeStringCreatedRepeatedly() {
 	@Test
 	public void testPrototypeWithArrayConversionForConstructor() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
-		List<String> list = new ManagedList<String>();
+		List<String> list = new ManagedList<>();
 		list.add("myName");
 		list.add("myBeanName");
 		RootBeanDefinition bd = new RootBeanDefinition(DerivedTestBean.class);
@@ -2219,7 +2219,7 @@ public void testPrototypeWithArrayConversionForConstructor() {
 	@Test
 	public void testPrototypeWithArrayConversionForFactoryMethod() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
-		List<String> list = new ManagedList<String>();
+		List<String> list = new ManagedList<>();
 		list.add("myName");
 		list.add("myBeanName");
 		RootBeanDefinition bd = new RootBeanDefinition(DerivedTestBean.class);

spring-core/src/test/java/org/springframework/tests/MockitoUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,10 @@
  *
  * @author Phillip Webb
  */
-public class MockitoUtils {
+public abstract class MockitoUtils {
+
+	private static final MockUtil mockUtil = new MockUtil();
 
-	private static MockUtil mockUtil = new MockUtil();
 
 	/**
 	 * Verify the same invocations have been applied to two mocks. This is generally not
@@ -48,16 +49,18 @@ public static <T> void verifySameInvocations(T expected, T actual, InvocationArg
 		verifySameInvocations(expectedInvocations, actualInvocations, argumentAdapters);
 	}
 
-	private static void verifySameInvocations(List<Invocation> expectedInvocations, List<Invocation> actualInvocations, InvocationArgumentsAdapter... argumentAdapters) {
+	private static void verifySameInvocations(List<Invocation> expectedInvocations, List<Invocation> actualInvocations,
+			InvocationArgumentsAdapter... argumentAdapters) {
+
 		assertThat(expectedInvocations.size(), is(equalTo(actualInvocations.size())));
 		for (int i = 0; i < expectedInvocations.size(); i++) {
 			verifySameInvocation(expectedInvocations.get(i), actualInvocations.get(i), argumentAdapters);
 		}
 	}
 
-	private static void verifySameInvocation(Invocation expectedInvocation, Invocation actualInvocation, InvocationArgumentsAdapter... argumentAdapters) {
-		System.out.println(expectedInvocation);
-		System.out.println(actualInvocation);
+	private static void verifySameInvocation(Invocation expectedInvocation, Invocation actualInvocation,
+			InvocationArgumentsAdapter... argumentAdapters) {
+
 		assertThat(expectedInvocation.getMethod(), is(equalTo(actualInvocation.getMethod())));
 		Object[] expectedArguments = getInvocationArguments(expectedInvocation, argumentAdapters);
 		Object[] actualArguments = getInvocationArguments(actualInvocation, argumentAdapters);
@@ -72,16 +75,18 @@ private static Object[] getInvocationArguments(Invocation invocation, Invocation
 		return arguments;
 	}
 
+
 	/**
 	 * Adapter strategy that can be used to change invocation arguments.
 	 */
-	public static interface InvocationArgumentsAdapter {
+	public interface InvocationArgumentsAdapter {
 
 		/**
-		 * Change the arguments if required
+		 * Change the arguments if required.
 		 * @param arguments the source arguments
 		 * @return updated or original arguments (never {@code null})
 		 */
 		Object[] adaptArguments(Object[] arguments);
 	}
+
 }

spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.Transformer;
@@ -28,15 +27,8 @@
 
 import org.junit.Before;
 import org.junit.Test;
-
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.tests.MockitoUtils;
-import org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter;
-
 import org.w3c.dom.Node;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -47,6 +39,11 @@
 import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.XMLReaderFactory;
 
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.tests.MockitoUtils;
+import org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter;
+
 import static org.junit.Assert.*;
 import static org.mockito.BDDMockito.*;
 
@@ -58,6 +55,7 @@ public abstract class AbstractStaxXMLReaderTestCase {
 
 	private ContentHandler standardContentHandler;
 
+
 	@Before
 	public void setUp() throws Exception {
 		inputFactory = XMLInputFactory.newInstance();
@@ -66,6 +64,7 @@ public void setUp() throws Exception {
 		standardReader.setContentHandler(standardContentHandler);
 	}
 
+
 	@Test
 	public void contentHandlerNamespacesNoPrefixes() throws Exception {
 		standardReader.setFeature("http://xml.org/sax/features/namespaces", true);
@@ -147,19 +146,16 @@ public void lexicalHandler() throws Exception {
 		inputFactory.setProperty("javax.xml.stream.isSupportingExternalEntities", Boolean.FALSE);
 
 		LexicalHandler actualLexicalHandler = mockLexicalHandler();
-		willAnswer(new Answer<Object>() {
-			@Override
-			public Object answer(InvocationOnMock invocation) throws Throwable {
-				return invocation.getArguments()[0] = "element";
-			}
-		}).given(actualLexicalHandler).startDTD(anyString(), anyString(), anyString());
+		willAnswer(invocation -> invocation.getArguments()[0] = "element").
+				given(actualLexicalHandler).startDTD(anyString(), anyString(), anyString());
 		AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(testLexicalHandlerXml.getInputStream());
 		staxXmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", actualLexicalHandler);
 		staxXmlReader.parse(new InputSource());
 
 		verifyIdenticalInvocations(expectedLexicalHandler, actualLexicalHandler);
 	}
 
+
 	private LexicalHandler mockLexicalHandler() throws Exception {
 		LexicalHandler lexicalHandler = mock(LexicalHandler.class);
 		willAnswer(new CopyCharsAnswer()).given(lexicalHandler).comment(any(char[].class), anyInt(), anyInt());
@@ -170,8 +166,6 @@ private InputStream createTestInputStream() {
 		return getClass().getResourceAsStream("testContentHandler.xml");
 	}
 
-	protected abstract AbstractStaxXMLReader createStaxXmlReader(InputStream inputStream) throws XMLStreamException;
-
 	protected final ContentHandler mockContentHandler() throws Exception {
 		ContentHandler contentHandler = mock(ContentHandler.class);
 		willAnswer(new CopyCharsAnswer()).given(contentHandler).characters(any(char[].class), anyInt(), anyInt());
@@ -191,7 +185,11 @@ protected <T> void verifyIdenticalInvocations(T expected, T actual) {
 				new SkipLocatorArgumentsAdapter(), new CharArrayToStringAdapter(), new PartialAttributesAdapter());
 	}
 
+	protected abstract AbstractStaxXMLReader createStaxXmlReader(InputStream inputStream) throws XMLStreamException;
+
+
 	private static class SkipLocatorArgumentsAdapter implements InvocationArgumentsAdapter {
+
 		@Override
 		public Object[] adaptArguments(Object[] arguments) {
 			for (int i = 0; i < arguments.length; i++) {
@@ -203,7 +201,9 @@ public Object[] adaptArguments(Object[] arguments) {
 		}
 	}
 
+
 	private static class CharArrayToStringAdapter implements InvocationArgumentsAdapter {
+
 		@Override
 		public Object[] adaptArguments(Object[] arguments) {
 			if (arguments.length == 3 && arguments[0] instanceof char[]
@@ -214,7 +214,9 @@ public Object[] adaptArguments(Object[] arguments) {
 		}
 	}
 
+
 	private static class PartialAttributesAdapter implements InvocationArgumentsAdapter {
+
 		@Override
 		public Object[] adaptArguments(Object[] arguments) {
 			for (int i = 0; i < arguments.length; i++) {
@@ -226,7 +228,9 @@ public Object[] adaptArguments(Object[] arguments) {
 		}
 	}
 
+
 	private static class CopyCharsAnswer implements Answer<Object> {
+
 		@Override
 		public Object answer(InvocationOnMock invocation) throws Throwable {
 			char[] chars = (char[]) invocation.getArguments()[0];
@@ -237,19 +241,15 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
 		}
 	}
 
+
 	private static class PartialAttributes {
 
-		private Attributes attributes;
+		private final Attributes attributes;
 
 		public PartialAttributes(Attributes attributes) {
 			this.attributes = attributes;
 		}
 
-		@Override
-		public int hashCode() {
-			return 1;
-		}
-
 		@Override
 		public boolean equals(Object obj) {
 			Attributes other = ((PartialAttributes) obj).attributes;
@@ -273,5 +273,11 @@ public boolean equals(Object obj) {
 			}
 			return true;
 		}
+
+		@Override
+		public int hashCode() {
+			return 1;
+		}
 	}
+
 }

spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,18 +18,15 @@
 
 import java.io.InputStream;
 import java.io.StringReader;
-
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 
 import org.junit.Test;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class StaxEventXMLReaderTests extends AbstractStaxXMLReaderTestCase {
@@ -45,7 +42,7 @@ protected AbstractStaxXMLReader createStaxXmlReader(InputStream inputStream) thr
 	public void partial() throws Exception {
 		XMLInputFactory inputFactory = XMLInputFactory.newInstance();
 		XMLEventReader eventReader = inputFactory.createXMLEventReader(new StringReader(CONTENT));
-		eventReader.nextTag(); // skip to root
+		eventReader.nextTag();  // skip to root
 		StaxEventXMLReader xmlReader = new StaxEventXMLReader(eventReader);
 		ContentHandler contentHandler = mock(ContentHandler.class);
 		xmlReader.setContentHandler(contentHandler);
@@ -55,5 +52,5 @@ public void partial() throws Exception {
 		verify(contentHandler).endElement("http://springframework.org/spring-ws", "child", "child");
 		verify(contentHandler).endDocument();
 	}
-}
 
+}

spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,21 +18,18 @@
 
 import java.io.InputStream;
 import java.io.StringReader;
-
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
 import org.junit.Test;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class StaxStreamXMLReaderTests extends AbstractStaxXMLReaderTestCase {
@@ -48,10 +45,10 @@ protected AbstractStaxXMLReader createStaxXmlReader(InputStream inputStream) thr
 	public void partial() throws Exception {
 		XMLInputFactory inputFactory = XMLInputFactory.newInstance();
 		XMLStreamReader streamReader = inputFactory.createXMLStreamReader(new StringReader(CONTENT));
-		streamReader.nextTag(); // skip to root
+		streamReader.nextTag();  // skip to root
 		assertEquals("Invalid element", new QName("http://springframework.org/spring-ws", "root"),
 				streamReader.getName());
-		streamReader.nextTag(); // skip to child
+		streamReader.nextTag();  // skip to child
 		assertEquals("Invalid element", new QName("http://springframework.org/spring-ws", "child"),
 				streamReader.getName());
 		StaxStreamXMLReader xmlReader = new StaxStreamXMLReader(streamReader);

spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,16 +60,10 @@
 import org.springframework.validation.Validator;
 import org.springframework.validation.annotation.Validated;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Mockito.verify;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.any;
+import static org.mockito.BDDMockito.*;
 
 /**
  * Test fixture for
@@ -367,7 +361,7 @@ private static class TestController {
 
 		private String method;
 
-		private Map<String, Object> arguments = new LinkedHashMap<String, Object>();
+		private Map<String, Object> arguments = new LinkedHashMap<>();
 
 		@MessageMapping("/headers")
 		public void headers(@Header String foo, @Headers Map<String, Object> headers) {
@@ -462,13 +456,13 @@ private static class ListenableFutureController {
 
 		@MessageMapping("success")
 		public ListenableFutureTask<String> handleListenableFuture() {
-			this.future = new ListenableFutureTask<String>(() -> "foo");
+			this.future = new ListenableFutureTask<>(() -> "foo");
 			return this.future;
 		}
 
 		@MessageMapping("failure")
 		public ListenableFutureTask<String> handleListenableFutureException() {
-			this.future = new ListenableFutureTask<String>(() -> {
+			this.future = new ListenableFutureTask<>(() -> {
 				throw new IllegalStateException();
 			});
 			return this.future;

spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java

@@ -48,11 +48,8 @@
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.notNull;
-import static org.mockito.Mockito.same;
 
 /**
  * Unit tests for {@link DefaultStompSession}.