Improve how ImageBuilder.build() handled HTTP 400 ("Bad Request")

Author: cowwoc

src/main/java/com/github/cowwoc/docker/internal/util/AsyncResponseListener.java

@@ -52,16 +52,16 @@ protected AsyncResponseListener(InternalClient client, BlockingQueue<Throwable>
 	}
 
 	/**
-	 * Processes a single JSON object returned by the server.
+	 * Processes a single non-empty line returned by the server.
 	 *
-	 * @param objectAsString the String representation of the JSON object
-	 * @throws NullPointerException if {@code objectAsString} is null
+	 * @param line the line
+	 * @throws NullPointerException if {@code line} is null
 	 */
-	protected void processObject(String objectAsString)
+	protected void processObject(String line)
 	{
 		try
 		{
-			JsonNode json = client.getJsonMapper().readTree(objectAsString);
+			JsonNode json = client.getJsonMapper().readTree(line);
 			JsonNode node = json.get("message");
 			if (node != null)
 			{
@@ -76,7 +76,6 @@ protected void processObject(String objectAsString)
 				warnOnUnexpectedProperties(json, "errorDetail", "error");
 				warnOnUnexpectedProperties(node, "code", "message");
 				String message = node.get("message").textValue();
-				log.error(message);
 				exceptions.add(new IOException(message));
 				return;
 			}
@@ -85,7 +84,6 @@ protected void processObject(String objectAsString)
 			{
 				warnOnUnexpectedProperties(json, "error");
 				String message = node.textValue();
-				log.error(message);
 				exceptions.add(new IOException(message));
 			}
 			processUnknownProperties(json);

src/main/java/com/github/cowwoc/docker/internal/util/ImageBuildListener.java

@@ -1,13 +1,15 @@
 package com.github.cowwoc.docker.internal.util;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.github.cowwoc.docker.exception.ResourceNotFoundException;
 import com.github.cowwoc.docker.internal.client.InternalClient;
 import org.eclipse.jetty.client.Response;
 import org.eclipse.jetty.client.Result;
 
 import java.io.IOException;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import static org.eclipse.jetty.http.HttpStatus.BAD_REQUEST_400;
 import static org.eclipse.jetty.http.HttpStatus.INTERNAL_SERVER_ERROR_500;
 import static org.eclipse.jetty.http.HttpStatus.OK_200;
 import static org.eclipse.jetty.util.BufferUtil.EMPTY_BUFFER;
@@ -38,8 +40,7 @@ protected void processUnknownProperties(JsonNode json)
 		if (node != null)
 		{
 			warnOnUnexpectedProperties(json, "stream");
-			linesToLog.append(node.textValue());
-			Strings.logLines(linesToLog, log);
+			log.info(node.textValue());
 			return;
 		}
 		node = json.get("aux");
@@ -72,14 +73,17 @@ public void onComplete(Result result)
 				exceptions.add(result.getResponseFailure());
 			decodeBytes(EMPTY_BUFFER, true);
 			processResponse(true);
-			if (!linesToLog.isEmpty())
-				log.info(linesToLog.toString());
 
 			// https://docs.docker.com/reference/api/engine/version/v1.47/#tag/Image/operation/ImageBuild
 			Response response = result.getResponse();
 			switch (response.getStatus())
 			{
 				case OK_200 -> processResponse(true);
+				case BAD_REQUEST_400 ->
+				{
+					JsonNode body = getResponseBody();
+					exceptions.add(new ResourceNotFoundException(body.get("message").textValue()));
+				}
 				case INTERNAL_SERVER_ERROR_500 -> exceptions.add(
 					new IOException("Unexpected response: " + responseAsString + "\n" +
 						"Request: " + client.toString(result.getRequest())));

src/main/java/com/github/cowwoc/docker/internal/util/ImageTransferListener.java

@@ -1,10 +1,8 @@
 package com.github.cowwoc.docker.internal.util;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.cowwoc.docker.exception.ResourceNotFoundException;
 import com.github.cowwoc.docker.internal.client.InternalClient;
-import com.github.cowwoc.pouch.core.WrappedCheckedException;
 import org.eclipse.jetty.client.Response;
 import org.eclipse.jetty.client.Result;
 
@@ -80,19 +78,4 @@ public void onComplete(Result result)
 			responseReady.countDown();
 		}
 	}
-
-	/**
-	 * @return the server response as JSON
-	 */
-	private JsonNode getResponseBody()
-	{
-		try
-		{
-			return client.getJsonMapper().readTree(responseAsString.toString());
-		}
-		catch (JsonProcessingException e)
-		{
-			throw WrappedCheckedException.wrap(e);
-		}
-	}
 }

