Skip to content

Commit 8a27a63

Browse files
Marcus ThiesenKostyaSha
authored andcommitted
Add aux to ResponseItem for API 1.22
As mentioned in Issue docker-java#437 Signed-off-by: Kanstantsin Shautsou <[email protected]>
1 parent 1cf2a46 commit 8a27a63

1 file changed

Lines changed: 57 additions & 10 deletions

File tree

src/main/java/com/github/dockerjava/api/model/ResponseItem.java

Lines changed: 57 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package com.github.dockerjava.api.model;
22

3-
import java.io.Serializable;
4-
5-
import javax.annotation.CheckForNull;
6-
7-
import org.apache.commons.lang.builder.ToStringBuilder;
8-
import org.apache.commons.lang.builder.ToStringStyle;
9-
103
import com.fasterxml.jackson.annotation.JsonIgnore;
114
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
125
import com.fasterxml.jackson.annotation.JsonProperty;
6+
import com.github.dockerjava.core.RemoteApiVersion;
7+
import org.apache.commons.lang.builder.ToStringBuilder;
8+
import org.apache.commons.lang.builder.ToStringStyle;
9+
10+
import javax.annotation.CheckForNull;
11+
import java.io.Serializable;
1312

1413
/**
1514
* Represents a pull response stream item
@@ -48,6 +47,12 @@ public class ResponseItem implements Serializable {
4847
@JsonProperty("error")
4948
private String error;
5049

50+
/**
51+
* @since {@link RemoteApiVersion#VERSION_1_22}
52+
*/
53+
@JsonProperty("aux")
54+
private AuxDetail aux;
55+
5156
@CheckForNull
5257
public String getStream() {
5358
return stream;
@@ -94,6 +99,14 @@ public String getError() {
9499
return error;
95100
}
96101

102+
/**
103+
* @see #aux
104+
*/
105+
@CheckForNull
106+
public AuxDetail getAux() {
107+
return aux;
108+
}
109+
97110
/**
98111
* Returns whether the error field indicates an error
99112
*
@@ -135,7 +148,7 @@ public Long getStart() {
135148

136149
@Override
137150
public String toString() {
138-
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
151+
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
139152
}
140153
}
141154

@@ -161,12 +174,46 @@ public String getMessage() {
161174

162175
@Override
163176
public String toString() {
164-
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
177+
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
178+
}
179+
}
180+
181+
@JsonIgnoreProperties(ignoreUnknown = true)
182+
public static class AuxDetail implements Serializable {
183+
private static final long serialVersionUID = 1L;
184+
185+
@JsonProperty("Size")
186+
private Integer size;
187+
188+
@JsonProperty("Tag")
189+
private String tag;
190+
191+
@JsonProperty("Digest")
192+
private String digest;
193+
194+
@CheckForNull
195+
public Integer getSize() {
196+
return size;
197+
}
198+
199+
@CheckForNull
200+
public String getTag() {
201+
return tag;
202+
}
203+
204+
@CheckForNull
205+
public String getDigest() {
206+
return digest;
207+
}
208+
209+
@Override
210+
public String toString() {
211+
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
165212
}
166213
}
167214

168215
@Override
169216
public String toString() {
170-
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
217+
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
171218
}
172219
}

0 commit comments

Comments
 (0)