Skip to content

Commit 97579e5

Browse files
belugabehreddumelendez
belugabehr
and
eddumelendez
authored
Use JDK Objects requireNonNull over Guava checkNotNull (#1981)
Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
1 parent 7ce35f4 commit 97579e5

File tree

71 files changed

+271
-389
lines changed

Some content is hidden

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

71 files changed

+271
-389
lines changed

‎docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java‎

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

3+
import java.util.Objects;
4+
35
import com.github.dockerjava.api.command.AttachContainerCmd;
46
import com.github.dockerjava.api.command.AuthCmd;
57
import com.github.dockerjava.api.command.BuildImageCmd;
@@ -160,8 +162,6 @@
160162
import com.github.dockerjava.core.exec.VersionCmdExec;
161163
import com.github.dockerjava.core.exec.WaitContainerCmdExec;
162164

163-
import static com.google.common.base.Preconditions.checkNotNull;
164-
165165
public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware {
166166

167167
private DockerClientConfig dockerClientConfig;
@@ -170,15 +170,14 @@ public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFacto
170170
protected Integer readTimeout;
171171

172172
protected DockerClientConfig getDockerClientConfig() {
173-
checkNotNull(dockerClientConfig,
173+
Objects.requireNonNull(dockerClientConfig,
174174
"Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
175175
return dockerClientConfig;
176176
}
177177

178178
@Override
179179
public void init(DockerClientConfig dockerClientConfig) {
180-
checkNotNull(dockerClientConfig, "config was not specified");
181-
this.dockerClientConfig = dockerClientConfig;
180+
this.dockerClientConfig = Objects.requireNonNull(dockerClientConfig, "config was not specified");
182181
}
183182

184183
@Override

‎docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import java.net.URI;
2424
import java.util.HashSet;
2525
import java.util.Map;
26+
import java.util.Objects;
2627
import java.util.Properties;
2728
import java.util.Set;
2829

29-
import static com.google.common.base.Preconditions.checkNotNull;
3030
import static org.apache.commons.lang3.BooleanUtils.isTrue;
3131

3232
/**
@@ -362,7 +362,7 @@ public Builder withProperties(Properties p) {
362362
* configure DOCKER_HOST
363363
*/
364364
public final Builder withDockerHost(String dockerHost) {
365-
checkNotNull(dockerHost, "uri was not specified");
365+
Objects.requireNonNull(dockerHost, "uri was not specified");
366366
this.dockerHost = URI.create(dockerHost);
367367
return this;
368368
}

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@
172172
import java.io.File;
173173
import java.io.IOException;
174174
import java.io.InputStream;
175-
176-
import static com.google.common.base.Preconditions.checkNotNull;
175+
import java.util.Objects;
177176

178177
/**
179178
* @author Konstantin Pelykh (kpelykh@gmail.com)
@@ -186,8 +185,7 @@ public class DockerClientImpl implements Closeable, DockerClient {
186185
DockerCmdExecFactory dockerCmdExecFactory;
187186

188187
DockerClientImpl(DockerClientConfig dockerClientConfig) {
189-
checkNotNull(dockerClientConfig, "config was not specified");
190-
this.dockerClientConfig = dockerClientConfig;
188+
this.dockerClientConfig = Objects.requireNonNull(dockerClientConfig, "config was not specified");
191189
}
192190

193191
/**
@@ -248,7 +246,7 @@ public DockerHttpClient getHttpClient() {
248246
*/
249247
@Deprecated
250248
public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
251-
checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
249+
Objects.requireNonNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
252250
this.dockerCmdExecFactory = dockerCmdExecFactory;
253251
if (dockerCmdExecFactory instanceof DockerClientConfigAware) {
254252
((DockerClientConfigAware) dockerCmdExecFactory).init(dockerClientConfig);
@@ -258,14 +256,14 @@ public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdE
258256

259257
@Deprecated
260258
private DockerCmdExecFactory getDockerCmdExecFactory() {
261-
checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
259+
Objects.requireNonNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
262260
return dockerCmdExecFactory;
263261
}
264262

265263
@Override
266264
public AuthConfig authConfig() {
267-
checkNotNull(dockerClientConfig.getRegistryUsername(), "Configured username is null.");
268-
checkNotNull(dockerClientConfig.getRegistryUrl(), "Configured serverAddress is null.");
265+
Objects.requireNonNull(dockerClientConfig.getRegistryUsername(), "Configured username is null.");
266+
Objects.requireNonNull(dockerClientConfig.getRegistryUrl(), "Configured serverAddress is null.");
269267

270268
return new AuthConfig()
271269
.withUsername(dockerClientConfig.getRegistryUsername())

‎docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java‎

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

3-
import static com.google.common.base.Preconditions.checkNotNull;
4-
53
import java.io.File;
64
import java.io.FileInputStream;
75
import java.io.IOException;
@@ -14,6 +12,7 @@
1412
import java.security.UnrecoverableKeyException;
1513
import java.security.cert.CertificateException;
1614
import java.security.cert.X509Certificate;
15+
import java.util.Objects;
1716

1817
import javax.net.ssl.KeyManagerFactory;
1918
import javax.net.ssl.SSLContext;
@@ -37,8 +36,7 @@ public class KeystoreSSLConfig implements SSLConfig, Serializable {
3736
*/
3837
public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) {
3938
this.keystorePassword = keystorePassword;
40-
checkNotNull(keystore);
41-
this.keystore = keystore;
39+
this.keystore = Objects.requireNonNull(keystore);
4240
}
4341

4442
/**
@@ -54,8 +52,8 @@ public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) {
5452
*/
5553
public KeystoreSSLConfig(File pfxFile, String password) throws KeyStoreException, IOException,
5654
CertificateException, NoSuchAlgorithmException {
57-
checkNotNull(pfxFile);
58-
checkNotNull(password);
55+
Objects.requireNonNull(pfxFile);
56+
Objects.requireNonNull(password);
5957
keystore = KeyStore.getInstance("pkcs12");
6058
try (FileInputStream fs = new FileInputStream(pfxFile)) {
6159
keystore.load(fs, password.toCharArray());

‎docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package com.github.dockerjava.core;
22

3-
import static com.google.common.base.Preconditions.checkNotNull;
4-
53
import java.io.File;
64
import java.io.Serializable;
75
import java.nio.file.Files;
86
import java.nio.file.Paths;
97
import java.security.AccessController;
108
import java.security.PrivilegedAction;
119
import java.security.Security;
10+
import java.util.Objects;
1211

1312
import javax.net.ssl.KeyManagerFactory;
1413
import javax.net.ssl.SSLContext;
@@ -29,8 +28,7 @@ public class LocalDirectorySSLConfig implements SSLConfig, Serializable {
2928
private final String dockerCertPath;
3029

3130
public LocalDirectorySSLConfig(String dockerCertPath) {
32-
checkNotNull(dockerCertPath);
33-
this.dockerCertPath = dockerCertPath;
31+
this.dockerCertPath = Objects.requireNonNull(dockerCertPath);
3432
}
3533

3634
public String getDockerCertPath() {

‎docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.dockerjava.core.command;
22

3-
import static com.google.common.base.Preconditions.checkNotNull;
3+
import java.util.Objects;
44

55
import com.github.dockerjava.api.async.ResultCallback;
66
import com.github.dockerjava.api.command.AsyncDockerCmd;
@@ -12,8 +12,7 @@ public abstract class AbstrAsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_
1212
protected transient DockerCmdAsyncExec<CMD_T, A_RES_T> execution;
1313

1414
public AbstrAsyncDockerCmd(DockerCmdAsyncExec<CMD_T, A_RES_T> execution) {
15-
checkNotNull(execution, "execution was not specified");
16-
this.execution = execution;
15+
this.execution = Objects.requireNonNull(execution, "execution was not specified");
1716
}
1817

1918
@Override

‎docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.github.dockerjava.core.command;
22

3-
import static com.google.common.base.Preconditions.checkNotNull;
4-
53
import java.io.IOException;
64
import java.util.Base64;
5+
import java.util.Objects;
76

87
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
98
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -24,8 +23,7 @@ public abstract class AbstrDockerCmd<CMD_T extends DockerCmd<RES_T>, RES_T> impl
2423
protected transient DockerCmdSyncExec<CMD_T, RES_T> execution;
2524

2625
public AbstrDockerCmd(DockerCmdSyncExec<CMD_T, RES_T> execution) {
27-
checkNotNull(execution, "execution was not specified");
28-
this.execution = execution;
26+
this.execution = Objects.requireNonNull(execution, "execution was not specified");
2927
}
3028

3129
@Override

‎docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java‎

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

3-
import static com.google.common.base.Preconditions.checkNotNull;
4-
53
import java.io.InputStream;
4+
import java.util.Objects;
65

76
import com.github.dockerjava.api.command.AttachContainerCmd;
87
import com.github.dockerjava.api.model.Frame;
@@ -61,7 +60,7 @@ public InputStream getStdin() {
6160

6261
@Override
6362
public AttachContainerCmd withContainerId(String containerId) {
64-
checkNotNull(containerId, "containerId was not specified");
63+
Objects.requireNonNull(containerId, "containerId was not specified");
6564
this.containerId = containerId;
6665
return this;
6766
}
@@ -92,8 +91,7 @@ public AttachContainerCmd withStdErr(Boolean stderr) {
9291

9392
@Override
9493
public AttachContainerCmd withStdIn(InputStream stdin) {
95-
checkNotNull(stdin, "stdin was not specified");
96-
this.stdin = stdin;
94+
this.stdin = Objects.requireNonNull(stdin, "stdin was not specified");
9795
return this;
9896
}
9997

‎docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
import java.net.URI;
1414
import java.util.HashMap;
1515
import java.util.Map;
16+
import java.util.Objects;
1617
import java.util.Set;
1718

18-
import static com.google.common.base.Preconditions.checkNotNull;
19-
2019
/**
2120
* Build an image from Dockerfile.
2221
*/
@@ -79,7 +78,7 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
7978

8079
public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) {
8180
super(exec);
82-
checkNotNull(dockerFileOrFolder, "dockerFolder is null");
81+
Objects.requireNonNull(dockerFileOrFolder, "dockerFolder is null");
8382

8483
if (dockerFileOrFolder.isDirectory()) {
8584
withBaseDirectory(dockerFileOrFolder);
@@ -91,7 +90,7 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) {
9190

9291
public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
9392
super(exec);
94-
checkNotNull(tarInputStream, "tarInputStream is null");
93+
Objects.requireNonNull(tarInputStream, "tarInputStream is null");
9594
withTarInputStream(tarInputStream);
9695
}
9796

@@ -232,8 +231,7 @@ public Set<String> getExtraHosts() {
232231
@Deprecated
233232
@Override
234233
public BuildImageCmdImpl withTag(String tag) {
235-
checkNotNull(tag, "Tag is null");
236-
this.tag = tag;
234+
this.tag = Objects.requireNonNull(tag, "Tag is null");
237235
return this;
238236
}
239237

@@ -328,7 +326,7 @@ public BuildImageCmd withBaseDirectory(File baseDirectory) {
328326

329327
@Override
330328
public BuildImageCmdImpl withDockerfile(File dockerfile) {
331-
checkNotNull(dockerfile);
329+
Objects.requireNonNull(dockerfile);
332330
if (!dockerfile.exists()) {
333331
throw new IllegalArgumentException("Dockerfile does not exist");
334332
}
@@ -353,22 +351,19 @@ public BuildImageCmdImpl withDockerfile(File dockerfile) {
353351

354352
@Override
355353
public BuildImageCmd withDockerfilePath(String dockerfilePath) {
356-
checkNotNull(dockerfilePath, "dockerfilePath is null");
357-
this.dockerFilePath = dockerfilePath;
354+
this.dockerFilePath = Objects.requireNonNull(dockerfilePath, "dockerfilePath is null");
358355
return this;
359356
}
360357

361358
@Override
362359
public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
363-
checkNotNull(tarInputStream, "tarInputStream is null");
364-
this.tarInputStream = tarInputStream;
360+
this.tarInputStream = Objects.requireNonNull(tarInputStream, "tarInputStream is null");
365361
return this;
366362
}
367363

368364
@Override
369365
public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
370-
checkNotNull(authConfigs, "authConfig is null");
371-
this.buildAuthConfigs = authConfigs;
366+
this.buildAuthConfigs = Objects.requireNonNull(authConfigs, "authConfig is null");
372367
return this;
373368
}
374369

0 commit comments

Comments
 (0)