chore

Author: gesellix

api-client/src/main/java/de/gesellix/docker/builder/BuildContextBuilder.java

@@ -1,8 +1,9 @@
 package de.gesellix.docker.builder;
 
-import de.gesellix.util.IOUtils;
+import okio.BufferedSink;
+import okio.BufferedSource;
 import okio.Okio;
-import okio.Source;
+
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.slf4j.Logger;
@@ -74,13 +75,11 @@ public static String relativize(File base, File absolute) {
   }
 
   public static long copyFile(File input, OutputStream output) throws IOException {
-    Source source = null;
-    try {
-      source = Okio.source(input);
-      return IOUtils.copy(source, Okio.sink(output));
-    }
-    finally {
-      IOUtils.closeQuietly(source);
+    BufferedSink sink = Okio.buffer(Okio.sink(output));
+    try (BufferedSource source = Okio.buffer(Okio.source(input))) {
+      long read = source.readAll(sink);
+      sink.flush();
+      return read;
     }
   }
 }

api-client/src/main/java/de/gesellix/docker/builder/DockerignoreFileFilter.java

@@ -1,6 +1,7 @@
 package de.gesellix.docker.builder;
 
-import de.gesellix.util.IOUtils;
+import okio.Okio;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,7 +58,9 @@ public List<String> getDockerignorePatterns(final File base) {
       return result;
     }
     try {
-      Collections.addAll(result, IOUtils.toString(Files.newInputStream(dockerignoreFile.get().toPath())).split("[\r\n]+"));
+      Collections.addAll(result, Okio.buffer(Okio.source(Files.newInputStream(dockerignoreFile.get().toPath())))
+          .readUtf8()
+          .split("[\r\n]+"));
       return result;
     }
     catch (IOException e) {