Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ca0b78a

Browse filesBrowse files
authored
Add common DockerObject parent to every model class (docker-java#1635)
* Add common `DockerObject` parent to every model class * Fix `DockerObjectArchTest` * Remove `callSuper`, do not extend meta-objects from `DockerObject` * Do not extend `@JsonCreator`-based objects from `DockerObject` * Put back `@EqualsAndHashCode` on `Volume` * Put back `@EqualsAndHashCode` on `ExposedPort` * Add exclusions to `ModelsSerializableTest` * Properly add exclusions to `ModelsSerializableTest` * Use `DeserializationContext#readTree`
1 parent 4f8f7b9 commit ca0b78a
Copy full SHA for ca0b78a

151 files changed

+472-154Lines changed: 472 additions & 154 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎docker-java-api/pom.xml‎

Copy file name to clipboardExpand all lines: docker-java-api/pom.xml
+22Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,28 @@
4141
<version>1.18.18</version>
4242
<scope>provided</scope>
4343
</dependency>
44+
45+
46+
<dependency>
47+
<groupId>org.junit.jupiter</groupId>
48+
<artifactId>junit-jupiter</artifactId>
49+
<version>5.7.2</version>
50+
<scope>test</scope>
51+
</dependency>
52+
53+
<dependency>
54+
<groupId>com.tngtech.archunit</groupId>
55+
<artifactId>archunit-junit5</artifactId>
56+
<version>0.18.0</version>
57+
<scope>test</scope>
58+
</dependency>
59+
60+
<dependency>
61+
<groupId>com.tngtech.archunit</groupId>
62+
<artifactId>archunit</artifactId>
63+
<version>0.18.0</version>
64+
<scope>test</scope>
65+
</dependency>
4466
</dependencies>
4567

4668
<build>
Collapse file

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java‎

Copy file name to clipboardExpand all lines: docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -9,7 +10,7 @@
910
*/
1011
@EqualsAndHashCode
1112
@ToString
12-
public class CreateConfigResponse {
13+
public class CreateConfigResponse extends DockerObject {
1314
@JsonProperty("ID")
1415
private String id;
1516

Collapse file

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java‎

Copy file name to clipboardExpand all lines: docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -11,7 +12,7 @@
1112
*/
1213
@EqualsAndHashCode
1314
@ToString
14-
public class CreateContainerResponse {
15+
public class CreateContainerResponse extends DockerObject {
1516

1617
@JsonProperty("Id")
1718
private String id;
Collapse file

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java‎

Copy file name to clipboardExpand all lines: docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -12,7 +13,7 @@
1213
*/
1314
@EqualsAndHashCode
1415
@ToString
15-
public class CreateImageResponse {
16+
public class CreateImageResponse extends DockerObject {
1617

1718
@JsonProperty("status")
1819
private String id;
Collapse file

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java‎

Copy file name to clipboardExpand all lines: docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

78
@EqualsAndHashCode
89
@ToString
9-
public class CreateNetworkResponse {
10+
public class CreateNetworkResponse extends DockerObject {
1011

1112
@JsonProperty("Id")
1213
private String id;
Collapse file

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java‎

Copy file name to clipboardExpand all lines: docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -9,7 +10,7 @@
910
*/
1011
@EqualsAndHashCode
1112
@ToString
12-
public class CreateSecretResponse {
13+
public class CreateSecretResponse extends DockerObject {
1314
@JsonProperty("ID")
1415
private String id;
1516

Collapse file

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java‎

Copy file name to clipboardExpand all lines: docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -9,7 +10,7 @@
910
*/
1011
@EqualsAndHashCode
1112
@ToString
12-
public class CreateServiceResponse {
13+
public class CreateServiceResponse extends DockerObject {
1314
@JsonProperty("ID")
1415
private String id;
1516

Collapse file

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java‎

Copy file name to clipboardExpand all lines: docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -12,7 +13,7 @@
1213
*/
1314
@EqualsAndHashCode
1415
@ToString
15-
public class CreateVolumeResponse {
16+
public class CreateVolumeResponse extends DockerObject {
1617

1718
@JsonProperty("Name")
1819
private String name;
Collapse file

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java‎

Copy file name to clipboardExpand all lines: docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

78
@EqualsAndHashCode
89
@ToString
9-
public class ExecCreateCmdResponse {
10+
public class ExecCreateCmdResponse extends DockerObject {
1011

1112
@JsonProperty("Id")
1213
private String id;
Collapse file

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java‎

Copy file name to clipboardExpand all lines: docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.api.command;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.github.dockerjava.api.model.DockerObject;
45
import lombok.EqualsAndHashCode;
56
import lombok.ToString;
67

@@ -12,7 +13,7 @@
1213
*/
1314
@EqualsAndHashCode
1415
@ToString
15-
public class GraphData {
16+
public class GraphData extends DockerObject {
1617

1718
@JsonProperty("RootDir")
1819
private String rootDir;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.