Skip to content

Commit 066f268

Browse files
bsideupbsideup
authored
Implicit jackson config (docker-java#1276)
* Replace static ObjectMappers with DockerClientConfig#getObjectMapper * remove unused `ObjectMapper` field * revert change * simplify AbstrDockerCmdExec * Remove unnecessary Jackson annotations * Remove `anUnconfiguredCommandSerializesToEmptyJson` test case * Try to disable the parallel test execution * Add more logging, try just "hello" * Revert the parallel change * Back to sequential tests :(
1 parent 41eea38 commit 066f268

File tree

116 files changed

+12
-383
lines changed

Some content is hidden

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

116 files changed

+12
-383
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import lombok.EqualsAndHashCode;
65
import lombok.ToString;
@@ -10,7 +9,6 @@
109
* @author Konstantin Pelykh (kpelykh@gmail.com)
1110
*
1211
*/
13-
@JsonIgnoreProperties(ignoreUnknown = true)
1412
@EqualsAndHashCode
1513
@ToString
1614
public class CreateContainerResponse {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import lombok.EqualsAndHashCode;
65
import lombok.ToString;
@@ -11,7 +10,6 @@
1110
* @author Ryan Campbell (ryan.campbell@gmail.com)
1211
*
1312
*/
14-
@JsonIgnoreProperties(ignoreUnknown = true)
1513
@EqualsAndHashCode
1614
@ToString
1715
public class CreateImageResponse {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import lombok.EqualsAndHashCode;
65
import lombok.ToString;
76

8-
@JsonIgnoreProperties(ignoreUnknown = true)
97
@EqualsAndHashCode
108
@ToString
119
public class CreateNetworkResponse {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import lombok.EqualsAndHashCode;
65
import lombok.ToString;
76

87
/**
98
* The response of a {@link CreateSecretCmd}
109
*/
11-
@JsonIgnoreProperties(ignoreUnknown = true)
1210
@EqualsAndHashCode
1311
@ToString
1412
public class CreateSecretResponse {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import lombok.EqualsAndHashCode;
65
import lombok.ToString;
76

87
/**
98
* The response of a {@link CreateServiceCmd}
109
*/
11-
@JsonIgnoreProperties(ignoreUnknown = true)
1210
@EqualsAndHashCode
1311
@ToString
1412
public class CreateServiceResponse {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import lombok.EqualsAndHashCode;
65
import lombok.ToString;
@@ -9,7 +8,6 @@
98
*
109
* @author Marcus Linke
1110
*/
12-
@JsonIgnoreProperties(ignoreUnknown = true)
1311
@EqualsAndHashCode
1412
@ToString
1513
public class CreateVolumeResponse {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import lombok.EqualsAndHashCode;
65
import lombok.ToString;
76

8-
@JsonIgnoreProperties(ignoreUnknown = true)
97
@EqualsAndHashCode
108
@ToString
119
public class ExecCreateCmdResponse {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import lombok.EqualsAndHashCode;
65
import lombok.ToString;
@@ -11,7 +10,6 @@
1110
* part of {@link GraphDriver}
1211
* @author Kanstantsin Shautsou
1312
*/
14-
@JsonIgnoreProperties(ignoreUnknown = true)
1513
@EqualsAndHashCode
1614
@ToString
1715
public class GraphData {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import lombok.EqualsAndHashCode;
65
import lombok.ToString;
@@ -13,7 +12,6 @@
1312
* @author Kanstantsin Shautsou
1413
* @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
1514
*/
16-
@JsonIgnoreProperties(ignoreUnknown = true)
1715
@EqualsAndHashCode
1816
@ToString
1917
public class GraphDriver {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package com.github.dockerjava.api.command;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import java.util.List;
65

7-
@JsonIgnoreProperties(ignoreUnknown = true)
86
public class HealthState {
97

108
@JsonProperty("Status")

0 commit comments

Comments
 (0)