A few tweaks

Sean Fitts · Sean Fitts · commit 6a2110cd41a3 · 2014-07-03T17:38:59.000-07:00
Revert API version which was by accident

Fix bug in logging filter

Add extra check to test to avoid downstream issues
diff --git a/src/main/java/com/github/dockerjava/client/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/client/SelectiveLoggingFilter.java
@@ -29,8 +29,8 @@ public class SelectiveLoggingFilter extends LoggingFilter {
     public ClientResponse handle(ClientRequest request) throws ClientHandlerException {
         // Unless the content type is in the list of those we want to ellide, then just have
         // our super-class handle things.
-        MediaType contentType = (MediaType) request.getHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
-        if (SKIPPED_CONTENT.contains(contentType.toString())) {
+        Object contentType = request.getHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
+        if (contentType != null && SKIPPED_CONTENT.contains(contentType.toString())) {
             // Skip logging this.
             //
             // N.B. -- I'd actually love to reproduce (or better yet just use) the logging code from
diff --git a/src/main/java/com/github/dockerjava/client/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/client/command/AbstrDockerCmd.java
@@ -1,9 +1,14 @@
 package com.github.dockerjava.client.command;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.google.common.base.Preconditions;
 import com.sun.jersey.api.client.WebResource;
 
 public abstract class AbstrDockerCmd<T extends AbstrDockerCmd<T, RES_T>, RES_T> implements DockerCmd<RES_T> {
+    
+    private final static Logger LOGGER = LoggerFactory.getLogger(AbstrDockerCmd.class);
 
 	protected WebResource baseResource;
 
@@ -18,6 +23,7 @@ public T withBaseResource(WebResource baseResource) {
 	@Override
 	public RES_T exec() {
 		Preconditions.checkNotNull(baseResource, "baseResource was not specified");
+		LOGGER.debug("Cmd: {}", this);
 		return impl();
 	}
 }
diff --git a/src/main/resources/docker.io.properties b/src/main/resources/docker.io.properties
@@ -1,2 +1,2 @@
 docker.io.url=http://localhost:2375
-docker.io.version=1.12
+docker.io.version=1.11
diff --git a/src/test/java/com/github/dockerjava/client/command/BuildImageCmdTest.java b/src/test/java/com/github/dockerjava/client/command/BuildImageCmdTest.java
@@ -198,6 +198,7 @@ public void testNetCatDockerfileBuilder() throws DockerException,
 		ImageInspectResponse imageInspectResponse = dockerClient
 				.inspectImageCmd(imageId).exec();
 		assertThat(imageInspectResponse, not(nullValue()));
+		assertThat(imageInspectResponse.getId(), not(nullValue()));
 		LOG.info("Image Inspect: {}", imageInspectResponse.toString());
 		tmpImgs.add(imageInspectResponse.getId());
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`docker.io.url=http://localhost:2375`
`2`		`-docker.io.version=1.12`
	`2`	`+docker.io.version=1.11`