Skip to content

Commit e60e7de

Browse files
author
Marcus Linke
committed
Formatting sources
1 parent ab2eabf commit e60e7de

256 files changed

Lines changed: 9586 additions & 10050 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.

‎src/main/java/com/github/dockerjava/api/BadRequestException.java‎

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

3-
43
/**
54
*
65
*/
76
public class BadRequestException extends DockerException {
87

9-
private static final long serialVersionUID = -2450396075981100160L;
8+
private static final long serialVersionUID = -2450396075981100160L;
109

11-
public BadRequestException(String message, Throwable cause) {
10+
public BadRequestException(String message, Throwable cause) {
1211
super(message, 400, cause);
1312
}
14-
15-
public BadRequestException(String message) {
13+
14+
public BadRequestException(String message) {
1615
this(message, null);
1716
}
18-
19-
public BadRequestException(Throwable cause) {
17+
18+
public BadRequestException(Throwable cause) {
2019
this(cause.getMessage(), cause);
2120
}
2221

‎src/main/java/com/github/dockerjava/api/ConflictException.java‎

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

3-
43
/**
54
*
65
*/
76
public class ConflictException extends DockerException {
87

9-
private static final long serialVersionUID = -290093024775500239L;
8+
private static final long serialVersionUID = -290093024775500239L;
109

11-
public ConflictException(String message, Throwable cause) {
10+
public ConflictException(String message, Throwable cause) {
1211
super(message, 409, cause);
1312
}
14-
15-
public ConflictException(String message) {
13+
14+
public ConflictException(String message) {
1615
this(message, null);
1716
}
18-
19-
public ConflictException(Throwable cause) {
17+
18+
public ConflictException(Throwable cause) {
2019
this(cause.getMessage(), cause);
2120
}
2221

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

Lines changed: 62 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -9,114 +9,108 @@
99
// https://godoc.org/github.com/fsouza/go-dockerclient
1010
public interface DockerClient extends Closeable {
1111

12-
public AuthConfig authConfig() throws DockerException;
12+
public AuthConfig authConfig() throws DockerException;
1313

14-
/**
15-
* Authenticate with the server, useful for checking authentication.
16-
*/
17-
public AuthCmd authCmd();
14+
/**
15+
* Authenticate with the server, useful for checking authentication.
16+
*/
17+
public AuthCmd authCmd();
1818

19-
public InfoCmd infoCmd();
19+
public InfoCmd infoCmd();
2020

21-
public PingCmd pingCmd();
21+
public PingCmd pingCmd();
2222

23-
public VersionCmd versionCmd();
23+
public VersionCmd versionCmd();
2424

25-
/**
26-
* * IMAGE API *
27-
*/
25+
/**
26+
* * IMAGE API *
27+
*/
2828

29-
public PullImageCmd pullImageCmd(String repository);
29+
public PullImageCmd pullImageCmd(String repository);
3030

31-
public PushImageCmd pushImageCmd(String name);
31+
public PushImageCmd pushImageCmd(String name);
3232

33-
public PushImageCmd pushImageCmd(Identifier identifier);
33+
public PushImageCmd pushImageCmd(Identifier identifier);
3434

35-
public CreateImageCmd createImageCmd(String repository,
36-
InputStream imageStream);
35+
public CreateImageCmd createImageCmd(String repository, InputStream imageStream);
3736

38-
public SearchImagesCmd searchImagesCmd(String term);
37+
public SearchImagesCmd searchImagesCmd(String term);
3938

40-
public RemoveImageCmd removeImageCmd(String imageId);
39+
public RemoveImageCmd removeImageCmd(String imageId);
4140

42-
public ListImagesCmd listImagesCmd();
41+
public ListImagesCmd listImagesCmd();
42+
43+
public InspectImageCmd inspectImageCmd(String imageId);
4344

44-
public InspectImageCmd inspectImageCmd(String imageId);
45-
4645
public SaveImageCmd saveImageCmd(String name);
4746

48-
/**
49-
* * CONTAINER API *
50-
*/
51-
52-
public ListContainersCmd listContainersCmd();
53-
54-
public CreateContainerCmd createContainerCmd(String image);
55-
56-
/**
57-
* Creates a new {@link StartContainerCmd} for the container with the
58-
* given ID.
59-
* The command can then be further customized by using builder
60-
* methods on it like {@link StartContainerCmd#withDns(String...)}.
61-
* <p>
62-
* <b>If you customize the command, any existing configuration of the
63-
* target container will get reset to its default before applying the
64-
* new configuration. To preserve the existing configuration, use an
65-
* unconfigured {@link StartContainerCmd}.</b>
66-
* <p>
67-
* This command corresponds to the <code>/containers/{id}/start</code>
68-
* endpoint of the Docker Remote API.
69-
*/
70-
public StartContainerCmd startContainerCmd(String containerId);
47+
/**
48+
* * CONTAINER API *
49+
*/
50+
51+
public ListContainersCmd listContainersCmd();
52+
53+
public CreateContainerCmd createContainerCmd(String image);
54+
55+
/**
56+
* Creates a new {@link StartContainerCmd} for the container with the given ID. The command can then be further
57+
* customized by using builder methods on it like {@link StartContainerCmd#withDns(String...)}.
58+
* <p>
59+
* <b>If you customize the command, any existing configuration of the target container will get reset to its default
60+
* before applying the new configuration. To preserve the existing configuration, use an unconfigured
61+
* {@link StartContainerCmd}.</b>
62+
* <p>
63+
* This command corresponds to the <code>/containers/{id}/start</code> endpoint of the Docker Remote API.
64+
*/
65+
public StartContainerCmd startContainerCmd(String containerId);
7166

7267
public ExecCreateCmd execCreateCmd(String containerId);
7368

74-
public InspectContainerCmd inspectContainerCmd(String containerId);
69+
public InspectContainerCmd inspectContainerCmd(String containerId);
7570

76-
public RemoveContainerCmd removeContainerCmd(String containerId);
71+
public RemoveContainerCmd removeContainerCmd(String containerId);
7772

78-
public WaitContainerCmd waitContainerCmd(String containerId);
73+
public WaitContainerCmd waitContainerCmd(String containerId);
7974

80-
public AttachContainerCmd attachContainerCmd(String containerId);
75+
public AttachContainerCmd attachContainerCmd(String containerId);
8176

8277
public ExecStartCmd execStartCmd(String containerId);
8378

8479
public InspectExecCmd inspectExecCmd(String execId);
8580

86-
public LogContainerCmd logContainerCmd(String containerId);
81+
public LogContainerCmd logContainerCmd(String containerId);
8782

88-
public CopyFileFromContainerCmd copyFileFromContainerCmd(
89-
String containerId, String resource);
83+
public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
9084

91-
public ContainerDiffCmd containerDiffCmd(String containerId);
85+
public ContainerDiffCmd containerDiffCmd(String containerId);
9286

93-
public StopContainerCmd stopContainerCmd(String containerId);
87+
public StopContainerCmd stopContainerCmd(String containerId);
9488

95-
public KillContainerCmd killContainerCmd(String containerId);
89+
public KillContainerCmd killContainerCmd(String containerId);
9690

97-
public RestartContainerCmd restartContainerCmd(String containerId);
91+
public RestartContainerCmd restartContainerCmd(String containerId);
9892

99-
public CommitCmd commitCmd(String containerId);
93+
public CommitCmd commitCmd(String containerId);
10094

10195
public BuildImageCmd buildImageCmd();
10296

103-
public BuildImageCmd buildImageCmd(File dockerFileOrFolder);
97+
public BuildImageCmd buildImageCmd(File dockerFileOrFolder);
98+
99+
public BuildImageCmd buildImageCmd(InputStream tarInputStream);
100+
101+
public TopContainerCmd topContainerCmd(String containerId);
104102

105-
public BuildImageCmd buildImageCmd(InputStream tarInputStream);
103+
public TagImageCmd tagImageCmd(String imageId, String repository, String tag);
106104

107-
public TopContainerCmd topContainerCmd(String containerId);
105+
public PauseContainerCmd pauseContainerCmd(String containerId);
108106

109-
public TagImageCmd tagImageCmd(String imageId, String repository, String tag);
110-
111-
public PauseContainerCmd pauseContainerCmd(String containerId);
112-
113-
public UnpauseContainerCmd unpauseContainerCmd(String containerId);
107+
public UnpauseContainerCmd unpauseContainerCmd(String containerId);
114108

115-
public EventsCmd eventsCmd(EventCallback eventCallback);
109+
public EventsCmd eventsCmd(EventCallback eventCallback);
116110

117-
public StatsCmd statsCmd(StatsCallback statsCallback);
111+
public StatsCmd statsCmd(StatsCallback statsCallback);
118112

119-
@Override
120-
public void close() throws IOException;
113+
@Override
114+
public void close() throws IOException;
121115

122116
}

‎src/main/java/com/github/dockerjava/api/DockerClientException.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77
public class DockerClientException extends RuntimeException {
88

9-
private static final long serialVersionUID = 7667768099261650608L;
10-
9+
private static final long serialVersionUID = 7667768099261650608L;
10+
1111
public DockerClientException(String message) {
1212
super(message);
1313
}

‎src/main/java/com/github/dockerjava/api/DockerException.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.github.dockerjava.api;
22

3-
4-
5-
63
/**
74
*
85
* @author Konstantin Pelykh (kpelykh@gmail.com)
@@ -11,9 +8,9 @@
118

129
public class DockerException extends RuntimeException {
1310

14-
private static final long serialVersionUID = 7667768099261650608L;
15-
16-
private int httpStatus = 0;
11+
private static final long serialVersionUID = 7667768099261650608L;
12+
13+
private int httpStatus = 0;
1714

1815
public DockerException(String message, int httpStatus) {
1916
super(message);
@@ -23,8 +20,8 @@ public DockerException(String message, int httpStatus) {
2320
public DockerException(String message, int httpStatus, Throwable cause) {
2421
super(message, cause);
2522
}
26-
23+
2724
public int getHttpStatus() {
28-
return httpStatus;
29-
}
25+
return httpStatus;
26+
}
3027
}

‎src/main/java/com/github/dockerjava/api/InternalServerErrorException.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
*/
66
public class InternalServerErrorException extends DockerException {
77

8-
private static final long serialVersionUID = -2450396075981100160L;
8+
private static final long serialVersionUID = -2450396075981100160L;
99

10-
public InternalServerErrorException(String message, Throwable cause) {
10+
public InternalServerErrorException(String message, Throwable cause) {
1111
super(message, 500, cause);
1212
}
13-
14-
public InternalServerErrorException(String message) {
13+
14+
public InternalServerErrorException(String message) {
1515
this(message, null);
1616
}
17-
18-
public InternalServerErrorException(Throwable cause) {
17+
18+
public InternalServerErrorException(Throwable cause) {
1919
this(cause.getMessage(), cause);
2020
}
2121

‎src/main/java/com/github/dockerjava/api/NotAcceptableException.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
*/
66
public class NotAcceptableException extends DockerException {
77

8-
private static final long serialVersionUID = -1771212181727204375L;
8+
private static final long serialVersionUID = -1771212181727204375L;
99

10-
public NotAcceptableException(String message, Throwable cause) {
10+
public NotAcceptableException(String message, Throwable cause) {
1111
super(message, 406, cause);
1212
}
13-
14-
public NotAcceptableException(String message) {
13+
14+
public NotAcceptableException(String message) {
1515
this(message, null);
1616
}
17-
18-
public NotAcceptableException(Throwable cause) {
17+
18+
public NotAcceptableException(Throwable cause) {
1919
this(cause.getMessage(), cause);
2020
}
2121

‎src/main/java/com/github/dockerjava/api/NotFoundException.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
*/
88
public class NotFoundException extends DockerException {
99

10-
private static final long serialVersionUID = -2450396075981100160L;
10+
private static final long serialVersionUID = -2450396075981100160L;
1111

12-
public NotFoundException(String message, Throwable cause) {
12+
public NotFoundException(String message, Throwable cause) {
1313
super(message, 404, cause);
1414
}
15-
16-
public NotFoundException(String message) {
15+
16+
public NotFoundException(String message) {
1717
this(message, null);
1818
}
19-
20-
public NotFoundException(Throwable cause) {
19+
20+
public NotFoundException(Throwable cause) {
2121
this(cause.getMessage(), cause);
2222
}
2323
}

‎src/main/java/com/github/dockerjava/api/NotModifiedException.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
*/
66
public class NotModifiedException extends DockerException {
77

8-
private static final long serialVersionUID = -290093024775500239L;
8+
private static final long serialVersionUID = -290093024775500239L;
99

10-
public NotModifiedException(String message, Throwable cause) {
10+
public NotModifiedException(String message, Throwable cause) {
1111
super(message, 304, cause);
1212
}
13-
14-
public NotModifiedException(String message) {
13+
14+
public NotModifiedException(String message) {
1515
this(message, null);
1616
}
17-
18-
public NotModifiedException(Throwable cause) {
17+
18+
public NotModifiedException(Throwable cause) {
1919
this(cause.getMessage(), cause);
2020
}
2121

‎src/main/java/com/github/dockerjava/api/UnauthorizedException.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
*/
66
public class UnauthorizedException extends DockerException {
77

8-
private static final long serialVersionUID = 8257731964780578278L;
8+
private static final long serialVersionUID = 8257731964780578278L;
99

10-
public UnauthorizedException(String message, Throwable cause) {
10+
public UnauthorizedException(String message, Throwable cause) {
1111
super(message, 401, cause);
1212
}
13-
14-
public UnauthorizedException(String message) {
13+
14+
public UnauthorizedException(String message) {
1515
this(message, null);
1616
}
17-
18-
public UnauthorizedException(Throwable cause) {
17+
18+
public UnauthorizedException(Throwable cause) {
1919
this(cause.getMessage(), cause);
2020
}
2121

0 commit comments

Comments
 (0)