From 286731aed44f45d0fd6171bfd66b1febafbd540c Mon Sep 17 00:00:00 2001 From: Marcus Thiesen Date: Thu, 28 Jan 2016 20:09:06 +0100 Subject: [PATCH] Add aux to ResponseItem for API 1.22 As mentioned in Issue #437 --- .../dockerjava/api/model/ResponseItem.java | 61 ++++++++++++++++--- 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java index 586a49d63..f2f5cb3e4 100644 --- a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java +++ b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java @@ -1,15 +1,14 @@ package com.github.dockerjava.api.model; -import java.io.Serializable; - -import javax.annotation.CheckForNull; - -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import com.github.dockerjava.core.RemoteApiVersion; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + +import javax.annotation.CheckForNull; +import java.io.Serializable; /** * Represents a pull response stream item @@ -48,6 +47,9 @@ public class ResponseItem implements Serializable { @JsonProperty("error") private String error; + @JsonProperty("aux") + private AuxDetail aux; + @CheckForNull public String getStream() { return stream; @@ -94,6 +96,17 @@ public String getError() { return error; } + /** + * Final information about a push + * + * @since {@link RemoteApiVersion#VERSION_1_22} + * @return + */ + @CheckForNull + public AuxDetail getAux() { + return aux; + } + /** * Returns whether the error field indicates an error * @@ -165,6 +178,40 @@ public String toString() { } } + @JsonIgnoreProperties(ignoreUnknown = true) + public static class AuxDetail implements Serializable { + private static final long serialVersionUID = -9136704865403084084L; + + @JsonProperty("Size") + Integer size; + + @JsonProperty("Tag") + String tag; + + @JsonProperty("Digest") + String digest; + + @CheckForNull + public Integer getSize() { + return size; + } + + @CheckForNull + public String getTag() { + return tag; + } + + @CheckForNull + public String getDigest() { + return digest; + } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString(); + } + } + @Override public String toString() { return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();