[Spring] openapi-generator generates an incorrect stub for types named "Resource"

[jburgess]

This fixes #1680 and #1888. It is based on work by @ErikGrimes.

PR checklist

• Read the contribution guidelines.
• If contributing template-only or documentation-only changes which will change sample output, build the project before.
• Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
• File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
• Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@bbdouglas @sreeshas @jfiala @lukoyanov @cbornet @jeff9finger @karismann @Zomzog @lwlee2608 @bkabrda

[jburgess]

@wing328 Any help on this? The circleci fails with UNCOMMITTED CHANGES ERROR. I have run ./bin/utils/ensure-up-to-date --batch before commit a0e4207 and the output reported clean: Git working tree is clean . Any ideas on how to fix this? I would like to get this into 4.3.1

[wing328]

@jburgess I'll take a look tomorrow instead as it's pretty late here...

[wing328]

I've updated the samples via 179136f.

Restarted all the CI jobs. Let's see how it goes.

(there was a github outage earlier causing the build to fail)

[jburgess]

@wing328 Thank you for all of your help on this! I was hesitant to update and commit the samples based on guidance in the update scripts. Possible to link #1888 as well?

[jburgess]

Any help on getting this reviewed and into 4.3.1?

@bbdouglas @sreeshas @jfiala @lukoyanov @cbornet @jeff9finger @karismann @Zomzog @lwlee2608 @bkabrda

@wing328

[Frontrider]

This is the one issue we have right now. When can we expect it to be fixed?

[maddingo]

Unfortunately, this fix didn't make it into 4.3.1. I tried to resolve the merge conflicts, but gave up. There are a lot og changes that apply to the documentation. And then some in the PHP code/tests. Since this bug only concerns Spring, is it really necessary to add code for other languages as well?

[wing328]

Closed via #8178