Sync reactor-core jdk8 bump

This commit is contained in:
Stephane Maldini
2016-02-27 13:34:15 +00:00
parent 4c477189a6
commit cc77a338b1
4 changed files with 14 additions and 8 deletions

View File

@@ -19,13 +19,13 @@ package org.springframework.core.codec.support;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.fn.Function;
import org.springframework.core.ResolvableType;
import org.springframework.core.io.buffer.DataBuffer;

View File

@@ -21,6 +21,7 @@ import java.util.Set;
import java.util.concurrent.CompletableFuture;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Mono;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
@@ -44,7 +45,7 @@ public class ReactiveStreamsToCompletableFutureConverter implements GenericConve
return null;
}
else if (CompletableFuture.class.isAssignableFrom(source.getClass())) {
return reactor.core.converter.CompletableFutureConverter.from((CompletableFuture) source);
return Mono.fromCompletableFuture((CompletableFuture)source);
}
else if (CompletableFuture.class.isAssignableFrom(targetType.getResolvableType().getRawClass())) {
return reactor.core.converter.CompletableFutureConverter.fromSingle((Publisher) source);

View File

@@ -15,12 +15,13 @@
*/
package org.springframework.http.server.reactive;
import java.util.function.Function;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;
import reactor.core.subscriber.SubscriberBarrier;
import reactor.core.util.Assert;
import reactor.fn.Function;
/**
@@ -81,7 +82,8 @@ public class WriteWithOperator<T> implements Function<Subscriber<? super Void>,
@Override
protected void doOnSubscribe(Subscription subscription) {
super.doOnSubscribe(subscription);
((Subscription) super.upstream()).request(1); // bypass doRequest
super.upstream()
.request(1); // bypass doRequest
}
@Override

View File

@@ -16,9 +16,7 @@
package org.springframework.web.client.reactive;
import static org.junit.Assert.*;
import static org.springframework.web.client.reactive.HttpRequestBuilders.*;
import static org.springframework.web.client.reactive.WebResponseExtractors.*;
import java.util.function.Consumer;
import okhttp3.HttpUrl;
import okhttp3.mockwebserver.MockResponse;
@@ -31,7 +29,6 @@ import org.junit.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.test.TestSubscriber;
import reactor.fn.Consumer;
import org.springframework.core.codec.support.Pojo;
import org.springframework.http.HttpHeaders;
@@ -39,6 +36,12 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.http.client.reactive.ReactorHttpClientRequestFactory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.springframework.web.client.reactive.HttpRequestBuilders.get;
import static org.springframework.web.client.reactive.HttpRequestBuilders.post;
import static org.springframework.web.client.reactive.WebResponseExtractors.*;
/**
* @author Brian Clozel
*/