Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
aed88211
Commit
aed88211
authored
Oct 12, 2019
by
Greg Messner
Browse files
Mods to explicitly set the ObjectMapper provider (#448).
parent
ccaa8f51
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/GitLabApiClient.java
View file @
aed88211
...
@@ -721,6 +721,9 @@ public class GitLabApiClient {
...
@@ -721,6 +721,9 @@ public class GitLabApiClient {
// library to work when both Jersey and Resteasy are present
// library to work when both Jersey and Resteasy are present
ClientBuilder
clientBuilder
=
new
JerseyClientBuilder
().
withConfig
(
clientConfig
);
ClientBuilder
clientBuilder
=
new
JerseyClientBuilder
().
withConfig
(
clientConfig
);
// Register JacksonJson as the ObjectMapper provider.
clientBuilder
.
register
(
JacksonJson
.
class
);
if
(
ignoreCertificateErrors
)
{
if
(
ignoreCertificateErrors
)
{
clientBuilder
.
sslContext
(
openSslContext
).
hostnameVerifier
(
openHostnameVerifier
);
clientBuilder
.
sslContext
(
openSslContext
).
hostnameVerifier
(
openHostnameVerifier
);
}
}
...
...
src/main/java/org/gitlab4j/api/utils/JacksonJson.java
View file @
aed88211
...
@@ -14,7 +14,6 @@ import java.util.TimeZone;
...
@@ -14,7 +14,6 @@ import java.util.TimeZone;
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
;
import
javax.ws.rs.ext.Provider
;
import
org.gitlab4j.api.models.User
;
import
org.gitlab4j.api.models.User
;
...
@@ -43,7 +42,6 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
...
@@ -43,7 +42,6 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
/**
/**
* Jackson JSON Configuration and utility class.
* Jackson JSON Configuration and utility class.
*/
*/
@Provider
@Produces
(
MediaType
.
APPLICATION_JSON
)
@Produces
(
MediaType
.
APPLICATION_JSON
)
public
class
JacksonJson
extends
JacksonJaxbJsonProvider
implements
ContextResolver
<
ObjectMapper
>
{
public
class
JacksonJson
extends
JacksonJaxbJsonProvider
implements
ContextResolver
<
ObjectMapper
>
{
...
@@ -72,6 +70,8 @@ public class JacksonJson extends JacksonJaxbJsonProvider implements ContextResol
...
@@ -72,6 +70,8 @@ public class JacksonJson extends JacksonJaxbJsonProvider implements ContextResol
module
.
addSerializer
(
Date
.
class
,
new
JsonDateSerializer
());
module
.
addSerializer
(
Date
.
class
,
new
JsonDateSerializer
());
module
.
addDeserializer
(
Date
.
class
,
new
JsonDateDeserializer
());
module
.
addDeserializer
(
Date
.
class
,
new
JsonDateDeserializer
());
objectMapper
.
registerModule
(
module
);
objectMapper
.
registerModule
(
module
);
setMapper
(
objectMapper
);
}
}
@Override
@Override
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment