forked from loafle/openapi-generator-original
2 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Philzen
|
642b1a3a95
|
[JAVA] [SPRING] [PKMST] [MICRONAUT] XML wireformat: Fix Jackson useWrapping=false, JAXB+Jackson namespaces (#18870)
* Fix XML annotations on model properties (JavaSpring) * generate JAXB annotations for attributes and elements * generate wrapper annotations (JAXB and Jackson) * use XML config from items for annotations of containers * Add test for Jackson XML wrapper correctness * Add additional test cases to cover all xml applications in spec Test now covers all use cases described in - https://web.archive.org/web/20240424203304/https://swagger.io/docs/specification/data-models/representing-xml/ - https://spec.openapis.org/oas/v3.0.0#xml-arrays * Fix basename used instead of xmlName when items.xmlName is unset See last example in spec: https://spec.openapis.org/oas/v3.0.0#xml-arrays * Harmonize spacing between Annotation attribute name and value * Refactor and group JAXB vs. Jackson XML annotations, only generate latter if enabled This is in line with the way the class annotations in `xmlAnnotations.mustache` are rendered – which only renders the `@Jackson`… xml annotations if additionalProperty jackson is true. Also reorder annotation attributes in the following order: - localName/name - namespace (optional) - isAttribute/useWrapping (optional) * Explicitly render `useWrapping = true` to @JacksonXmlElementWrapper This was slightly inspired by @jzrebiec via PR #5371. Wrapping is the default since Jackson 2.1 – so explicitly rendering this will: - make generated model work out-of-the-box in Jackson 2.0 for instance - ensure the models still work if the local `XmlWrapper` was configured with `useXmlWrapper(false)` * Move xml test spec to java resources folder (not spring specific) * Make test class name match class-under-test This makes discovery & cross-navigation in IDE easier. * Add complete xml annotations test for Java generators * Fix Java PKMST generator not generating @JacksonXmlElementWrapper * Fix Java microprofile generator missing @JacksonXmlRootElement * Fix Java microprofile generator not using wrapper annotations and namespaces * Fix Java Micronaut Client creating invalid (unclosed) @XmlAttribute annotations * Fix Micronaut Client using wrong localName for @JacksonXmlElementWrapper * Fix Micronaut client rendering @JacksonXmlProperty annotation twice * Make Java Micronaut render @JacksonXmlElementWrapper(useWrapping=false) for non-wrapped elements * Fix Jackson element using `xml.name` when it should be `items.xml.name` Closes #5989 Closes #3223 Relates to #9371 * Fix JAXB element using `baseName` instead of `xmlName` when items.xmlName is unset * Remove XML generation debug output from templates * Remove redundant newline between XML class annotations and class Brings the SpringCodegen in line with other Java Codegen's * Remove redundant newline between XML setter annotations and setter * Fix multiline JavaDoc block indentation and format * Simplify / condense xml annotation template into single lines May look a bit more complex, but cuts out a lot of repetitiveness. Also reorders annotation attributes in the following order: - localName/name - namespace (optional) - isAttribute/useWrapping (optional) * Harmonize spacing between Annotation attribute name and value * Remove unused jackson_annotations partial Was not referenced anywhere in java-helidon resources folder --------- Co-authored-by: Christian Schuster <christian@dnup.de> |
||
Nicklas Wiegandt
|
ef2fa03e96
|
[Java][Client] Add support for the new Spring RestClient (#18522)
* feat (JAVA SPRING RESTTEMPLATE) 17571: initial commit for Spring RestClient * feat (JAVA SPRING RESTTEMPLATE) 17571: Copied and changed the webclient mustache files The RestClient API is oriented on the WebClient API so many parts of the templates can be the same * fix (JAVA SPRING RESTTEMPLATE) 17571: Renaming error & add README template The README must be changed because the minimal Java Version for this client is 17 * fix (JAVA SPRING RESTTEMPLATE) 17571: Imports, compile errors and cookie setting * feat (JAVA SPRING RESTTEMPLATE) 17571: Add generated samples * test (JAVA SPRING RESTTEMPLATE) 17571: Add tests * feat (JAVA SPRING RESTTEMPLATE) 17571: Update doc * Add the restcilent to samples-java-client-jdk17.yam The minimum Java version of the used Spring Version is 17 * fix (JAVA SPRING RESTTEMPLATE) 17571: Workflow paths to petstore samples * fix (JAVA SPRING RESTTEMPLATE) 17571: Regenerated samples * feat (JAVA SPRING RESTTEMPLATE) 17571: Generated echo-api sample for RestClient * fix (JAVA SPRING RESTTEMPLATE) 17571: Missing import * fix (JAVA SPRING RESTTEMPLATE) 17571: Missing body class exception when null body is set * test (JAVA SPRING RESTTEMPLATE) 17571: Add echo-api Auth test * fix (JAVA SPRING RESTTEMPLATE) 17571: Gradlew file permissions * feat (JAVA SPRING RESTTEMPLATE) 17571: Reggenerate samples after rebase * test (JAVA SPRING RESTTEMPLATE) 17571: Add echo-api Body gif test * test (JAVA SPRING RESTTEMPLATE) 17571: Add echo-api octet stream body test * test (JAVA SPRING RESTTEMPLATE) 17571: Add echo-api multipart form data test * fix (JAVA SPRING RESTTEMPLATE) 17571: Form as body when body is null Also regenerated the restclient samples |