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

Bump RESTEasy to 4.5.8.Final #12270

Merged
merged 1 commit into from
Sep 24, 2020
Merged

Conversation

ronsigal
Copy link
Contributor

@ronsigal ronsigal commented Sep 22, 2020

This is #12232 but with RESTEasy version 4.5.8.Final. I don't have permission to edit #12232 directly.

Fixes: #10133

@ronsigal ronsigal changed the title Resteasy458 Bump RESTEasy to 4.5.8.Final Sep 22, 2020
@ronsigal
Copy link
Contributor Author

"Initial JDK 11 Build' failed because RESTEasy 4.5.8.Final hasn't made it to https://repo.maven.apache.org/maven2.

@ronsigal
Copy link
Contributor Author

RESTEasy 4.5.8.Final is now on https://repo.maven.apache.org/maven2. Could someone restart the tests?

@kenfinnigan
Copy link
Member

done

@gastaldi
Copy link
Contributor

That's awesome, but can you squash all these commits and add a Co-authored-by in the single commit? It seems to me that the upgrade only works when all these commits are applied, hence the request 😉

@ronsigal ronsigal force-pushed the resteasy458 branch 2 times, most recently from d1c814d to 9dbc5eb Compare September 23, 2020 16:38
@ronsigal
Copy link
Contributor Author

Hi @gastaldi,

re: "squash all these commits and add a Co-authored-by in the single commit?"

Done.

@gastaldi
Copy link
Contributor

@ronsigal excellent, but I thought the Co-Authored-By would mention @asoldano instead ?

@ronsigal
Copy link
Contributor Author

re: "would mention @asoldano instead"

Ah, I thought maybe there was some standard requiring a Co-authored-by in any case. I doubt that @asoldano would be offended, but, sure, I can update it. ;-)

[QUARKUS-423] Changes to conform to RESTEasy 4.5.7.Final

[QUARKUS-398] RESTEasy 4.5.7.Final->4.5.8.Final

Co-authored-by: Alessio Soldano <[email protected]>
@ronsigal
Copy link
Contributor Author

Done.

@gastaldi
Copy link
Contributor

@ronsigal thank you, yeah, it's just to give him credit for his commits ;)

@gastaldi gastaldi added this to the 1.9.0 - master milestone Sep 23, 2020
@gastaldi gastaldi added the triage/waiting-for-ci Ready to merge when CI successfully finishes label Sep 23, 2020
@ronsigal
Copy link
Contributor Author

re: "it's just to give him credit for his commits"

Cool. Maybe I can leverage this into a larger bonus. ;-)

@kenfinnigan
Copy link
Member

Is it also worth replacing https://github.com/quarkusio/quarkus/blob/master/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java#L64-L69 with the static call to ResteasyClientBuilderImpl that was added to RESTEasy?

@ronsigal
Copy link
Contributor Author

Hi @kenfinnigan,

re: "Is it also worth replacing"

Sorry, I'm not following ... . https://github.com/quarkusio/quarkus/blob/master/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java#L64-L69 doesn't reference ResteasyClientBuilderImpl. What am I missing?

@kenfinnigan
Copy link
Member

Sorry @ronsigal

Those lines were added because we didn't have the ability to set the static, so I think they can be removed and replaced with a call to the static, similar to calling the RestClientBuilderImpl static to set the provider factory

@ronsigal
Copy link
Contributor Author

Oh, man, I'm still not getting it. I blame 2020 because nothing else makes sense either. :(

@kenfinnigan
Copy link
Member

No worries.

Instead of the lines I highlighted that peek into the RESTEasy provider factory and set it, just call ResteasyClientBuilderImpl.setProviderFactory(clientProviderFactory);

@ronsigal
Copy link
Contributor Author

Mmmm, but ResteasyProviderFactory.instance and RestClientBuilderImpl.PROVIDER_FACTORY are two different things ... . I guess I still don't know the resteasy-client-microprofile code as well as I should.

@kenfinnigan
Copy link
Member

They most definitely are different, but hijacking the RESTEasy provider factory for everything was the only way we could hack it so that the ResteasyClientBuilderImpl ended up with the provider factory we wanted it to.

With the static, we don't need those shenanigans and we can just set the static.

Sound ok?

@ronsigal
Copy link
Contributor Author

Ahhhhhh. Yes, ok. ;-)

Would you like me to add that change to this PR?

Copy link
Contributor

@asoldano asoldano left a comment

Choose a reason for hiding this comment

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

Given this is passing CI, I would deal with what @kenfinnigan is asking for (enhancements relying on the additions in 4.5.8.Final) in another PR.

@gastaldi gastaldi merged commit 9c74230 into quarkusio:master Sep 24, 2020
@ronsigal
Copy link
Contributor Author

@kenfinnigan , I've created issue #12325 "Remove unnecesary code from RestClientRecorder" and pull request #12326 to remove that bit of code.

@gsmet
Copy link
Member

gsmet commented Oct 2, 2020

@kenfinnigan any chance you could address the static thing? You're probably the one with the best understanding of this.

@kenfinnigan
Copy link
Member

@ronsigal has provided a PR in #12326

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
triage/waiting-for-ci Ready to merge when CI successfully finishes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Spring MVC @RequestParam encoding problem on UTF-8
5 participants