diff --git a/src/main/java/rx/apache/http/consumers/ResponseConsumerChunked.java b/src/main/java/rx/apache/http/consumers/ResponseConsumerChunked.java
new file mode 100644
index 0000000..0138561
--- /dev/null
+++ b/src/main/java/rx/apache/http/consumers/ResponseConsumerChunked.java
@@ -0,0 +1,143 @@
+/**
+ * Copyright 2014 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package rx.apache.http.consumers;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpException;
+import org.apache.http.HttpResponse;
+import org.apache.http.entity.ContentType;
+import org.apache.http.nio.ContentDecoder;
+import org.apache.http.nio.IOControl;
+import org.apache.http.nio.protocol.AbstractAsyncResponseConsumer;
+import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
+import org.apache.http.protocol.HttpContext;
+
+import rx.Observable;
+import rx.Observable.OnSubscribe;
+import rx.Observer;
+import rx.Subscriber;
+import rx.apache.http.ObservableHttpResponse;
+import rx.subjects.PublishSubject;
+import rx.subscriptions.CompositeSubscription;
+
+/**
+ * {@link HttpAsyncResponseConsumer} for Transfer-Encoding:chunked
+ *
+ * It will emit a byte[] via {@link Observer#onNext} for each non-empty line.
+ */
+class ResponseConsumerChunked extends AbstractAsyncResponseConsumer implements ResponseDelegate {
+
+ private final static int BUFFER_SIZE = 8192;
+
+ private final Observer super ObservableHttpResponse> observer;
+ private final PublishSubject contentSubject = PublishSubject. create();
+ private final CompositeSubscription parentSubscription;
+
+ public ResponseConsumerChunked(final Observer super ObservableHttpResponse> observer,
+ CompositeSubscription parentSubscription) {
+ this.observer = observer;
+ this.parentSubscription = parentSubscription;
+ }
+
+ @Override
+ protected final void onEntityEnclosed(final HttpEntity entity, final ContentType contentType) {
+ }
+
+ @Override
+ protected final void onContentReceived(final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
+ if (parentSubscription.isUnsubscribed()) {
+ ioctrl.shutdown();
+ }
+
+ byte[] data;
+ data = new byte[BUFFER_SIZE];
+
+ final int bytesRead;
+ bytesRead = decoder.read(ByteBuffer.wrap(data));
+
+ if (bytesRead > 0) {
+ if (bytesRead == data.length) {
+ contentSubject.onNext(data);
+
+ } else {
+ byte[] subset;
+ subset = new byte[bytesRead];
+ System.arraycopy(data, 0, subset, 0, bytesRead);
+
+ contentSubject.onNext(subset);
+
+ }
+
+ }
+
+ if (decoder.isCompleted()) {
+ contentSubject.onCompleted();
+ }
+ }
+
+ @Override
+ protected void releaseResources() {
+ }
+
+ @Override
+ public void _onContentReceived(ContentDecoder decoder, IOControl ioctrl) throws IOException {
+ onContentReceived(decoder, ioctrl);
+ }
+
+ @Override
+ public void _onEntityEnclosed(HttpEntity entity, ContentType contentType) throws IOException {
+ onEntityEnclosed(entity, contentType);
+ }
+
+ @Override
+ public HttpResponse _buildResult(HttpContext context) throws Exception {
+ return buildResult(context);
+ }
+
+ @Override
+ public void _releaseResources() {
+ releaseResources();
+ }
+
+ @Override
+ public void _onResponseReceived(HttpResponse aResponse) throws HttpException, IOException {
+ onResponseReceived(aResponse);
+ }
+
+ @Override
+ protected void onResponseReceived(HttpResponse aResponse) throws HttpException, IOException {
+ // wrap the contentSubject so we can chain the Subscription between
+ // parent and child
+ Observable contentObservable = Observable.create(new OnSubscribe() {
+
+ @Override
+ public void call(Subscriber super byte[]> observer) {
+ observer.add(parentSubscription);
+ parentSubscription.add(contentSubject.subscribe(observer));
+ }
+ });
+ observer.onNext(new ObservableHttpResponse(aResponse, contentObservable));
+ }
+
+ @Override
+ protected HttpResponse buildResult(HttpContext aContext) throws Exception {
+ // streaming results, so not returning anything here
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/rx/apache/http/consumers/ResponseConsumerDelegate.java b/src/main/java/rx/apache/http/consumers/ResponseConsumerDelegate.java
index 7fa7b34..8a2821a 100644
--- a/src/main/java/rx/apache/http/consumers/ResponseConsumerDelegate.java
+++ b/src/main/java/rx/apache/http/consumers/ResponseConsumerDelegate.java
@@ -1,12 +1,12 @@
/**
* Copyright 2014 Netflix, Inc.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,8 @@
import rx.subscriptions.CompositeSubscription;
/**
- * AbstractAsyncResponseConsumer that chooses different implementations based on return headers.
+ * AbstractAsyncResponseConsumer that chooses different implementations based on
+ * return headers.
*
*
* - Content-Type:text/event-stream == {@link ResponseConsumerEventStream}
@@ -41,34 +42,47 @@
*/
public class ResponseConsumerDelegate extends AbstractAsyncResponseConsumer {
- private volatile ResponseDelegate consumer = null;
+ private volatile ResponseDelegate consumer = null;
final Observer super ObservableHttpResponse> observer;
- final CompositeSubscription subscription;
+ final CompositeSubscription subscription;
- public ResponseConsumerDelegate(final Observer super ObservableHttpResponse> observer, CompositeSubscription subscription) {
+ public ResponseConsumerDelegate(final Observer super ObservableHttpResponse> observer,
+ CompositeSubscription subscription) {
this.observer = observer;
this.subscription = subscription;
}
@Override
protected void onResponseReceived(HttpResponse response) throws HttpException, IOException {
- // when we receive the response with headers we evaluate what type of consumer we want
- if (responseIsStreamLike(response)) {
+ // when we receive the response with headers we evaluate what type of
+ // consumer we want
+ if (responseIsEventStream(response)) {
consumer = new ResponseConsumerEventStream(observer, subscription);
+
+ } else if (responseIsChunked(response)) {
+ consumer = new ResponseConsumerChunked(observer, subscription);
+
} else {
consumer = new ResponseConsumerBasic(observer, subscription);
+
}
// forward 'response' to actual consumer
consumer._onResponseReceived(response);
}
- private boolean responseIsStreamLike(HttpResponse response) {
+ private boolean responseIsEventStream(HttpResponse response) {
final Header contentType = response.getFirstHeader("Content-Type");
- // use 'contains' instead of equals since Content-Type can contain additional information
- // such as charset ... see here: http://www.w3.org/International/O-HTTP-charset
+ // use 'contains' instead of equals since Content-Type can contain
+ // additional information
+ // such as charset ... see here:
+ // http://www.w3.org/International/O-HTTP-charset
if (contentType != null && contentType.getValue().contains("text/event-stream")) {
return true;
}
+ return false;
+ }
+
+ private boolean responseIsChunked(HttpResponse response) {
final Header transferEncoding = response.getFirstHeader("Transfer-Encoding");
if (transferEncoding != null && transferEncoding.getValue().equals("chunked")) {
return true;