Skip to content

Commit 1da0e3c

Browse files
bsideupbsideup
authored
Share the unix socket impl between OkHttp & HttpClient5 (#1566)
1 parent f9d2db6 commit 1da0e3c

File tree

15 files changed

+582
-850
lines changed

15 files changed

+582
-850
lines changed

‎docker-java-transport-httpclient5/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>net.java.dev.jna</groupId>
3939
<artifactId>jna</artifactId>
40-
<version>5.5.0</version>
40+
<version>5.8.0</version>
4141
</dependency>
4242
</dependencies>
4343

‎docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.github.dockerjava.httpclient5;
22

33
import com.github.dockerjava.transport.DockerHttpClient;
4+
import com.github.dockerjava.transport.DomainSocket;
5+
import com.github.dockerjava.transport.NamedPipeSocket;
46
import com.github.dockerjava.transport.SSLConfig;
57
import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
68
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -117,7 +119,7 @@ private Registry<ConnectionSocketFactory> createConnectionSocketFactoryRegistry(
117119
.register("unix", new PlainConnectionSocketFactory() {
118120
@Override
119121
public Socket createSocket(HttpContext context) throws IOException {
120-
return new UnixDomainSocket(dockerHost.getPath());
122+
return DomainSocket.get(dockerHost.getPath());
121123
}
122124
})
123125
.register("npipe", new PlainConnectionSocketFactory() {

‎docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java‎

Lines changed: 0 additions & 322 deletions
This file was deleted.

‎docker-java-transport-okhttp/pom.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>net.java.dev.jna</groupId>
3333
<artifactId>jna-platform</artifactId>
34-
<version>5.5.0</version>
34+
<version>5.8.0</version>
3535
</dependency>
3636
</dependencies>
3737

@@ -49,6 +49,9 @@
4949
<sourceCompatible>true</sourceCompatible>
5050
</overrideCompatibilityChangeParameter>
5151
</overrideCompatibilityChangeParameters>
52+
<excludes>
53+
<exclude>com.github.dockerjava.okhttp.UnixDomainSocket$SockAddr</exclude>
54+
</excludes>
5255
</parameter>
5356
</configuration>
5457
</plugin>

0 commit comments

Comments
 (0)