Skip to content

Commit 9d20d12

Browse files
author
Marcus Linke
committed
Format sources
1 parent ffe7cc4 commit 9d20d12

File tree

6 files changed

+21
-19
lines changed

6 files changed

+21
-19
lines changed

‎src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
297297
public CreateContainerCmd withContainerIDFile(String containerIDFile);
298298

299299
/**
300-
* Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace
301-
* inside the container
300+
* Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
302301
*/
303302
public CreateContainerCmd withPidMode(String pidMode);
304303

‎src/main/java/com/github/dockerjava/core/DockerClientImpl.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,14 +336,12 @@ public BuildImageCmd buildImageCmd() {
336336

337337
@Override
338338
public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
339-
return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
340-
dockerFileOrFolder);
339+
return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(), dockerFileOrFolder);
341340
}
342341

343342
@Override
344343
public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
345-
return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
346-
tarInputStream);
344+
return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(), tarInputStream);
347345
}
348346

349347
@Override

‎src/main/java/com/github/dockerjava/core/RemoteApiVersion.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
public class RemoteApiVersion {
1919

2020
public static final RemoteApiVersion VERSION_1_19 = RemoteApiVersion.create(1, 19);
21+
2122
private static final Pattern VERSION_REGEX = Pattern.compile("v?(\\d+)\\.(\\d+)");
23+
2224
private static final RemoteApiVersion UNKNOWN_VERSION = new RemoteApiVersion(0, 0) {
2325

2426
@Override
@@ -36,8 +38,11 @@ public String asWebPathPart() {
3638
return "";
3739
}
3840
};
41+
3942
private final int major;
43+
4044
private final int minor;
45+
4146
private RemoteApiVersion(final int major, final int minor) {
4247
this.major = major;
4348
this.minor = minor;
@@ -85,11 +90,12 @@ public boolean isGreaterOrEqual(final RemoteApiVersion other) {
8590

8691
@Override
8792
public boolean equals(final Object o) {
88-
if (this == o) return true;
89-
if (o == null || getClass() != o.getClass()) return false;
93+
if (this == o)
94+
return true;
95+
if (o == null || getClass() != o.getClass())
96+
return false;
9097
final RemoteApiVersion that = (RemoteApiVersion) o;
91-
return Objects.equal(major, that.major) &&
92-
Objects.equal(minor, that.minor);
98+
return Objects.equal(major, that.major) && Objects.equal(minor, that.minor);
9399
}
94100

95101
@Override
@@ -99,10 +105,7 @@ public int hashCode() {
99105

100106
@Override
101107
public String toString() {
102-
return MoreObjects.toStringHelper(this)
103-
.add("major", major)
104-
.add("minor", minor)
105-
.toString();
108+
return MoreObjects.toStringHelper(this).add("major", major).add("minor", minor).toString();
106109
}
107110

108111
public String asWebPathPart() {

‎src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
public abstract class AbstrDockerCmdExec {
1616

1717
private final DockerClientConfig dockerClientConfig;
18+
1819
private final WebTarget baseResource;
1920

2021
public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {

‎src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ private Invocation.Builder resourceWithOptionalAuthConfig(BuildImageCmd command,
3535
return request;
3636
}
3737

38-
private static AuthConfigurations firstNonNull(final AuthConfigurations fromCommand, final AuthConfigurations fromConfig) {
38+
private static AuthConfigurations firstNonNull(final AuthConfigurations fromCommand,
39+
final AuthConfigurations fromConfig) {
3940
if (fromCommand != null) {
4041
return fromCommand;
4142
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,8 @@ public void init(DockerClientConfig dockerClientConfig) {
167167
if (originalUri.getScheme().equals("unix")) {
168168
dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
169169
}
170-
WebTarget webResource = client.target(dockerClientConfig.getUri());
171170

172-
baseResource = webResource.path(dockerClientConfig.getVersion().asWebPathPart());
171+
baseResource = client.target(dockerClientConfig.getUri()).path(dockerClientConfig.getVersion().asWebPathPart());
173172

174173
this.dockerClientConfig = dockerClientConfig;
175174
}
@@ -189,9 +188,10 @@ protected WebTarget getBaseResource() {
189188
checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
190189
return baseResource;
191190
}
192-
191+
193192
protected DockerClientConfig getDockerClientConfig() {
194-
checkNotNull(dockerClientConfig, "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
193+
checkNotNull(dockerClientConfig,
194+
"Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
195195
return dockerClientConfig;
196196
}
197197

0 commit comments

Comments
 (0)