src/main/java/com/github/cowwoc/docker/internal/util/JsonStreamListener.java

@@ -1,7 +1,9 @@
 package com.github.cowwoc.docker.internal.util;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.cowwoc.docker.internal.client.InternalClient;
+import com.github.cowwoc.pouch.core.WrappedCheckedException;
 import org.eclipse.jetty.client.Response;
 
 import java.nio.ByteBuffer;
@@ -38,10 +40,6 @@ public abstract class JsonStreamListener extends AsyncResponseListener
 	 * The time that the last message was logged.
 	 */
 	protected final AtomicReference<Instant> timeOfLastMessage = new AtomicReference<>(Instant.MIN);
-	/**
-	 * Lines of text that were returned by the server for logging by the client.
-	 */
-	protected final StringBuilder linesToLog = new StringBuilder();
 
 	/**
 	 * Creates a new instance.
@@ -136,8 +134,22 @@ protected void processStatus(JsonNode node)
 			// Only log the status if it's changed or PROGRESS_FREQUENCY has elapsed
 			lastMessage.set(message);
 			timeOfLastMessage.set(now);
-			linesToLog.append(message);
-			Strings.logLines(linesToLog, log);
+			log.info(message);
+		}
+	}
+
+	/**
+	 * @return the server response as JSON
+	 */
+	protected JsonNode getResponseBody()
+	{
+		try
+		{
+			return client.getJsonMapper().readTree(responseAsString.toString());
+		}
+		catch (JsonProcessingException e)
+		{
+			throw WrappedCheckedException.wrap(e);
 		}
 	}
 }

src/main/java/com/github/cowwoc/docker/internal/util/Strings.java

@@ -1,7 +1,5 @@
 package com.github.cowwoc.docker.internal.util;
 
-import org.slf4j.Logger;
-
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
@@ -31,51 +29,6 @@ public static String format(long value)
 		return FORMATTER.get().format(value);
 	}
 
-	/**
-	 * Logs lines, one at a time.
-	 *
-	 * @param lines zero or more lines of text
-	 * @param log   the logger to log to
-	 * @throws NullPointerException if any of the arguments are null
-	 */
-	public static void logLines(StringBuilder lines, Logger log)
-	{
-		while (true)
-		{
-			String line = nextLine(lines);
-			if (line.isEmpty())
-				return;
-			log.info(line);
-		}
-	}
-
-	/**
-	 * Removes the next line and returns it. If there is only one line left, this method does nothing and
-	 * returns an empty string.
-	 *
-	 * @param lines a {@code StringBuilder} that may contain multiple lines
-	 * @return an empty string if there is only one line left
-	 * @throws NullPointerException if {@code lines} is null
-	 */
-	private static String nextLine(StringBuilder lines)
-	{
-		int index = lines.indexOf("\n");
-		if (index != -1)
-		{
-			String line = lines.substring(0, index);
-			lines.delete(0, index + 2);
-			return line;
-		}
-		index = lines.indexOf("\n");
-		if (index != -1)
-		{
-			String line = lines.substring(0, index);
-			lines.delete(0, index + 1);
-			return line;
-		}
-		return "";
-	}
-
 	private Strings()
 	{
 	}