Merge pull request gitlab4j#795 from dcendents/json_binding

configure jersey to use jackson over json binding
tmonning-xt · Mar 8, 2022 · e9e2a5b · e9e2a5b
2 parents 044bf32 + f517be4
commit e9e2a5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -403,12 +403,6 @@
 			<artifactId>jakarta.activation-api</artifactId>
 			<version>${activation.version}</version>
 		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.inject</groupId>
 			<artifactId>jersey-hk2</artifactId>
@@ -429,6 +423,11 @@
 			<artifactId>jersey-media-multipart</artifactId>
 			<version>${jersey.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>

diff --git a/src/main/java/org/gitlab4j/api/GitLabApiClient.java b/src/main/java/org/gitlab4j/api/GitLabApiClient.java
@@ -38,6 +38,7 @@
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.JerseyClientBuilder;
+import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.media.multipart.BodyPart;
 import org.glassfish.jersey.media.multipart.Boundary;
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
@@ -244,6 +245,7 @@ public GitLabApiClient(ApiVersion apiVersion, String hostUrl, TokenType tokenTyp
         clientConfig.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, true);
 
         clientConfig.register(JacksonJson.class);
+        clientConfig.register(JacksonFeature.class);
         clientConfig.register(MultiPartFeature.class);
     }
 
@@ -778,6 +780,7 @@ protected Client createApiClient() {
 
         // Register JacksonJson as the ObjectMapper provider.
         clientBuilder.register(JacksonJson.class);
+        clientBuilder.register(JacksonFeature.class);
 
         if (ignoreCertificateErrors) {
             clientBuilder.sslContext(openSslContext).hostnameVerifier(openHostnameVerifier);

diff --git a/src/main/java/org/gitlab4j/api/utils/JacksonJson.java b/src/main/java/org/gitlab4j/api/utils/JacksonJson.java
@@ -16,6 +16,7 @@
 import javax.ws.rs.ext.ContextResolver;
 
 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.core.JsonGenerationException;
@@ -37,7 +38,6 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.type.CollectionType;
-import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 
 /**
  * Jackson JSON Configuration and utility class.