From bb8d8ab8ac1bc14b26abf45c8fda5cf571c1c9bb Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Mon, 07 Nov 2016 13:59:40 +0000
Subject: [PATCH] OPENDJ-3179: Migrate LDAP Connection Handler to SDK Grizzly transport
---
opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java b/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java
index f3ee127..126f97b 100644
--- a/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java
+++ b/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java
@@ -15,7 +15,7 @@
*/
package com.forgerock.opendj.grizzly;
-import static com.forgerock.reactive.RxJavaStreams.*;
+import static com.forgerock.reactive.RxJavaStreams.streamFromPublisher;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -56,7 +56,6 @@
import org.forgerock.util.Options;
import com.forgerock.reactive.ReactiveHandler;
-import com.forgerock.reactive.Single;
import com.forgerock.reactive.Stream;
import io.reactivex.BackpressureStrategy;
@@ -121,10 +120,10 @@
final DecodeOptions decodeOptions = options.get(CommonLDAPOptions.LDAP_DECODE_OPTIONS);
return new ReactiveHandler<LDAPClientContext, LdapRawMessage, Stream<Response>>() {
@Override
- public Single<Stream<Response>> handle(final LDAPClientContext context,
+ public Stream<Response> handle(final LDAPClientContext context,
final LdapRawMessage rawRequest) throws Exception {
final LDAPReader<ASN1Reader> reader = LDAP.getReader(rawRequest.getContent(), decodeOptions);
- return singleFrom(streamFromPublisher(Flowable.create(new FlowableOnSubscribe<Response>() {
+ return streamFromPublisher(Flowable.create(new FlowableOnSubscribe<Response>() {
@Override
public void subscribe(final FlowableEmitter<Response> emitter) throws Exception {
reader.readMessage(new AbstractLDAPMessageHandler() {
@@ -190,7 +189,7 @@
});
emitter.onComplete();
}
- }, BackpressureStrategy.ERROR)));
+ }, BackpressureStrategy.ERROR));
}
};
}
--
Gitblit v1.10.0