Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Use jackson-jaxrs 2.3.3 #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2014
Merged

Use jackson-jaxrs 2.3.3 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 96 additions & 93 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<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">
<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">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -52,6 +53,8 @@
<jersey.version>1.18</jersey.version>
<jersey-apache-client4.version>1.9</jersey-apache-client4.version>

<jackson-jaxrs.version>2.3.3</jackson-jaxrs.version>

<httpclient.version>4.2.5</httpclient.version>
<commons-compress.version>1.5</commons-compress.version>
<commons-io.version>2.3</commons-io.version>
Expand All @@ -78,20 +81,21 @@

<dependencies>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-jaxrs.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>

<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
Expand Down Expand Up @@ -210,93 +214,92 @@


<build>
<pluginManagement>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${jdk.source}</source>
<target>${jdk.target}</target>
<encoding>ISO-8859-1</encoding>
<debug>${jdk.debug}</debug>
<optimize>${jdk.optimize}</optimize>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<skipTests>${skipTests}</skipTests>
</configuration>
</plugin>


<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>${cobertura-maven-plugin.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo>*******************************************************************</echo>
<echo>*******************************************************************</echo>
<echo>[project.name] : ${project.name}</echo>
<echo>[project.basedir] : ${project.basedir}</echo>
<echo>[project.version] : ${project.version}</echo>
<echo>[project.artifactId] ${project.artifactId}</echo>
<echo>[project.build.directory] ${project.build.directory}</echo>
<echo>[jdk.source] : ${jdk.source}</echo>
<echo>[jdk.target] : ${jdk.target}</echo>
<echo>[jdk.debug] : ${jdk.debug}</echo>
<echo>[jdk.optimize] : ${jdk.optimize}</echo>
<echo>[source encoding]: ${project.build.sourceEncoding}</echo>
<echo>[M2_HOME] : ${env.M2_HOME}</echo>
<echo>[LocalRepository] : ${settings.localRepository}</echo>
<echo>*******************************************************************</echo>
<echo>*******************************************************************</echo>
</tasks>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</pluginManagement>
<pluginManagement>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${jdk.source}</source>
<target>${jdk.target}</target>
<encoding>ISO-8859-1</encoding>
<debug>${jdk.debug}</debug>
<optimize>${jdk.optimize}</optimize>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<skipTests>${skipTests}</skipTests>
</configuration>
</plugin>


<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>${cobertura-maven-plugin.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo>*******************************************************************</echo>
<echo>*******************************************************************</echo>
<echo>[project.name] : ${project.name}</echo>
<echo>[project.basedir] : ${project.basedir}</echo>
<echo>[project.version] : ${project.version}</echo>
<echo>[project.artifactId] ${project.artifactId}</echo>
<echo>[project.build.directory] ${project.build.directory}</echo>
<echo>[jdk.source] : ${jdk.source}</echo>
<echo>[jdk.target] : ${jdk.target}</echo>
<echo>[jdk.debug] : ${jdk.debug}</echo>
<echo>[jdk.optimize] : ${jdk.optimize}</echo>
<echo>[source encoding]: ${project.build.sourceEncoding}</echo>
<echo>[LocalRepository] : ${settings.localRepository}</echo>
<echo>*******************************************************************</echo>
<echo>*******************************************************************</echo>
</tasks>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</pluginManagement>
</build>

</project>
22 changes: 11 additions & 11 deletions src/main/java/com/kpelykh/docker/client/DockerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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()));
Expand Down Expand Up @@ -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));
Expand All @@ -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);
}
}
Expand Down Expand Up @@ -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()));
Expand All @@ -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);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/kpelykh/docker/client/model/AuthConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/kpelykh/docker/client/model/BoundHostVolumes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/kpelykh/docker/client/model/ChangeLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

/**
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/kpelykh/docker/client/model/CommitConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

/**
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/kpelykh/docker/client/model/Container.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/kpelykh/docker/client/model/ContainerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/kpelykh/docker/client/model/ContainerCreateResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Loading