Skip to content

Commit

Permalink
remove Netty classes from OkHttpInvocationBuilder (#869)
Browse files Browse the repository at this point in the history 
* remove Netty classes from OkHttpInvocationBuilder

* use `BufferedReader`

* simplify JsonSink

* code cleanup
  • Loading branch information
@bsideup
bsideup committed Sep 20, 2018
1 parent 53e5ece commit 75e0ee4
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 49 deletions.
144 changes: 96 additions & 48 deletions ...c/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpInvocationBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@
import com.github.dockerjava.api.exception.NotModifiedException;
import com.github.dockerjava.api.exception.UnauthorizedException;
import com.github.dockerjava.api.model.Frame;
import com.github.dockerjava.api.model.StreamType;
import com.github.dockerjava.core.InvocationBuilder;
import com.github.dockerjava.netty.handler.FramedResponseStreamHandler;
import com.github.dockerjava.netty.handler.JsonResponseCallbackHandler;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.SimpleChannelInboundHandler;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.experimental.FieldDefaults;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -34,13 +31,15 @@
import okio.BufferedSource;
import okio.Okio;
import okio.Source;
import org.testcontainers.DockerClientFactory;

import javax.annotation.Nullable;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.Objects;
import java.util.function.Consumer;

@Slf4j
@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
Expand Down Expand Up @@ -91,7 +90,7 @@ public void get(ResultCallback<Frame> resultCallback) {
executeAndStream(
request,
resultCallback,
new FramedResponseStreamHandler(resultCallback)
new FramedSink(resultCallback)
);
}

Expand Down Expand Up @@ -187,7 +186,7 @@ public void run() {
okHttpClient,
request,
resultCallback,
new FramedResponseStreamHandler(resultCallback)
new FramedSink(resultCallback)
);
}

Expand All @@ -200,7 +199,7 @@ public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCal
executeAndStream(
request,
resultCallback,
new JsonResponseCallbackHandler<>(typeReference, resultCallback)
new JsonSink<>(objectMapper, typeReference, resultCallback)
);
}

Expand Down Expand Up @@ -247,7 +246,7 @@ public MediaType contentType() {

@Override
public void writeTo(BufferedSink sink) throws IOException {
try(Source source = Okio.source(body)) {
try (Source source = Okio.source(body)) {
sink.writeAll(source);
}
}
Expand Down Expand Up @@ -286,49 +285,98 @@ protected Response execute(OkHttpClient okHttpClient, Request request) {
}
}

protected <T> void executeAndStream(Request request, ResultCallback<T> callback, SimpleChannelInboundHandler<ByteBuf> handler) {
executeAndStream(okHttpClient, request, callback, handler);
protected <T> void executeAndStream(Request request, ResultCallback<T> callback, Consumer<BufferedSource> sourceConsumer) {
executeAndStream(okHttpClient, request, callback, sourceConsumer);
}

protected <T> void executeAndStream(OkHttpClient okHttpClient, Request request, ResultCallback<T> callback, SimpleChannelInboundHandler<ByteBuf> handler) {
// TODO proper thread management
Thread thread = new Thread() {
@Override
@SneakyThrows
public void run() {
try (
Response response = execute(okHttpClient, request.newBuilder().tag("streaming").build());
BufferedSource source = response.body().source();
InputStream inputStream = source.inputStream();
) {
AtomicBoolean shouldStop = new AtomicBoolean();
callback.onStart(() -> {
shouldStop.set(true);
response.close();
});

byte[] buffer = new byte[4 * 1024];
while (!(shouldStop.get() || source.exhausted())) {
int bytesReceived = inputStream.read(buffer);

int offset = 0;
for (int i = 0; i < bytesReceived; i++) {
// some handlers like JsonResponseCallbackHandler do not work with multi-line buffers
boolean isLineBreak = buffer[i] == '\n';
boolean isEndOfBuffer = i == bytesReceived - 1;
if (isLineBreak || isEndOfBuffer) {
handler.channelRead(null, Unpooled.wrappedBuffer(buffer, offset, i - offset + 1));
offset = i + 1;
}
}
protected <T> void executeAndStream(OkHttpClient okHttpClient, Request request, ResultCallback<T> callback, Consumer<BufferedSource> sourceConsumer) {
Thread thread = new Thread(DockerClientFactory.TESTCONTAINERS_THREAD_GROUP, () -> {
try (
Response response = execute(okHttpClient, request.newBuilder().tag("streaming").build());
BufferedSource source = response.body().source();
) {
callback.onStart(response);
sourceConsumer.accept(source);
callback.onComplete();
} catch (Exception e) {
callback.onError(e);
}
}, "tc-okhttp-stream-" + Objects.hashCode(request));
thread.setDaemon(true);

thread.start();
}

@RequiredArgsConstructor
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
private static class JsonSink<T> implements Consumer<BufferedSource> {

ObjectMapper objectMapper;

TypeReference<T> typeReference;

ResultCallback<T> resultCallback;

@Override
public void accept(BufferedSource source) {
try {
while (true) {
String line = source.readUtf8Line();
if (line == null) {
break;
}
callback.onComplete();
} catch (Exception e) {
callback.onError(e);

resultCallback.onNext(objectMapper.readValue(line, typeReference));
}
} catch (Exception e) {
resultCallback.onError(e);
}
};
}
}

thread.start();
@RequiredArgsConstructor
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
private static class FramedSink implements Consumer<BufferedSource> {

private static final int HEADER_SIZE = 8;

ResultCallback<Frame> resultCallback;

@Override
public void accept(BufferedSource source) {
try {
while (!source.exhausted()) {
// See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach
if(!source.request(HEADER_SIZE)) {
return;
}
StreamType streamType = streamType(source.readByte());
source.skip(3);
int payloadSize = source.readInt();

if(!source.request(payloadSize)) {
return;
}
byte[] payload = source.readByteArray(payloadSize);

resultCallback.onNext(new Frame(streamType, payload));
}
} catch (Exception e) {
resultCallback.onError(e);
}
}

private static StreamType streamType(byte streamType) {
switch (streamType) {
case 0:
return StreamType.STDIN;
case 1:
return StreamType.STDOUT;
case 2:
return StreamType.STDERR;
default:
return StreamType.RAW;
}
}
}
}
4 changes: 3 additions & 1 deletion core/src/main/java/org/testcontainers/dockerclient/transport/okhttp/OkHttpWebTarget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.github.dockerjava.core.InvocationBuilder;
import com.github.dockerjava.core.WebTarget;
import com.google.common.collect.HashMultimap;
Expand All @@ -24,7 +25,8 @@
@Value
class OkHttpWebTarget implements WebTarget {

private static final ObjectMapper MAPPER = new ObjectMapper();
private static final ObjectMapper MAPPER = new ObjectMapper()
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);

OkHttpClient okHttpClient;

Expand Down

0 comments on commit 75e0ee4

Please sign in to comment.