[Java][Native] Support oneOf/anyOf schemas #7263

bgong-mdsol · 2020-08-20T17:30:52Z

Description of the PR

This PR includes

Add oneOf and anyOf implementation (based on java jersey2 approach)
re-generate sample projects of native/asyncNative
add a sample project for OneOf

@wing328 @sebastien-rosset @cbornet @jeff9finger @bbdouglas @sreeshas @jfiala @lukoyanov @karismann @Zomzog @lwlee2608 @bkabrda @jfeltesse-mdsol @jcarres-mdsol

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.
If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. 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*. For Windows users, please run the script in Git BASH.
File the PR against the correct branch: master
Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

jfeltesse-mdsol · 2020-08-21T05:41:21Z

modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache

+            }
+            {{/discriminator}}
+            {{#anyOf}}
+            // deserialzie {{{.}}}


fixed in 675545c

jfeltesse-mdsol · 2020-08-21T05:41:59Z

modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache

+    public {{classname}}() {
+        super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
+    }
+{{> libraries/jersey2/additional_properties }}


jersey2 reference here?

updated in 675545c

jfeltesse-mdsol · 2020-08-21T05:42:38Z

modules/openapi-generator/src/main/resources/Java/libraries/native/JSON.mustache

+  private static JSON json;
+
+  static
+  {


elsewhere in the code the curly brace is on the same line as static

updated in 675545c

jfeltesse-mdsol · 2020-08-21T05:43:45Z

modules/openapi-generator/src/main/resources/Java/libraries/native/model.mustache

+{{/additionalPropertiesType}}
+{{/model}}
+{{/models}}
+{{^supportJava6}}


is this needed? unsure what it means actually but native == JDK 11

removed in 675545c

jfeltesse-mdsol · 2020-08-21T05:45:00Z

modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache

+    public {{classname}}() {
+        super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
+    }
+{{> libraries/jersey2/additional_properties }}


here as well, jersey2

updated in 675545c

bgong-mdsol · 2020-09-15T15:42:01Z

@wing328 @sebastien-rosset @cbornet @jeff9finger @bbdouglas @sreeshas @jfiala @lukoyanov @karismann @Zomzog @lwlee2608 @bkabrda @jfeltesse-mdsol @jcarres-mdsol

Can someone help to review this PR? Thanks in advance.

wing328 · 2020-09-20T10:48:28Z

bin/configs/java-native-8.yaml

+  artifactId: petstore-openapi3-native-java8
+  hideGenerationTimestamp: true
+  serverPort: "8082"
+  dateLibrary: java8


@bgong-mdsol I think you can remove this option as it makes no difference in the native library

For serverPort, I don't think it's used in the native template.

updated as suggested in 0ddb2a9

Can you please resolve the merge conflicts? I'll try to review and merge if no question from me later this week.

@wing328 Sure, I am going to resolve the merge conflicts.

wing328 · 2020-09-20T10:49:13Z

bin/configs/java-native-8.yaml

@@ -0,0 +1,12 @@
+generatorName: java
+outputDir: samples/openapi3/client/petstore/java/native-java8


I think native requires JDK11+ so I would remove java8 as it's a bit confusing.

updated as suggested in 0ddb2a9

bgong-mdsol · 2020-09-26T12:49:49Z

Are there anything that I need to address before get this merged? Thanks

wing328 · 2020-10-14T15:25:55Z

Can you please resolve the merge conflicts? I'll try to review and merge if no question from me later this week.

bgong-mdsol · 2020-10-15T01:58:08Z

@wing328 This PR is ready for review, thanks a lot

wing328 · 2020-10-15T09:28:21Z

Tests in Drone.io CI passed: https://cloud.drone.io/OpenAPITools/openapi-generator/11888

* master: (66 commits) [Typescript][Angular] Fix generated README when using apiModulePrefix (#7725) remove outdated scala files (#7723) [FEAT][TYPESCRIPT-ANGULAR] Add configurationPrefix option to allow generating unique configuration token (#7731) [bug] Fix FILES sort and path provider issue (#7729) better csharp tests (#7727) [go] Improve examples generation (#7576) Fixes #7635: typescript-inversify generator wrongly handles array type parameters (#7636) [Java] Fix import mapping for arrays with reference items of type string (#7182) [Java][Native] Support oneOf/anyOf schemas (#7263) [BUG][Ada] Incorrect client Ada code generated (#7719) add cake, sbt integration (#7713) Use 3.0 spec in documentations, update docs (#7710) remove github.com/antihax/optional from go.sum (#7692) Update junit to newer version (4.13.1) (#7690) [Fix/Dart2] Resolve an exception with status 204 and no body. (#7647) [typescript-angular] pass array as a single JSON string to url query when queryParamObjectFormat=json (fix #7620) (#7649) Add back HttpSigningConfiguration.cs remove HTTPSigningConfiguration.cs add AnyType support to Swift generators (#7644) fix warning, remove trailing spaces (#7659) ...

jfeltesse-mdsol reviewed Aug 21, 2020

View reviewed changes

bgong-mdsol force-pushed the feature/java-native-oneof branch 6 times, most recently from 6b04a39 to 6ac7aee Compare September 15, 2020 13:28

This was referenced Sep 17, 2020

[BUG][Java] Empty looking object is generated for anyOf type #6485

Open

[BUG] OpenAPI 4.0.2 not able to generate anyOf models. #4576

Open

wing328 reviewed Sep 20, 2020

View reviewed changes

wing328 added Client: Java Enhancement: Feature Feature: OAS 3.0 spec support labels Oct 14, 2020

wing328 added this to the 5.0.0 milestone Oct 14, 2020

bgong-mdsol added 3 commits October 14, 2020 20:25

Java-native add models of oneOf/anyOf

eb9f231

Java-native refresh samples

f001a37

Java-native add a sample project for openapi3

b04d96a

bgong-mdsol force-pushed the feature/java-native-oneof branch from 0ddb2a9 to b04d96a Compare October 15, 2020 00:47

wing328 approved these changes Oct 15, 2020

View reviewed changes

wing328 merged commit edf153e into OpenAPITools:master Oct 15, 2020

tschaffter mentioned this pull request Nov 7, 2020

OpenAPI 4.3.1 not able to generate anyOf models nlpsandbox/data-node#77

Closed

seybi87 mentioned this pull request Nov 20, 2020

[BUG] [Java] JAX-RS Jersey Compile errors when using oneOf in OpenApi definition #7988

Closed

bgong-mdsol deleted the feature/java-native-oneof branch November 25, 2020 00:33

tkalmar mentioned this pull request Jan 4, 2021

[BUG] Description #8320

Closed

6 tasks

4brunu mentioned this pull request Feb 17, 2021

[swift5] Add support for oneOfs #8714

Merged

5 tasks

shartte mentioned this pull request May 25, 2021

[java][native] Remove JAX-RS dependency from generated java-native client. #9585

Merged

5 tasks

hidingturtle mentioned this pull request Nov 17, 2021

[BUG][Java] OneOf-Class not generated #10880

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Java][Native] Support oneOf/anyOf schemas #7263

[Java][Native] Support oneOf/anyOf schemas #7263

bgong-mdsol commented Aug 20, 2020

jfeltesse-mdsol Aug 21, 2020

bgong-mdsol Aug 21, 2020

jfeltesse-mdsol Aug 21, 2020

bgong-mdsol Aug 21, 2020

jfeltesse-mdsol Aug 21, 2020

bgong-mdsol Aug 21, 2020

jfeltesse-mdsol Aug 21, 2020

bgong-mdsol Aug 21, 2020

jfeltesse-mdsol Aug 21, 2020

bgong-mdsol Aug 21, 2020

bgong-mdsol commented Sep 15, 2020

wing328 Sep 20, 2020 •

edited

Loading

bgong-mdsol Sep 20, 2020

bgong-mdsol Oct 14, 2020

wing328 Sep 20, 2020

bgong-mdsol Sep 20, 2020

bgong-mdsol commented Sep 26, 2020

wing328 commented Oct 14, 2020

bgong-mdsol commented Oct 15, 2020

wing328 commented Oct 15, 2020

		@@ -0,0 +1,12 @@
		generatorName: java
		outputDir: samples/openapi3/client/petstore/java/native-java8

[Java][Native] Support oneOf/anyOf schemas #7263

[Java][Native] Support oneOf/anyOf schemas #7263

Conversation

bgong-mdsol commented Aug 20, 2020

Description of the PR

PR checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bgong-mdsol commented Sep 15, 2020

wing328 Sep 20, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bgong-mdsol commented Sep 26, 2020

wing328 commented Oct 14, 2020

bgong-mdsol commented Oct 15, 2020

wing328 commented Oct 15, 2020

wing328 Sep 20, 2020 •

edited

Loading