chore

Author: gesellix

engine/src/main/java/de/gesellix/docker/engine/AttachConfig.java

@@ -22,10 +22,6 @@ public Streams getStreams() {
     return streams;
   }
 
-  public Callbacks getCallbacks() {
-    return callbacks;
-  }
-
   public Object onFailure(Exception e) {
     return callbacks.onFailure.apply(e);
   }
@@ -40,7 +36,7 @@ public void setOnFailure(Function<Exception, ?> onFailure) {
    */
   @Deprecated
   public void setOnFailure(Closure<?> onFailure) {
-    callbacks.onFailure = onFailure::call;
+    setOnFailure(onFailure::call);
   }
 
   public Object onResponse(Response r) {
@@ -57,7 +53,7 @@ public void setOnResponse(Function<Response, ?> onResponse) {
    */
   @Deprecated
   public void setOnResponse(Closure<?> onResponse) {
-    callbacks.onResponse = onResponse::call;
+    setOnResponse(onResponse::call);
   }
 
   public Object onSinkClosed(Response r) {
@@ -74,7 +70,7 @@ public void setOnSinkClosed(Function<Response, ?> onSinkClosed) {
    */
   @Deprecated
   public void setOnSinkClosed(Closure<?> onSinkClosed) {
-    callbacks.onSinkClosed = onSinkClosed::call;
+    setOnSinkClosed(onSinkClosed::call);
   }
 
   public Object onSinkWritten(Response r) {
@@ -91,7 +87,7 @@ public void setOnSinkWritten(Function<Response, ?> onSinkWritten) {
    */
   @Deprecated
   public void setOnSinkWritten(Closure<?> onSinkWritten) {
-    callbacks.onSinkWritten = onSinkWritten::call;
+    setOnSinkWritten(onSinkWritten::call);
   }
 
   public Object onSourceConsumed() {
@@ -108,10 +104,10 @@ public void setOnSourceConsumed(Supplier<?> onSourceConsumed) {
    */
   @Deprecated
   public void setOnSourceConsumed(Closure<?> onSourceConsumed) {
-    callbacks.onSourceConsumed = () -> {
+    setOnSourceConsumed(() -> {
       onSourceConsumed.call();
       return null;
-    };
+    });
   }
 
   public static class Streams {
@@ -158,45 +154,5 @@ public static class Callbacks {
     private Function<Response, ?> onSinkClosed = (Response r) -> null;
     private Function<Response, ?> onSinkWritten = (Response r) -> null;
     private Supplier<?> onSourceConsumed = () -> null;
-
-    public Function<Exception, ?> getOnFailure() {
-      return onFailure;
-    }
-
-    public void setOnFailure(Function<Exception, ?> onFailure) {
-      this.onFailure = onFailure;
-    }
-
-    public Function<Response, ?> getOnResponse() {
-      return onResponse;
-    }
-
-    public void setOnResponse(Function<Response, ?> onResponse) {
-      this.onResponse = onResponse;
-    }
-
-    public Function<Response, ?> getOnSinkClosed() {
-      return onSinkClosed;
-    }
-
-    public void setOnSinkClosed(Function<Response, ?> onSinkClosed) {
-      this.onSinkClosed = onSinkClosed;
-    }
-
-    public Function<Response, ?> getOnSinkWritten() {
-      return onSinkWritten;
-    }
-
-    public void setOnSinkWritten(Function<Response, ?> onSinkWritten) {
-      this.onSinkWritten = onSinkWritten;
-    }
-
-    public Supplier<?> getOnSourceConsumed() {
-      return onSourceConsumed;
-    }
-
-    public void setOnSourceConsumed(Supplier<?> onSourceConsumed) {
-      this.onSourceConsumed = onSourceConsumed;
-    }
   }
 }

engine/src/main/java/de/gesellix/docker/engine/ConnectionProvider.java

@@ -24,7 +24,7 @@ public Response intercept(Chain chain) throws IOException {
     // attention: this connection is *per request*, so sink and source might be overwritten
     Connection connection = chain.connection();
     if (connection == null) {
-      throw new IllegalStateException("Connection is null. This one should only be used in a network interceptor, not in an application interceptor.");
+      throw new IllegalStateException("Connection is null. This one should only be used as a network interceptor, not as application interceptor.");
     }
 
     if (source != null) {

engine/src/main/java/de/gesellix/docker/engine/OkResponseCallback.java

@@ -15,7 +15,6 @@
 import java.util.TimerTask;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 public class OkResponseCallback implements Callback {
@@ -24,18 +23,10 @@ public class OkResponseCallback implements Callback {
 
   private final ConnectionProvider connectionProvider;
   private final AttachConfig attachConfig;
-  private final Function<Response, ?> onResponse;
-  private final Function<Response, ?> onSinkClosed;
-  private final Function<Response, ?> onSinkWritten;
-  private final Supplier<?> onSourceConsumed;
 
   public OkResponseCallback(ConnectionProvider connectionProvider, AttachConfig attachConfig) {
     this.connectionProvider = connectionProvider;
     this.attachConfig = attachConfig;
-    this.onResponse = attachConfig.getCallbacks().getOnResponse();
-    this.onSinkClosed = attachConfig.getCallbacks().getOnSinkClosed();
-    this.onSinkWritten = attachConfig.getCallbacks().getOnSinkWritten();
-    this.onSourceConsumed = attachConfig.getCallbacks().getOnSourceConsumed();
   }
 
   @Override
@@ -62,12 +53,12 @@ public void onResponse(@NotNull final Call call, @NotNull final Response respons
           final BufferedSink bufferedSink = Okio.buffer(getConnectionProvider().getSink());
           bufferedSink.writeAll(stdinSource);
           bufferedSink.flush();
-          onSinkWritten.apply(response);
+          attachConfig.onSinkWritten(response);
           CountDownLatch done = new CountDownLatch(1);
           delayed(100, "writer", () -> {
             try {
               bufferedSink.close();
-              onSinkClosed.apply(response);
+              attachConfig.onSinkClosed(response);
             }
             catch (Exception e) {
               log.warn("error", e);
@@ -102,7 +93,7 @@ public void onResponse(@NotNull final Call call, @NotNull final Response respons
           bufferedStdout.flush();
           CountDownLatch done = new CountDownLatch(1);
           delayed(100, "reader", () -> {
-            onSourceConsumed.get();
+            attachConfig.onSourceConsumed();
             return null;
           }, done);
           done.await(5, TimeUnit.SECONDS);
@@ -125,7 +116,7 @@ public void onResponse(@NotNull final Call call, @NotNull final Response respons
       log.debug("no stdout.");
     }
 
-    onResponse.apply(response);
+    attachConfig.onResponse(response);
   }
 
   public static void delayed(long delay, String name, final Supplier<?> action, final CountDownLatch done) {