Skip to content

Commit 74a4479

Browse files
bsideupKostyaSha
bsideup
authored and
KostyaSha
committed
Create modules for core & transports (jersey, netty) (docker-java#1251)
* Use Java 8 features * introduce transport modules * remove unused import
1 parent 14d5353 commit 74a4479

402 files changed

Lines changed: 295 additions & 586 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/encodings.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docker-java-api/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@
3838
<version>${guava.version}</version>
3939
</dependency>
4040

41+
<dependency>
42+
<groupId>org.slf4j</groupId>
43+
<artifactId>slf4j-api</artifactId>
44+
<version>${slf4j-api.version}</version>
45+
</dependency>
46+
4147
<dependency>
4248
<groupId>com.google.code.findbugs</groupId>
4349
<artifactId>annotations</artifactId>

‎docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
import com.github.dockerjava.api.model.SecretSpec;
7777
import com.github.dockerjava.api.model.ServiceSpec;
7878
import com.github.dockerjava.api.model.SwarmSpec;
79-
import com.github.dockerjava.core.RemoteApiVersion;
8079

8180
import javax.annotation.Nonnull;
8281
import java.io.Closeable;

docker-java/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java renamed to docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
/*
22
* Created on 16.06.2015
33
*/
4-
package com.github.dockerjava.core.async;
4+
package com.github.dockerjava.api.async;
55

6-
import com.github.dockerjava.api.async.ResultCallback;
76
import com.google.common.base.Throwables;
87
import org.slf4j.Logger;
98
import org.slf4j.LoggerFactory;

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import com.github.dockerjava.api.model.AuthConfigurations;
1313
import com.github.dockerjava.api.model.BuildResponseItem;
14-
import com.github.dockerjava.core.RemoteApiVersion;
1514

1615
/**
1716
* Build an image from Dockerfile.

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.github.dockerjava.api.command;
22

33
import com.github.dockerjava.api.model.ContainerNetwork;
4-
import com.github.dockerjava.core.RemoteApiVersion;
54

65
import javax.annotation.CheckForNull;
76
import javax.annotation.Nonnull;

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.github.dockerjava.api.model.Network;
44
import com.github.dockerjava.api.model.Network.Ipam;
5-
import com.github.dockerjava.core.RemoteApiVersion;
65

76
import javax.annotation.CheckForNull;
87
import javax.annotation.Nonnull;

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.github.dockerjava.api.exception.ConflictException;
44
import com.github.dockerjava.api.model.SecretSpec;
5-
import com.github.dockerjava.core.RemoteApiVersion;
65

76
import javax.annotation.CheckForNull;
87

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.github.dockerjava.api.exception.ConflictException;
44
import com.github.dockerjava.api.model.ServiceSpec;
5-
import com.github.dockerjava.core.RemoteApiVersion;
65

76
import javax.annotation.CheckForNull;
87

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.github.dockerjava.core.RemoteApiVersion;
4-
53
import javax.annotation.CheckForNull;
64
import javax.annotation.Nonnull;
75

0 commit comments

Comments
 (0)