Skip to content

Commit b480281

Browse files
KostyaShaKostyaSha
authored
Merge pull request docker-java#667 from KostyaSha/serializable
Make all models serializable
2 parents 8c456c2 + 96d7ddb commit b480281

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+244
-52
lines changed

‎src/main/java/com/github/dockerjava/api/model/AuthConfig.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
import com.fasterxml.jackson.annotation.JsonProperty;
99

1010
import javax.annotation.CheckForNull;
11+
import java.io.Serializable;
1112

1213
@JsonInclude(Include.NON_NULL)
13-
public class AuthConfig {
14+
public class AuthConfig implements Serializable {
15+
private static final long serialVersionUID = 1L;
1416

1517
/**
1618
* For backwards compatibility. Make sure you update the properties if you change this.

‎src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.github.dockerjava.api.model;
22

3+
import java.io.Serializable;
34
import java.util.Map;
45
import java.util.TreeMap;
56

67
import com.fasterxml.jackson.annotation.JsonProperty;
78

8-
public class AuthConfigurations {
9+
public class AuthConfigurations implements Serializable {
10+
private static final long serialVersionUID = 1L;
911

1012
@JsonProperty("configs")
1113
private Map<String, AuthConfig> configs = new TreeMap<>();

‎src/main/java/com/github/dockerjava/api/model/AuthResponse.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44

5-
public class AuthResponse {
5+
import java.io.Serializable;
6+
7+
public class AuthResponse implements Serializable {
8+
private static final long serialVersionUID = 1L;
9+
610
@JsonProperty("Status")
711
private String status;
812

‎src/main/java/com/github/dockerjava/api/model/Bind.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
import org.apache.commons.lang.builder.EqualsBuilder;
44
import org.apache.commons.lang.builder.HashCodeBuilder;
55

6+
import java.io.Serializable;
7+
68
/**
79
* Represents a host path being bind mounted as a {@link Volume} in a Docker container.
810
* The Bind can be in read only or read write access mode.
911
*/
10-
public class Bind {
12+
public class Bind implements Serializable {
13+
private static final long serialVersionUID = 1L;
1114

1215
private String path;
1316

‎src/main/java/com/github/dockerjava/api/model/Binds.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.model;
22

33
import java.io.IOException;
4+
import java.io.Serializable;
45
import java.util.ArrayList;
56
import java.util.Iterator;
67
import java.util.List;
@@ -19,7 +20,8 @@
1920

2021
@JsonSerialize(using = Binds.Serializer.class)
2122
@JsonDeserialize(using = Binds.Deserializer.class)
22-
public class Binds {
23+
public class Binds implements Serializable {
24+
private static final long serialVersionUID = 1L;
2325

2426
private Bind[] binds;
2527

‎src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99
@JsonIgnoreProperties(ignoreUnknown = true)
1010
public class BuildResponseItem extends ResponseItem {
11-
1211
private static final long serialVersionUID = -1252904184236343612L;
1312

1413
private static final String BUILD_SUCCESS = "Successfully built";

‎src/main/java/com/github/dockerjava/api/model/ChangeLog.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@
55
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
66
import com.fasterxml.jackson.annotation.JsonProperty;
77

8+
import java.io.Serializable;
9+
810
/**
911
*
1012
* @author Konstantin Pelykh (kpelykh@gmail.com)
1113
*
1214
*/
1315
@JsonIgnoreProperties(ignoreUnknown = true)
14-
public class ChangeLog {
16+
public class ChangeLog implements Serializable {
17+
private static final long serialVersionUID = 1L;
1518

1619
@JsonProperty("Path")
1720
private String path;

‎src/main/java/com/github/dockerjava/api/model/Container.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.apache.commons.lang.builder.ToStringBuilder;
1212

1313
import javax.annotation.CheckForNull;
14+
import java.io.Serializable;
1415
import java.util.Map;
1516

1617
/**
@@ -20,7 +21,8 @@
2021
*/
2122
@JsonIgnoreProperties(ignoreUnknown = true)
2223
@JsonInclude(Include.NON_NULL)
23-
public class Container {
24+
public class Container implements Serializable {
25+
private static final long serialVersionUID = 1L;
2426

2527
@JsonProperty("Command")
2628
private String command;

‎src/main/java/com/github/dockerjava/api/model/ContainerConfig.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.apache.commons.lang.builder.ToStringBuilder;
1111

1212
import javax.annotation.CheckForNull;
13+
import java.io.Serializable;
1314
import java.util.Map;
1415

1516
/**
@@ -19,7 +20,8 @@
1920
*/
2021
@JsonIgnoreProperties(ignoreUnknown = true)
2122
@JsonInclude(Include.NON_NULL)
22-
public class ContainerConfig {
23+
public class ContainerConfig implements Serializable {
24+
private static final long serialVersionUID = 1L;
2325

2426
@JsonProperty("AttachStderr")
2527
private Boolean attachStderr;

‎src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,18 @@
66
import org.apache.commons.lang.builder.HashCodeBuilder;
77
import org.apache.commons.lang.builder.ToStringBuilder;
88

9+
import java.io.Serializable;
10+
911
/**
1012
* Used in {@link Container}
1113
*
1214
* @see Container
1315
* @author Kanstantsin Shautsou
1416
*/
1517
@JsonIgnoreProperties(ignoreUnknown = true)
16-
public class ContainerHostConfig {
18+
public class ContainerHostConfig implements Serializable {
19+
private static final long serialVersionUID = 1L;
20+
1721
@JsonProperty("NetworkMode")
1822
private String networkMode;
1923

‎src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.apache.commons.lang.builder.ToStringBuilder;
1010

1111
import javax.annotation.CheckForNull;
12+
import java.io.Serializable;
1213
import java.util.Arrays;
1314
import java.util.List;
1415

@@ -21,7 +22,9 @@
2122
* @author Kanstantsin Shautsou
2223
*/
2324
@JsonIgnoreProperties(ignoreUnknown = true)
24-
public class ContainerNetwork {
25+
public class ContainerNetwork implements Serializable {
26+
private static final long serialVersionUID = 1L;
27+
2528
/**
2629
* FIXME verify
2730
*/

‎src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.apache.commons.lang.builder.HashCodeBuilder;
88
import org.apache.commons.lang.builder.ToStringBuilder;
99

10+
import java.io.Serializable;
1011
import java.util.Map;
1112

1213
/**
@@ -16,7 +17,9 @@
1617
* @since {@link RemoteApiVersion#VERSION_1_22}
1718
*/
1819
@JsonIgnoreProperties(ignoreUnknown = true)
19-
public class ContainerNetworkSettings {
20+
public class ContainerNetworkSettings implements Serializable {
21+
private static final long serialVersionUID = 1L;
22+
2023
/**
2124
* @since {@link RemoteApiVersion#VERSION_1_22}
2225
*/

‎src/main/java/com/github/dockerjava/api/model/ContainerPort.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
import org.apache.commons.lang.builder.ToStringBuilder;
88

99
import javax.annotation.CheckForNull;
10+
import java.io.Serializable;
1011

1112
/**
1213
* @author Kanstantsin Shautsou
1314
* @see Container
1415
*/
1516
@JsonIgnoreProperties(ignoreUnknown = true)
16-
public class ContainerPort {
17+
public class ContainerPort implements Serializable {
18+
private static final long serialVersionUID = 1L;
1719

1820
@JsonProperty("IP")
1921
private String ip;

‎src/main/java/com/github/dockerjava/api/model/Device.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
import com.fasterxml.jackson.annotation.JsonProperty;
1313

1414
import javax.annotation.Nonnull;
15+
import java.io.Serializable;
1516
import java.util.HashMap;
1617
import java.util.Map;
1718
import java.util.StringTokenizer;
1819

1920
@JsonInclude(Include.NON_NULL)
20-
public class Device {
21+
public class Device implements Serializable {
22+
private static final long serialVersionUID = 1L;
2123

2224
@JsonProperty("CgroupPermissions")
2325
private String cGroupPermissions = "";

‎src/main/java/com/github/dockerjava/api/model/DriverStatus.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77
import com.fasterxml.jackson.annotation.JsonInclude.Include;
88
import com.fasterxml.jackson.annotation.JsonProperty;
99

10+
import java.io.Serializable;
11+
1012
/**
11-
* Created by ben on 12/12/13.
13+
* @author ben
1214
*/
1315
@JsonIgnoreProperties(ignoreUnknown = true)
1416
@JsonInclude(Include.NON_NULL)
15-
public class DriverStatus {
17+
public class DriverStatus implements Serializable {
18+
private static final long serialVersionUID = 1L;
1619

1720
@JsonProperty("Root Dir")
1821
private String rootDir;

‎src/main/java/com/github/dockerjava/api/model/ErrorDetail.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
import com.fasterxml.jackson.annotation.JsonInclude.Include;
55
import com.fasterxml.jackson.annotation.JsonProperty;
66

7+
import java.io.Serializable;
8+
79
@JsonInclude(Include.NON_NULL)
8-
public class ErrorDetail {
10+
public class ErrorDetail implements Serializable {
11+
private static final long serialVersionUID = 1L;
12+
913
@JsonProperty
1014
private String message;
1115

‎src/main/java/com/github/dockerjava/api/model/ErrorResponse.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
import com.fasterxml.jackson.annotation.JsonInclude.Include;
55
import com.fasterxml.jackson.annotation.JsonProperty;
66

7+
import java.io.Serializable;
8+
79
@JsonInclude(Include.NON_NULL)
8-
public class ErrorResponse {
10+
public class ErrorResponse implements Serializable {
11+
private static final long serialVersionUID = 1L;
12+
913
@JsonProperty
1014
private ErrorDetail errorDetail;
1115

‎src/main/java/com/github/dockerjava/api/model/Event.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@
1313

1414
import static org.apache.commons.lang.builder.ToStringStyle.SHORT_PREFIX_STYLE;
1515

16+
import java.io.Serializable;
17+
1618
/**
1719
* Representation of a Docker event.
1820
*/
1921
@JsonIgnoreProperties(ignoreUnknown = true)
2022
@JsonInclude(Include.NON_NULL)
21-
public class Event {
23+
public class Event implements Serializable {
24+
private static final long serialVersionUID = 1L;
2225

2326
/**
2427
* @since 1.16

‎src/main/java/com/github/dockerjava/api/model/ExposedPort.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static com.github.dockerjava.api.model.InternetProtocol.UDP;
55

66
import java.io.IOException;
7+
import java.io.Serializable;
78
import java.util.Map.Entry;
89

910
import org.apache.commons.lang.builder.EqualsBuilder;
@@ -30,7 +31,8 @@
3031
*/
3132
@JsonDeserialize(using = ExposedPort.Deserializer.class)
3233
@JsonSerialize(using = ExposedPort.Serializer.class)
33-
public class ExposedPort {
34+
public class ExposedPort implements Serializable {
35+
private static final long serialVersionUID = 1L;
3436

3537
private final InternetProtocol protocol;
3638

‎src/main/java/com/github/dockerjava/api/model/ExposedPorts.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.model;
22

33
import java.io.IOException;
4+
import java.io.Serializable;
45
import java.util.ArrayList;
56
import java.util.Iterator;
67
import java.util.List;
@@ -21,7 +22,8 @@
2122

2223
@JsonSerialize(using = ExposedPorts.Serializer.class)
2324
@JsonDeserialize(using = ExposedPorts.Deserializer.class)
24-
public class ExposedPorts {
25+
public class ExposedPorts implements Serializable {
26+
private static final long serialVersionUID = 1L;
2527

2628
private ExposedPort[] exposedPorts;
2729

‎src/main/java/com/github/dockerjava/api/model/Frame.java

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

3+
import java.io.Serializable;
34
import java.util.Arrays;
45

56
/**
67
* Represents a logging frame.
78
*/
8-
public class Frame {
9+
public class Frame implements Serializable {
10+
private static final long serialVersionUID = 1L;
11+
912
private final StreamType streamType;
1013

1114
private final byte[] payload;

‎src/main/java/com/github/dockerjava/api/model/HostConfig.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.apache.commons.lang.builder.ToStringBuilder;
1212

1313
import javax.annotation.CheckForNull;
14+
import java.io.Serializable;
1415
import java.util.Arrays;
1516
import java.util.List;
1617

@@ -20,7 +21,8 @@
2021
*/
2122
@JsonIgnoreProperties(ignoreUnknown = true)
2223
@JsonInclude(Include.NON_NULL)
23-
public class HostConfig {
24+
public class HostConfig implements Serializable {
25+
private static final long serialVersionUID = 1L;
2426

2527
private static final List<String> PREDEFINED_NETWORKS = Arrays.asList("bridge", "host", "none");
2628

‎src/main/java/com/github/dockerjava/api/model/Identifier.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
import com.google.common.base.Objects;
44
import com.google.common.base.Optional;
55

6+
import java.io.Serializable;
7+
68
/**
7-
* Created by magnayn on 22/07/2014.
9+
* @author magnayn
810
*/
9-
public class Identifier {
11+
public class Identifier implements Serializable {
12+
private static final long serialVersionUID = 1L;
13+
1014
public final Repository repository;
1115

1216
public final Optional<String> tag;

‎src/main/java/com/github/dockerjava/api/model/Image.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@
77
import com.fasterxml.jackson.annotation.JsonInclude.Include;
88
import com.fasterxml.jackson.annotation.JsonProperty;
99

10+
import java.io.Serializable;
11+
1012
/**
1113
*
1214
* @author Konstantin Pelykh (kpelykh@gmail.com)
1315
*
1416
*/
1517
@JsonIgnoreProperties(ignoreUnknown = true)
1618
@JsonInclude(Include.NON_NULL)
17-
public class Image {
19+
public class Image implements Serializable {
20+
private static final long serialVersionUID = 1L;
1821

1922
@JsonProperty("Created")
2023
private Long created;

0 commit comments

Comments
 (0)