Skip to content

Commit 98b2655

Browse files
author
Marcus Linke
committed
Upgraded from jersey-json to jackson-jaxrs 2.3.3
1 parent 88b06be commit 98b2655

21 files changed

+159
-156
lines changed

‎pom.xml‎

Lines changed: 96 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34

45
<parent>
@@ -52,6 +53,8 @@
5253
<jersey.version>1.18</jersey.version>
5354
<jersey-apache-client4.version>1.9</jersey-apache-client4.version>
5455

56+
<jackson-jaxrs.version>2.3.3</jackson-jaxrs.version>
57+
5558
<httpclient.version>4.2.5</httpclient.version>
5659
<commons-compress.version>1.5</commons-compress.version>
5760
<commons-io.version>2.3</commons-io.version>
@@ -78,20 +81,21 @@
7881

7982
<dependencies>
8083
<dependency>
81-
<groupId>com.sun.jersey</groupId>
82-
<artifactId>jersey-core</artifactId>
83-
<version>${jersey.version}</version>
84+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
85+
<artifactId>jackson-jaxrs-json-provider</artifactId>
86+
<version>${jackson-jaxrs.version}</version>
8487
</dependency>
8588
<dependency>
8689
<groupId>com.sun.jersey</groupId>
87-
<artifactId>jersey-client</artifactId>
90+
<artifactId>jersey-core</artifactId>
8891
<version>${jersey.version}</version>
8992
</dependency>
9093
<dependency>
9194
<groupId>com.sun.jersey</groupId>
92-
<artifactId>jersey-json</artifactId>
95+
<artifactId>jersey-client</artifactId>
9396
<version>${jersey.version}</version>
9497
</dependency>
98+
9599
<dependency>
96100
<groupId>com.sun.jersey.contribs</groupId>
97101
<artifactId>jersey-multipart</artifactId>
@@ -210,93 +214,92 @@
210214

211215

212216
<build>
213-
<pluginManagement>
214-
<plugins>
215-
216-
<plugin>
217-
<groupId>org.apache.maven.plugins</groupId>
218-
<artifactId>maven-release-plugin</artifactId>
219-
<version>${maven-release-plugin.version}</version>
220-
</plugin>
221-
222-
<plugin>
223-
<groupId>org.apache.maven.plugins</groupId>
224-
<artifactId>maven-compiler-plugin</artifactId>
225-
<version>${maven-compiler-plugin.version}</version>
226-
<configuration>
227-
<source>${jdk.source}</source>
228-
<target>${jdk.target}</target>
229-
<encoding>ISO-8859-1</encoding>
230-
<debug>${jdk.debug}</debug>
231-
<optimize>${jdk.optimize}</optimize>
232-
</configuration>
233-
</plugin>
234-
235-
<plugin>
236-
<groupId>org.apache.maven.plugins</groupId>
237-
<artifactId>maven-jar-plugin</artifactId>
238-
<version>${maven-jar-plugin.version}</version>
239-
<executions>
240-
<execution>
241-
<goals>
242-
<goal>test-jar</goal>
243-
</goals>
244-
</execution>
245-
</executions>
246-
</plugin>
247-
248-
<plugin>
249-
<groupId>org.apache.maven.plugins</groupId>
250-
<artifactId>maven-surefire-plugin</artifactId>
251-
<version>${maven-surefire-plugin.version}</version>
252-
<configuration>
253-
<skipTests>${skipTests}</skipTests>
254-
</configuration>
255-
</plugin>
256-
257-
258-
<plugin>
259-
<groupId>org.codehaus.mojo</groupId>
260-
<artifactId>cobertura-maven-plugin</artifactId>
261-
<version>${cobertura-maven-plugin.version}</version>
262-
</plugin>
263-
264-
<plugin>
265-
<groupId>org.apache.maven.plugins</groupId>
266-
<artifactId>maven-antrun-plugin</artifactId>
267-
<version>${maven-antrun-plugin.version}</version>
268-
<executions>
269-
<execution>
270-
<phase>validate</phase>
271-
<goals>
272-
<goal>run</goal>
273-
</goals>
274-
<configuration>
275-
<tasks>
276-
<echo>*******************************************************************</echo>
277-
<echo>*******************************************************************</echo>
278-
<echo>[project.name] : ${project.name}</echo>
279-
<echo>[project.basedir] : ${project.basedir}</echo>
280-
<echo>[project.version] : ${project.version}</echo>
281-
<echo>[project.artifactId] ${project.artifactId}</echo>
282-
<echo>[project.build.directory] ${project.build.directory}</echo>
283-
<echo>[jdk.source] : ${jdk.source}</echo>
284-
<echo>[jdk.target] : ${jdk.target}</echo>
285-
<echo>[jdk.debug] : ${jdk.debug}</echo>
286-
<echo>[jdk.optimize] : ${jdk.optimize}</echo>
287-
<echo>[source encoding]: ${project.build.sourceEncoding}</echo>
288-
<echo>[M2_HOME] : ${env.M2_HOME}</echo>
289-
<echo>[LocalRepository] : ${settings.localRepository}</echo>
290-
<echo>*******************************************************************</echo>
291-
<echo>*******************************************************************</echo>
292-
</tasks>
293-
</configuration>
294-
</execution>
295-
</executions>
296-
</plugin>
297-
298-
</plugins>
299-
</pluginManagement>
217+
<pluginManagement>
218+
<plugins>
219+
220+
<plugin>
221+
<groupId>org.apache.maven.plugins</groupId>
222+
<artifactId>maven-release-plugin</artifactId>
223+
<version>${maven-release-plugin.version}</version>
224+
</plugin>
225+
226+
<plugin>
227+
<groupId>org.apache.maven.plugins</groupId>
228+
<artifactId>maven-compiler-plugin</artifactId>
229+
<version>${maven-compiler-plugin.version}</version>
230+
<configuration>
231+
<source>${jdk.source}</source>
232+
<target>${jdk.target}</target>
233+
<encoding>ISO-8859-1</encoding>
234+
<debug>${jdk.debug}</debug>
235+
<optimize>${jdk.optimize}</optimize>
236+
</configuration>
237+
</plugin>
238+
239+
<plugin>
240+
<groupId>org.apache.maven.plugins</groupId>
241+
<artifactId>maven-jar-plugin</artifactId>
242+
<version>${maven-jar-plugin.version}</version>
243+
<executions>
244+
<execution>
245+
<goals>
246+
<goal>test-jar</goal>
247+
</goals>
248+
</execution>
249+
</executions>
250+
</plugin>
251+
252+
<plugin>
253+
<groupId>org.apache.maven.plugins</groupId>
254+
<artifactId>maven-surefire-plugin</artifactId>
255+
<version>${maven-surefire-plugin.version}</version>
256+
<configuration>
257+
<skipTests>${skipTests}</skipTests>
258+
</configuration>
259+
</plugin>
260+
261+
262+
<plugin>
263+
<groupId>org.codehaus.mojo</groupId>
264+
<artifactId>cobertura-maven-plugin</artifactId>
265+
<version>${cobertura-maven-plugin.version}</version>
266+
</plugin>
267+
268+
<plugin>
269+
<groupId>org.apache.maven.plugins</groupId>
270+
<artifactId>maven-antrun-plugin</artifactId>
271+
<version>${maven-antrun-plugin.version}</version>
272+
<executions>
273+
<execution>
274+
<phase>validate</phase>
275+
<goals>
276+
<goal>run</goal>
277+
</goals>
278+
<configuration>
279+
<tasks>
280+
<echo>*******************************************************************</echo>
281+
<echo>*******************************************************************</echo>
282+
<echo>[project.name] : ${project.name}</echo>
283+
<echo>[project.basedir] : ${project.basedir}</echo>
284+
<echo>[project.version] : ${project.version}</echo>
285+
<echo>[project.artifactId] ${project.artifactId}</echo>
286+
<echo>[project.build.directory] ${project.build.directory}</echo>
287+
<echo>[jdk.source] : ${jdk.source}</echo>
288+
<echo>[jdk.target] : ${jdk.target}</echo>
289+
<echo>[jdk.debug] : ${jdk.debug}</echo>
290+
<echo>[jdk.optimize] : ${jdk.optimize}</echo>
291+
<echo>[source encoding]: ${project.build.sourceEncoding}</echo>
292+
<echo>[LocalRepository] : ${settings.localRepository}</echo>
293+
<echo>*******************************************************************</echo>
294+
<echo>*******************************************************************</echo>
295+
</tasks>
296+
</configuration>
297+
</execution>
298+
</executions>
299+
</plugin>
300+
301+
</plugins>
302+
</pluginManagement>
300303
</build>
301304

