Polishing

Author: jhoeller

spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -23,9 +23,7 @@
 import static org.junit.Assert.*;
 
 /**
- * Unit tests for {@link PropertyComparator}
- *
- * @see org.springframework.util.comparator.ComparatorTests
+ * Unit tests for {@link PropertyComparator}.
  *
  * @author Keith Donald
  * @author Chris Beams
@@ -40,7 +38,7 @@ public void testPropertyComparator() {
 		Dog dog2 = new Dog();
 		dog2.setNickName("biscy");
 
-		PropertyComparator c = new PropertyComparator("nickName", false, true);
+		PropertyComparator<Dog> c = new PropertyComparator<>("nickName", false, true);
 		assertTrue(c.compare(dog, dog2) > 0);
 		assertTrue(c.compare(dog, dog) == 0);
 		assertTrue(c.compare(dog2, dog) < 0);
@@ -50,15 +48,14 @@ public void testPropertyComparator() {
 	public void testPropertyComparatorNulls() {
 		Dog dog = new Dog();
 		Dog dog2 = new Dog();
-		PropertyComparator c = new PropertyComparator("nickName", false, true);
+		PropertyComparator<Dog> c = new PropertyComparator<>("nickName", false, true);
 		assertTrue(c.compare(dog, dog2) == 0);
 	}
 
-	@SuppressWarnings("unchecked")
 	@Test
 	public void testCompoundComparator() {
-		CompoundComparator<Dog> c = new CompoundComparator<Dog>();
-		c.addComparator(new PropertyComparator("lastName", false, true));
+		CompoundComparator<Dog> c = new CompoundComparator<>();
+		c.addComparator(new PropertyComparator<>("lastName", false, true));
 
 		Dog dog1 = new Dog();
 		dog1.setFirstName("macy");
@@ -70,19 +67,19 @@ public void testCompoundComparator() {
 
 		assertTrue(c.compare(dog1, dog2) == 0);
 
-		c.addComparator(new PropertyComparator("firstName", false, true));
+		c.addComparator(new PropertyComparator<>("firstName", false, true));
 		assertTrue(c.compare(dog1, dog2) > 0);
 
 		dog2.setLastName("konikk dog");
 		assertTrue(c.compare(dog2, dog1) > 0);
 	}
 
-	@SuppressWarnings("unchecked")
 	@Test
 	public void testCompoundComparatorInvert() {
-		CompoundComparator<Dog> c = new CompoundComparator<Dog>();
-		c.addComparator(new PropertyComparator("lastName", false, true));
-		c.addComparator(new PropertyComparator("firstName", false, true));
+		CompoundComparator<Dog> c = new CompoundComparator<>();
+		c.addComparator(new PropertyComparator<>("lastName", false, true));
+		c.addComparator(new PropertyComparator<>("firstName", false, true));
+
 		Dog dog1 = new Dog();
 		dog1.setFirstName("macy");
 		dog1.setLastName("grayspots");
@@ -97,7 +94,6 @@ public void testCompoundComparatorInvert() {
 	}
 
 
-	@SuppressWarnings("unused")
 	private static class Dog implements Comparable<Object> {
 
 		private String nickName;
@@ -106,11 +102,6 @@ private static class Dog implements Comparable<Object> {
 
 		private String lastName;
 
-		@Override
-		public int compareTo(Object o) {
-			return nickName.compareTo(((Dog)o).nickName);
-		}
-
 		public String getNickName() {
 			return nickName;
 		}
@@ -134,6 +125,11 @@ public String getLastName() {
 		public void setLastName(String lastName) {
 			this.lastName = lastName;
 		}
+
+		@Override
+		public int compareTo(Object o) {
+			return this.nickName.compareTo(((Dog) o).nickName);
+		}
 	}
 
 }

spring-core/src/test/java/org/springframework/util/comparator/CompoundComparatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -23,7 +23,7 @@
 import org.junit.rules.ExpectedException;
 
 /**
- * Test for {@link ComparableComparator}.
+ * Test for {@link CompoundComparator}.
  *
  * @author Keith Donald
  * @author Chris Beams
@@ -36,7 +36,7 @@ public class CompoundComparatorTests {
 
 	@Test
 	public void shouldNeedAtLeastOneComparator() {
-		Comparator<String> c = new CompoundComparator<String>();
+		Comparator<String> c = new CompoundComparator<>();
 		thrown.expect(IllegalStateException.class);
 		c.compare("foo", "bar");
 	}

spring-core/src/test/java/org/springframework/util/comparator/InvertibleComparatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2017 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,33 +30,31 @@
  * @author Chris Beams
  * @author Phillip Webb
  */
-
 public class InvertibleComparatorTests {
 
-	private Comparator<Integer> comparator = new ComparableComparator<Integer>();
+	private final Comparator<Integer> comparator = new ComparableComparator<>();
+
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void shouldNeedComparator() throws Exception {
-		new InvertibleComparator<Object>(null);
+		new InvertibleComparator<>(null);
 	}
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void shouldNeedComparatorWithAscending() throws Exception {
-		new InvertibleComparator<Object>(null, true);
+		new InvertibleComparator<>(null, true);
 	}
 
 	@Test
 	public void shouldDefaultToAscending() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator =
-				new InvertibleComparator<Integer>(comparator);
+		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator);
 		assertThat(invertibleComparator.isAscending(), is(true));
 		assertThat(invertibleComparator.compare(1, 2), is(-1));
 	}
 
 	@Test
 	public void shouldInvert() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator =
-				new InvertibleComparator<Integer>(comparator);
+		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator);
 		assertThat(invertibleComparator.isAscending(), is(true));
 		assertThat(invertibleComparator.compare(1, 2), is(-1));
 		invertibleComparator.invertOrder();
@@ -66,15 +64,13 @@ public void shouldInvert() throws Exception {
 
 	@Test
 	public void shouldCompareAscending() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator =
-				new InvertibleComparator<Integer>(comparator, true);
+		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator, true);
 		assertThat(invertibleComparator.compare(1, 2), is(-1));
 	}
 
 	@Test
 	public void shouldCompareDescending() throws Exception {
-		InvertibleComparator<Integer> invertibleComparator =
-				new InvertibleComparator<Integer>(comparator, false);
+		InvertibleComparator<Integer> invertibleComparator = new InvertibleComparator<>(comparator, false);
 		assertThat(invertibleComparator.compare(1, 2), is(1));
 	}
 

spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java

@@ -67,17 +67,24 @@
  */
 public class JdbcTemplateTests {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
 	private Connection connection;
+
 	private DataSource dataSource;
+
 	private PreparedStatement preparedStatement;
+
 	private Statement statement;
+
 	private ResultSet resultSet;
+
 	private JdbcTemplate template;
+
 	private CallableStatement callableStatement;
 
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+
 	@Before
 	public void setup() throws Exception {
 		this.connection = mock(Connection.class);
@@ -98,6 +105,7 @@ public void setup() throws Exception {
 		given(this.callableStatement.getResultSet()).willReturn(this.resultSet);
 	}
 
+
 	@Test
 	public void testBeanProperties() throws Exception {
 		assertTrue("datasource ok", this.template.getDataSource() == this.dataSource);