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

sync reactor-netty

Browse Source
This commit is contained in:
Stephane Maldini
2016-03-12 01:16:49 +00:00
parent 13ddfb4aab
commit 530c817287
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorHttpClientRequestFactory.java
View File

@@ -18,7 +18,6 @@ package org.springframework.http.client.reactive;
import java.net.URI;
import reactor.io.netty.ReactiveNet;
import reactor.io.netty.http.HttpClient;
import org.springframework.core.io.buffer.DataBufferAllocator;
@@ -43,7 +42,7 @@ public class ReactorHttpClientRequestFactory implements ClientHttpRequestFactory
}
public ReactorHttpClientRequestFactory(DataBufferAllocator allocator) {
this(allocator, ReactiveNet.httpClient());
this(allocator, reactor.io.netty.http.HttpClient.create());
}
protected ReactorHttpClientRequestFactory(DataBufferAllocator allocator, HttpClient httpClient) {

5
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java
View File

@@ -19,7 +19,6 @@ package org.springframework.http.server.reactive.boot;
import reactor.core.flow.Loopback;
import reactor.core.state.Completable;
import reactor.io.buffer.Buffer;
import reactor.io.netty.ReactiveNet;
import org.springframework.core.io.buffer.DataBufferAllocator;
import org.springframework.core.io.buffer.DefaultDataBufferAllocator;
@@ -50,8 +49,8 @@ public class ReactorHttpServer extends HttpServerSupport
Assert.notNull(getHttpHandler());
this.reactorHandler = new ReactorHttpHandlerAdapter(getHttpHandler(), allocator);
this.reactorServer = (getPort() != -1 ? ReactiveNet.httpServer(getPort()) :
ReactiveNet.httpServer());
this.reactorServer = (getPort() != -1 ? reactor.io.netty.http.HttpServer.create(getPort()) :
reactor.io.netty.http.HttpServer.create());
}
@Override