Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-867 - Additional Java 8 language feature cleanup.

Browse Source 
Make use of lambdas and method references though out the codebase. Remove no longer required generic type parameters.
Additionally remove unused imports and replace single element list initialization with dedicated singletonList.
Use Assertion overloads taking Supplier for dynamic assertion error messages.
This commit is contained in:
Christoph Strobl
2017-02-15 12:06:09 +01:00
committed by Oliver Gierke
parent aa4c51e1ea
commit be347eaaab
176 changed files with 673 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/org/springframework/data/projection/MapAccessingMethodInterceptorUnitTests.java
View File

@@ -60,7 +60,7 @@ public class MapAccessingMethodInterceptorUnitTests {
@Test // DATACMNS-630
public void setterInvocationStoresValueInMap() throws Throwable {
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new HashMap<>();
when(invocation.getMethod()).thenReturn(Sample.class.getMethod("setName", String.class));
when(invocation.getArguments()).thenReturn(new Object[] { "Foo" });
@@ -74,7 +74,7 @@ public class MapAccessingMethodInterceptorUnitTests {
@Test // DATACMNS-630
public void getterInvocationReturnsValueFromMap() throws Throwable {
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new HashMap<>();
map.put("name", "Foo");
when(invocation.getMethod()).thenReturn(Sample.class.getMethod("getName"));
@@ -87,7 +87,7 @@ public class MapAccessingMethodInterceptorUnitTests {
@Test // DATACMNS-630
public void getterReturnsNullIfMapDoesNotContainValue() throws Throwable {
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new HashMap<>();
when(invocation.getMethod()).thenReturn(Sample.class.getMethod("getName"));
@@ -98,7 +98,7 @@ public class MapAccessingMethodInterceptorUnitTests {
public void rejectsNonAccessorInvocation() throws Throwable {
when(invocation.getMethod()).thenReturn(Sample.class.getMethod("someMethod"));
new MapAccessingMethodInterceptor(Collections.<String, Object> emptyMap()).invoke(invocation);
new MapAccessingMethodInterceptor(Collections.emptyMap()).invoke(invocation);
}
interface Sample {

1
src/test/java/org/springframework/data/projection/ProjectingMethodInterceptorUnitTests.java
View File

@@ -16,7 +16,6 @@
package org.springframework.data.projection;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.util.Collection;

4
src/test/java/org/springframework/data/projection/ProxyProjectionFactoryUnitTests.java
View File

@@ -94,11 +94,11 @@ public class ProxyProjectionFactoryUnitTests {
@Test // DATACMNS-630
public void createsMapBasedProxyFromSource() {
HashMap<String, Object> addressSource = new HashMap<String, Object>();
HashMap<String, Object> addressSource = new HashMap<>();
addressSource.put("zipCode", "ZIP");
addressSource.put("city", "NewYork");
Map<String, Object> source = new HashMap<String, Object>();
Map<String, Object> source = new HashMap<>();
source.put("firstname", "Dave");
source.put("lastname", "Matthews");
source.put("address", addressSource);

2
src/test/java/org/springframework/data/projection/SpelEvaluatingMethodInterceptorUnitTests.java
View File

@@ -93,7 +93,7 @@ public class SpelEvaluatingMethodInterceptorUnitTests {
@Test // DATACMNS-630
public void allowsMapAccessViaPropertyExpression() throws Throwable {
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new HashMap<>();
map.put("name", "Dave");
when(invocation.getMethod()).thenReturn(Projection.class.getMethod("propertyFromTarget"));