-
Notifications
You must be signed in to change notification settings - Fork 2.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move standard ObjectMapper customization to dedicated Customizer
#40819
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
...ons/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/ConfigurationCustomizer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package io.quarkus.jackson.runtime; | ||
|
|
||
| import java.time.ZoneId; | ||
| import java.util.TimeZone; | ||
|
|
||
| import jakarta.inject.Inject; | ||
| import jakarta.inject.Singleton; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.databind.DeserializationFeature; | ||
| import com.fasterxml.jackson.databind.MapperFeature; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.fasterxml.jackson.databind.SerializationFeature; | ||
|
|
||
| import io.quarkus.jackson.ObjectMapperCustomizer; | ||
|
|
||
| @Singleton | ||
| public class ConfigurationCustomizer implements ObjectMapperCustomizer { | ||
| @Inject | ||
| JacksonBuildTimeConfig jacksonBuildTimeConfig; | ||
|
|
||
| @Inject | ||
| JacksonSupport jacksonSupport; | ||
|
|
||
| @Override | ||
| public void customize(ObjectMapper objectMapper) { | ||
| if (!jacksonBuildTimeConfig.failOnUnknownProperties) { | ||
| // this feature is enabled by default, so we disable it | ||
| objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); | ||
| } | ||
geoand marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (!jacksonBuildTimeConfig.failOnEmptyBeans) { | ||
| // this feature is enabled by default, so we disable it | ||
| objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); | ||
| } | ||
| if (!jacksonBuildTimeConfig.writeDatesAsTimestamps) { | ||
| // this feature is enabled by default, so we disable it | ||
| objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); | ||
| } | ||
| if (!jacksonBuildTimeConfig.writeDurationsAsTimestamps) { | ||
| // this feature is enabled by default, so we disable it | ||
| objectMapper.disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS); | ||
| } | ||
| if (jacksonBuildTimeConfig.acceptCaseInsensitiveEnums) { | ||
| objectMapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS); | ||
| } | ||
| JsonInclude.Include serializationInclusion = jacksonBuildTimeConfig.serializationInclusion.orElse(null); | ||
| if (serializationInclusion != null) { | ||
| objectMapper.setSerializationInclusion(serializationInclusion); | ||
| } | ||
| ZoneId zoneId = jacksonBuildTimeConfig.timezone.orElse(null); | ||
| if ((zoneId != null) && !zoneId.getId().equals("UTC")) { // Jackson uses UTC as the default, so let's not reset it | ||
| objectMapper.setTimeZone(TimeZone.getTimeZone(zoneId)); | ||
| } | ||
| if (jacksonSupport.configuredNamingStrategy().isPresent()) { | ||
| objectMapper.setPropertyNamingStrategy(jacksonSupport.configuredNamingStrategy().get()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public int priority() { | ||
| // we return the maximum possible priority to make sure these | ||
| // settings are always applied first, before any other customizers. | ||
| return ObjectMapperCustomizer.MAXIMUM_PRIORITY; | ||
| } | ||
| } | ||
37 changes: 0 additions & 37 deletions
37
...nsions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/ObjectMapperProducer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this the correct way of doing it? Or should I use the
producerinstead of theadditionalProducer?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should work just fine :)