From bb98ce218255cf66db588696790ca8b94dab5155 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 19 Nov 2019 14:23:57 +0100 Subject: [PATCH 01/10] Replace static ObjectMappers with DockerClientConfig#getObjectMapper --- .../core/DefaultDockerClientConfig.java | 2 +- .../dockerjava/core/DockerClientConfig.java | 18 +++++++ .../dockerjava/core/DockerConfigFile.java | 21 ++++---- .../core/async/JsonStreamProcessor.java | 19 +++++-- .../core/command/AbstrDockerCmd.java | 15 +++++- .../core/exec/AbstrDockerCmdExec.java | 7 ++- .../core/util/CacheFromEncoder.java | 1 + .../dockerjava/core/util/FiltersEncoder.java | 1 + .../dockerjava/jaxrs/AbstrDockerCmdExec.java | 7 ++- .../dockerjava/jaxrs/BuildImageCmdExec.java | 8 +-- .../dockerjava/jaxrs/EventsCmdExec.java | 2 +- .../jaxrs/JerseyDockerCmdExecFactory.java | 9 ++-- .../dockerjava/jaxrs/PullImageCmdExec.java | 5 +- .../dockerjava/jaxrs/PushImageCmdExec.java | 5 +- .../github/dockerjava/jaxrs/StatsCmdExec.java | 2 +- .../jaxrs/WaitContainerCmdExec.java | 2 +- .../filter/ResponseStatusExceptionFilter.java | 14 ++++- .../netty/NettyDockerCmdExecFactory.java | 3 +- .../netty/NettyInvocationBuilder.java | 27 ++++++++-- .../dockerjava/netty/NettyWebTarget.java | 52 ++++++++++++++----- .../netty/handler/JsonRequestHandler.java | 3 ++ .../handler/JsonResponseCallbackHandler.java | 16 +++++- .../command/InspectContainerResponseTest.java | 8 ++- .../api/command/InspectExecResponseTest.java | 5 +- .../api/command/InspectImageResponseTest.java | 17 +++--- .../dockerjava/api/model/AuthConfigTest.java | 14 ++--- .../dockerjava/api/model/CapabilityTest.java | 9 ++-- .../dockerjava/api/model/ContainerTest.java | 5 +- .../dockerjava/api/model/EventsTest.java | 5 +- .../github/dockerjava/api/model/InfoTest.java | 11 ++-- .../api/model/PortsSerializingTest.java | 13 +++-- .../model/RestartPolicySerializingTest.java | 13 +++-- .../dockerjava/api/model/StatisticsTest.java | 5 +- .../dockerjava/api/model/VersionTest.java | 8 ++- .../dockerjava/api/model/VolumeBindsTest.java | 9 ++-- .../api/model/VolumeFromSerializingTest.java | 7 ++- .../dockerjava/cmd/StartContainerCmdIT.java | 5 +- .../dockerjava/cmd/UpdateContainerCmdIT.java | 5 +- .../dockerjava/core/DockerConfigFileTest.java | 3 +- .../core/async/JsonStreamProcessorTest.java | 4 +- .../dockerjava/netty/NettyWebTargetTest.java | 9 ++-- .../dockerjava/test/serdes/JSONSamples.java | 18 +++---- .../test/serdes/JSONTestHelper.java | 24 +++++---- 43 files changed, 264 insertions(+), 172 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 063fbd3bf..44f54bddb 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -242,7 +242,7 @@ public String getDockerConfigPath() { public DockerConfigFile getDockerConfig() { if (dockerConfig == null) { try { - dockerConfig = DockerConfigFile.loadConfig(getDockerConfigPath()); + dockerConfig = DockerConfigFile.loadConfig(getObjectMapper(), getDockerConfigPath()); } catch (IOException e) { throw new DockerClientException("Failed to parse docker configuration file", e); } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java index 532fe6b43..226b95c05 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java @@ -5,6 +5,8 @@ import java.net.URI; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.AuthConfigurations; @@ -37,4 +39,20 @@ public interface DockerClientConfig { */ SSLConfig getSSLConfig(); + default ObjectMapper getObjectMapper() { + return DefaultObjectMapperHolder.INSTANCE.getObjectMapper(); + } +} + +enum DefaultObjectMapperHolder { + INSTANCE; + + private final ObjectMapper objectMapper = new ObjectMapper() + // TODO .setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL) + // TODO .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + + public ObjectMapper getObjectMapper() { + return objectMapper; + } } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java index 0cef8676d..fd04a5aa6 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java @@ -1,6 +1,5 @@ package com.github.dockerjava.core; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -20,12 +19,10 @@ import java.util.List; import java.util.Map; -@JsonIgnoreProperties(ignoreUnknown = true) public class DockerConfigFile { private static final String DOCKER_LEGACY_CFG = ".dockercfg"; private static final String DOCKER_CFG = "config.json"; - private static final ObjectMapper MAPPER = new ObjectMapper(); private static final TypeReference> CONFIG_MAP_TYPE = new TypeReference>() { }; @@ -118,18 +115,24 @@ public String toString() { } @Nonnull + @Deprecated public static DockerConfigFile loadConfig(@CheckForNull String dockerConfigPath) throws IOException { + return loadConfig(DefaultObjectMapperHolder.INSTANCE.getObjectMapper(), dockerConfigPath); + } + + @Nonnull + public static DockerConfigFile loadConfig(ObjectMapper objectMapper, @CheckForNull String dockerConfigPath) throws IOException { // no any configs, but for empty auths return non null object if (dockerConfigPath == null) { return new DockerConfigFile(); } //parse new docker config file format - DockerConfigFile dockerConfig = loadCurrentConfig(dockerConfigPath); + DockerConfigFile dockerConfig = loadCurrentConfig(objectMapper, dockerConfigPath); //parse old auth config file format if (dockerConfig == null) { - dockerConfig = loadLegacyConfig(dockerConfigPath); + dockerConfig = loadLegacyConfig(objectMapper, dockerConfigPath); } //otherwise create default config @@ -148,7 +151,7 @@ public static DockerConfigFile loadConfig(@CheckForNull String dockerConfigPath) } @CheckForNull - private static DockerConfigFile loadCurrentConfig(@CheckForNull String dockerConfigPath) throws IOException { + private static DockerConfigFile loadCurrentConfig(ObjectMapper objectMapper, @CheckForNull String dockerConfigPath) throws IOException { File dockerCfgFile = new File(dockerConfigPath, DOCKER_CFG); if (!dockerCfgFile.exists() || !dockerCfgFile.isFile()) { @@ -156,14 +159,14 @@ private static DockerConfigFile loadCurrentConfig(@CheckForNull String dockerCon } try { - return MAPPER.readValue(dockerCfgFile, DockerConfigFile.class); + return objectMapper.readValue(dockerCfgFile, DockerConfigFile.class); } catch (IOException e) { throw new IOException("Failed to parse docker " + DOCKER_CFG, e); } } @CheckForNull - private static DockerConfigFile loadLegacyConfig(String dockerConfigPath) throws IOException { + private static DockerConfigFile loadLegacyConfig(ObjectMapper objectMapper, String dockerConfigPath) throws IOException { File dockerLegacyCfgFile = new File(dockerConfigPath, DOCKER_LEGACY_CFG); if (!dockerLegacyCfgFile.exists() || !dockerLegacyCfgFile.isFile()) { @@ -172,7 +175,7 @@ private static DockerConfigFile loadLegacyConfig(String dockerConfigPath) throws //parse legacy auth config file format try { - return new DockerConfigFile(MAPPER.>readValue(dockerLegacyCfgFile, CONFIG_MAP_TYPE)); + return new DockerConfigFile(objectMapper.>readValue(dockerLegacyCfgFile, CONFIG_MAP_TYPE)); } catch (IOException e) { // pass } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java index 9da43b62b..7ad1c135a 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.dockerjava.api.async.ResultCallback; @@ -22,19 +23,27 @@ public class JsonStreamProcessor implements ResponseStreamProcessor { private static final JsonFactory JSON_FACTORY = new JsonFactory(); - private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); - private final Class clazz; + private final ObjectMapper objectMapper; + + @Deprecated public JsonStreamProcessor(Class clazz) { + this( + new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES), + clazz + ); + } + + public JsonStreamProcessor(ObjectMapper objectMapper, Class clazz) { this.clazz = clazz; + this.objectMapper = objectMapper.copy().enable(JsonParser.Feature.AUTO_CLOSE_SOURCE); } @Override public void processResponseStream(InputStream response, ResultCallback resultCallback) { resultCallback.onStart(response); - OBJECT_MAPPER.configure(JsonParser.Feature.AUTO_CLOSE_SOURCE, true); try { JsonParser jp = JSON_FACTORY.createParser(response); @@ -42,10 +51,10 @@ public void processResponseStream(InputStream response, ResultCallback result JsonToken nextToken = jp.nextToken(); while (!closed && nextToken != null && nextToken != JsonToken.END_OBJECT) { try { - ObjectNode objectNode = OBJECT_MAPPER.readTree(jp); + ObjectNode objectNode = objectMapper.readTree(jp); // exclude empty item serialization into class #461 if (!objectNode.isEmpty(null)) { - T next = OBJECT_MAPPER.treeToValue(objectNode, clazz); + T next = objectMapper.treeToValue(objectNode, clazz); resultCallback.onNext(next); } } catch (Exception e) { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java index c89465059..e84d3286e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.util.Base64; +import com.fasterxml.jackson.databind.DeserializationFeature; import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.slf4j.Logger; @@ -23,9 +24,21 @@ public abstract class AbstrDockerCmd, RES_T> impl protected DockerCmdSyncExec execution; + protected final ObjectMapper objectMapper; + + @Deprecated public AbstrDockerCmd(DockerCmdSyncExec execution) { + this( + new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES), + execution + ); + } + + public AbstrDockerCmd(ObjectMapper objectMapper, DockerCmdSyncExec execution) { + checkNotNull(objectMapper, "objectMapper was not specified"); checkNotNull(execution, "execution was not specified"); this.execution = execution; + this.objectMapper = objectMapper; } @Override @@ -46,7 +59,7 @@ public String toString() { protected String registryAuth(AuthConfig authConfig) { try { - return Base64.getEncoder().encodeToString(new ObjectMapper().writeValueAsBytes(authConfig)); + return Base64.getEncoder().encodeToString(objectMapper.writeValueAsBytes(authConfig)); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java index 1ec333416..6270118b6 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java @@ -24,11 +24,15 @@ public abstract class AbstrDockerCmdExec { private final WebTarget baseResource; + protected final ObjectMapper objectMapper; + public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { checkNotNull(baseResource, "baseResource was not specified"); checkNotNull(dockerClientConfig, "dockerClientConfig was not specified"); this.baseResource = baseResource; this.dockerClientConfig = dockerClientConfig; + this.objectMapper = dockerClientConfig.getObjectMapper(); + checkNotNull(objectMapper, "objectMapper was not specified"); } protected WebTarget getBaseResource() { @@ -42,7 +46,7 @@ protected AuthConfigurations getBuildAuthConfigs() { protected String registryAuth(@Nonnull AuthConfig authConfig) { try { - return BaseEncoding.base64Url().encode(new ObjectMapper().writeValueAsString(authConfig).getBytes()); + return BaseEncoding.base64Url().encode(objectMapper.writeValueAsString(authConfig).getBytes()); } catch (IOException e) { throw new RuntimeException(e); } @@ -52,7 +56,6 @@ protected String registryAuth(@Nonnull AuthConfig authConfig) { protected String registryConfigs(@Nonnull AuthConfigurations authConfigs) { try { final String json; - final ObjectMapper objectMapper = new ObjectMapper(); final RemoteApiVersion apiVersion = dockerClientConfig.getApiVersion(); if (apiVersion.equals(UNKNOWN_VERSION)) { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java index fd2dd50b9..b5753bf57 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java @@ -13,6 +13,7 @@ public class CacheFromEncoder { private CacheFromEncoder() { } + // This instance MUST NOT be used for domain-specific serialization of the docker-java types private static final ObjectMapper MAPPER = new ObjectMapper(); public static String jsonEncode(Collection imageIds) { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java index 7b1e34f74..975d65aa3 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java @@ -16,6 +16,7 @@ public class FiltersEncoder { private FiltersEncoder() { } + // This instance MUST NOT be used for domain-specific serialization of the docker-java types private static final ObjectMapper MAPPER = new ObjectMapper(); public static String jsonEncode(Map> mapStringListString) { diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java index 47681e20c..3b93a8af2 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java @@ -22,11 +22,15 @@ public abstract class AbstrDockerCmdExec { private final WebTarget baseResource; + protected final ObjectMapper objectMapper; + public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { checkNotNull(baseResource, "baseResource was not specified"); checkNotNull(dockerClientConfig, "dockerClientConfig was not specified"); this.baseResource = baseResource; this.dockerClientConfig = dockerClientConfig; + this.objectMapper = dockerClientConfig.getObjectMapper(); + checkNotNull(objectMapper, "objectMapper was not specified"); } protected WebTarget getBaseResource() { @@ -39,7 +43,7 @@ protected AuthConfigurations getBuildAuthConfigs() { protected String registryAuth(AuthConfig authConfig) { try { - return BaseEncoding.base64Url().encode(new ObjectMapper().writeValueAsString(authConfig).getBytes()); + return BaseEncoding.base64Url().encode(objectMapper.writeValueAsString(authConfig).getBytes()); } catch (IOException e) { throw new RuntimeException(e); } @@ -60,7 +64,6 @@ protected Invocation.Builder resourceWithOptionalAuthConfig(AuthConfig authConfi protected String registryConfigs(AuthConfigurations authConfigs) { try { final String json; - final ObjectMapper objectMapper = new ObjectMapper(); final RemoteApiVersion apiVersion = dockerClientConfig.getApiVersion(); if (apiVersion.equals(UNKNOWN_VERSION)) { diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java index 49d83eaf9..20dd5396d 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java @@ -7,8 +7,6 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; -import com.fasterxml.jackson.databind.ObjectMapper; - import com.github.dockerjava.core.util.CacheFromEncoder; import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.RequestEntityProcessing; @@ -32,8 +30,6 @@ public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec callbackNotifier(BuildImag LOGGER.trace("POST: {}", webTarget); - return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(BuildResponseItem.class), + return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, BuildResponseItem.class), resultCallback, resourceWithOptionalAuthConfig(command, webTarget.request()).accept(MediaType.TEXT_PLAIN), entity(command.getTarInputStream(), "application/tar") @@ -148,7 +144,7 @@ private WebTarget writeMap(WebTarget webTarget, String name, Map if (value != null && !value.isEmpty()) { try { return webTarget.queryParam(name, - URLEncoder.encode(MAPPER.writeValueAsString(value), "UTF-8").replaceAll("\\+", "%20")); + URLEncoder.encode(objectMapper.writeValueAsString(value), "UTF-8").replaceAll("\\+", "%20")); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java index 090fca8ac..d6cb6aeed 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java @@ -36,7 +36,7 @@ protected AbstractCallbackNotifier callbackNotifier(EventsCmd command, Re LOGGER.trace("GET: {}", webTarget); - return new GETCallbackNotifier<>(new JsonStreamProcessor<>(Event.class), resultCallback, + return new GETCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, Event.class), resultCallback, webTarget.request()); } } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java index 158a93706..461899290 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java @@ -1,7 +1,5 @@ package com.github.dockerjava.jaxrs; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import com.github.dockerjava.api.command.AttachContainerCmd; import com.github.dockerjava.api.command.AuthCmd; @@ -157,13 +155,12 @@ public void init(DockerClientConfig dockerClientConfig) { if (requestEntityProcessing != null) { clientConfig.property(ClientProperties.REQUEST_ENTITY_PROCESSING, requestEntityProcessing); } - clientConfig.register(ResponseStatusExceptionFilter.class); + + clientConfig.register(new ResponseStatusExceptionFilter(dockerClientConfig.getObjectMapper())); clientConfig.register(JsonClientFilter.class); RequestConfig.Builder requestConfigBuilder = RequestConfig.custom(); - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); - clientConfig.register(new JacksonJsonProvider(objectMapper)); + clientConfig.register(new JacksonJsonProvider(dockerClientConfig.getObjectMapper())); // logging may disabled via log level clientConfig.register(new SelectiveLoggingFilter(LOGGER, true)); diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java index 70cde2ee3..c20691288 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java @@ -40,7 +40,8 @@ protected AbstractCallbackNotifier callbackNotifier(PullImageC Builder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept( MediaType.APPLICATION_OCTET_STREAM_TYPE); - return new POSTCallbackNotifier<>(new JsonStreamProcessor<>( - PullResponseItem.class), resultCallback, builder, entity(null, MediaType.APPLICATION_JSON)); + return new POSTCallbackNotifier<>( + new JsonStreamProcessor<>(objectMapper, PullResponseItem.class), + resultCallback, builder, entity(null, MediaType.APPLICATION_JSON)); } } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java index d5da2915b..3f6d5434c 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java @@ -44,7 +44,8 @@ protected AbstractCallbackNotifier callbackNotifier(PushImageC Builder builder = resourceWithAuthConfig(command.getAuthConfig(), webResource.request()) .accept(MediaType.APPLICATION_JSON); - return new POSTCallbackNotifier<>(new JsonStreamProcessor<>( - PushResponseItem.class), resultCallback, builder, entity(null, MediaType.APPLICATION_JSON)); + return new POSTCallbackNotifier<>( + new JsonStreamProcessor<>(objectMapper, PushResponseItem.class), + resultCallback, builder, entity(null, MediaType.APPLICATION_JSON)); } } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java index 4358e00fe..b1c69b656 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java @@ -29,7 +29,7 @@ protected AbstractCallbackNotifier callbackNotifier(StatsCmd command LOGGER.trace("GET: {}", webTarget); - return new GETCallbackNotifier<>(new JsonStreamProcessor<>(Statistics.class), + return new GETCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, Statistics.class), resultCallback, webTarget.request()); } } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java index 2d5b64917..644bb8f22 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java @@ -34,7 +34,7 @@ protected AbstractCallbackNotifier callbackNotifier(WaitContainerC LOGGER.trace("POST: {}", webResource); - return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(WaitResponse.class), + return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, WaitResponse.class), resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null, MediaType.APPLICATION_JSON)); } diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java index bac31fc81..c0c6e3d48 100644 --- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java +++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java @@ -9,6 +9,7 @@ import javax.ws.rs.client.ClientResponseFilter; import javax.ws.rs.core.MediaType; +import com.fasterxml.jackson.databind.DeserializationFeature; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,6 +36,17 @@ public class ResponseStatusExceptionFilter implements ClientResponseFilter { private static final Logger LOG = LoggerFactory.getLogger(ResponseStatusExceptionFilter.class); + private final ObjectMapper objectMapper; + + @Deprecated + public ResponseStatusExceptionFilter() { + this(new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)); + } + + public ResponseStatusExceptionFilter(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + @Override public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException { int status = responseContext.getStatus(); @@ -84,7 +96,7 @@ private String getBodyAsMessage(ClientResponseContext responseContext) { if (MediaType.APPLICATION_JSON_TYPE.equals(mediaType)) { try { - JsonNode node = new ObjectMapper().readTree(message); + JsonNode node = objectMapper.readTree(message); if (node != null) { JsonNode messageNode = node.get("message"); if (messageNode != null && messageNode.isTextual()) { diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java index ff55892bf..3a5a1a32b 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java @@ -112,7 +112,8 @@ public void init(DockerClientConfig dockerClientConfig) { eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig); - baseResource = new NettyWebTarget(channelProvider, host).path(dockerClientConfig.getApiVersion().asWebPathPart()); + baseResource = new NettyWebTarget(dockerClientConfig.getObjectMapper(), channelProvider, host) + .path(dockerClientConfig.getApiVersion().asWebPathPart()); } diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java index 902dc24cf..7478b83f6 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.github.dockerjava.api.async.ResultCallback; @@ -80,7 +81,19 @@ public void onNext(Void object) { private Map headers = new HashMap<>(); + private final ObjectMapper objectMapper; + + @Deprecated public NettyInvocationBuilder(ChannelProvider channelProvider, String resource) { + this( + new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES), + channelProvider, + resource + ); + } + + public NettyInvocationBuilder(ObjectMapper objectMapper, ChannelProvider channelProvider, String resource) { + this.objectMapper = objectMapper.copy().disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); this.channelProvider = channelProvider; this.resource = resource; } @@ -143,7 +156,9 @@ public void get(TypeReference typeReference, ResultCallback resultCall Channel channel = getChannel(); - JsonResponseCallbackHandler jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference, + JsonResponseCallbackHandler jsonResponseHandler = new JsonResponseCallbackHandler<>( + objectMapper, + typeReference, resultCallback); HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback); @@ -267,7 +282,9 @@ public void post(final Object entity, TypeReference typeReference, final Channel channel = getChannel(); - JsonResponseCallbackHandler jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference, + JsonResponseCallbackHandler jsonResponseHandler = new JsonResponseCallbackHandler<>( + objectMapper, + typeReference, resultCallback); HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback); @@ -317,8 +334,6 @@ private HttpRequest prepareEntityRequest(String uri, Object entity, HttpMethod h byte[] bytes; try { - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); bytes = objectMapper.writeValueAsBytes(entity); } catch (JsonProcessingException e) { throw new RuntimeException(e); @@ -371,7 +386,9 @@ public void post(TypeReference typeReference, ResultCallback resultCal Channel channel = getChannel(); - JsonResponseCallbackHandler jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference, + JsonResponseCallbackHandler jsonResponseHandler = new JsonResponseCallbackHandler<>( + objectMapper, + typeReference, resultCallback); HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback); diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java index 7d713849f..e209cd231 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java @@ -12,6 +12,7 @@ import java.util.Objects; import java.util.Set; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.core.WebTarget; import com.google.common.collect.ImmutableSet; @@ -28,7 +29,6 @@ * @author Marcus Linke */ public class NettyWebTarget implements WebTarget { - private static final ObjectMapper MAPPER = new ObjectMapper(); private final ChannelProvider channelProvider; @@ -45,16 +45,40 @@ public class NettyWebTarget implements WebTarget { private static final String PATH_SEPARATOR = "/"; + private final ObjectMapper objectMapper; + + @Deprecated public NettyWebTarget(ChannelProvider channelProvider, String host) { - this(channelProvider, host, ImmutableList.of(), ImmutableMap.of(), - ImmutableMap.>of()); + this( + new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES), + channelProvider, + host, + ImmutableList.of(), + ImmutableMap.of(), + ImmutableMap.of() + ); + } + + public NettyWebTarget(ObjectMapper objectMapper, ChannelProvider channelProvider, String host) { + this( + objectMapper, + channelProvider, + host, + ImmutableList.of(), + ImmutableMap.of(), + ImmutableMap.of() + ); } - private NettyWebTarget(ChannelProvider channelProvider, - String host, - ImmutableList path, - ImmutableMap queryParams, - ImmutableMap> queryParamsSet) { + private NettyWebTarget( + ObjectMapper objectMapper, + ChannelProvider channelProvider, + String host, + ImmutableList path, + ImmutableMap queryParams, + ImmutableMap> queryParamsSet + ) { + this.objectMapper = objectMapper; this.channelProvider = channelProvider; this.host = host; this.path = path; @@ -69,7 +93,7 @@ public NettyWebTarget path(String... components) { newPath.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR))); } - return new NettyWebTarget(channelProvider, host, newPath.build(), queryParams, queryParamsSet); + return new NettyWebTarget(objectMapper, channelProvider, host, newPath.build(), queryParams, queryParamsSet); } public NettyInvocationBuilder request() { @@ -90,7 +114,7 @@ public NettyInvocationBuilder request() { resource = resource + "?" + StringUtils.join(params, "&"); } - return new NettyInvocationBuilder(channelProvider, resource) + return new NettyInvocationBuilder(objectMapper, channelProvider, resource) .header("Host", host); } @@ -112,7 +136,7 @@ public NettyWebTarget resolveTemplate(String name, Object value) { component = component.replaceAll("\\{" + name + "\\}", value.toString()); newPath.add(component); } - return new NettyWebTarget(channelProvider, host, newPath.build(), queryParams, queryParamsSet); + return new NettyWebTarget(objectMapper, channelProvider, host, newPath.build(), queryParams, queryParamsSet); } public NettyWebTarget queryParam(String name, Object value) { @@ -120,7 +144,7 @@ public NettyWebTarget queryParam(String name, Object value) { if (value != null) { builder.put(name, value.toString()); } - return new NettyWebTarget(channelProvider, host, path, builder.build(), queryParamsSet); + return new NettyWebTarget(objectMapper, channelProvider, host, path, builder.build(), queryParamsSet); } public NettyWebTarget queryParamsSet(String name, Set values) { @@ -132,14 +156,14 @@ public NettyWebTarget queryParamsSet(String name, Set values) { } builder.put(name, valueBuilder.build()); } - return new NettyWebTarget(channelProvider, host, path, queryParams, builder.build()); + return new NettyWebTarget(objectMapper, channelProvider, host, path, queryParams, builder.build()); } public NettyWebTarget queryParamsJsonMap(String name, Map values) { if (values != null && !values.isEmpty()) { try { // when param value is JSON string - return queryParam(name, MAPPER.writeValueAsString(values)); + return queryParam(name, objectMapper.writeValueAsString(values)); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java index f1e0ed042..963937061 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java @@ -11,7 +11,10 @@ * Handler that encodes an outgoing object to JSON. * * @author Marcus Linke + * + * @deprecated unused in docker-java */ +@Deprecated public class JsonRequestHandler extends MessageToByteEncoder { private ObjectMapper mapper = new ObjectMapper(); diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java index 2b188e378..b46d062f9 100644 --- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java +++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java @@ -1,5 +1,6 @@ package com.github.dockerjava.netty.handler; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.SerializationFeature; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; @@ -16,16 +17,27 @@ */ public class JsonResponseCallbackHandler extends SimpleChannelInboundHandler { - private static ObjectMapper objectMapper = new ObjectMapper(); + private final ObjectMapper objectMapper; private TypeReference typeReference; private ResultCallback callback; + @Deprecated public JsonResponseCallbackHandler(TypeReference typeReference, ResultCallback callback) { + this( + new ObjectMapper() + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS), + typeReference, + callback + ); + } + + public JsonResponseCallbackHandler(ObjectMapper objectMapper, TypeReference typeReference, ResultCallback callback) { + this.objectMapper = objectMapper; this.typeReference = typeReference; this.callback = callback; - objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); } @Override diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java index d664e8c73..f19bb1663 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java @@ -16,11 +16,11 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.api.model.ContainerNetwork; import com.github.dockerjava.api.model.Isolation; import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.core.RemoteApiVersion; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import java.io.IOException; @@ -69,8 +69,7 @@ public void roundTrip_full() throws IOException { @Test public void roundTrip_full_healthcheck() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(InspectContainerResponse.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectContainerResponse.class); final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_24, "/containers/inspect/1.json", @@ -140,8 +139,7 @@ public void roundTrip_empty() throws IOException { @Test public void inspect_windows_container() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(InspectContainerResponse.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectContainerResponse.class); final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_38, "/containers/inspect/lcow.json", diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java index 9c2641885..040f1c2d7 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java @@ -1,8 +1,8 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.core.RemoteApiVersion; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip; @@ -20,8 +20,7 @@ public class InspectExecResponseTest { @Test public void test_1_22_SerDer1() throws Exception { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(InspectExecResponse.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectExecResponse.class); final InspectExecResponse execResponse = testRoundTrip(RemoteApiVersion.VERSION_1_22, "/exec/ID/1.json", diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java index 2cfde68d7..d548fa329 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java @@ -1,8 +1,8 @@ package com.github.dockerjava.api.command; import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.api.model.ContainerConfig; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import java.io.IOException; @@ -28,8 +28,7 @@ public class InspectImageResponseTest { @Test public void serder1_22Json() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectImageResponse.class); final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/image1/inspect1.json", @@ -138,8 +137,7 @@ public void serder1_22Json() throws IOException { @Test public void serder1_22_doc() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectImageResponse.class); final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/docImage/doc.json", @@ -164,8 +162,7 @@ public void serder1_22_doc() throws IOException { @Test public void serder1_22_inspect_doc() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectImageResponse.class); final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/docImage/inspect_doc.json", @@ -193,8 +190,7 @@ public void serder1_22_inspect_doc() throws IOException { @Test public void testOverlayNetworkRootDir() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectImageResponse.class); final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/overlay/inspectOverlay.json", type); @@ -210,8 +206,7 @@ public void testOverlayNetworkRootDir() throws IOException { @Test public void inspectWindowsImage() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectImageResponse.class); final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_25, "images/windowsImage/doc.json", diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java index d470ff1d7..f77ac56c9 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java @@ -1,8 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.core.RemoteApiVersion; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import java.io.IOException; @@ -24,8 +24,7 @@ public void defaultServerAddress() throws Exception { @Test public void serderDocs1() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(AuthConfig.class); final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_22, "/other/AuthConfig/docs1.json", @@ -46,8 +45,7 @@ public void serderDocs1() throws IOException { @Test public void serderDocs2() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(AuthConfig.class); final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_22, "/other/AuthConfig/docs2.json", @@ -65,8 +63,7 @@ public void serderDocs2() throws IOException { @Test public void compatibleWithIdentitytoken() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(AuthConfig.class); final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_23, "/other/AuthConfig/docs1.json", type @@ -82,8 +79,7 @@ public void compatibleWithIdentitytoken() throws IOException { @Test public void shouldNotFailWithStackOrchestratorInConfig() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(AuthConfig.class); final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_25, "/other/AuthConfig/orchestrators.json", type diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java index 7e1afdf17..e76d2437c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java @@ -1,28 +1,27 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import static org.junit.Assert.assertEquals; public class CapabilityTest { - private final ObjectMapper objectMapper = new ObjectMapper(); @Test public void serializeCapability() throws Exception { - String json = objectMapper.writeValueAsString(Capability.ALL); + String json = JSONTestHelper.getMapper().writeValueAsString(Capability.ALL); assertEquals(json, "\"ALL\""); } @Test public void deserializeCapability() throws Exception { - Capability capability = objectMapper.readValue("\"ALL\"", Capability.class); + Capability capability = JSONTestHelper.getMapper().readValue("\"ALL\"", Capability.class); assertEquals(capability, Capability.ALL); } @Test(expected = JsonMappingException.class) public void deserializeInvalidCapability() throws Exception { - objectMapper.readValue("\"nonsense\"", Capability.class); + JSONTestHelper.getMapper().readValue("\"nonsense\"", Capability.class); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ContainerTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ContainerTest.java index 97b19bd01..7b1e22f0d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/ContainerTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ContainerTest.java @@ -1,8 +1,8 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.CollectionType; import com.github.dockerjava.core.RemoteApiVersion; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import java.io.IOException; @@ -20,8 +20,7 @@ public class ContainerTest { @Test public void serderJson1() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final CollectionType type = mapper.getTypeFactory().constructCollectionType(List.class, Container.class); + final CollectionType type = JSONTestHelper.getMapper().getTypeFactory().constructCollectionType(List.class, Container.class); final List containers = testRoundTrip(RemoteApiVersion.VERSION_1_22, "containers/json/filter1.json", diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/EventsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/EventsTest.java index 05b6a7a1d..0f0b2456d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/EventsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/EventsTest.java @@ -1,8 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.core.RemoteApiVersion; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import java.io.IOException; @@ -23,8 +23,7 @@ public class EventsTest { @Test public void serderDocs1() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(Event.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Event.class); final Event event = testRoundTrip(RemoteApiVersion.VERSION_1_24, "/events/docs1.json", diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java index 6e37636ec..10b401685 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java @@ -1,9 +1,9 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.api.model.InfoRegistryConfig.IndexConfig; import com.github.dockerjava.core.RemoteApiVersion; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.hamcrest.CoreMatchers; import org.junit.Test; @@ -35,8 +35,7 @@ public class InfoTest { @Test public void serder1Json() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(Info.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Info.class); final Info info = testRoundTrip(VERSION_1_22, "info/1.json", @@ -175,8 +174,7 @@ public void serder1Json() throws IOException { @Test public void serder2Json() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(Info.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Info.class); final Info info = testRoundTrip(VERSION_1_22, "info/2.json", @@ -332,8 +330,7 @@ public void serder2Json() throws IOException { @Test public void info_1_38() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(Info.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Info.class); final Info info = testRoundTrip(RemoteApiVersion.VERSION_1_38, "info/lcow.json", diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java index 818f3dd91..ecbdd9a49 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java @@ -1,7 +1,7 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.api.model.Ports.Binding; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import java.util.Map; @@ -10,7 +10,6 @@ import static org.junit.Assert.assertNull; public class PortsSerializingTest { - private final ObjectMapper objectMapper = new ObjectMapper(); private final String jsonWithDoubleBindingForOnePort = "{\"80/tcp\":[{\"HostIp\":\"10.0.0.1\",\"HostPort\":\"80\"},{\"HostIp\":\"10.0.0.2\",\"HostPort\":\"80\"}]}"; @@ -18,7 +17,7 @@ public class PortsSerializingTest { @Test public void deserializingPortWithMultipleBindings() throws Exception { - Ports ports = objectMapper.readValue(jsonWithDoubleBindingForOnePort, Ports.class); + Ports ports = JSONTestHelper.getMapper().readValue(jsonWithDoubleBindingForOnePort, Ports.class); Map map = ports.getBindings(); assertEquals(map.size(), 1); @@ -33,18 +32,18 @@ public void serializingPortWithMultipleBindings() throws Exception { Ports ports = new Ports(); ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", "80")); ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", "80")); - assertEquals(objectMapper.writeValueAsString(ports), jsonWithDoubleBindingForOnePort); + assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithDoubleBindingForOnePort); } @Test public void serializingEmptyBinding() throws Exception { Ports ports = new Ports(ExposedPort.tcp(80), new Binding(null, null)); - assertEquals(objectMapper.writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}"); + assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}"); } @Test public void deserializingPortWithNullBindings() throws Exception { - Ports ports = objectMapper.readValue(jsonWithNullBindingForOnePort, Ports.class); + Ports ports = JSONTestHelper.getMapper().readValue(jsonWithNullBindingForOnePort, Ports.class); Map map = ports.getBindings(); assertEquals(map.size(), 1); @@ -55,6 +54,6 @@ public void deserializingPortWithNullBindings() throws Exception { public void serializingWithNullBindings() throws Exception { Ports ports = new Ports(); ports.bind(ExposedPort.tcp(80), null); - assertEquals(objectMapper.writeValueAsString(ports), jsonWithNullBindingForOnePort); + assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithNullBindingForOnePort); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java index 9ac888478..6e4524fd5 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java @@ -1,6 +1,6 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -10,40 +10,39 @@ * docker run --restart xxx. */ public class RestartPolicySerializingTest { - private final ObjectMapper objectMapper = new ObjectMapper(); @Test // --restart no public void noRestart() throws Exception { - String json = objectMapper.writeValueAsString(RestartPolicy.noRestart()); + String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.noRestart()); assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"\"}"); } @Test // --restart always public void alwaysRestart() throws Exception { - String json = objectMapper.writeValueAsString(RestartPolicy.alwaysRestart()); + String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.alwaysRestart()); assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}"); } @Test // --restart unless-stopped public void unlessStoppedRestart() throws Exception { - String json = objectMapper.writeValueAsString(RestartPolicy.unlessStoppedRestart()); + String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.unlessStoppedRestart()); assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"unless-stopped\"}"); } @Test // --restart on-failure public void onFailureRestart() throws Exception { - String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(0)); + String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.onFailureRestart(0)); assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}"); } @Test // --restart on-failure:2 public void onFailureRestartWithCount() throws Exception { - String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(2)); + String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.onFailureRestart(2)); assertEquals(json, "{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}"); } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java index 261fe7d1b..9734c5e14 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java @@ -1,8 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.core.RemoteApiVersion; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.hamcrest.Matchers; import org.junit.Test; @@ -22,8 +22,7 @@ public class StatisticsTest { @Test public void serderJson1() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(Statistics.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Statistics.class); final Statistics statistics = testRoundTrip(RemoteApiVersion.VERSION_1_27, "containers/container/stats/stats1.json", diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VersionTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VersionTest.java index 1c3e55c5c..77fafac37 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VersionTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VersionTest.java @@ -1,8 +1,8 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.core.RemoteApiVersion; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import java.util.Collections; @@ -23,8 +23,7 @@ public class VersionTest { @Test public void testSerDer1() throws Exception { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(Version.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Version.class); final Version version = testRoundTrip(RemoteApiVersion.VERSION_1_22, "/version/1.json", @@ -45,8 +44,7 @@ public void testSerDer1() throws Exception { @Test public void version_1_38() throws Exception { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(Version.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Version.class); final Version version = testRoundTrip(RemoteApiVersion.VERSION_1_38, "/version/lcow.json", diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java index 067542c5c..0d509dbfa 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java @@ -1,7 +1,7 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import java.io.IOException; @@ -9,11 +9,11 @@ import static org.junit.Assert.assertEquals; public class VolumeBindsTest { + @Test public void t() throws IOException { String s = "{\"/data\":\"/some/path\"}"; - ObjectMapper objectMapper = new ObjectMapper(); - VolumeBinds volumeBinds = objectMapper.readValue(s, VolumeBinds.class); + VolumeBinds volumeBinds = JSONTestHelper.getMapper().readValue(s, VolumeBinds.class); VolumeBind[] binds = volumeBinds.getBinds(); assertEquals(binds.length, 1); assertEquals(binds[0].getHostPath(), "/some/path"); @@ -23,8 +23,7 @@ public void t() throws IOException { @Test(expected = JsonMappingException.class) public void t1() throws IOException { String s = "{\"/data\": {} }"; - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.readValue(s, VolumeBinds.class); + JSONTestHelper.getMapper().readValue(s, VolumeBinds.class); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java index 143ecaaca..ae343047c 100644 --- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java @@ -1,25 +1,24 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import static org.junit.Assert.assertEquals; public class VolumeFromSerializingTest { - private final ObjectMapper objectMapper = new ObjectMapper(); private final String json = "\"container1:ro\""; @Test public void deserializing() throws Exception { - VolumesFrom volumeFrom = objectMapper.readValue(json, VolumesFrom.class); + VolumesFrom volumeFrom = JSONTestHelper.getMapper().readValue(json, VolumesFrom.class); assertEquals(volumeFrom, new VolumesFrom("container1", AccessMode.ro)); } @Test public void serializing() throws Exception { VolumesFrom volumeFrom = new VolumesFrom("container1", AccessMode.ro); - assertEquals(objectMapper.writeValueAsString(volumeFrom), json); + assertEquals(JSONTestHelper.getMapper().writeValueAsString(volumeFrom), json); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java index 5fde7bc03..3a00d2d53 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java @@ -1,6 +1,5 @@ package com.github.dockerjava.cmd; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.command.StartContainerCmd; @@ -17,6 +16,7 @@ import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.VolumesFrom; import com.github.dockerjava.core.command.WaitContainerResultCallback; +import com.github.dockerjava.test.serdes.JSONTestHelper; import net.jcip.annotations.NotThreadSafe; import org.junit.Test; import org.slf4j.Logger; @@ -573,8 +573,7 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio @Test public void anUnconfiguredCommandSerializesToEmptyJson() throws Exception { - ObjectMapper objectMapper = new ObjectMapper(); StartContainerCmd command = dockerRule.getClient().startContainerCmd(""); - assertThat(objectMapper.writeValueAsString(command), is("{}")); + assertThat(JSONTestHelper.getMapper().writeValueAsString(command), is("{}")); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java index 66fbdfd95..aaa023db8 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java @@ -1,12 +1,12 @@ package com.github.dockerjava.cmd; import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.model.HostConfig; import com.github.dockerjava.core.command.UpdateContainerCmdImpl; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; @@ -82,8 +82,7 @@ public void updateContainer() throws DockerException, IOException { @Ignore("impossible to serder because model bundled in cmd") @Test public void serDerDocs1() throws IOException { - final ObjectMapper mapper = new ObjectMapper(); - final JavaType type = mapper.getTypeFactory().constructType(UpdateContainerCmdImpl.class); + final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(UpdateContainerCmdImpl.class); final UpdateContainerCmdImpl upd = testRoundTrip(VERSION_1_22, "/containers/container/update/docs.json", diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java index b7edb3001..e3b21ad8d 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java @@ -4,6 +4,7 @@ package com.github.dockerjava.core; import com.github.dockerjava.api.model.AuthConfig; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -156,7 +157,7 @@ public void nonExistent() throws IOException { } private DockerConfigFile runTest(String testFileName) throws IOException { - return DockerConfigFile.loadConfig(new File(FILESROOT, testFileName).getAbsolutePath()); + return DockerConfigFile.loadConfig(JSONTestHelper.getMapper(), new File(FILESROOT, testFileName).getAbsolutePath()); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java index 72fdb7867..f4d790e0e 100644 --- a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java @@ -5,6 +5,7 @@ import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.model.PullResponseItem; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Test; import java.io.ByteArrayInputStream; @@ -29,7 +30,8 @@ public void processEmptyJson() throws Exception { InputStream response = new ByteArrayInputStream("{}".getBytes()); - JsonStreamProcessor jsonStreamProcessor = new JsonStreamProcessor<>(PullResponseItem.class); + JsonStreamProcessor jsonStreamProcessor = new JsonStreamProcessor<>( + JSONTestHelper.getMapper(), PullResponseItem.class); final List completed = new ArrayList<>(); diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java index 432878f9c..adef3268f 100644 --- a/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java +++ b/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java @@ -1,6 +1,7 @@ package com.github.dockerjava.netty; +import com.github.dockerjava.test.serdes.JSONTestHelper; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -22,7 +23,7 @@ public void setUp() throws Exception { @Test public void verifyImmutability() throws Exception { - NettyWebTarget emptyWebTarget = new NettyWebTarget(channelProvider, "DUMMY"); + NettyWebTarget emptyWebTarget = new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY"); NettyWebTarget initWebTarget = emptyWebTarget.path("/containers/{id}/attach").resolveTemplate("id", "d03da378b592") .queryParam("logs", "true"); @@ -30,12 +31,12 @@ public void verifyImmutability() throws Exception { NettyWebTarget anotherWebTarget = emptyWebTarget.path("/containers/{id}/attach") .resolveTemplate("id", "2cfada4e3c07").queryParam("stdin", "true"); - assertEquals(new NettyWebTarget(channelProvider, "DUMMY"), emptyWebTarget); + assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY"), emptyWebTarget); - assertEquals(new NettyWebTarget(channelProvider, "DUMMY").path("/containers/d03da378b592/attach") + assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/d03da378b592/attach") .queryParam("logs", "true"), initWebTarget); - assertEquals(new NettyWebTarget(channelProvider, "DUMMY").path("/containers/2cfada4e3c07/attach") + assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/2cfada4e3c07/attach") .queryParam("stdin", "true"), anotherWebTarget); } } diff --git a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java index ca706fa14..231d1426a 100644 --- a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java +++ b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.dockerjava.core.RemoteApiVersion; import org.apache.commons.io.FileUtils; @@ -35,8 +34,7 @@ public static String getSampleContent(RemoteApiVersion version, String context) public static TClass testRoundTrip(RemoteApiVersion version, String context, JavaType type) throws IOException { - ObjectMapper mapper = new ObjectMapper(); - final TClass tObject = mapper.readValue(getSampleContent(version, context), type); + final TClass tObject = JSONTestHelper.getMapper().readValue(getSampleContent(version, context), type); return testRoundTrip(tObject, type); } @@ -46,16 +44,14 @@ public static TClass testRoundTrip(RemoteApiVersion version, String con */ public static TClass testRoundTrip(TClass item, JavaType type) throws IOException, AssertionError { - ObjectMapper mapper = new ObjectMapper(); + String serialized1 = JSONTestHelper.getMapper().writeValueAsString(item); + JsonNode json1 = JSONTestHelper.getMapper().readTree(serialized1); - String serialized1 = mapper.writeValueAsString(item); - JsonNode json1 = mapper.readTree(serialized1); + TClass deserialized1 = JSONTestHelper.getMapper().readValue(serialized1, type); + String serialized2 = JSONTestHelper.getMapper().writeValueAsString(deserialized1); - TClass deserialized1 = mapper.readValue(serialized1, type); - String serialized2 = mapper.writeValueAsString(deserialized1); - - JsonNode json2 = mapper.readTree(serialized2); - TClass deserialized2 = mapper.readValue(serialized2, type); + JsonNode json2 = JSONTestHelper.getMapper().readTree(serialized2); + TClass deserialized2 = JSONTestHelper.getMapper().readValue(serialized2, type); assertEquals("JSONs must be equal after the second roundtrip", json2, json1); assertEquals("Objects must be equal after the second roundtrip", deserialized2, deserialized2); diff --git a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java index d430b0387..24d7b1677 100644 --- a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java +++ b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java @@ -17,6 +17,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.dockerjava.core.DefaultDockerClientConfig; import org.apache.commons.io.IOUtils; import java.io.IOException; @@ -32,6 +33,8 @@ */ public class JSONTestHelper { + static final ObjectMapper MAPPER = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(); + /** * Reads JSON String from the specified resource * @@ -64,9 +67,8 @@ public static String readString(JSONResourceRef resource) throws IOException { * JSON conversion error */ public static TClass readObject(JSONResourceRef resource, Class tclass) throws IOException { - ObjectMapper mapper = new ObjectMapper(); String str = readString(resource); - return mapper.readValue(str, tclass); + return MAPPER.readValue(str, tclass); } /** @@ -125,16 +127,18 @@ public static TClass testRoundTrip(TClass item) throws IOException, Ass * Validation error */ public static TClass testRoundTrip(TClass item, Class asclass) throws IOException, AssertionError { - ObjectMapper mapper = new ObjectMapper(); - - String serialized1 = mapper.writeValueAsString(item); - JsonNode json1 = mapper.readTree(serialized1); - TClass deserialized1 = mapper.readValue(serialized1, asclass); - String serialized2 = mapper.writeValueAsString(deserialized1); - JsonNode json2 = mapper.readTree(serialized2); - TClass deserialized2 = mapper.readValue(serialized2, asclass); + String serialized1 = MAPPER.writeValueAsString(item); + JsonNode json1 = MAPPER.readTree(serialized1); + TClass deserialized1 = MAPPER.readValue(serialized1, asclass); + String serialized2 = MAPPER.writeValueAsString(deserialized1); + JsonNode json2 = MAPPER.readTree(serialized2); + TClass deserialized2 = MAPPER.readValue(serialized2, asclass); assertEquals("JSONs must be equal after the second roundtrip", json2, json1); return deserialized2; } + + public static ObjectMapper getMapper() { + return MAPPER; + } } From 2c6002ef8ac1d2ce591826e8488b39c3b490f5ce Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 19 Nov 2019 14:47:21 +0100 Subject: [PATCH 02/10] remove unused `ObjectMapper` field --- .../dockerjava/core/command/AbstrDockerCmd.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java index e84d3286e..9d58639d3 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java @@ -24,21 +24,9 @@ public abstract class AbstrDockerCmd, RES_T> impl protected DockerCmdSyncExec execution; - protected final ObjectMapper objectMapper; - - @Deprecated public AbstrDockerCmd(DockerCmdSyncExec execution) { - this( - new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES), - execution - ); - } - - public AbstrDockerCmd(ObjectMapper objectMapper, DockerCmdSyncExec execution) { - checkNotNull(objectMapper, "objectMapper was not specified"); checkNotNull(execution, "execution was not specified"); this.execution = execution; - this.objectMapper = objectMapper; } @Override @@ -57,8 +45,11 @@ public String toString() { return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE); } + @Deprecated protected String registryAuth(AuthConfig authConfig) { try { + ObjectMapper objectMapper = new ObjectMapper() + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); return Base64.getEncoder().encodeToString(objectMapper.writeValueAsBytes(authConfig)); } catch (IOException e) { throw new RuntimeException(e); From 79c36083b5de11b61174a18e31789b2d85dfbfdd Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 19 Nov 2019 14:48:58 +0100 Subject: [PATCH 03/10] revert change --- .../com/github/dockerjava/core/command/AbstrDockerCmd.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java index 9d58639d3..b2c9d36ce 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.util.Base64; -import com.fasterxml.jackson.databind.DeserializationFeature; import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.slf4j.Logger; @@ -48,9 +47,7 @@ public String toString() { @Deprecated protected String registryAuth(AuthConfig authConfig) { try { - ObjectMapper objectMapper = new ObjectMapper() - .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); - return Base64.getEncoder().encodeToString(objectMapper.writeValueAsBytes(authConfig)); + return Base64.getEncoder().encodeToString(new ObjectMapper().writeValueAsBytes(authConfig)); } catch (IOException e) { throw new RuntimeException(e); } From cd11cf93dd5699a2fad12cf78873ea0d6472ba1a Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Tue, 19 Nov 2019 14:50:17 +0100 Subject: [PATCH 04/10] simplify AbstrDockerCmdExec --- .../github/dockerjava/core/exec/AbstrDockerCmdExec.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java index 6270118b6..78211bdec 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java @@ -24,15 +24,11 @@ public abstract class AbstrDockerCmdExec { private final WebTarget baseResource; - protected final ObjectMapper objectMapper; - public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) { checkNotNull(baseResource, "baseResource was not specified"); checkNotNull(dockerClientConfig, "dockerClientConfig was not specified"); this.baseResource = baseResource; this.dockerClientConfig = dockerClientConfig; - this.objectMapper = dockerClientConfig.getObjectMapper(); - checkNotNull(objectMapper, "objectMapper was not specified"); } protected WebTarget getBaseResource() { @@ -46,7 +42,7 @@ protected AuthConfigurations getBuildAuthConfigs() { protected String registryAuth(@Nonnull AuthConfig authConfig) { try { - return BaseEncoding.base64Url().encode(objectMapper.writeValueAsString(authConfig).getBytes()); + return BaseEncoding.base64Url().encode(dockerClientConfig.getObjectMapper().writeValueAsString(authConfig).getBytes()); } catch (IOException e) { throw new RuntimeException(e); } @@ -57,6 +53,7 @@ protected String registryConfigs(@Nonnull AuthConfigurations authConfigs) { try { final String json; final RemoteApiVersion apiVersion = dockerClientConfig.getApiVersion(); + ObjectMapper objectMapper = dockerClientConfig.getObjectMapper(); if (apiVersion.equals(UNKNOWN_VERSION)) { ObjectNode rootNode = objectMapper.valueToTree(authConfigs.getConfigs()); // all registries From e9ccbedbdf69b5cb5eb25773bf93ba1fa4479050 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 20 Nov 2019 08:24:02 +0100 Subject: [PATCH 05/10] Remove unnecessary Jackson annotations --- .../dockerjava/api/command/CreateContainerResponse.java | 2 -- .../github/dockerjava/api/command/CreateImageResponse.java | 2 -- .../dockerjava/api/command/CreateNetworkResponse.java | 2 -- .../dockerjava/api/command/CreateSecretResponse.java | 2 -- .../dockerjava/api/command/CreateServiceResponse.java | 2 -- .../dockerjava/api/command/CreateVolumeResponse.java | 2 -- .../dockerjava/api/command/ExecCreateCmdResponse.java | 2 -- .../java/com/github/dockerjava/api/command/GraphData.java | 2 -- .../com/github/dockerjava/api/command/GraphDriver.java | 2 -- .../com/github/dockerjava/api/command/HealthState.java | 2 -- .../com/github/dockerjava/api/command/HealthStateLog.java | 2 -- .../dockerjava/api/command/InspectContainerResponse.java | 5 ----- .../github/dockerjava/api/command/InspectExecResponse.java | 4 ---- .../dockerjava/api/command/InspectImageResponse.java | 2 -- .../dockerjava/api/command/InspectVolumeResponse.java | 2 -- .../github/dockerjava/api/command/ListVolumesResponse.java | 2 -- .../java/com/github/dockerjava/api/command/RootFS.java | 2 -- .../dockerjava/api/command/TopContainerResponse.java | 2 -- .../java/com/github/dockerjava/api/model/AuthConfig.java | 3 --- .../java/com/github/dockerjava/api/model/AuthResponse.java | 2 -- .../com/github/dockerjava/api/model/BlkioStatEntry.java | 4 ---- .../com/github/dockerjava/api/model/BlkioStatsConfig.java | 2 -- .../com/github/dockerjava/api/model/BuildResponseItem.java | 2 -- .../java/com/github/dockerjava/api/model/ChangeLog.java | 2 -- .../java/com/github/dockerjava/api/model/ClusterInfo.java | 4 ---- .../java/com/github/dockerjava/api/model/Container.java | 5 ----- .../com/github/dockerjava/api/model/ContainerConfig.java | 5 ----- .../github/dockerjava/api/model/ContainerDNSConfig.java | 4 ---- .../github/dockerjava/api/model/ContainerHostConfig.java | 2 -- .../com/github/dockerjava/api/model/ContainerMount.java | 2 -- .../com/github/dockerjava/api/model/ContainerNetwork.java | 2 -- .../dockerjava/api/model/ContainerNetworkSettings.java | 2 -- .../com/github/dockerjava/api/model/ContainerPort.java | 2 -- .../com/github/dockerjava/api/model/ContainerSpec.java | 4 ---- .../github/dockerjava/api/model/ContainerSpecConfig.java | 4 ---- .../com/github/dockerjava/api/model/ContainerSpecFile.java | 4 ---- .../api/model/ContainerSpecPrivilegesSELinuxContext.java | 4 ---- .../github/dockerjava/api/model/ContainerSpecSecret.java | 4 ---- .../com/github/dockerjava/api/model/CpuStatsConfig.java | 2 -- .../com/github/dockerjava/api/model/CpuUsageConfig.java | 2 -- .../main/java/com/github/dockerjava/api/model/Device.java | 3 --- .../java/com/github/dockerjava/api/model/DriverStatus.java | 5 ----- .../java/com/github/dockerjava/api/model/EndpointSpec.java | 4 ---- .../java/com/github/dockerjava/api/model/ErrorDetail.java | 3 --- .../com/github/dockerjava/api/model/ErrorResponse.java | 3 --- .../main/java/com/github/dockerjava/api/model/Event.java | 5 ----- .../java/com/github/dockerjava/api/model/ExternalCA.java | 4 ---- .../java/com/github/dockerjava/api/model/HealthCheck.java | 4 ---- .../java/com/github/dockerjava/api/model/HostConfig.java | 5 ----- .../main/java/com/github/dockerjava/api/model/Image.java | 5 ----- .../main/java/com/github/dockerjava/api/model/Info.java | 5 ----- .../github/dockerjava/api/model/InfoRegistryConfig.java | 3 --- .../main/java/com/github/dockerjava/api/model/LxcConf.java | 3 --- .../com/github/dockerjava/api/model/MemoryStatsConfig.java | 2 -- .../com/github/dockerjava/api/model/NamedResourceSpec.java | 5 ----- .../main/java/com/github/dockerjava/api/model/Network.java | 7 ------- .../dockerjava/api/model/NetworkAttachmentConfig.java | 4 ---- .../com/github/dockerjava/api/model/NetworkSettings.java | 2 -- .../main/java/com/github/dockerjava/api/model/Node.java | 3 --- .../com/github/dockerjava/api/model/ObjectVersion.java | 4 ---- .../java/com/github/dockerjava/api/model/PeerNode.java | 4 ---- .../com/github/dockerjava/api/model/PruneResponse.java | 2 -- .../com/github/dockerjava/api/model/PullResponseItem.java | 2 -- .../com/github/dockerjava/api/model/PushResponseItem.java | 3 --- .../github/dockerjava/api/model/ResourceRequirements.java | 4 ---- .../com/github/dockerjava/api/model/ResourceSpecs.java | 4 ---- .../com/github/dockerjava/api/model/ResourceVersion.java | 4 ---- .../java/com/github/dockerjava/api/model/ResponseItem.java | 5 ----- .../java/com/github/dockerjava/api/model/SearchItem.java | 2 -- .../main/java/com/github/dockerjava/api/model/Secret.java | 4 ---- .../java/com/github/dockerjava/api/model/SecretSpec.java | 4 ---- .../main/java/com/github/dockerjava/api/model/Service.java | 5 ----- .../dockerjava/api/model/ServiceGlobalModeOptions.java | 2 -- .../com/github/dockerjava/api/model/ServiceModeConfig.java | 2 -- .../com/github/dockerjava/api/model/ServicePlacement.java | 4 ---- .../java/com/github/dockerjava/api/model/ServiceSpec.java | 4 ---- .../dockerjava/api/model/StatisticNetworksConfig.java | 2 -- .../java/com/github/dockerjava/api/model/Statistics.java | 5 ----- .../com/github/dockerjava/api/model/SwarmCAConfig.java | 4 ---- .../github/dockerjava/api/model/SwarmDispatcherConfig.java | 4 ---- .../java/com/github/dockerjava/api/model/SwarmInfo.java | 4 ---- .../com/github/dockerjava/api/model/SwarmJoinTokens.java | 4 ---- .../java/com/github/dockerjava/api/model/SwarmNode.java | 4 ---- .../github/dockerjava/api/model/SwarmNodeDescription.java | 4 ---- .../dockerjava/api/model/SwarmNodeEngineDescription.java | 4 ---- .../dockerjava/api/model/SwarmNodeManagerStatus.java | 4 ---- .../dockerjava/api/model/SwarmNodePluginDescription.java | 4 ---- .../github/dockerjava/api/model/SwarmNodeResources.java | 4 ---- .../com/github/dockerjava/api/model/SwarmNodeSpec.java | 4 ---- .../com/github/dockerjava/api/model/SwarmNodeStatus.java | 4 ---- .../com/github/dockerjava/api/model/SwarmNodeVersion.java | 4 ---- .../github/dockerjava/api/model/SwarmOrchestration.java | 4 ---- .../com/github/dockerjava/api/model/SwarmRaftConfig.java | 4 ---- .../java/com/github/dockerjava/api/model/SwarmSpec.java | 4 ---- .../java/com/github/dockerjava/api/model/SwarmVersion.java | 4 ---- .../main/java/com/github/dockerjava/api/model/Task.java | 4 ---- .../java/com/github/dockerjava/api/model/TaskDefaults.java | 4 ---- .../java/com/github/dockerjava/api/model/TaskSpec.java | 4 ---- .../java/com/github/dockerjava/api/model/TaskStatus.java | 4 ---- .../dockerjava/api/model/TaskStatusContainerStatus.java | 4 ---- .../github/dockerjava/api/model/ThrottlingDataConfig.java | 2 -- .../java/com/github/dockerjava/api/model/TmpfsOptions.java | 4 ---- .../dockerjava/api/model/UpdateContainerResponse.java | 2 -- .../main/java/com/github/dockerjava/api/model/Version.java | 2 -- .../com/github/dockerjava/api/model/VersionComponent.java | 2 -- .../com/github/dockerjava/api/model/VersionPlatform.java | 2 -- .../java/com/github/dockerjava/api/model/WaitResponse.java | 2 -- .../dockerjava/core/command/CreateContainerCmdImpl.java | 3 --- .../github/dockerjava/core/command/ExecCreateCmdImpl.java | 3 --- .../github/dockerjava/core/command/ExecStartCmdImpl.java | 3 --- .../github/dockerjava/core/command/JoinSwarmCmdImpl.java | 2 -- .../dockerjava/core/command/StartContainerCmdImpl.java | 3 --- .../dockerjava/core/command/UpdateContainerCmdImpl.java | 5 +++-- 113 files changed, 3 insertions(+), 369 deletions(-) diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java index 091661af7..b19f8c6ae 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java @@ -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; @@ -10,7 +9,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class CreateContainerResponse { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java index 3cf373860..09b1929c0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java @@ -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; @@ -11,7 +10,6 @@ * @author Ryan Campbell (ryan.campbell@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class CreateImageResponse { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java index c43cdca53..a816f3f3a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java @@ -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 { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java index b71adc9c0..c9da4c3ba 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java @@ -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; @@ -8,7 +7,6 @@ /** * The response of a {@link CreateSecretCmd} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class CreateSecretResponse { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java index c570000e3..1cbd421b9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java @@ -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; @@ -8,7 +7,6 @@ /** * The response of a {@link CreateServiceCmd} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class CreateServiceResponse { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java index 7b9d9eed1..a6dffb94d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java @@ -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; @@ -9,7 +8,6 @@ * * @author Marcus Linke */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class CreateVolumeResponse { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java index c7065217c..e751896de 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java @@ -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 { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java index f64d4df0e..7852e8d59 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java @@ -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; @@ -11,7 +10,6 @@ * part of {@link GraphDriver} * @author Kanstantsin Shautsou */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class GraphData { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java index f9eebe8ea..5ba4d456e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java @@ -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; @@ -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 { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java index 6f5418713..cd7290785 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java @@ -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") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java index 9edee6127..d68dcb74f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java @@ -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") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java index 98d3a53cb..06e18fa21 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java @@ -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; @@ -23,7 +22,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class InspectContainerResponse { @@ -251,7 +249,6 @@ public String getPlatform() { return platform; } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerState { @@ -457,7 +454,6 @@ public HealthState getHealth() { } } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class Mount { @@ -583,7 +579,6 @@ public Mount withSource(String source) { } } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class Node { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java index e479562e3..06d904dc8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java @@ -2,7 +2,6 @@ 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; @@ -10,7 +9,6 @@ import javax.annotation.CheckForNull; -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class InspectExecResponse { @@ -152,7 +150,6 @@ public Long getPidLong() { return pid; } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ProcessConfig { @@ -193,7 +190,6 @@ public String getUser() { } } - @JsonIgnoreProperties(ignoreUnknown = true) public class Container { @JsonProperty("NetworkSettings") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java index 6d2ef6b87..b8590bfc6 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java @@ -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; @@ -14,7 +13,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class InspectImageResponse { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java index d42a1682a..020e0f9ae 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java @@ -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; @@ -9,7 +8,6 @@ * * @author Marcus Linke */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class InspectVolumeResponse { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java index 207e65ca6..4e1b449f8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java @@ -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; @@ -11,7 +10,6 @@ * * @author Marcus Linke */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ListVolumesResponse { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java index 9d6834c8e..e4cc0ec54 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java @@ -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; @@ -13,7 +12,6 @@ * * @author Dmitry Tretyakov */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class RootFS { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java index f3d4f8d1a..6f7b1d49f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java @@ -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; @@ -10,7 +9,6 @@ * @author Marcus Linke * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class TopContainerResponse { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java index 41f31b42e..1b6a01ea1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java @@ -1,7 +1,5 @@ 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; @@ -9,7 +7,6 @@ import javax.annotation.CheckForNull; import java.io.Serializable; -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class AuthConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java index 821d4c4ac..89069fe54 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java @@ -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; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java index f4def9089..d47b2fe42 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java @@ -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; @@ -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 { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java index 4822c5e82..55479d024 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java @@ -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; @@ -14,7 +13,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class BlkioStatsConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java index 7236be23d..b781bac9f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java @@ -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; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java index e69eb585c..922e2e2b3 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java @@ -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; @@ -12,7 +11,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ChangeLog implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java index c2e4fd9a5..40055106b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java @@ -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; @@ -16,8 +14,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ClusterInfo implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java index d5da8eb11..e2723a96b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java @@ -1,8 +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.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.ListContainersCmd; import lombok.EqualsAndHashCode; @@ -18,8 +15,6 @@ * * @author Konstantin Pelykh (kpelykh@gmail.com) */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Container implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java index dcb3cc99d..a84835277 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java @@ -1,9 +1,6 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -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; @@ -17,8 +14,6 @@ * * @author Konstantin Pelykh (kpelykh@gmail.com) */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java index bd84d26ce..c60414f81 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java @@ -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; @@ -14,8 +12,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_25} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerDNSConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java index e671f8a6d..590d22a92 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java @@ -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; @@ -13,7 +12,6 @@ * @see Container * @author Kanstantsin Shautsou */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerHostConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java index 59c2bccfc..48b4c9f47 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java @@ -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; @@ -12,7 +11,6 @@ * @author Yuting Liu * @see Container */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerMount implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java index cb3671fe0..52acf4c77 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java @@ -1,7 +1,6 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -19,7 +18,6 @@ * @see ContainerNetworkSettings * @author Kanstantsin Shautsou */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerNetwork implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java index be05bde22..19e249e29 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java @@ -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; @@ -14,7 +13,6 @@ * @see Container * @since {@link RemoteApiVersion#VERSION_1_22} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerNetworkSettings implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java index 2fedf33d9..b22aecc0e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java @@ -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; @@ -12,7 +11,6 @@ * @author Kanstantsin Shautsou * @see Container */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ContainerPort implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java index fa0c6cca5..f56399ce8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java @@ -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; @@ -16,8 +14,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerSpec implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java index 49c708fde..274ad8f55 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java @@ -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; @@ -13,8 +11,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_29} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerSpecConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java index 8b69c4a72..cf8471d7c 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java @@ -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; @@ -13,8 +11,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_26} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerSpecFile implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java index c2f4d0a62..c7fa68af8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java @@ -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; @@ -13,8 +11,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_29} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerSpecPrivilegesSELinuxContext implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java index 7e1b8e7e6..e92b2b07f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java @@ -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; @@ -13,8 +11,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_26} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ContainerSpecSecret implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java index 1444d5472..fce6e610d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.CheckForNull; @@ -11,7 +10,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) public class CpuStatsConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java index e85fc637e..e9e4d2212 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.CheckForNull; @@ -12,7 +11,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) public class CpuUsageConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java index 754a53df5..09223e52a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java @@ -2,8 +2,6 @@ import static java.util.Objects.requireNonNull; -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; @@ -14,7 +12,6 @@ import java.util.Map; import java.util.StringTokenizer; -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Device implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java index 44cdd8ee8..cca52f1d0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java @@ -1,8 +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.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,8 +9,6 @@ /** * @author ben */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class DriverStatus implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java index 73a002b55..75b5056f0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java @@ -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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class EndpointSpec implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java index 92e869d2a..10c3310d1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java @@ -1,12 +1,9 @@ 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 java.io.Serializable; -@JsonInclude(Include.NON_NULL) public class ErrorDetail implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java index f6abfc3eb..ef4f93eb1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java @@ -1,12 +1,9 @@ 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 java.io.Serializable; -@JsonInclude(Include.NON_NULL) public class ErrorResponse implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java index 589e3e3ba..59ecc67bd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java @@ -1,8 +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.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,8 +11,6 @@ /** * Representation of a Docker event. */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Event implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java index 575498d9e..95a80eb03 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java @@ -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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ExternalCA implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java index 0d3181e5f..e21a0763f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java @@ -15,8 +15,6 @@ */ 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; @@ -28,8 +26,6 @@ * * @author cdancy */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class HealthCheck implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java index f43dde1da..bcae9a4cc 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java @@ -1,9 +1,6 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -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; @@ -20,8 +17,6 @@ * Used in `/containers/create`, and in inspect container. * TODO exclude usage for 2 different models. */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class HostConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java index e04369aac..e6552eb35 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java @@ -1,8 +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.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -14,8 +11,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Image implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java index 1226180a6..e472fa622 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java @@ -1,8 +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.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -17,8 +14,6 @@ * * @author Konstantin Pelykh (kpelykh@gmail.com) */ -@JsonInclude(Include.NON_NULL) -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class Info implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java index a94716c4d..8c4d9f35d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java @@ -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; @@ -13,7 +12,6 @@ /** * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public final class InfoRegistryConfig implements Serializable { @@ -82,7 +80,6 @@ public InfoRegistryConfig withMirrors(Object mirrors) { /** * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20} */ - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static final class IndexConfig { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java index 0a60086fb..ddf1bbae0 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java @@ -1,12 +1,9 @@ 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 java.io.Serializable; -@JsonInclude(Include.NON_NULL) public class LxcConf implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java index 4320a89ed..12e6abccf 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.CheckForNull; @@ -11,7 +10,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) public class MemoryStatsConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java index a6d016fe2..e06f69d01 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java @@ -1,15 +1,10 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; - import java.io.Serializable; /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) public class NamedResourceSpec extends GenericResource implements Serializable { private static final long serialVersionUID = 1L; } diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java index 0945137d7..0187d73f4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java @@ -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; @@ -12,8 +10,6 @@ import java.util.List; import java.util.Map; -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class Network implements Serializable { @@ -96,7 +92,6 @@ public Map getLabels() { return labels; } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class ContainerNetworkConfig { @@ -130,7 +125,6 @@ public String getIpv6Address() { } } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class Ipam { @@ -171,7 +165,6 @@ public Ipam withDriver(String driver) { return this; } - @JsonIgnoreProperties(ignoreUnknown = true) public static class Config { @JsonProperty("Subnet") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java index 413803a9e..2afa87b73 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java @@ -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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class NetworkAttachmentConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java index 816604552..3ef92ac64 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java @@ -3,7 +3,6 @@ */ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,7 +15,6 @@ * @author Marcus Linke * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class NetworkSettings implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java index 9c901c072..2b12ab48f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java @@ -1,7 +1,5 @@ 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; @@ -11,7 +9,6 @@ /** * A node as returned by the /events API, for instance, when Swarm is used. */ -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Node implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java index 1e3f78a08..0b0259049 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java @@ -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 java.io.Serializable; @@ -15,8 +13,6 @@ * same base version, only one of the requests can succeed. As a result, two separate update requests that * happen at the same time will not unintentionally overwrite each other. */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) public class ObjectVersion implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java index ba9d49594..e20af63b9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java @@ -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; @@ -12,8 +10,6 @@ /** * @since 1.24 */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class PeerNode implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java index 0bf3ebde8..3efaf47c1 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java @@ -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; @@ -10,7 +9,6 @@ /** * Delete unused content (containers, images, volumes, networks, build relicts) */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class PruneResponse implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java index 3c9d99b2e..66a559934 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java @@ -1,12 +1,10 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; /** * Represents a pull response stream item */ -@JsonIgnoreProperties(ignoreUnknown = true) public class PullResponseItem extends ResponseItem { private static final long serialVersionUID = -2575482839766823293L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java index 829fbbbad..0b28a46fb 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java @@ -1,11 +1,8 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - /** * Represents a push response stream item */ -@JsonIgnoreProperties(ignoreUnknown = true) public class PushResponseItem extends ResponseItem { private static final long serialVersionUID = 8256977108011295857L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java index f72e861d6..463b22011 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java @@ -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; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ResourceRequirements implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java index 9af891b59..86ab24b52 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java @@ -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; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ResourceSpecs implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java index 14269bbe2..4838b78d7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java @@ -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; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ResourceVersion implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java index 2d932942a..d0f797a71 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java @@ -1,7 +1,6 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -12,7 +11,6 @@ /** * Represents a pull response stream item */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ResponseItem implements Serializable { @@ -118,7 +116,6 @@ public boolean isErrorIndicated() { return getError() != null || getErrorDetail() != null; } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class ProgressDetail implements Serializable { @@ -149,7 +146,6 @@ public Long getStart() { } } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class ErrorDetail implements Serializable { @@ -172,7 +168,6 @@ public String getMessage() { } } - @JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public static class AuxDetail implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java index eb5c04b0e..a77f38053 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java @@ -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; @@ -12,7 +11,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class SearchItem implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java index fba85c13e..20680f5fb 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java @@ -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 java.io.Serializable; @@ -12,8 +10,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_25} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) public class Secret implements Serializable { public static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java index a24e89aa2..572c0c90e 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java @@ -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; @@ -14,8 +12,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_25} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SecretSpec implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java index 4a809946d..63b3b4757 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java @@ -1,8 +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.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,8 +13,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Service implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java index f5e8455fa..ccd9b4bea 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -9,7 +8,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString @SuppressWarnings("checkstyle:hideutilityclassconstructor") diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java index 641ff22db..c179271bf 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java @@ -1,7 +1,6 @@ package com.github.dockerjava.api.model; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -11,7 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class ServiceModeConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java index 6a6c0d212..9c2f0223a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java @@ -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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ServicePlacement implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java index 84d4c23ee..b5ca4a5dd 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java @@ -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; @@ -14,8 +12,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class ServiceSpec implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java index 4d2ff8d67..d22b6a787 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java @@ -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; @@ -13,7 +12,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class StatisticNetworksConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java index 4abda09d1..2bbc91777 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java @@ -5,9 +5,6 @@ import javax.annotation.CheckForNull; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -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; @@ -15,8 +12,6 @@ /** * Representation of a Docker statistics. */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(Include.NON_NULL) @EqualsAndHashCode @ToString public class Statistics implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java index 0c853e57a..6f632aa1b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java @@ -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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmCAConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java index c7d6d9f84..bc8fd4305 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java @@ -1,8 +1,6 @@ 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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmDispatcherConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java index e7bd8fdd9..3fd8e8704 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java @@ -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; @@ -13,8 +11,6 @@ /** * @since 1.24 */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmInfo implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java index ddda93d53..06b1f3a78 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java @@ -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; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmJoinTokens implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java index ee556bd9a..cdb17c20d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java @@ -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; @@ -16,8 +14,6 @@ * * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNode implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java index 1044dd1f5..d0c35c873 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java @@ -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; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeDescription implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java index 5eff03272..41c369d09 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java @@ -1,8 +1,6 @@ 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; @@ -14,8 +12,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeEngineDescription implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java index 384c45a0f..07a0e448b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java @@ -1,8 +1,6 @@ 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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeManagerStatus implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java index 9e71e6188..d05bfb9c9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java @@ -1,8 +1,6 @@ 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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodePluginDescription implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java index 298360ce7..05f6d0203 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java @@ -1,8 +1,6 @@ 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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeResources implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java index b02366972..5162bdff7 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java @@ -1,8 +1,6 @@ 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; @@ -14,8 +12,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeSpec implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java index 7260f3da9..ba99a194a 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java @@ -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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeStatus implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java index ad2211aa5..35cbba491 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java @@ -1,8 +1,6 @@ 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; @@ -14,8 +12,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmNodeVersion implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java index e68018c3b..60cc1f32d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java @@ -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; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmOrchestration implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java index 17c2bcc95..16553defc 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java @@ -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; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmRaftConfig implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java index 656f826b3..bbc8f6db6 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java @@ -1,8 +1,6 @@ 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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmSpec implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java index 9a2f6c317..2d7fc3e43 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java @@ -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; @@ -12,8 +10,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class SwarmVersion implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java index dd8f3ac62..46585eed8 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java @@ -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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class Task implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java index 710b9b344..c385bd1b9 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java @@ -1,8 +1,6 @@ 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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class TaskDefaults implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java index c81192164..bef5e579d 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java @@ -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; @@ -13,8 +11,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class TaskSpec implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java index bdfdf35ea..a335350e4 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java @@ -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; @@ -11,8 +9,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class TaskStatus implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java index 84c760c43..0349e301f 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java @@ -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; @@ -11,8 +9,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_24} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class TaskStatusContainerStatus implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java index 5d38941c7..ce29b7057 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.CheckForNull; @@ -11,7 +10,6 @@ * * @author Yuting Liu */ -@JsonIgnoreProperties(ignoreUnknown = true) public class ThrottlingDataConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java index d5c4443ac..b2dc02a30 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java @@ -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; @@ -11,8 +9,6 @@ /** * @since {@link RemoteApiVersion#VERSION_1_29} */ -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonInclude(JsonInclude.Include.NON_NULL) @EqualsAndHashCode @ToString public class TmpfsOptions implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java index 37587de91..5b7b849b5 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import javax.annotation.CheckForNull; @@ -13,7 +12,6 @@ * https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/ * @since {@link RemoteApiVersion#VERSION_1_22} */ -@JsonIgnoreProperties(ignoreUnknown = true) public class UpdateContainerResponse extends ResponseItem { private static final long serialVersionUID = 1L; diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java index aed730c72..2ac89e88b 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.VersionCmd; import lombok.EqualsAndHashCode; @@ -16,7 +15,6 @@ * @author Konstantin Pelykh (kpelykh@gmail.com) * @see VersionCmd */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class Version implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java index 52579785a..bee6774ba 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java @@ -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; @@ -15,7 +14,6 @@ * @since {@link RemoteApiVersion#VERSION_1_35} * @author Dmitry Tretyakov */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class VersionComponent implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java index f86e3cb33..96b389ef6 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java @@ -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; @@ -14,7 +13,6 @@ * @since {@link RemoteApiVersion#VERSION_1_35} * @author Dmitry Tretyakov */ -@JsonIgnoreProperties(ignoreUnknown = true) @EqualsAndHashCode @ToString public class VersionPlatform implements Serializable { diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java index 0cab338b2..d80343057 100644 --- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java +++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java @@ -1,6 +1,5 @@ package com.github.dockerjava.api.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; @@ -8,7 +7,6 @@ /** * Represents a wait container command response */ -@JsonIgnoreProperties(ignoreUnknown = true) public class WaitResponse implements Serializable { private static final long serialVersionUID = 1L; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java index 74347e900..1360598de 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java @@ -1,8 +1,6 @@ package com.github.dockerjava.core.command; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.CreateContainerCmd; import com.github.dockerjava.api.command.CreateContainerResponse; @@ -43,7 +41,6 @@ * Creates a new container. * `/containers/create` */ -@JsonInclude(Include.NON_NULL) public class CreateContainerCmdImpl extends AbstrDockerCmd implements CreateContainerCmd { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java index ecf208b7e..dc410f78b 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java @@ -4,14 +4,11 @@ import java.util.List; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.ExecCreateCmd; import com.github.dockerjava.api.command.ExecCreateCmdResponse; import com.github.dockerjava.api.exception.NotFoundException; -@JsonInclude(Include.NON_NULL) public class ExecCreateCmdImpl extends AbstrDockerCmd implements ExecCreateCmd { private String containerId; diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java index 01532090a..9ab3bfb8e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java @@ -5,15 +5,12 @@ import java.io.InputStream; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.command.ExecStartCmd; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Frame; -@JsonInclude(Include.NON_NULL) public class ExecStartCmdImpl extends AbstrAsyncDockerCmd implements ExecStartCmd { @JsonIgnore diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java index 08e3a7cdc..72a1cdb82 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java @@ -1,7 +1,6 @@ package com.github.dockerjava.core.command; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.JoinSwarmCmd; import org.apache.commons.lang.builder.EqualsBuilder; @@ -11,7 +10,6 @@ import javax.annotation.CheckForNull; import java.util.List; -@JsonInclude(JsonInclude.Include.NON_NULL) public class JoinSwarmCmdImpl extends AbstrDockerCmd implements JoinSwarmCmd { diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java index 6f127da23..c159c920e 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java @@ -1,10 +1,8 @@ package com.github.dockerjava.core.command; -import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY; import static com.google.common.base.Preconditions.checkNotNull; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.exception.NotModifiedException; @@ -12,7 +10,6 @@ /** * Start a container */ -@JsonInclude(NON_EMPTY) public class StartContainerCmdImpl extends AbstrDockerCmd implements StartContainerCmd { @JsonIgnore diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java index 2ca771767..aad2b19e3 100644 --- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java +++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java @@ -1,6 +1,6 @@ package com.github.dockerjava.core.command; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.dockerjava.api.command.UpdateContainerCmd; import com.github.dockerjava.api.exception.NotFoundException; @@ -22,7 +22,7 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd implements UpdateContainerCmd { - @JsonIgnoreProperties + @JsonIgnore private String containerId; @JsonProperty("BlkioWeight") @@ -80,6 +80,7 @@ public UpdateContainerCmd withBlkioWeight(Integer blkioWeight) { * @see #containerId */ @CheckForNull + @JsonIgnore public String getContainerId() { return containerId; } From 1171555a6b2454ee584f2aa68a34682d2b126ba6 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 20 Nov 2019 08:52:15 +0100 Subject: [PATCH 06/10] Remove `anUnconfiguredCommandSerializesToEmptyJson` test case --- .../com/github/dockerjava/cmd/StartContainerCmdIT.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java index 3a00d2d53..b0c6508a6 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java @@ -2,7 +2,6 @@ import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.InspectContainerResponse; -import com.github.dockerjava.api.command.StartContainerCmd; import com.github.dockerjava.api.exception.DockerException; import com.github.dockerjava.api.exception.InternalServerErrorException; import com.github.dockerjava.api.exception.NotFoundException; @@ -16,7 +15,6 @@ import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.VolumesFrom; import com.github.dockerjava.core.command.WaitContainerResultCallback; -import com.github.dockerjava.test.serdes.JSONTestHelper; import net.jcip.annotations.NotThreadSafe; import org.junit.Test; import org.slf4j.Logger; @@ -570,10 +568,4 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio assertThat(inspectContainerResponse.getHostConfig().getDns(), is(notNullValue())); assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()), contains(dnsServer)); } - - @Test - public void anUnconfiguredCommandSerializesToEmptyJson() throws Exception { - StartContainerCmd command = dockerRule.getClient().startContainerCmd(""); - assertThat(JSONTestHelper.getMapper().writeValueAsString(command), is("{}")); - } } From 72990a28c120a5baf20a662b5a3706a52229cd07 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 20 Nov 2019 12:10:00 +0100 Subject: [PATCH 07/10] Try to disable the parallel test execution --- docker-java/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 2092e575d..5034f09c4 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -129,9 +129,9 @@ 3 - true - 1 - classes + + + com.github.dockerjava.junit.category.Integration com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration From eebb9ff4540a258678fae27bd507e9d22566babd Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 20 Nov 2019 14:22:58 +0100 Subject: [PATCH 08/10] Add more logging, try just "hello" --- .../com/github/dockerjava/cmd/AttachContainerCmdIT.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java index caaadde16..ba0128b78 100644 --- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java +++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java @@ -218,7 +218,7 @@ public void attachContainerClosesStdoutWhenContainerExits() throws Exception { DockerClient dockerClient = dockerRule.getClient(); CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE) - .withCmd("echo", "hello world") + .withCmd("echo", "hello") .withTty(false) .exec(); LOG.info("Created container: {}", container.toString()); @@ -238,6 +238,7 @@ public void onStart(Closeable stream) { @Override public void onNext(Frame item) { + LOG.info("Got frame: {}", item); if (item.getStreamType() == StreamType.STDOUT) { gotLineAtNanos.set(System.nanoTime()); gotLine.countDown(); @@ -245,6 +246,12 @@ public void onNext(Frame item) { super.onNext(item); } + @Override + public void onError(Throwable throwable) { + LOG.info("Got error: ", throwable); + super.onError(throwable); + } + @Override public void onComplete() { completed.countDown(); From 1aa68fa15b3baf7599b1724425c8bca6acd618a3 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 20 Nov 2019 15:28:24 +0100 Subject: [PATCH 09/10] Revert the parallel change --- docker-java/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 5034f09c4..2092e575d 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -129,9 +129,9 @@ 3 - - - + true + 1 + classes com.github.dockerjava.junit.category.Integration com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration From 0522a79032f90eb66d1ddebac5aea83370db3414 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Wed, 20 Nov 2019 15:42:53 +0100 Subject: [PATCH 10/10] Back to sequential tests :( --- docker-java/pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docker-java/pom.xml b/docker-java/pom.xml index 2092e575d..13b44f68b 100644 --- a/docker-java/pom.xml +++ b/docker-java/pom.xml @@ -127,11 +127,7 @@ - 3 - - true - 1 - classes + 5 com.github.dockerjava.junit.category.Integration com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration