restore value ffor tests

KostyaSha · KostyaSha · commit b04832d479a1 · 2020-03-04T20:22:42.000+03:00
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/InvocationBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/InvocationBuilder.java
@@ -69,7 +69,7 @@ private void onResult(A_RES_T object) {
         }
 
         @Override
-        public void close() throws IOException {
+        public void     close() throws IOException {
             try {
                 super.close();
             } finally {
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
@@ -35,7 +35,9 @@ public DockerCmdExecFactory createExecFactory() {
         OKHTTP(true) {
             @Override
             public DockerCmdExecFactory createExecFactory() {
-                return new OkHttpDockerCmdExecFactory().withConnectTimeout(30 * 1000);
+                return new OkHttpDockerCmdExecFactory()
+                    .withConnectTimeout(60 * 1000)
+                    .withReadTimeout(0);
             }
         };
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.async.ResultCallbackTemplate;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Statistics;
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,8 +28,10 @@ public void testStatsStreaming() throws InterruptedException, IOException {
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         boolean gotStats = false;
-        try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).exec(
-                new StatsCallbackTest(countDownLatch))) {
+        try (StatsCallbackTest statsCallback = dockerRule.getClient()
+            .statsCmd(container.getId())
+            .exec(new StatsCallbackTest(countDownLatch))) {
+
             assertTrue(countDownLatch.await(10, TimeUnit.SECONDS));
             gotStats = statsCallback.gotStats();
 
@@ -53,7 +55,7 @@ public void testStatsNoStreaming() throws InterruptedException, IOException {
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).withNoStream(true).exec(
-                new StatsCallbackTest(countDownLatch))) {
+            new StatsCallbackTest(countDownLatch))) {
             countDownLatch.await(5, TimeUnit.SECONDS);
 
             LOG.info("Stop stats collection");
@@ -67,7 +69,7 @@ public void testStatsNoStreaming() throws InterruptedException, IOException {
         assertEquals("Expected stats called only once", countDownLatch.getCount(), NUM_STATS - 1);
     }
 
-    private class StatsCallbackTest extends ResultCallbackTemplate<StatsCallbackTest, Statistics> {
+    private static class StatsCallbackTest extends ResultCallbackTemplate<StatsCallbackTest, Statistics> {
         private final CountDownLatch countDownLatch;
 
         private Boolean gotStats = false;

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ private void onResult(A_RES_T object) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@Override`
`72`		`- public void close() throws IOException {`
	`72`	`+ public void close() throws IOException {`
`73`	`73`	`try {`
`74`	`74`	`super.close();`
`75`	`75`	`} finally {`