Skip to content

Commit 8cf84fe

Browse files
marcuslinkemarcuslinke
committed
wip
1 parent b2d9482 commit 8cf84fe

File tree

1 file changed

+19
-29
lines changed

1 file changed

+19
-29
lines changed

‎src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java

+19-29
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
package com.github.dockerjava.netty;
22

3+
import static com.google.common.base.Preconditions.checkNotNull;
4+
5+
import java.io.IOException;
6+
import java.net.InetAddress;
7+
import java.net.InetSocketAddress;
8+
import java.net.SocketAddress;
9+
import java.security.Security;
10+
11+
import javax.net.ssl.SSLContext;
12+
import javax.net.ssl.SSLEngine;
13+
import javax.net.ssl.SSLParameters;
14+
15+
import org.bouncycastle.jce.provider.BouncyCastleProvider;
16+
317
import com.github.dockerjava.api.command.AttachContainerCmd;
418
import com.github.dockerjava.api.command.AuthCmd;
519
import com.github.dockerjava.api.command.BuildImageCmd;
@@ -38,6 +52,7 @@
3852
import com.github.dockerjava.api.command.RemoveImageCmd;
3953
import com.github.dockerjava.api.command.RemoveNetworkCmd;
4054
import com.github.dockerjava.api.command.RemoveVolumeCmd;
55+
import com.github.dockerjava.api.command.RenameContainerCmd;
4156
import com.github.dockerjava.api.command.RestartContainerCmd;
4257
import com.github.dockerjava.api.command.SaveImageCmd;
4358
import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -50,7 +65,6 @@
5065
import com.github.dockerjava.api.command.UpdateContainerCmd;
5166
import com.github.dockerjava.api.command.VersionCmd;
5267
import com.github.dockerjava.api.command.WaitContainerCmd;
53-
import com.github.dockerjava.api.command.RenameContainerCmd;
5468
import com.github.dockerjava.core.DockerClientConfig;
5569
import com.github.dockerjava.core.DockerClientImpl;
5670
import com.github.dockerjava.core.LocalDirectorySSLConfig;
@@ -91,6 +105,7 @@
91105
import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
92106
import com.github.dockerjava.netty.exec.RemoveNetworkCmdExec;
93107
import com.github.dockerjava.netty.exec.RemoveVolumeCmdExec;
108+
import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
94109
import com.github.dockerjava.netty.exec.RestartContainerCmdExec;
95110
import com.github.dockerjava.netty.exec.SaveImageCmdExec;
96111
import com.github.dockerjava.netty.exec.SearchImagesCmdExec;
@@ -103,47 +118,21 @@
103118
import com.github.dockerjava.netty.exec.UpdateContainerCmdExec;
104119
import com.github.dockerjava.netty.exec.VersionCmdExec;
105120
import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
106-
import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
107121

108122
import io.netty.bootstrap.Bootstrap;
109-
import io.netty.channel.Channel;
110123
import io.netty.channel.ChannelFactory;
111124
import io.netty.channel.ChannelInitializer;
112125
import io.netty.channel.EventLoopGroup;
113-
import io.netty.channel.epoll.EpollDomainSocketChannel;
114-
import io.netty.channel.epoll.EpollEventLoopGroup;
115126
import io.netty.channel.nio.NioEventLoopGroup;
116127
import io.netty.channel.socket.DuplexChannel;
117128
import io.netty.channel.socket.SocketChannel;
118129
import io.netty.channel.socket.nio.NioSocketChannel;
119-
import io.netty.channel.unix.DomainSocketAddress;
120-
import io.netty.channel.unix.UnixChannel;
121130
import io.netty.handler.codec.http.HttpClientCodec;
122131
import io.netty.handler.logging.LoggingHandler;
123132
import io.netty.handler.ssl.SslHandler;
124133
import io.netty.util.concurrent.DefaultThreadFactory;
125-
126-
import org.bouncycastle.jce.provider.BouncyCastleProvider;
127-
128-
import unisockets.Addr;
129-
130-
import javax.net.ssl.SSLContext;
131-
import javax.net.ssl.SSLEngine;
132-
import javax.net.ssl.SSLParameters;
133-
134-
import java.io.IOException;
135-
import java.net.InetAddress;
136-
import java.net.InetSocketAddress;
137-
import java.net.SocketAddress;
138-
import java.nio.channels.SelectionKey;
139-
import java.nio.channels.Selector;
140-
import java.security.Security;
141-
142134
import jnr.enxio.channels.NativeSelectorProvider;
143-
import jnr.unixsocket.UnixServerSocketChannel;
144-
import jnr.unixsocket.UnixSocketAddress;
145-
import jnr.unixsocket.UnixSocketChannel;
146-
import static com.google.common.base.Preconditions.checkNotNull;
135+
import unisockets.Addr;
147136

148137
/**
149138
* Experimental implementation of {@link DockerCmdExecFactory} that supports http connection hijacking that is needed to pass STDIN to the
@@ -232,7 +221,8 @@ private class UnixDomainSocketInitializer implements NettyInitializer {
232221
@Override
233222
public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
234223

235-
EventLoopGroup nioEventLoopGroup = new NioEventLoopGroup(0, new DefaultThreadFactory(threadPrefix), NativeSelectorProvider.getInstance());
224+
EventLoopGroup nioEventLoopGroup = new NioEventLoopGroup(0,
225+
new DefaultThreadFactory(threadPrefix), NativeSelectorProvider.getInstance());
236226

237227
ChannelFactory<NioSocketChannel> factory = new ChannelFactory<NioSocketChannel>() {
238228

0 commit comments

Comments
 (0)