Skip to content

Commit ad8643f

Browse files
committed
Cleanup modifiers.
1 parent 6d90bc3 commit ad8643f

Some content is hidden

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

58 files changed

+589
-590
lines changed

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

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -64,48 +64,48 @@
6464
// https://godoc.org/github.com/fsouza/go-dockerclient
6565
public interface DockerClient extends Closeable {
6666

67-
public AuthConfig authConfig() throws DockerException;
67+
AuthConfig authConfig() throws DockerException;
6868

6969
/**
7070
* Authenticate with the server, useful for checking authentication.
7171
*/
72-
public AuthCmd authCmd();
72+
AuthCmd authCmd();
7373

74-
public InfoCmd infoCmd();
74+
InfoCmd infoCmd();
7575

76-
public PingCmd pingCmd();
76+
PingCmd pingCmd();
7777

78-
public VersionCmd versionCmd();
78+
VersionCmd versionCmd();
7979

8080
/**
8181
* * IMAGE API *
8282
*/
8383

84-
public PullImageCmd pullImageCmd(@Nonnull String repository);
84+
PullImageCmd pullImageCmd(@Nonnull String repository);
8585

86-
public PushImageCmd pushImageCmd(@Nonnull String name);
86+
PushImageCmd pushImageCmd(@Nonnull String name);
8787

88-
public PushImageCmd pushImageCmd(@Nonnull Identifier identifier);
88+
PushImageCmd pushImageCmd(@Nonnull Identifier identifier);
8989

90-
public CreateImageCmd createImageCmd(@Nonnull String repository, @Nonnull InputStream imageStream);
90+
CreateImageCmd createImageCmd(@Nonnull String repository, @Nonnull InputStream imageStream);
9191

92-
public SearchImagesCmd searchImagesCmd(@Nonnull String term);
92+
SearchImagesCmd searchImagesCmd(@Nonnull String term);
9393

94-
public RemoveImageCmd removeImageCmd(@Nonnull String imageId);
94+
RemoveImageCmd removeImageCmd(@Nonnull String imageId);
9595

96-
public ListImagesCmd listImagesCmd();
96+
ListImagesCmd listImagesCmd();
9797

98-
public InspectImageCmd inspectImageCmd(@Nonnull String imageId);
98+
InspectImageCmd inspectImageCmd(@Nonnull String imageId);
9999

100-
public SaveImageCmd saveImageCmd(@Nonnull String name);
100+
SaveImageCmd saveImageCmd(@Nonnull String name);
101101

102102
/**
103103
* * CONTAINER API *
104104
*/
105105

106-
public ListContainersCmd listContainersCmd();
106+
ListContainersCmd listContainersCmd();
107107

108-
public CreateContainerCmd createContainerCmd(@Nonnull String image);
108+
CreateContainerCmd createContainerCmd(@Nonnull String image);
109109

110110
/**
111111
* Creates a new {@link StartContainerCmd} for the container with the given ID. The command can then be further customized by using
@@ -116,23 +116,23 @@ public interface DockerClient extends Closeable {
116116
* <p>
117117
* This command corresponds to the <code>/containers/{id}/start</code> endpoint of the Docker Remote API.
118118
*/
119-
public StartContainerCmd startContainerCmd(@Nonnull String containerId);
119+
StartContainerCmd startContainerCmd(@Nonnull String containerId);
120120

121-
public ExecCreateCmd execCreateCmd(@Nonnull String containerId);
121+
ExecCreateCmd execCreateCmd(@Nonnull String containerId);
122122

123-
public InspectContainerCmd inspectContainerCmd(@Nonnull String containerId);
123+
InspectContainerCmd inspectContainerCmd(@Nonnull String containerId);
124124

125-
public RemoveContainerCmd removeContainerCmd(@Nonnull String containerId);
125+
RemoveContainerCmd removeContainerCmd(@Nonnull String containerId);
126126

127-
public WaitContainerCmd waitContainerCmd(@Nonnull String containerId);
127+
WaitContainerCmd waitContainerCmd(@Nonnull String containerId);
128128

129-
public AttachContainerCmd attachContainerCmd(@Nonnull String containerId);
129+
AttachContainerCmd attachContainerCmd(@Nonnull String containerId);
130130

131-
public ExecStartCmd execStartCmd(@Nonnull String containerId);
131+
ExecStartCmd execStartCmd(@Nonnull String containerId);
132132

133-
public InspectExecCmd inspectExecCmd(@Nonnull String execId);
133+
InspectExecCmd inspectExecCmd(@Nonnull String execId);
134134

135-
public LogContainerCmd logContainerCmd(@Nonnull String containerId);
135+
LogContainerCmd logContainerCmd(@Nonnull String containerId);
136136

137137
/**
138138
* Copy resource from container to local machine.
@@ -144,7 +144,7 @@ public interface DockerClient extends Closeable {
144144
* @return created command
145145
* @since {@link RemoteApiVersion#VERSION_1_20}
146146
*/
147-
public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
147+
CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
148148

149149
/**
150150
* Copy resource from container to local machine.
@@ -158,7 +158,7 @@ public interface DockerClient extends Closeable {
158158
* @deprecated since docker API version 1.20, replaced by {@link #copyArchiveFromContainerCmd(String, String)}
159159
*/
160160
@Deprecated
161-
public CopyFileFromContainerCmd copyFileFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
161+
CopyFileFromContainerCmd copyFileFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
162162

163163
/**
164164
* Copy archive from local machine to remote container
@@ -168,13 +168,13 @@ public interface DockerClient extends Closeable {
168168
* @return created command
169169
* @since {@link RemoteApiVersion#VERSION_1_20}
170170
*/
171-
public CopyArchiveToContainerCmd copyArchiveToContainerCmd(@Nonnull String containerId);
171+
CopyArchiveToContainerCmd copyArchiveToContainerCmd(@Nonnull String containerId);
172172

173-
public ContainerDiffCmd containerDiffCmd(@Nonnull String containerId);
173+
ContainerDiffCmd containerDiffCmd(@Nonnull String containerId);
174174

175-
public StopContainerCmd stopContainerCmd(@Nonnull String containerId);
175+
StopContainerCmd stopContainerCmd(@Nonnull String containerId);
176176

177-
public KillContainerCmd killContainerCmd(@Nonnull String containerId);
177+
KillContainerCmd killContainerCmd(@Nonnull String containerId);
178178

179179
/**
180180
* Update container settings
@@ -183,51 +183,51 @@ public interface DockerClient extends Closeable {
183183
* @return command
184184
* @since {@link RemoteApiVersion#VERSION_1_22}
185185
*/
186-
public UpdateContainerCmd updateContainerCmd(@Nonnull String containerId);
186+
UpdateContainerCmd updateContainerCmd(@Nonnull String containerId);
187187

188-
public RestartContainerCmd restartContainerCmd(@Nonnull String containerId);
188+
RestartContainerCmd restartContainerCmd(@Nonnull String containerId);
189189

190-
public CommitCmd commitCmd(@Nonnull String containerId);
190+
CommitCmd commitCmd(@Nonnull String containerId);
191191

192-
public BuildImageCmd buildImageCmd();
192+
BuildImageCmd buildImageCmd();
193193

194-
public BuildImageCmd buildImageCmd(File dockerFileOrFolder);
194+
BuildImageCmd buildImageCmd(File dockerFileOrFolder);
195195

196-
public BuildImageCmd buildImageCmd(InputStream tarInputStream);
196+
BuildImageCmd buildImageCmd(InputStream tarInputStream);
197197

198-
public TopContainerCmd topContainerCmd(String containerId);
198+
TopContainerCmd topContainerCmd(String containerId);
199199

200-
public TagImageCmd tagImageCmd(String imageId, String repository, String tag);
200+
TagImageCmd tagImageCmd(String imageId, String repository, String tag);
201201

202-
public PauseContainerCmd pauseContainerCmd(String containerId);
202+
PauseContainerCmd pauseContainerCmd(String containerId);
203203

204-
public UnpauseContainerCmd unpauseContainerCmd(String containerId);
204+
UnpauseContainerCmd unpauseContainerCmd(String containerId);
205205

206-
public EventsCmd eventsCmd();
206+
EventsCmd eventsCmd();
207207

208-
public StatsCmd statsCmd(String containerId);
208+
StatsCmd statsCmd(String containerId);
209209

210-
public CreateVolumeCmd createVolumeCmd();
210+
CreateVolumeCmd createVolumeCmd();
211211

212-
public InspectVolumeCmd inspectVolumeCmd(String name);
212+
InspectVolumeCmd inspectVolumeCmd(String name);
213213

214-
public RemoveVolumeCmd removeVolumeCmd(String name);
214+
RemoveVolumeCmd removeVolumeCmd(String name);
215215

216-
public ListVolumesCmd listVolumesCmd();
216+
ListVolumesCmd listVolumesCmd();
217217

218-
public ListNetworksCmd listNetworksCmd();
218+
ListNetworksCmd listNetworksCmd();
219219

220-
public InspectNetworkCmd inspectNetworkCmd();
220+
InspectNetworkCmd inspectNetworkCmd();
221221

222-
public CreateNetworkCmd createNetworkCmd();
222+
CreateNetworkCmd createNetworkCmd();
223223

224-
public RemoveNetworkCmd removeNetworkCmd(@Nonnull String networkId);
224+
RemoveNetworkCmd removeNetworkCmd(@Nonnull String networkId);
225225

226-
public ConnectToNetworkCmd connectToNetworkCmd();
226+
ConnectToNetworkCmd connectToNetworkCmd();
227227

228-
public DisconnectFromNetworkCmd disconnectFromNetworkCmd();
228+
DisconnectFromNetworkCmd disconnectFromNetworkCmd();
229229

230230
@Override
231-
public void close() throws IOException;
231+
void close() throws IOException;
232232

233233
}