302305
</project>

‎src/main/java/com/kpelykh/docker/client/DockerClient.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.kpelykh.docker.client;
22

3+
import com.fasterxml.jackson.databind.ObjectMapper;
4+
import com.fasterxml.jackson.databind.node.ObjectNode;
35
import com.google.common.base.Preconditions;
46
import com.kpelykh.docker.client.model.*;
57
import com.kpelykh.docker.client.utils.CompressArchiveUtil;
@@ -9,10 +11,10 @@
911
import com.sun.jersey.api.client.config.ClientConfig;
1012
import com.sun.jersey.api.client.config.DefaultClientConfig;
1113
import com.sun.jersey.api.client.filter.LoggingFilter;
12-
import com.sun.jersey.api.json.JSONConfiguration;
1314
import com.sun.jersey.client.apache4.ApacheHttpClient4;
1415
import com.sun.jersey.client.apache4.ApacheHttpClient4Handler;
1516
import com.sun.jersey.core.util.MultivaluedMapImpl;
17+
1618
import org.apache.commons.codec.binary.Base64;
1719
import org.apache.commons.io.FileUtils;
1820
import org.apache.commons.io.IOUtils;
@@ -25,14 +27,12 @@
2527
import org.apache.http.conn.ssl.SSLSocketFactory;
2628
import org.apache.http.impl.client.DefaultHttpClient;
2729
import org.apache.http.impl.conn.PoolingClientConnectionManager;
28-
import org.codehaus.jackson.map.ObjectMapper;
29-
import org.codehaus.jettison.json.JSONException;
30-
import org.codehaus.jettison.json.JSONObject;
3130
import org.slf4j.Logger;
3231
import org.slf4j.LoggerFactory;
3332

3433
import javax.ws.rs.core.MediaType;
3534
import javax.ws.rs.core.MultivaluedMap;
35+
3636
import java.io.File;
3737
import java.io.IOException;
3838
import java.io.InputStream;
@@ -62,7 +62,7 @@ public DockerClient() {
6262
public DockerClient(String serverUrl) {
6363
restEndpointUrl = serverUrl + "/v1.11";
6464
ClientConfig clientConfig = new DefaultClientConfig();
65-
clientConfig.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
65+
//clientConfig.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
6666

6767
SchemeRegistry schemeRegistry = new SchemeRegistry();
6868
schemeRegistry.register(new Scheme("http", 4243, PlainSocketFactory.getSocketFactory()));
@@ -585,8 +585,8 @@ public int waitContainer(String containerId) throws DockerException, NotFoundExc
585585

586586
try {
587587
LOGGER.trace("POST: {}", webResource);
588-
JSONObject jsonObject = webResource.accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_JSON).post(JSONObject.class);
589-
return jsonObject.getInt("StatusCode");
588+
ObjectNode ObjectNode = webResource.accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_JSON).post(ObjectNode.class);
589+
return ObjectNode.get("StatusCode").asInt();
590590
} catch (UniformInterfaceException exception) {
591591
if (exception.getResponse().getStatus() == 404) {
592592
throw new NotFoundException(String.format("No such container %s", containerId));
@@ -595,7 +595,7 @@ public int waitContainer(String containerId) throws DockerException, NotFoundExc
595595
} else {
596596
throw new DockerException(exception);
597597
}
598-
} catch (JSONException e) {
598+
} catch (Exception e) {
599599
throw new DockerException(e);
600600
}
601601
}
@@ -765,8 +765,8 @@ public String commit(CommitConfig commitConfig) throws DockerException, NotFound
765765

