From 98b265515b152822fc9a28e598ceb150bf6a892a Mon Sep 17 00:00:00 2001 From: Marcus Linke Date: Sat, 17 May 2014 13:10:55 +0200 Subject: [PATCH] Upgraded from jersey-json to jackson-jaxrs 2.3.3 --- pom.xml | 189 +++++++++--------- .../kpelykh/docker/client/DockerClient.java | 22 +- .../docker/client/model/AuthConfig.java | 4 +- .../docker/client/model/BoundHostVolumes.java | 11 +- .../docker/client/model/ChangeLog.java | 4 +- .../docker/client/model/CommitConfig.java | 4 +- .../docker/client/model/Container.java | 4 +- .../docker/client/model/ContainerConfig.java | 4 +- .../client/model/ContainerCreateResponse.java | 4 +- .../model/ContainerInspectResponse.java | 4 +- .../docker/client/model/CopyConfig.java | 4 +- .../docker/client/model/DriverStatus.java | 4 +- .../docker/client/model/HostConfig.java | 4 +- .../kpelykh/docker/client/model/Image.java | 4 +- .../client/model/ImageCreateResponse.java | 4 +- .../client/model/ImageInspectResponse.java | 4 +- .../com/kpelykh/docker/client/model/Info.java | 6 +- .../com/kpelykh/docker/client/model/Port.java | 4 +- .../kpelykh/docker/client/model/Ports.java | 23 ++- .../docker/client/model/SearchItem.java | 4 +- .../kpelykh/docker/client/model/Version.java | 4 +- 21 files changed, 159 insertions(+), 156 deletions(-) diff --git a/pom.xml b/pom.xml index a7390017..3de239d1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 @@ -52,6 +53,8 @@ 1.18 1.9 + 2.3.3 + 4.2.5

1.5

2.3 @@ -78,20 +81,21 @@ - com.sun.jersey - jersey-core - ${jersey.version} + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson-jaxrs.version} com.sun.jersey - jersey-client + jersey-core ${jersey.version} com.sun.jersey - jersey-json + jersey-client ${jersey.version} + com.sun.jersey.contribs jersey-multipart @@ -210,93 +214,92 @@ - - - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${jdk.source} - ${jdk.target} - ISO-8859-1 - ${jdk.debug} - ${jdk.optimize} - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - - test-jar - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - ${skipTests} - - - - - - org.codehaus.mojo - cobertura-maven-plugin - ${cobertura-maven-plugin.version} - - - - org.apache.maven.plugins - maven-antrun-plugin - ${maven-antrun-plugin.version} - - - validate - - run - - - - ******************************************************************* - ******************************************************************* - [project.name] : ${project.name} - [project.basedir] : ${project.basedir} - [project.version] : ${project.version} - [project.artifactId] ${project.artifactId} - [project.build.directory] ${project.build.directory} - [jdk.source] : ${jdk.source} - [jdk.target] : ${jdk.target} - [jdk.debug] : ${jdk.debug} - [jdk.optimize] : ${jdk.optimize} - [source encoding]: ${project.build.sourceEncoding} - [M2_HOME] : ${env.M2_HOME} - [LocalRepository] : ${settings.localRepository} - ******************************************************************* - ******************************************************************* - - - - - - - - + + + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${jdk.source} + ${jdk.target} + ISO-8859-1 + ${jdk.debug} + ${jdk.optimize} + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + + test-jar + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + ${skipTests} + + + + + + org.codehaus.mojo + cobertura-maven-plugin + ${cobertura-maven-plugin.version} + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + validate + + run + + + + ******************************************************************* + ******************************************************************* + [project.name] : ${project.name} + [project.basedir] : ${project.basedir} + [project.version] : ${project.version} + [project.artifactId] ${project.artifactId} + [project.build.directory] ${project.build.directory} + [jdk.source] : ${jdk.source} + [jdk.target] : ${jdk.target} + [jdk.debug] : ${jdk.debug} + [jdk.optimize] : ${jdk.optimize} + [source encoding]: ${project.build.sourceEncoding} + [LocalRepository] : ${settings.localRepository} + ******************************************************************* + ******************************************************************* + + + + + + + + diff --git a/src/main/java/com/kpelykh/docker/client/DockerClient.java b/src/main/java/com/kpelykh/docker/client/DockerClient.java index 1f606922..2e370b4a 100644 --- a/src/main/java/com/kpelykh/docker/client/DockerClient.java +++ b/src/main/java/com/kpelykh/docker/client/DockerClient.java @@ -1,5 +1,7 @@ package com.kpelykh.docker.client; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.base.Preconditions; import com.kpelykh.docker.client.model.*; import com.kpelykh.docker.client.utils.CompressArchiveUtil; @@ -9,10 +11,10 @@ import com.sun.jersey.api.client.config.ClientConfig; import com.sun.jersey.api.client.config.DefaultClientConfig; import com.sun.jersey.api.client.filter.LoggingFilter; -import com.sun.jersey.api.json.JSONConfiguration; import com.sun.jersey.client.apache4.ApacheHttpClient4; import com.sun.jersey.client.apache4.ApacheHttpClient4Handler; import com.sun.jersey.core.util.MultivaluedMapImpl; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -25,14 +27,12 @@ import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.conn.PoolingClientConnectionManager; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jettison.json.JSONException; -import org.codehaus.jettison.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -62,7 +62,7 @@ public DockerClient() { public DockerClient(String serverUrl) { restEndpointUrl = serverUrl + "/v1.11"; ClientConfig clientConfig = new DefaultClientConfig(); - clientConfig.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE); + //clientConfig.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE); SchemeRegistry schemeRegistry = new SchemeRegistry(); schemeRegistry.register(new Scheme("http", 4243, PlainSocketFactory.getSocketFactory())); @@ -585,8 +585,8 @@ public int waitContainer(String containerId) throws DockerException, NotFoundExc try { LOGGER.trace("POST: {}", webResource); - JSONObject jsonObject = webResource.accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_JSON).post(JSONObject.class); - return jsonObject.getInt("StatusCode"); + ObjectNode ObjectNode = webResource.accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_JSON).post(ObjectNode.class); + return ObjectNode.get("StatusCode").asInt(); } catch (UniformInterfaceException exception) { if (exception.getResponse().getStatus() == 404) { throw new NotFoundException(String.format("No such container %s", containerId)); @@ -595,7 +595,7 @@ public int waitContainer(String containerId) throws DockerException, NotFoundExc } else { throw new DockerException(exception); } - } catch (JSONException e) { + } catch (Exception e) { throw new DockerException(e); } } @@ -765,8 +765,8 @@ public String commit(CommitConfig commitConfig) throws DockerException, NotFound try { LOGGER.trace("POST: {}", webResource); - JSONObject jsonObject = webResource.accept("application/vnd.docker.raw-stream").post(JSONObject.class, params); - return jsonObject.getString("Id"); + ObjectNode ObjectNode = webResource.accept("application/vnd.docker.raw-stream").post(ObjectNode.class, params); + return ObjectNode.get("Id").asText(); } catch (UniformInterfaceException exception) { if (exception.getResponse().getStatus() == 404) { throw new NotFoundException(String.format("No such container %s", commitConfig.getContainer())); @@ -775,7 +775,7 @@ public String commit(CommitConfig commitConfig) throws DockerException, NotFound } else { throw new DockerException(exception); } - } catch (JSONException e) { + } catch (Exception e) { throw new DockerException(e); } } diff --git a/src/main/java/com/kpelykh/docker/client/model/AuthConfig.java b/src/main/java/com/kpelykh/docker/client/model/AuthConfig.java index 3fc709f7..514e79be 100644 --- a/src/main/java/com/kpelykh/docker/client/model/AuthConfig.java +++ b/src/main/java/com/kpelykh/docker/client/model/AuthConfig.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class AuthConfig { diff --git a/src/main/java/com/kpelykh/docker/client/model/BoundHostVolumes.java b/src/main/java/com/kpelykh/docker/client/model/BoundHostVolumes.java index c5c30de4..9a912439 100644 --- a/src/main/java/com/kpelykh/docker/client/model/BoundHostVolumes.java +++ b/src/main/java/com/kpelykh/docker/client/model/BoundHostVolumes.java @@ -18,16 +18,15 @@ */ package com.kpelykh.docker.client.model; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.map.JsonSerializer; -import org.codehaus.jackson.map.SerializerProvider; -import org.codehaus.jackson.map.annotate.JsonSerialize; - - /** * @author Kevin A. Archie * diff --git a/src/main/java/com/kpelykh/docker/client/model/ChangeLog.java b/src/main/java/com/kpelykh/docker/client/model/ChangeLog.java index ac45ad3e..50fdab4a 100644 --- a/src/main/java/com/kpelykh/docker/client/model/ChangeLog.java +++ b/src/main/java/com/kpelykh/docker/client/model/ChangeLog.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * diff --git a/src/main/java/com/kpelykh/docker/client/model/CommitConfig.java b/src/main/java/com/kpelykh/docker/client/model/CommitConfig.java index 51a83d8e..4023deb7 100644 --- a/src/main/java/com/kpelykh/docker/client/model/CommitConfig.java +++ b/src/main/java/com/kpelykh/docker/client/model/CommitConfig.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * diff --git a/src/main/java/com/kpelykh/docker/client/model/Container.java b/src/main/java/com/kpelykh/docker/client/model/Container.java index 14970c3c..3e6554cb 100644 --- a/src/main/java/com/kpelykh/docker/client/model/Container.java +++ b/src/main/java/com/kpelykh/docker/client/model/Container.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Arrays; diff --git a/src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java b/src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java index 5e9dbf7d..d0865ae0 100644 --- a/src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java +++ b/src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Arrays; import java.util.Map; diff --git a/src/main/java/com/kpelykh/docker/client/model/ContainerCreateResponse.java b/src/main/java/com/kpelykh/docker/client/model/ContainerCreateResponse.java index 43b6144d..8f60ce15 100644 --- a/src/main/java/com/kpelykh/docker/client/model/ContainerCreateResponse.java +++ b/src/main/java/com/kpelykh/docker/client/model/ContainerCreateResponse.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Arrays; diff --git a/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java b/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java index 55db87e3..555842e7 100644 --- a/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java +++ b/src/main/java/com/kpelykh/docker/client/model/ContainerInspectResponse.java @@ -3,8 +3,8 @@ import java.util.Map; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * diff --git a/src/main/java/com/kpelykh/docker/client/model/CopyConfig.java b/src/main/java/com/kpelykh/docker/client/model/CopyConfig.java index 7fea11fc..696778a2 100755 --- a/src/main/java/com/kpelykh/docker/client/model/CopyConfig.java +++ b/src/main/java/com/kpelykh/docker/client/model/CopyConfig.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Configuration object for copy command. diff --git a/src/main/java/com/kpelykh/docker/client/model/DriverStatus.java b/src/main/java/com/kpelykh/docker/client/model/DriverStatus.java index 3968efc1..5421bc44 100644 --- a/src/main/java/com/kpelykh/docker/client/model/DriverStatus.java +++ b/src/main/java/com/kpelykh/docker/client/model/DriverStatus.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Created by ben on 12/12/13. diff --git a/src/main/java/com/kpelykh/docker/client/model/HostConfig.java b/src/main/java/com/kpelykh/docker/client/model/HostConfig.java index ec6a043e..dc7d4258 100644 --- a/src/main/java/com/kpelykh/docker/client/model/HostConfig.java +++ b/src/main/java/com/kpelykh/docker/client/model/HostConfig.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Arrays; diff --git a/src/main/java/com/kpelykh/docker/client/model/Image.java b/src/main/java/com/kpelykh/docker/client/model/Image.java index a6a1a18f..cfc578ce 100644 --- a/src/main/java/com/kpelykh/docker/client/model/Image.java +++ b/src/main/java/com/kpelykh/docker/client/model/Image.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Arrays; diff --git a/src/main/java/com/kpelykh/docker/client/model/ImageCreateResponse.java b/src/main/java/com/kpelykh/docker/client/model/ImageCreateResponse.java index 26d83400..21545a2d 100644 --- a/src/main/java/com/kpelykh/docker/client/model/ImageCreateResponse.java +++ b/src/main/java/com/kpelykh/docker/client/model/ImageCreateResponse.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Parse reponses from /images/create diff --git a/src/main/java/com/kpelykh/docker/client/model/ImageInspectResponse.java b/src/main/java/com/kpelykh/docker/client/model/ImageInspectResponse.java index 187cf5c3..a7b4409e 100644 --- a/src/main/java/com/kpelykh/docker/client/model/ImageInspectResponse.java +++ b/src/main/java/com/kpelykh/docker/client/model/ImageInspectResponse.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * diff --git a/src/main/java/com/kpelykh/docker/client/model/Info.java b/src/main/java/com/kpelykh/docker/client/model/Info.java index 59e9e9ed..72f2f360 100644 --- a/src/main/java/com/kpelykh/docker/client/model/Info.java +++ b/src/main/java/com/kpelykh/docker/client/model/Info.java @@ -1,8 +1,8 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.List; diff --git a/src/main/java/com/kpelykh/docker/client/model/Port.java b/src/main/java/com/kpelykh/docker/client/model/Port.java index 048c2ab5..538213ec 100644 --- a/src/main/java/com/kpelykh/docker/client/model/Port.java +++ b/src/main/java/com/kpelykh/docker/client/model/Port.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * @author Nicolas De Loof diff --git a/src/main/java/com/kpelykh/docker/client/model/Ports.java b/src/main/java/com/kpelykh/docker/client/model/Ports.java index d9fdab60..fc590289 100644 --- a/src/main/java/com/kpelykh/docker/client/model/Ports.java +++ b/src/main/java/com/kpelykh/docker/client/model/Ports.java @@ -1,13 +1,14 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.*; -import org.codehaus.jackson.map.DeserializationContext; -import org.codehaus.jackson.map.JsonDeserializer; -import org.codehaus.jackson.map.JsonSerializer; -import org.codehaus.jackson.map.SerializerProvider; -import org.codehaus.jackson.map.annotate.JsonDeserialize; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.node.NullNode; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.node.NullNode; import java.io.IOException; import java.util.HashMap; @@ -93,12 +94,12 @@ public Ports deserialize(JsonParser jsonParser, DeserializationContext deseriali Ports out = new Ports(); ObjectCodec oc = jsonParser.getCodec(); JsonNode node = oc.readTree(jsonParser); - for (Iterator> it = node.getFields(); it.hasNext();) { + for (Iterator> it = node.fields(); it.hasNext();) { Map.Entry field = it.next(); if (!field.getValue().equals(NullNode.getInstance())) { - String hostIp = field.getValue().get(0).get("HostIp").getTextValue(); - String hostPort = field.getValue().get(0).get("HostPort").getTextValue(); + String hostIp = field.getValue().get(0).get("HostIp").textValue(); + String hostPort = field.getValue().get(0).get("HostPort").textValue(); out.addPort(Port.makePort(field.getKey(), hostIp, hostPort)); } } diff --git a/src/main/java/com/kpelykh/docker/client/model/SearchItem.java b/src/main/java/com/kpelykh/docker/client/model/SearchItem.java index 8478a321..d7f6eb4f 100644 --- a/src/main/java/com/kpelykh/docker/client/model/SearchItem.java +++ b/src/main/java/com/kpelykh/docker/client/model/SearchItem.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * diff --git a/src/main/java/com/kpelykh/docker/client/model/Version.java b/src/main/java/com/kpelykh/docker/client/model/Version.java index d8d27b39..a427aafb 100644 --- a/src/main/java/com/kpelykh/docker/client/model/Version.java +++ b/src/main/java/com/kpelykh/docker/client/model/Version.java @@ -1,7 +1,7 @@ package com.kpelykh.docker.client.model; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** *