Normalize the authConfig handling in the different commands

fbuecklers · fbuecklers · commit 5139cd84647a · 2017-11-18T17:27:27.000+01:00
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,12 +1,11 @@
 package com.github.dockerjava.api.command;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
 import com.github.dockerjava.api.exception.UnauthorizedException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthResponse;
 
+import javax.annotation.CheckForNull;
+
 /**
  *
  * Authenticate with the server, useful for checking authentication.
@@ -17,7 +16,7 @@ public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
     @CheckForNull
     AuthConfig getAuthConfig();
 
-    AuthCmd withAuthConfig(@Nonnull AuthConfig authConfig);
+    AuthCmd withAuthConfig(AuthConfig authConfig);
 
     /**
      * @return The status. Based on it's value you may mean you need to authorise your account, e.g.: "Account created. Please see the
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -24,6 +24,7 @@
 
 public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
+    @CheckForNull
     AuthConfig getAuthConfig();
 
     @CheckForNull
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.api.command;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 /**
  *
  * Pull image from repository.
@@ -22,6 +22,7 @@ public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseI
     @CheckForNull
     String getRegistry();
 
+    @CheckForNull
     AuthConfig getAuthConfig();
 
     PullImageCmd withRepository(@Nonnull String repository);
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -238,12 +238,8 @@ public PullImageCmd pullImageCmd(String repository) {
 
     @Override
     public PushImageCmd pushImageCmd(String name) {
-        PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(), name);
-
-        AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(name);
-        if (cfg != null) {
-            cmd.withAuthConfig(cfg);
-        }
+        PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(),
+                dockerClientConfig.effectiveAuthConfig(name), name);
         return cmd;
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
diff --git a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
@@ -10,7 +10,9 @@
  * Authenticate with the server, useful for checking authentication.
  *
  */
-public class AuthCmdImpl extends AbstrAuthCfgDockerCmd<AuthCmd, AuthResponse> implements AuthCmd {
+public class AuthCmdImpl extends AbstrDockerCmd<AuthCmd, AuthResponse> implements AuthCmd {
+
+    private AuthConfig authConfig;
 
     public AuthCmdImpl(AuthCmd.Exec exec, AuthConfig authConfig) {
         super(exec);
@@ -21,4 +23,13 @@ public AuthCmdImpl(AuthCmd.Exec exec, AuthConfig authConfig) {
     public AuthResponse exec() throws UnauthorizedException {
         return super.exec();
     }
+
+    public AuthConfig getAuthConfig() {
+        return authConfig;
+    }
+
+    public AuthCmd withAuthConfig(AuthConfig authConfig) {
+        this.authConfig = authConfig;
+        return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -133,7 +133,7 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, AuthConfig authConfig, String image) {
         super(exec);
         checkNotNull(image, "image was not specified");
-        withOptionalAuthConfig(authConfig);
+        withAuthConfig(authConfig);
         withImage(image);
     }
 
@@ -142,11 +142,6 @@ public AuthConfig getAuthConfig() {
     }
 
     public CreateContainerCmd withAuthConfig(AuthConfig authConfig) {
-        checkNotNull(authConfig, "authConfig was not specified");
-        return withOptionalAuthConfig(authConfig);
-    }
-
-    private CreateContainerCmd withOptionalAuthConfig(AuthConfig authConfig) {
         this.authConfig = authConfig;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  *
  * Pull image from repository.
@@ -19,7 +19,7 @@ public class PullImageCmdImpl extends AbstrAsyncDockerCmd<PullImageCmd, PullResp
 
     public PullImageCmdImpl(PullImageCmd.Exec exec, AuthConfig authConfig, String repository) {
         super(exec);
-        withOptionalAuthConfig(authConfig);
+        withAuthConfig(authConfig);
         withRepository(repository);
     }
 
@@ -28,11 +28,6 @@ public AuthConfig getAuthConfig() {
     }
 
     public PullImageCmd withAuthConfig(AuthConfig authConfig) {
-        checkNotNull(authConfig, "authConfig was not specified");
-        return withOptionalAuthConfig(authConfig);
-    }
-
-    private PullImageCmd withOptionalAuthConfig(AuthConfig authConfig) {
         this.authConfig = authConfig;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
@@ -20,9 +20,10 @@ public class PushImageCmdImpl extends AbstrAsyncDockerCmd<PushImageCmd, PushResp
 
     private AuthConfig authConfig;
 
-    public PushImageCmdImpl(PushImageCmd.Exec exec, String name) {
+    public PushImageCmdImpl(PushImageCmd.Exec exec, AuthConfig authConfig, String name) {
         super(exec);
         withName(name);
+        withAuthConfig(authConfig);
     }
 
     @Override
@@ -62,13 +63,7 @@ public AuthConfig getAuthConfig() {
     }
 
     public PushImageCmd withAuthConfig(AuthConfig authConfig) {
-        checkNotNull(authConfig, "authConfig was not specified");
-        return withOptionalAuthConfig(authConfig);
-    }
-
-    private PushImageCmd withOptionalAuthConfig(AuthConfig authConfig) {
         this.authConfig = authConfig;
         return this;
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C`
`133`	`133`	`public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, AuthConfig authConfig, String image) {`
`134`	`134`	`super(exec);`
`135`	`135`	`checkNotNull(image, "image was not specified");`
`136`		`- withOptionalAuthConfig(authConfig);`
	`136`	`+ withAuthConfig(authConfig);`
`137`	`137`	`withImage(image);`
`138`	`138`	`}`
`139`	`139`
`@@ -142,11 +142,6 @@ public AuthConfig getAuthConfig() {`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`public CreateContainerCmd withAuthConfig(AuthConfig authConfig) {`
`145`		`- checkNotNull(authConfig, "authConfig was not specified");`
`146`		`- return withOptionalAuthConfig(authConfig);`
`147`		`- }`
`148`		`-`
`149`		`- private CreateContainerCmd withOptionalAuthConfig(AuthConfig authConfig) {`
`150`	`145`	`this.authConfig = authConfig;`
`151`	`146`	`return this;`
`152`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,10 @@ public class PushImageCmdImpl extends AbstrAsyncDockerCmd<PushImageCmd, PushResp`
`20`	`20`
`21`	`21`	`private AuthConfig authConfig;`
`22`	`22`
`23`		`- public PushImageCmdImpl(PushImageCmd.Exec exec, String name) {`
	`23`	`+ public PushImageCmdImpl(PushImageCmd.Exec exec, AuthConfig authConfig, String name) {`
`24`	`24`	`super(exec);`
`25`	`25`	`withName(name);`
	`26`	`+ withAuthConfig(authConfig);`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`@Override`
`@@ -62,13 +63,7 @@ public AuthConfig getAuthConfig() {`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`public PushImageCmd withAuthConfig(AuthConfig authConfig) {`
`65`		`- checkNotNull(authConfig, "authConfig was not specified");`
`66`		`- return withOptionalAuthConfig(authConfig);`
`67`		`- }`
`68`		`-`
`69`		`- private PushImageCmd withOptionalAuthConfig(AuthConfig authConfig) {`
`70`	`66`	`this.authConfig = authConfig;`
`71`	`67`	`return this;`
`72`	`68`	`}`
`73`		`-`
`74`	`69`	`}`