Fix #18715 [JAVA] ensure codegen fields and additionalProperties are not conflicting

[jpfinne]

Only write back to additionalProperties if it was present

PR checklist

• Read the contribution guidelines.
• Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
• Run the following to build the project and update samples:

  ./mvnw clean package 
  ./bin/generate-samples.sh ./bin/configs/*.yaml
  ./bin/utils/export_docs_generators.sh
  

  (For Windows users, please run the script in Git BASH)
  Commit all changed files.
  This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
  These must match the expectations made by your contribution.
  You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
  IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
• File the PR against the correct branch: master (upcoming 7.6.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
• If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

[wing328]

can you please resolve the merge conflicts when you've time? then I'll get it merged first thing before merging other PRs

[jpfinne]

can you please resolve the merge conflicts when you've time? then I'll get it merged first thing before merging other PRs

Done

[wing328]

@jpfinne overall it looks good. May I know why these 3 lines are commented out?

[jpfinne]

removed

[wing328]

can you please add comments explaining what this code block does and what exactly is CodegenConstants.CONFIG?

[jpfinne]

Comments added
CONFIG renamed to MUSTACHE_PARENT_CONTEXT

[wing328]

thanks. that's much better

[wing328]

cc @OpenAPITools/generator-core-team

[wing328]

we can merge it to start with. i've a few more qeustions/suggestions that I'll discuss with you via Slack