I have pushed a minimal set of changes that fix my issue. I am not 100% this is the right way to solve the problem, though, any advice is welcome!

May I interest some reviewers in reviewing this PR?

Hi @julienrf ! Appreciate your effort while contributing to the project. I reviewed the code and left one comment. Should you have any questions to the comment, please let me know :)

Thank you!

Thank you @timur27 for the review and improved solution! I’ve just pushed a commit that follows your suggestion.

Hey @timur27, may I request another review?

Hey @timur27, may I request another review?

I see there are some test failures, could you address them? :) @julienrf

Hi @timur27,
I followed your suggestion but I am not sure that we should treat the oneOf schemas like the allOf schemas. In particular, I don’t think we should call addSchema on them because a one of schema must be at most one of the alternative schemas, unlike anyOf and allOf schemas. Doing so breaks a lot of tests that rely on getOneOf and getDiscriminator to manipulate the underlying mapping of a one of schema.
So, I have added back my initial solution, which I think is correct.

Friendly reminder: it would be great if I could get a review :)

Could anyone help us move this PR forward? Maybe @joschi (forgive me the direct ping please :) )
If I could help anyhow, don't hesitate to let me know.