[JAVA] Generate and use variable name for setting discriminator and fix #9205

[DaveChamberlinKidd]

PR checklist

• Read the contribution guidelines.
• Filed the PR against the correct branch: 3.0.0 branch for changes related to OpenAPI spec 3.0. Default: master.
• Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Doesn't seem to be a name on the technical committee for Java.
The original change was made by @SergeyLyakhov and the person who authorized it @wing328

Description of the PR

This fixes a bug with discriminators that are specified with underscores.

In v2.4.0 a change was made which automatically populated the discriminator variable
with the class name. However whilst the variable name was converted from the model to
a java friendly variable, for example object_type to objectType in the parent class
the set variable didn't translate accordingly and so leaves uncompilable code.

As a result the generated code produced was...

  public ParentObject() {
    this.object_type = this.getClass().getSimpleName();
  }
  public ParentObject objectType(String objectType) {
    this.objectType = objectType;
    return this;
  }

and not

    this.objectType = this.getClass().getSimpleName();

I created new discriminatorClassVarName variable in the CodegenModel to store the converted discriminator name and populated it with the discriminator value converted to the correct style by calling the existing toParamName method.

I'm happy to refactor that code before merging in as the nested ifs are getting a bit nasty but didn't want to do that until someone had signed off on the approach as I don't know the code base and might be missing a better solution.

Also change the pojo mustache template to use the new variable rather than the plain discriminator value currently used.

If the PR is missing info you need apologies it's my first.

[DaveChamberlinKidd]

Also feeling bad that I haven't added a test though you can see the example swagger.yaml in the issue I raised #9205.

[HugoMario]

hey @flamangoes, thanks for this PR, changes looks pretty neat for me, it will only affect the files where new property is used, so i think it's ok to merge. i'm going to check this issue to see if it's present on v3 and port it .

[DaveChamberlinKidd]

Great thanks

…

On Wed, 6 Mar 2019 at 02:17, HugoMario ***@***.***> wrote: hey @flamangoes <https://github.com/flamangoes>, thanks for this PR, changes looks pretty neat for me, it will only affect the files where new property is used, so i think it's ok to merge. i'm going to check this issue to see if it's present on v3 and port it . — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#9207 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AGJEDw8sZmcIhFHsvKgZGAYrNUrYBMOFks5vTyUbgaJpZM4bMWQ6> .