Code style/design for shmsize build option (API v1_22)

Alejandro Mousist · Alejandro Mousist · commit 8c7e12caf1d2 · 2016-03-30T23:10:04.000-03:00
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -95,8 +95,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     Map<String, String> getBuildArgs();
 
+    /**
+     *@since {@link RemoteApiVersion#VERSION_1_22}
+     */
     @CheckForNull
-    long getShmsize();
+    Long getShmsize();
 
     // setters
 
@@ -137,7 +140,10 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     BuildImageCmd withTarInputStream(@Nonnull InputStream tarInputStream);
 
-    BuildImageCmd withShmsize(long shmsize);
+    /**
+    *@since {@link RemoteApiVersion#VERSION_1_22}
+    */
+    BuildImageCmd withShmsize(Long shmsize);
 
     interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -50,7 +50,7 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private Long memswap;
 
-    private long shmsize;
+    private Long shmsize;
 
     private URI remote;
 
@@ -161,8 +161,11 @@ public InputStream getTarInputStream() {
         return tarInputStream;
     }
 
+    /**
+     * @see #shmsize
+     */
     @Override
-    public long getShmsize() {
+    public Long getShmsize() {
         return shmsize;
     }
 
@@ -291,8 +294,11 @@ public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
         return this;
     }
 
+    /**
+     * @see #shmsize
+     */
     @Override
-    public BuildImageCmd withShmsize(long shmsize) {
+    public BuildImageCmd withShmsize(Long shmsize) {
         this.shmsize = shmsize;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -108,7 +108,7 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             }
         }
 
-        if (command.getShmsize() != 0) {
+        if (command.getShmsize() != null) {
             webTarget = webTarget.queryParam("shmsize", command.getShmsize());
         }
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -93,7 +93,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             }
         }
 
-        if (command.getShmsize() != 0) {
+        if (command.getShmsize() != null) {
             webTarget = webTarget.queryParam("shmsize", command.getShmsize());
         }
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`- if (command.getShmsize() != 0) {`
	`111`	`+ if (command.getShmsize() != null) {`
`112`	`112`	`webTarget = webTarget.queryParam("shmsize", command.getShmsize());`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- if (command.getShmsize() != 0) {`
	`96`	`+ if (command.getShmsize() != null) {`
`97`	`97`	`webTarget = webTarget.queryParam("shmsize", command.getShmsize());`
`98`	`98`	`}`
`99`	`99`