Skip to content

Add aux to ResponseItem for API 1.22 #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KostyaSha merged 1 commit into from
Mar 10, 2016
Merged

Add aux to ResponseItem for API 1.22 #500

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 57 additions & 10 deletions src/main/java/com/github/dockerjava/api/model/ResponseItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -48,6 +47,12 @@ public class ResponseItem implements Serializable {
@JsonProperty("error")
private String error;

/**
* @since {@link RemoteApiVersion#VERSION_1_22}
*/
@JsonProperty("aux")
private AuxDetail aux;

@CheckForNull
public String getStream() {
return stream;
Expand Down Expand Up @@ -94,6 +99,14 @@ public String getError() {
return error;
}

/**
* @see #aux
*/
@CheckForNull
public AuxDetail getAux() {
return aux;
}

/**
* Returns whether the error field indicates an error
*
Expand Down Expand Up @@ -135,7 +148,7 @@ public Long getStart() {

@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
}
}

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

@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
}
}

@JsonIgnoreProperties(ignoreUnknown = true)
public static class AuxDetail implements Serializable {
private static final long serialVersionUID = 1L;

@JsonProperty("Size")
private Integer size;

@JsonProperty("Tag")
private String tag;

@JsonProperty("Digest")
private 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);
}
}

@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
}
}