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.

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

[2.7.x] Fix Json issues: parse on form and tailrec deser #10496

Merged
merged 6 commits into from Oct 26, 2020

Conversation

octonato
Copy link
Member

No description provided.

@@ -0,0 +1,186 @@
/*
* Copyright (C) Lightbend Inc. <https://www.lightbend.com>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Today is like one of those days that you convince yourself that nothing that you know about builds is valid.

I changed that line because of this error in Travis.

CleanShot 2020-10-26 at 17 14 39

Note, this is a scala file failing when running the java code formatter. Ok, before running the java formatter we run the scala formatter, so we could think that it's failing because the code was modified by the scala formatter. Well, in that case, the scala formatter should fail, no?

Moreover, I could not reproduce it locally. So, simply decided to change the offending line and pray that this thing will pass.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One more weird thing about it, is that the failure is about a file header. Which is checked after scalafmt and javafmt.

Anyway, I can't explain that.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason may be that my local branch was not rebased which surprises me because I remember to have done it. I can be mistaking.

ignasi35 and others added 6 commits October 26, 2020 19:12
Co-authored-by: James Roper <james@jazzy.id.au>
Co-authored-by: Marcos Pereira <marcos.silva@gmail.com>
Co-authored-by: James Roper <james@jazzy.id.au>
Co-authored-by: Marcos Pereira <marcos.silva@gmail.com>
Co-authored-by: Johannes Rudolph <johannes.rudolph@gmail.com>
Co-authored-by: Renato Cavalcanti <renato@cavalcanti.be>
@mergify mergify bot merged commit c8bff56 into 2.7.x Oct 26, 2020
@mergify mergify bot deleted the rgc/json-fix-2.7.x branch October 26, 2020 20:34
object JacksonJsonNodeModule extends JacksonJsonNodeModule

private class JsonNodeDeserializer extends JsonDeserializer[JsonNode] {
override def isCachable: Boolean = true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isCacheable?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants