docker-java · marcuslinke · Nov 5, 2015 · Aug 25, 2015 · Aug 26, 2015 · Aug 28, 2015
diff --git a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
@@ -20,5 +20,4 @@ public interface ResultCallback<A_RES_T> extends Closeable {
 
     /** Called when processing was finished either by reaching the end or by aborting it */
     void onComplete();
-
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -2,6 +2,9 @@
 
 import java.io.InputStream;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Frame;
 
@@ -22,45 +25,40 @@
  */
 public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, Frame> {
 
+    @CheckForNull
     public String getContainerId();
 
-    public boolean hasLogsEnabled();
-
-    public boolean hasFollowStreamEnabled();
+    @CheckForNull
+    public Boolean hasLogsEnabled();
 
-    public boolean hasTimestampsEnabled();
+    @CheckForNull
+    public Boolean hasFollowStreamEnabled();
 
-    public boolean hasStdoutEnabled();
+    @CheckForNull
+    public Boolean hasTimestampsEnabled();
 
-    public boolean hasStderrEnabled();
+    @CheckForNull
+    public Boolean hasStdoutEnabled();
 
-    public AttachContainerCmd withContainerId(String containerId);
+    @CheckForNull
+    public Boolean hasStderrEnabled();
 
-    /**
-     * See {@link #withFollowStream(boolean)}
-     */
-    public AttachContainerCmd withFollowStream();
+    public AttachContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
      * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to
      * {@link DockerClient}!
      */
-    public AttachContainerCmd withFollowStream(boolean followStream);
-
-    public AttachContainerCmd withTimestamps(boolean timestamps);
-
-    public AttachContainerCmd withStdOut();
-
-    public AttachContainerCmd withStdOut(boolean stdout);
+    public AttachContainerCmd withFollowStream(Boolean followStream);
 
-    public AttachContainerCmd withStdErr();
+    public AttachContainerCmd withTimestamps(Boolean timestamps);
 
-    public AttachContainerCmd withStdErr(boolean stderr);
+    public AttachContainerCmd withStdOut(Boolean stdout);
 
-    public AttachContainerCmd withLogs(boolean logs);
+    public AttachContainerCmd withStdErr(Boolean stderr);
 
-    public AttachContainerCmd withLogs();
+    public AttachContainerCmd withLogs(Boolean logs);
 
     public static interface Exec extends DockerCmdAsyncExec<AttachContainerCmd, Frame> {
     }

diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.UnauthorizedException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthResponse;
@@ -11,9 +14,10 @@
  */
 public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
 
+    @CheckForNull
     public AuthConfig getAuthConfig();
 
-    public AuthCmd withAuthConfig(AuthConfig authConfig);
+    public AuthCmd withAuthConfig(@Nonnull AuthConfig authConfig);
 
     /**
      * @return The status. Based on it's value you may mean you need to authorise your account, e.g.:

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -4,6 +4,8 @@
 import com.github.dockerjava.api.model.BuildResponseItem;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import java.io.File;
 import java.io.InputStream;
 import java.net.URI;
@@ -20,8 +22,10 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     // lib specific
 
+    @CheckForNull
     public InputStream getTarInputStream();
 
+    @CheckForNull
     public AuthConfigurations getBuildAuthConfigs();
 
     // getters
@@ -41,30 +45,32 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     /**
      * "nocache" in API
      */
-    public boolean hasNoCacheEnabled();
+    @CheckForNull
+    public Boolean hasNoCacheEnabled();
 
     /**
      * "rm" in API
      */
-    public boolean hasRemoveEnabled();
+    @CheckForNull
+    public Boolean hasRemoveEnabled();
 
     /**
      * "forcerm" in API
      */
-    public boolean isForcerm();
-
     @CheckForNull
-    public Boolean getForcerm();
+    public Boolean isForcerm();
 
     /**
      * "q" in API
      */
-    public boolean isQuiet();
+    @CheckForNull
+    public Boolean isQuiet();
 
     /**
      * "pull" in API
      */
-    public boolean hasPullEnabled();
+    @CheckForNull
+    public Boolean hasPullEnabled();
 
     @CheckForNull
     public String getPathToDockerfile();
@@ -91,29 +97,19 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withDockerfile(File dockerfile);
 
-    public BuildImageCmd withNoCache();
-
-    public BuildImageCmd withNoCache(boolean noCache);
-
-    public BuildImageCmd withRemove();
+    public BuildImageCmd withNoCache(Boolean noCache);
 
-    public BuildImageCmd withRemove(boolean rm);
-
-    public BuildImageCmd withForcerm();
+    public BuildImageCmd withRemove(Boolean rm);
 
     public BuildImageCmd withForcerm(Boolean forcerm);
 
-    public BuildImageCmd withQuiet();
-
-    public BuildImageCmd withQuiet(boolean quiet);
-
-    public BuildImageCmd withPull();
+    public BuildImageCmd withQuiet(Boolean quiet);
 
-    public BuildImageCmd withPull(boolean pull);
+    public BuildImageCmd withPull(Boolean pull);
 
-    public BuildImageCmd withMemory(long memory);
+    public BuildImageCmd withMemory(Long memory);
 
-    public BuildImageCmd withMemswap(long memswap);
+    public BuildImageCmd withMemswap(Long memswap);
 
     public BuildImageCmd withCpushares(String cpushares);
 
@@ -123,7 +119,7 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
 
-    public BuildImageCmd withTarInputStream(InputStream tarInputStream);
+    public BuildImageCmd withTarInputStream(@Nonnull InputStream tarInputStream);
 
     public static interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }

diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.Volumes;
@@ -11,96 +14,104 @@
  */
 public interface CommitCmd extends SyncDockerCmd<String> {
 
+    @CheckForNull
+    public String getAuthor();
+
+    @CheckForNull
     public String getContainerId();
 
-    public CommitCmd withContainerId(String containerId);
+    @CheckForNull
+    public String[] getEnv();
 
-    public String getRepository();
+    @CheckForNull
+    public ExposedPorts getExposedPorts();
 
-    public String getTag();
+    @CheckForNull
+    public String getHostname();
+
+    @CheckForNull
+    public Integer getMemory();
 
+    @CheckForNull
+    public Integer getMemorySwap();
+
+    @CheckForNull
     public String getMessage();
 
-    public String getAuthor();
+    @CheckForNull
+    public String[] getPortSpecs();
 
-    public boolean hasPauseEnabled();
+    @CheckForNull
+    public String getRepository();
 
-    public CommitCmd withAttachStderr(boolean attachStderr);
+    @CheckForNull
+    public String getTag();
 
-    public CommitCmd withAttachStderr();
+    @CheckForNull
+    public String getUser();
 
-    public CommitCmd withAttachStdin(boolean attachStdin);
+    @CheckForNull
+    public Volumes getVolumes();
 
-    public CommitCmd withAttachStdin();
+    @CheckForNull
+    public String getWorkingDir();
 
-    public CommitCmd withAttachStdout(boolean attachStdout);
+    @CheckForNull
+    public Boolean hasPauseEnabled();
 
-    public CommitCmd withAttachStdout();
+    @CheckForNull
+    public Boolean isOpenStdin();
 
-    public CommitCmd withCmd(String... cmd);
+    @CheckForNull
+    public Boolean isStdinOnce();
 
-    public CommitCmd withDisableNetwork(boolean disableNetwork);
+    @CheckForNull
+    public Boolean isTty();
 
-    public CommitCmd withAuthor(String author);
+    public CommitCmd withAttachStderr(Boolean attachStderr);
 
-    public CommitCmd withMessage(String message);
+    public CommitCmd withAttachStdin(Boolean attachStdin);
 
-    public CommitCmd withTag(String tag);
+    public CommitCmd withAttachStdout(Boolean attachStdout);
 
-    public CommitCmd withRepository(String repository);
+    public CommitCmd withAuthor(String author);
 
-    public CommitCmd withPause(boolean pause);
+    public CommitCmd withCmd(String... cmd);
 
-    public String[] getEnv();
+    public CommitCmd withContainerId(@Nonnull String containerId);
 
-    public CommitCmd withEnv(String... env);
+    public CommitCmd withDisableNetwork(Boolean disableNetwork);
 
-    public ExposedPorts getExposedPorts();
+    public CommitCmd withEnv(String... env);
 
     public CommitCmd withExposedPorts(ExposedPorts exposedPorts);
 
-    public String getHostname();
-
     public CommitCmd withHostname(String hostname);
 
-    public Integer getMemory();
-
     public CommitCmd withMemory(Integer memory);
 
-    public Integer getMemorySwap();
-
     public CommitCmd withMemorySwap(Integer memorySwap);
 
-    public boolean isOpenStdin();
+    public CommitCmd withMessage(String message);
 
-    public CommitCmd withOpenStdin(boolean openStdin);
+    public CommitCmd withOpenStdin(Boolean openStdin);
 
-    public String[] getPortSpecs();
+    public CommitCmd withPause(Boolean pause);
 
     public CommitCmd withPortSpecs(String... portSpecs);
 
-    public boolean isStdinOnce();
-
-    public CommitCmd withStdinOnce(boolean stdinOnce);
-
-    public CommitCmd withStdinOnce();
-
-    public boolean isTty();
+    public CommitCmd withRepository(String repository);
 
-    public CommitCmd withTty(boolean tty);
+    public CommitCmd withStdinOnce(Boolean stdinOnce);
 
-    public CommitCmd withTty();
+    public CommitCmd withTag(String tag);
 
-    public String getUser();
+    public CommitCmd withTty(Boolean tty);
 
     public CommitCmd withUser(String user);
 
-    public Volumes getVolumes();
-
     public CommitCmd withVolumes(Volumes volumes);
 
-    public String getWorkingDir();
-
     public CommitCmd withWorkingDir(String workingDir);
 
     /**
@@ -112,5 +123,4 @@ public interface CommitCmd extends SyncDockerCmd<String> {
 
     public static interface Exec extends DockerCmdSyncExec<CommitCmd, String> {
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
@@ -2,16 +2,20 @@
 
 import java.util.List;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.InternalServerErrorException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.ChangeLog;
 
 public interface ContainerDiffCmd extends SyncDockerCmd<List<ChangeLog>> {
 
+    @CheckForNull
     public String getContainerId();
 
-    public ContainerDiffCmd withContainerId(String containerId);
+    public ContainerDiffCmd withContainerId(@Nonnull String containerId);
 
     @Override
     public String toString();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,5 +20,4 @@ public interface ResultCallback<A_RES_T> extends Closeable {

		/** Called when processing was finished either by reaching the end or by aborting it */
		void onComplete();

		}