Isse docker-java#62 Allow to configure versionless requests

Marcus Linke · Marcus Linke · commit 6d7d8bd34640 · 2014-09-24T21:18:45.000+02:00
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -80,10 +80,10 @@ public void init(DockerClientConfig dockerClientConfig) {
            
         WebTarget webResource = client.target(dockerClientConfig.getUri());
 
-        if (dockerClientConfig.getVersion() != null) {
-            baseResource = webResource.path("v" + dockerClientConfig.getVersion());
+        if (dockerClientConfig.getVersion() == null || dockerClientConfig.getVersion().isEmpty()) {
+        	baseResource = webResource; 
         } else {
-            baseResource = webResource;
+        	baseResource = webResource.path("v" + dockerClientConfig.getVersion());
         }
 		
 	}

Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,10 @@ public void init(DockerClientConfig dockerClientConfig) {`
`80`	`80`
`81`	`81`	`WebTarget webResource = client.target(dockerClientConfig.getUri());`
`82`	`82`
`83`		`- if (dockerClientConfig.getVersion() != null) {`
`84`		`- baseResource = webResource.path("v" + dockerClientConfig.getVersion());`
	`83`	`+ if (dockerClientConfig.getVersion() == null \|\| dockerClientConfig.getVersion().isEmpty()) {`
	`84`	`+ baseResource = webResource;`
`85`	`85`	`} else {`
`86`		`- baseResource = webResource;`
	`86`	`+ baseResource = webResource.path("v" + dockerClientConfig.getVersion());`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`}`