766766
try {
767767
LOGGER.trace("POST: {}", webResource);
768-
JSONObject jsonObject = webResource.accept("application/vnd.docker.raw-stream").post(JSONObject.class, params);
769-
return jsonObject.getString("Id");
768+
ObjectNode ObjectNode = webResource.accept("application/vnd.docker.raw-stream").post(ObjectNode.class, params);
769+
return ObjectNode.get("Id").asText();
770770
} catch (UniformInterfaceException exception) {
771771
if (exception.getResponse().getStatus() == 404) {
772772
throw new NotFoundException(String.format("No such container %s", commitConfig.getContainer()));
@@ -775,7 +775,7 @@ public String commit(CommitConfig commitConfig) throws DockerException, NotFound
775775
} else {
776776
throw new DockerException(exception);
777777
}
778-
} catch (JSONException e) {
778+
} catch (Exception e) {
779779
throw new DockerException(e);
780780
}
781781
}

‎src/main/java/com/kpelykh/docker/client/model/AuthConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.kpelykh.docker.client.model;
22

3-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
4-
import org.codehaus.jackson.annotate.JsonProperty;
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
55

66
@JsonIgnoreProperties(ignoreUnknown = true)
77
public class AuthConfig {

‎src/main/java/com/kpelykh/docker/client/model/BoundHostVolumes.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@
1818
*/
1919
package com.kpelykh.docker.client.model;
2020

21+
import com.fasterxml.jackson.core.JsonGenerator;
22+
import com.fasterxml.jackson.databind.JsonSerializer;
23+
import com.fasterxml.jackson.databind.SerializerProvider;
24+
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
25+
2126
import java.io.IOException;
2227
import java.util.ArrayList;
2328
import java.util.List;
2429

25-
import org.codehaus.jackson.JsonGenerator;
26-
import org.codehaus.jackson.map.JsonSerializer;
27-
import org.codehaus.jackson.map.SerializerProvider;
28-
import org.codehaus.jackson.map.annotate.JsonSerialize;
29-
30-
3130
/**
3231
* @author Kevin A. Archie <karchie@wustl.edu>
3332
*

‎src/main/java/com/kpelykh/docker/client/model/ChangeLog.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.kpelykh.docker.client.model;
22

3-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
4-
import org.codehaus.jackson.annotate.JsonProperty;
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
55

66
/**
77
*

‎src/main/java/com/kpelykh/docker/client/model/CommitConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.kpelykh.docker.client.model;
22

3-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
4-
import org.codehaus.jackson.annotate.JsonProperty;
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
55

66
/**
77
*

‎src/main/java/com/kpelykh/docker/client/model/Container.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.kpelykh.docker.client.model;
22

3-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
4-
import org.codehaus.jackson.annotate.JsonProperty;
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
55

66
import java.util.Arrays;
77

‎src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.kpelykh.docker.client.model;
22

3-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
4-
import org.codehaus.jackson.annotate.JsonProperty;
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
55

66
import java.util.Arrays;
77
import java.util.Map;

‎src/main/java/com/kpelykh/docker/client/model/ContainerCreateResponse.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.kpelykh.docker.client.model;
22

3-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
4-
import org.codehaus.jackson.annotate.JsonProperty;
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
55

66
import java.util.Arrays;
77

0 commit comments

Comments
 (0)