X Tutup
Skip to content

Implicit jackson config #1

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

Open
iluxa-test wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Implicit jackson config #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bb98ce2
Replace static ObjectMappers with DockerClientConfig#getObjectMapper
bsideup Nov 19, 2019
2c6002e
remove unused `ObjectMapper` field
bsideup Nov 19, 2019
79c3608
revert change
bsideup Nov 19, 2019
cd11cf9
simplify AbstrDockerCmdExec
bsideup Nov 19, 2019
05b4f29
Merge branch 'master' into implicit_jackson_config
bsideup Nov 20, 2019
e9ccbed
Remove unnecessary Jackson annotations
bsideup Nov 20, 2019
1171555
Remove `anUnconfiguredCommandSerializesToEmptyJson` test case
bsideup Nov 20, 2019
72990a2
Try to disable the parallel test execution
bsideup Nov 20, 2019
eebb9ff
Add more logging, try just "hello"
bsideup Nov 20, 2019
1aa68fa
Revert the parallel change
bsideup Nov 20, 2019
0522a79
Back to sequential tests :(
bsideup Nov 20, 2019
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
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -10,7 +9,6 @@
* @author Konstantin Pelykh (kpelykh@gmail.com)
*
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class CreateContainerResponse {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -11,7 +10,6 @@
* @author Ryan Campbell (ryan.campbell@gmail.com)
*
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class CreateImageResponse {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;

@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class CreateNetworkResponse {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;

/**
* The response of a {@link CreateSecretCmd}
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class CreateSecretResponse {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;

/**
* The response of a {@link CreateServiceCmd}
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class CreateServiceResponse {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -9,7 +8,6 @@
*
* @author Marcus Linke
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class CreateVolumeResponse {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;

@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class ExecCreateCmdResponse {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -11,7 +10,6 @@
* part of {@link GraphDriver}
* @author Kanstantsin Shautsou
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class GraphData {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -13,7 +12,6 @@
* @author Kanstantsin Shautsou
* @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class GraphDriver {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;

@JsonIgnoreProperties(ignoreUnknown = true)
public class HealthState {

@JsonProperty("Status")
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

@JsonIgnoreProperties(ignoreUnknown = true)
public class HealthStateLog {

@JsonProperty("Start")
Expand Down
5 changes: 0 additions & 5 deletions ...er-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.dockerjava.api.model.ContainerConfig;
import com.github.dockerjava.api.model.HostConfig;
Expand All @@ -23,7 +22,6 @@
* @author Konstantin Pelykh (kpelykh@gmail.com)
*
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class InspectContainerResponse {
Expand Down Expand Up @@ -251,7 +249,6 @@ public String getPlatform() {
return platform;
}

@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class ContainerState {
Expand Down Expand Up @@ -457,7 +454,6 @@ public HealthState getHealth() {
}
}

@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public static class Mount {
Expand Down Expand Up @@ -583,7 +579,6 @@ public Mount withSource(String source) {
}
}

@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class Node {
Expand Down
4 changes: 0 additions & 4 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@

import java.util.List;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.dockerjava.api.model.NetworkSettings;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import javax.annotation.CheckForNull;

@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class InspectExecResponse {
Expand Down Expand Up @@ -152,7 +150,6 @@ public Long getPidLong() {
return pid;
}

@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class ProcessConfig {
Expand Down Expand Up @@ -193,7 +190,6 @@ public String getUser() {
}
}

@JsonIgnoreProperties(ignoreUnknown = true)
public class Container {

@JsonProperty("NetworkSettings")
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.dockerjava.api.model.ContainerConfig;
import lombok.EqualsAndHashCode;
Expand All @@ -14,7 +13,6 @@
* @author Konstantin Pelykh (kpelykh@gmail.com)
*
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class InspectImageResponse {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -9,7 +8,6 @@
*
* @author Marcus Linke
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class InspectVolumeResponse {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.List;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -11,7 +10,6 @@
*
* @author Marcus Linke
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class ListVolumesResponse {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -13,7 +12,6 @@
*
* @author Dmitry Tretyakov
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class RootFS {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.dockerjava.api.command;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -10,7 +9,6 @@
* @author Marcus Linke
*
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class TopContainerResponse {
Expand Down
3 changes: 0 additions & 3 deletions docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import javax.annotation.CheckForNull;
import java.io.Serializable;

@JsonInclude(Include.NON_NULL)
@EqualsAndHashCode
@ToString
public class AuthConfig implements Serializable {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import java.io.Serializable;

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

Expand Down
4 changes: 0 additions & 4 deletions docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -12,8 +10,6 @@
* BlkioStat is not documented in pubic docker swapper.yaml yet, reference:
* https://github.com/moby/moby/blob/master/api/types/stats.go
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(JsonInclude.Include.NON_NULL)
@EqualsAndHashCode
@ToString
public class BlkioStatEntry implements Serializable {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -14,7 +13,6 @@
*
* @author Yuting Liu
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class BlkioStatsConfig implements Serializable {
Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

/**
* Represents a build response stream item
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class BuildResponseItem extends ResponseItem {
private static final long serialVersionUID = -1252904184236343612L;

Expand Down
2 changes: 0 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -12,7 +11,6 @@
* @author Konstantin Pelykh (kpelykh@gmail.com)
*
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@EqualsAndHashCode
@ToString
public class ChangeLog implements Serializable {
Expand Down
Loading
X Tutup