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/web/MapDataBinderUnitTests.java
View File

@@ -49,7 +49,7 @@ public class MapDataBinderUnitTests {
MutablePropertyValues values = new MutablePropertyValues();
values.add("foo.date", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(reference));
Map<String, Object> nested = new HashMap<String, Object>();
Map<String, Object> nested = new HashMap<>();
nested.put("date", reference);
assertThat(bind(values)).containsEntry("foo", nested);
@@ -67,7 +67,7 @@ public class MapDataBinderUnitTests {
List<String> list = new ArrayList<>();
list.add("String");
assertThat(result).isEqualTo((Map) singletonMap("foo", singletonMap("bar", singletonMap("fooBar", list))));
assertThat(result).isEqualTo(singletonMap("foo", singletonMap("bar", singletonMap("fooBar", list))));
}
@Test // DATACMNS-630
@@ -80,11 +80,11 @@ public class MapDataBinderUnitTests {
Map<String, Object> result = bind(values);
Map<String, Object> dave = new HashMap<String, Object>();
Map<String, Object> dave = new HashMap<>();
dave.put("firstname", "Dave");
dave.put("lastname", "Matthews");
assertThat(result).isEqualTo((Map) singletonMap("foo", dave));
assertThat(result).isEqualTo(singletonMap("foo", dave));
}
@Test // DATACMNS-630

2
src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java
View File

@@ -69,7 +69,7 @@ public abstract class PageableDefaultUnitTests {
@Test
public void returnsDefaultIfNoRequestParametersAndNoDefault() throws Exception {
assertSupportedAndResult(getParameterOfMethod("supportedMethod"), (Pageable) ReflectionTestUtils
assertSupportedAndResult(getParameterOfMethod("supportedMethod"), ReflectionTestUtils
.invokeMethod(ReflectionTestUtils.getField(getResolver(), "fallbackPageable"), "get"));
}

2
src/test/java/org/springframework/data/web/PagedResourcesAssemblerUnitTests.java
View File

@@ -253,7 +253,7 @@ public class PagedResourcesAssemblerUnitTests {
Person person = new Person();
person.name = "Dave";
return new PageImpl<>(Arrays.asList(person), request, 3);
return new PageImpl<>(Collections.singletonList(person), request, 3);
}
private static Map<String, String> getQueryParameters(Link link) {

3
src/test/java/org/springframework/data/web/config/PageableResourcesAssemblerIntegrationTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.data.web.config;
import static org.assertj.core.api.Assertions.*;
import java.util.Arrays;
import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
@@ -99,7 +100,7 @@ public class PageableResourcesAssemblerIntegrationTests {
@RequestMapping("/persons")
PagedResources<Resource<Person>> sample(Pageable pageable) {
Page<Person> page = new PageImpl<>(Arrays.asList(new Person()), pageable,
Page<Person> page = new PageImpl<>(Collections.singletonList(new Person()), pageable,
pageable.getOffset() + pageable.getPageSize() + 1);
return assembler.toResource(page);

6
src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java
View File

@@ -97,7 +97,7 @@ public class QuerydslPredicateArgumentResolverUnitTests {
request.addParameter("firstname", "rand");
Predicate predicate = (BooleanExpression) resolver.resolveArgument(
Predicate predicate = resolver.resolveArgument(
getMethodParameterFor("simpleFind", Predicate.class), null, new ServletWebRequest(request), null);
assertThat(predicate).isEqualTo((Predicate) QUser.user.firstname.eq("rand"));
@@ -157,7 +157,7 @@ public class QuerydslPredicateArgumentResolverUnitTests {
request.addParameter("inceptionYear", "978");
Predicate predicate = (BooleanExpression) resolver.resolveArgument(
Predicate predicate = resolver.resolveArgument(
getMethodParameterFor("specificFind", Predicate.class), null, new ServletWebRequest(request), null);
assertThat(predicate).isEqualTo((Predicate) QUser.user.inceptionYear.eq(978L));
@@ -168,7 +168,7 @@ public class QuerydslPredicateArgumentResolverUnitTests {
request.addParameter("inceptionYear", new String[] { "978", "998" });
Predicate predicate = (BooleanExpression) resolver.resolveArgument(
Predicate predicate = resolver.resolveArgument(
getMethodParameterFor("specificFind", Predicate.class), null, new ServletWebRequest(request), null);
assertThat(predicate).isEqualTo((Predicate) QUser.user.inceptionYear.in(978L, 998L));