Commit 3efc1263 authored by Daniel Beland's avatar Daniel Beland
Browse files

configure jersey to use jackson over json binding

parent 5335c9e2
...@@ -403,12 +403,6 @@ ...@@ -403,12 +403,6 @@
<artifactId>jakarta.activation-api</artifactId> <artifactId>jakarta.activation-api</artifactId>
<version>${activation.version}</version> <version>${activation.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.inject</groupId> <groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId> <artifactId>jersey-hk2</artifactId>
...@@ -429,6 +423,11 @@ ...@@ -429,6 +423,11 @@
<artifactId>jersey-media-multipart</artifactId> <artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version> <version>${jersey.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jakarta.servlet-api</artifactId>
......
...@@ -38,6 +38,7 @@ import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; ...@@ -38,6 +38,7 @@ import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.client.JerseyClientBuilder; import org.glassfish.jersey.client.JerseyClientBuilder;
import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.media.multipart.Boundary; import org.glassfish.jersey.media.multipart.Boundary;
import org.glassfish.jersey.media.multipart.FormDataMultiPart; import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.MultiPart; import org.glassfish.jersey.media.multipart.MultiPart;
...@@ -242,6 +243,7 @@ public class GitLabApiClient implements AutoCloseable { ...@@ -242,6 +243,7 @@ public class GitLabApiClient implements AutoCloseable {
clientConfig.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, true); clientConfig.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, true);
clientConfig.register(JacksonJson.class); clientConfig.register(JacksonJson.class);
clientConfig.register(JacksonFeature.class);
clientConfig.register(MultiPartFeature.class); clientConfig.register(MultiPartFeature.class);
} }
...@@ -769,6 +771,7 @@ public class GitLabApiClient implements AutoCloseable { ...@@ -769,6 +771,7 @@ public class GitLabApiClient implements AutoCloseable {
// Register JacksonJson as the ObjectMapper provider. // Register JacksonJson as the ObjectMapper provider.
clientBuilder.register(JacksonJson.class); clientBuilder.register(JacksonJson.class);
clientBuilder.register(JacksonFeature.class);
if (ignoreCertificateErrors) { if (ignoreCertificateErrors) {
clientBuilder.sslContext(openSslContext).hostnameVerifier(openHostnameVerifier); clientBuilder.sslContext(openSslContext).hostnameVerifier(openHostnameVerifier);
......
...@@ -16,6 +16,7 @@ import javax.ws.rs.core.MediaType; ...@@ -16,6 +16,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.ContextResolver;
import org.gitlab4j.api.models.User; import org.gitlab4j.api.models.User;
import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonGenerationException;
...@@ -37,7 +38,6 @@ import com.fasterxml.jackson.databind.SerializationFeature; ...@@ -37,7 +38,6 @@ import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.type.CollectionType; import com.fasterxml.jackson.databind.type.CollectionType;
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
/** /**
* Jackson JSON Configuration and utility class. * Jackson JSON Configuration and utility class.
......
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