Skip to content
GitLab

[Java-server] Fix improper quoting of default values for query parameters

Merged Administrator requested to merge github/fork/OmriHarary/fix_issue540 into master

Created by: OmriHarary

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language. cc: @bbdouglas @JFCote @sreeshas @jfiala @lukoyanov @cbornet @jeff9finger

Description of the PR

Fixes issue described in #540 (closed) where non-enum string default values for query parameters were being surrounded with two sets of quotes so generated code would not compile.

Modified templates for spring, java-pkmst, java-msf4j, jaxrs-cxf, jaxrs-spec, jaxrs-cxf-cdi, jaxrs-cxf-client, jaxrs-jersey, and jaxrs-resteasy generators to only add double quotes around non-string and string enum default values, since AbstractJavaCodegen.toDefaultValue() already adds the quotes to non-enum string values.

The issue is also present in code generated by java-play-framework, but attempted fixes caused problems with non-query params and likely require more substantial changes.

Also fixes a related issue with java-vertx generation where the quotes on string default values were being HTML escaped, and string enum default values were not being quoted at all.