Rename withServerAddress to withRegistryAddress.

KostyaSha · KostyaSha · commit 01d432fc6529 · 2016-02-08T21:25:49.000+03:00
This is more correct as auth used only for pull/push operations.
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -63,7 +63,7 @@ public String getServerAddress() {
         return serverAddress;
     }
 
-    public AuthConfig withServerAddress(String serverAddress) {
+    public AuthConfig withRegistryAddres(String serverAddress) {
         this.serverAddress = serverAddress;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -112,7 +112,7 @@ public static AuthConfigFile loadConfig(File confFile) throws IOException {
                 AuthConfig authConfig = entry.getValue();
                 decodeAuth(authConfig.getAuth(), authConfig);
                 authConfig.withAuth(null);
-                authConfig.withServerAddress(entry.getKey());
+                authConfig.withRegistryAddres(entry.getKey());
                 configFile.addConfig(authConfig);
             }
         } else {
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -282,7 +282,7 @@ && getRegistryUrl() != null) {
                     .withUsername(getRegistryUsername())
                     .withPassword(getRegistryPassword())
                     .withEmail(getRegistryEmail())
-                    .withServerAddress(getRegistryUrl());
+                    .withRegistryAddres(getRegistryUrl());
         }
         return authConfig;
     }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -168,7 +168,7 @@ public AuthConfig authConfig() {
                 .withUsername(dockerClientConfig.getRegistryUsername())
                 .withPassword(dockerClientConfig.getRegistryPassword())
                 .withEmail(dockerClientConfig.getRegistryEmail())
-                .withServerAddress(dockerClientConfig.getRegistryUrl());
+                .withRegistryAddres(dockerClientConfig.getRegistryUrl());
     }
 
     /**
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -14,7 +14,7 @@ public void setUp() throws Exception {
         authConfig = new AuthConfig()
                 .withEmail("foo")
                 .withPassword("bar")
-                .withServerAddress("baz")
+                .withRegistryAddres("baz")
                 .withUsername("qux");
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java b/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
@@ -52,13 +52,13 @@ public void validJson() throws IOException {
                 .withEmail("foo@example.com")
                 .withUsername("foo")
                 .withPassword("bar")
-                .withServerAddress("quay.io");
+                .withRegistryAddres("quay.io");
 
         AuthConfig authConfig2 = new AuthConfig()
                 .withEmail("moo@example.com")
                 .withUsername("foo1")
                 .withPassword("bar1")
-                .withServerAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
+                .withRegistryAddres(AuthConfig.DEFAULT_SERVER_ADDRESS);
 
         AuthConfigFile expected = new AuthConfigFile();
         expected.addConfig(authConfig1);
@@ -74,7 +74,7 @@ public void validLegacy() throws IOException {
                 .withEmail("foo@example.com")
                 .withUsername("foo")
                 .withPassword("bar")
-                .withServerAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
+                .withRegistryAddres(AuthConfig.DEFAULT_SERVER_ADDRESS);
 
         AuthConfigFile expected = new AuthConfigFile();
         expected.addConfig(authConfig);
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -279,7 +279,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
                 .withUsername("testuser")
                 .withPassword("testpassword")
                 .withEmail("foo@bar.de")
-                .withServerAddress("localhost:5000");
+                .withRegistryAddres("localhost:5000");
 
         dockerClient.authCmd().withAuthConfig(authConfig).exec();
         dockerClient.tagImageCmd("busybox:latest", "localhost:5000/testuser/busybox", "latest").withForce().exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -271,7 +271,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
                 .withUsername("testuser")
                 .withPassword("testpassword")
                 .withEmail("foo@bar.de")
-                .withServerAddress("localhost:5000");
+                .withRegistryAddres("localhost:5000");
 
         dockerClient.authCmd().withAuthConfig(authConfig).exec();
         dockerClient.tagImageCmd("busybox:latest", "localhost:5000/testuser/busybox", "latest").withForce().exec();

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public String getServerAddress() {`
`63`	`63`	`return serverAddress;`
`64`	`64`	`}`
`65`	`65`
`66`		`- public AuthConfig withServerAddress(String serverAddress) {`
	`66`	`+ public AuthConfig withRegistryAddres(String serverAddress) {`
`67`	`67`	`this.serverAddress = serverAddress;`
`68`	`68`	`return this;`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public static AuthConfigFile loadConfig(File confFile) throws IOException {`
`112`	`112`	`AuthConfig authConfig = entry.getValue();`
`113`	`113`	`decodeAuth(authConfig.getAuth(), authConfig);`
`114`	`114`	`authConfig.withAuth(null);`
`115`		`- authConfig.withServerAddress(entry.getKey());`
	`115`	`+ authConfig.withRegistryAddres(entry.getKey());`
`116`	`116`	`configFile.addConfig(authConfig);`
`117`	`117`	`}`
`118`	`118`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ && getRegistryUrl() != null) {`
`282`	`282`	`.withUsername(getRegistryUsername())`
`283`	`283`	`.withPassword(getRegistryPassword())`
`284`	`284`	`.withEmail(getRegistryEmail())`
`285`		`- .withServerAddress(getRegistryUrl());`
	`285`	`+ .withRegistryAddres(getRegistryUrl());`
`286`	`286`	`}`
`287`	`287`	`return authConfig;`
`288`	`288`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public AuthConfig authConfig() {`
`168`	`168`	`.withUsername(dockerClientConfig.getRegistryUsername())`
`169`	`169`	`.withPassword(dockerClientConfig.getRegistryPassword())`
`170`	`170`	`.withEmail(dockerClientConfig.getRegistryEmail())`
`171`		`- .withServerAddress(dockerClientConfig.getRegistryUrl());`
	`171`	`+ .withRegistryAddres(dockerClientConfig.getRegistryUrl());`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public void setUp() throws Exception {`
`14`	`14`	`authConfig = new AuthConfig()`
`15`	`15`	`.withEmail("foo")`
`16`	`16`	`.withPassword("bar")`
`17`		`- .withServerAddress("baz")`
	`17`	`+ .withRegistryAddres("baz")`
`18`	`18`	`.withUsername("qux");`
`19`	`19`	`}`
`20`	`20`