Commit ba09289c authored by Greg Messner's avatar Greg Messner
Browse files

Mods to make the Jersey client work in a server environment.

parent 92e14f81
...@@ -4,7 +4,6 @@ package com.messners.gitlab.api; ...@@ -4,7 +4,6 @@ package com.messners.gitlab.api;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.ContextResolver;
...@@ -12,6 +11,7 @@ import javax.ws.rs.ext.Provider; ...@@ -12,6 +11,7 @@ import javax.ws.rs.ext.Provider;
import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.ObjectWriter; import org.codehaus.jackson.map.ObjectWriter;
...@@ -28,8 +28,7 @@ import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; ...@@ -28,8 +28,7 @@ import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
*/ */
@Provider @Provider
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON) public class JacksonJson extends JacksonJaxbJsonProvider implements ContextResolver<ObjectMapper> {
public class JacksonJson implements ContextResolver<ObjectMapper> {
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment