Skip to content

Commit e9e2a5b

Browse files
authored
Merge pull request #795 from dcendents/json_binding
configure jersey to use jackson over json binding
2 parents 044bf32 + f517be4 commit e9e2a5b

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

pom.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,6 @@
403403
<artifactId>jakarta.activation-api</artifactId>
404404
<version>${activation.version}</version>
405405
</dependency>
406-
407-
<dependency>
408-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
409-
<artifactId>jackson-jaxrs-json-provider</artifactId>
410-
<version>${jackson.version}</version>
411-
</dependency>
412406
<dependency>
413407
<groupId>org.glassfish.jersey.inject</groupId>
414408
<artifactId>jersey-hk2</artifactId>
@@ -429,6 +423,11 @@
429423
<artifactId>jersey-media-multipart</artifactId>
430424
<version>${jersey.version}</version>
431425
</dependency>
426+
<dependency>
427+
<groupId>org.glassfish.jersey.media</groupId>
428+
<artifactId>jersey-media-json-jackson</artifactId>
429+
<version>${jersey.version}</version>
430+
</dependency>
432431
<dependency>
433432
<groupId>jakarta.servlet</groupId>
434433
<artifactId>jakarta.servlet-api</artifactId>

src/main/java/org/gitlab4j/api/GitLabApiClient.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.glassfish.jersey.client.ClientConfig;
3939
import org.glassfish.jersey.client.ClientProperties;
4040
import org.glassfish.jersey.client.JerseyClientBuilder;
41+
import org.glassfish.jersey.jackson.JacksonFeature;
4142
import org.glassfish.jersey.media.multipart.BodyPart;
4243
import org.glassfish.jersey.media.multipart.Boundary;
4344
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
@@ -244,6 +245,7 @@ public GitLabApiClient(ApiVersion apiVersion, String hostUrl, TokenType tokenTyp
244245
clientConfig.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, true);
245246

246247
clientConfig.register(JacksonJson.class);
248+
clientConfig.register(JacksonFeature.class);
247249
clientConfig.register(MultiPartFeature.class);
248250
}
249251

@@ -778,6 +780,7 @@ protected Client createApiClient() {
778780

779781
// Register JacksonJson as the ObjectMapper provider.
780782
clientBuilder.register(JacksonJson.class);
783+
clientBuilder.register(JacksonFeature.class);
781784

782785
if (ignoreCertificateErrors) {
783786
clientBuilder.sslContext(openSslContext).hostnameVerifier(openHostnameVerifier);

src/main/java/org/gitlab4j/api/utils/JacksonJson.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import javax.ws.rs.ext.ContextResolver;
1717

1818
import org.gitlab4j.api.models.User;
19+
import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider;
1920

2021
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2122
import com.fasterxml.jackson.core.JsonGenerationException;
@@ -37,7 +38,6 @@
3738
import com.fasterxml.jackson.databind.SerializerProvider;
3839
import com.fasterxml.jackson.databind.module.SimpleModule;
3940
import com.fasterxml.jackson.databind.type.CollectionType;
40-
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
4141

4242
/**
4343
* Jackson JSON Configuration and utility class.

0 commit comments

Comments
 (0)