Skip to content

Remove DockerServiceImpl.StreamUtils #2648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rovarga wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −50
Open

Remove DockerServiceImpl.StreamUtils #2648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 22 additions & 50 deletions docker/src/main/java/org/apache/karaf/docker/internal/DockerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,29 @@
*/
package org.apache.karaf.docker.internal;

import org.apache.karaf.docker.*;

import java.io.*;
import org.apache.karaf.docker.Container;
import org.apache.karaf.docker.ContainerConfig;
import org.apache.karaf.docker.DockerClient;
import org.apache.karaf.docker.DockerService;
import org.apache.karaf.docker.HostConfig;
import org.apache.karaf.docker.HostPortBinding;
import org.apache.karaf.docker.Image;
import org.apache.karaf.docker.ImageHistory;
import org.apache.karaf.docker.ImageSearch;
import org.apache.karaf.docker.Info;
import org.apache.karaf.docker.Top;
import org.apache.karaf.docker.Version;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.attribute.PosixFilePermission;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

public class DockerServiceImpl implements DockerService {

Expand Down Expand Up @@ -377,53 +394,8 @@ private void copy(File source, File destination) throws IOException {
copy(new File(source, child), new File(destination, child));
}
} else {
try (
InputStream in = new FileInputStream(source);
OutputStream out = new FileOutputStream(destination)
) {
new StreamUtils().copy(in, out);
}
}
}

class StreamUtils {

public StreamUtils() {
}

public void close(Closeable... closeables) {
for (Closeable c : closeables) {
try {
if (c != null) {
c.close();
}
} catch (IOException e) {
// Ignore
}
}
}

public void close(Iterable<Closeable> closeables) {
for (Closeable c : closeables) {
try {
if (c != null) {
c.close();
}
} catch (IOException e) {
// Ignore
}
}
Files.copy(source.toPath(), destination.toPath());
}

public void copy(final InputStream input, final OutputStream output) throws IOException {
byte[] buffer = new byte[1024 * 16];
int n;
while ((n = input.read(buffer)) > 0) {
output.write(buffer, 0, n);
}
output.flush();
}

}

private static void makeFileExecutable(File serviceFile) throws IOException {
Expand Down
Loading