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

DATACMNS-714 - Added support for CompletableFuture and ListenableFuture for query methods.

Browse Source 
Spring Framework 4.2 is going to introduce support for CompletableFuture as return type for @Async methods. Support for Spring's ListenableFuture has already been supported in the framework 4.1. We've added the necessary infrastructure to  allow these types as return types on repository methods, too.

Related tickets: SPR-13128.
This commit is contained in:
Oliver Gierke
2015-06-15 12:57:57 +02:00
parent a8b64c3828
commit b294bfce3b
2 changed files with 99 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-2015 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,11 +18,13 @@ package org.springframework.data.repository.util;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import org.junit.Assume;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.util.ClassUtils;
import org.springframework.util.concurrent.ListenableFuture;
import com.google.common.base.Optional;
@@ -42,6 +44,19 @@ public class QueryExecutionConvertersUnitTests {
QueryExecutionConverters.registerConvertersIn(conversionService);
}
/**
* @see DATACMNS-714
*/
@Test
public void registersWrapperTypes() {
assertThat(QueryExecutionConverters.supports(Optional.class), is(true));
assertThat(QueryExecutionConverters.supports(java.util.Optional.class), is(true));
assertThat(QueryExecutionConverters.supports(Future.class), is(true));
assertThat(QueryExecutionConverters.supports(ListenableFuture.class), is(true));
assertThat(QueryExecutionConverters.supports(CompletableFuture.class), is(true));
}
/**
* @see DATACMNS-483
*/
@@ -60,9 +75,22 @@ public class QueryExecutionConvertersUnitTests {
@SuppressWarnings("unchecked")
public void turnsNullIntoJdk8Optional() {
Assume.assumeThat(ClassUtils.isPresent("java.util.Optional", getClass().getClassLoader()), is(true));
java.util.Optional<Object> optional = conversionService.convert(new NullableWrapper(null), java.util.Optional.class);
java.util.Optional<Object> optional = conversionService.convert(new NullableWrapper(null),
java.util.Optional.class);
assertThat(optional, is(java.util.Optional.<Object> empty()));
}
/**
* @see DATACMNS-714
*/
@Test
@SuppressWarnings("unchecked")
public void turnsNullIntoCompletableFutureForNull() throws Exception {
CompletableFuture<Object> result = conversionService.convert(new NullableWrapper(null), CompletableFuture.class);
assertThat(result, is(notNullValue()));
assertThat(result.isDone(), is(true));
assertThat(result.get(), is(nullValue()));
}
}