Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix for #1154 #1155

Merged
merged 2 commits into from
Mar 12, 2016
Merged

Fix for #1154 #1155

merged 2 commits into from
Mar 12, 2016

Commits on Mar 9, 2016

  1. Test case for FasterXML#1154

    @yrodiere
    yrodiere committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    c5fba8a View commit details
    Browse the repository at this point in the history

  2. Fix for FasterXML#1154 

    Partially roll back to pre-FasterXML#1111 behavior.
We just make sure that the STRING shape is chosen when Shape.ANY (the default) is set on the annotation, but some other annotation attribute was also set (pattern, locale or timezone).
This way of fixing the issue has the added benefit of respecting the user config regarding the default serialization of dates when @jsonformat(shape = Shape.ANY) is set on a property.
    @yrodiere
    yrodiere committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    16cb352 View commit details
    Browse the repository at this point in the history