src/main/java/com/github/dockerjava/api/command/AuthCmd.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
1616

1717
@CheckForNull
18-
public AuthConfig getAuthConfig();
18+
AuthConfig getAuthConfig();
1919

20-
public AuthCmd withAuthConfig(@Nonnull AuthConfig authConfig);
20+
AuthCmd withAuthConfig(@Nonnull AuthConfig authConfig);
2121

2222
/**
2323
* @return The status. Based on it's value you may mean you need to authorise your account, e.g.: "Account created. Please see the
@@ -26,9 +26,9 @@ public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
2626
* If you're not authorised (e.g. bad password).
2727
*/
2828
@Override
29-
public AuthResponse exec() throws UnauthorizedException;
29+
AuthResponse exec() throws UnauthorizedException;
3030

31-
public static interface Exec extends DockerCmdSyncExec<AuthCmd, AuthResponse> {
31+
interface Exec extends DockerCmdSyncExec<AuthCmd, AuthResponse> {
3232
}
3333

3434
}

src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,116 +25,116 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
2525
// lib specific
2626

2727
@CheckForNull
28-
public InputStream getTarInputStream();
28+
InputStream getTarInputStream();
2929

3030
@CheckForNull
31-
public AuthConfigurations getBuildAuthConfigs();
31+
AuthConfigurations getBuildAuthConfigs();
3232

3333
// getters
3434

3535
/**
3636
* "t" in API
3737
*/
3838
@CheckForNull
39-
public String getTag();
39+
String getTag();
4040

4141
/**
4242
* "remote" in API
4343
*/
4444
@CheckForNull
45-
public URI getRemote();
45+
URI getRemote();
4646

4747
/**
4848
* "nocache" in API
4949
*/
5050
@CheckForNull
51-
public Boolean hasNoCacheEnabled();
51+
Boolean hasNoCacheEnabled();
5252

5353
/**
5454
* "rm" in API
5555
*/
5656
@CheckForNull
57-
public Boolean hasRemoveEnabled();
57+
Boolean hasRemoveEnabled();
5858

5959
/**
6060
* "forcerm" in API
6161
*/
6262
@CheckForNull
63-
public Boolean isForcerm();
63+
Boolean isForcerm();
6464

6565
/**
6666
* "q" in API
6767
*/
6868
@CheckForNull
69-
public Boolean isQuiet();
69+
Boolean isQuiet();
7070

7171
/**
7272
* "pull" in API
7373
*/
7474
@CheckForNull
75-
public Boolean hasPullEnabled();
75+
Boolean hasPullEnabled();
7676

7777
@CheckForNull
78-
public String getPathToDockerfile();
78+
String getPathToDockerfile();
7979

8080
@CheckForNull
81-
public Long getMemory();
81+
Long getMemory();
8282

8383
@CheckForNull
84-
public Long getMemswap();
84+
Long getMemswap();
8585

8686
@CheckForNull
87-
public String getCpushares();
87+
String getCpushares();
8888

8989
@CheckForNull
90-
public String getCpusetcpus();
90+
String getCpusetcpus();
9191

9292
/**
9393
* @since {@link RemoteApiVersion#VERSION_1_21}
9494
*/
9595
@CheckForNull
96-
public Map<String, String> getBuildArgs();
96+
Map<String, String> getBuildArgs();
9797

9898
// setters
9999

100-
public BuildImageCmd withTag(String tag);
100+
BuildImageCmd withTag(String tag);
101101

102-
public BuildImageCmd withRemote(URI remote);
102+
BuildImageCmd withRemote(URI remote);
103103

104-
public BuildImageCmd withBaseDirectory(File baseDirectory);
104+
BuildImageCmd withBaseDirectory(File baseDirectory);
105105

106-
public BuildImageCmd withDockerfile(File dockerfile);
106+
BuildImageCmd withDockerfile(File dockerfile);
107107

108-
public BuildImageCmd withNoCache(Boolean noCache);
108+
BuildImageCmd withNoCache(Boolean noCache);
109109

110-
public BuildImageCmd withRemove(Boolean rm);
110+
BuildImageCmd withRemove(Boolean rm);
111111

112-
public BuildImageCmd withForcerm(Boolean forcerm);
112+
BuildImageCmd withForcerm(Boolean forcerm);
113113

114-
public BuildImageCmd withQuiet(Boolean quiet);
114+
BuildImageCmd withQuiet(Boolean quiet);
115115

116-
public BuildImageCmd withPull(Boolean pull);
116+
BuildImageCmd withPull(Boolean pull);
117117

118-
public BuildImageCmd withMemory(Long memory);
118+
BuildImageCmd withMemory(Long memory);
119119

120-
public BuildImageCmd withMemswap(Long memswap);
120+
BuildImageCmd withMemswap(Long memswap);
121121

122-
public BuildImageCmd withCpushares(String cpushares);
122+
BuildImageCmd withCpushares(String cpushares);
123123

124-
public BuildImageCmd withCpusetcpus(String cpusetcpus);
124+
BuildImageCmd withCpusetcpus(String cpusetcpus);
125125

126126
/**
127127
* @since {@link RemoteApiVersion#VERSION_1_21}
128128
*/
129-
public BuildImageCmd withBuildArg(String key, String value);
129+
BuildImageCmd withBuildArg(String key, String value);
130130

131131
// setters lib specific
132132

133-
public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
133+
BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
134134

135-
public BuildImageCmd withTarInputStream(@Nonnull InputStream tarInputStream);
135+
BuildImageCmd withTarInputStream(@Nonnull InputStream tarInputStream);
136136

137-
public static interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
137+
interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
138138
}
139139

140140
}

0 commit comments

Comments
 (0)