@@ -5769,28 +5769,30 @@ public void addOneOfNameExtension(ComposedSchema s, String name) {
5769
5769
}
5770
5770
5771
5771
/**
5772
- * Add a given ComposedSchema as an interface model to be generated
5772
+ * Add a given ComposedSchema as an interface model to be generated, assuming it has `oneOf` defined
5773
5773
* @param cs ComposedSchema object to create as interface model
5774
5774
* @param type name to use for the generated interface model
5775
5775
*/
5776
5776
public void addOneOfInterfaceModel (ComposedSchema cs , String type ) {
5777
+ if (cs .getOneOf () == null ) {
5778
+ return ;
5779
+ }
5777
5780
CodegenModel cm = new CodegenModel ();
5778
5781
5779
5782
cm .discriminator = createDiscriminator ("" , (Schema ) cs );
5780
- if (cs .getOneOf () != null ){
5781
- for (Schema o : cs .getOneOf ()) {
5782
- if (o .get$ref () == null ) {
5783
- if (cm .discriminator != null && o .get$ref () == null ) {
5784
- // OpenAPI spec states that inline objects should not be considered when discriminator is used
5785
- // https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#discriminatorObject
5786
- LOGGER .warn ("Ignoring inline object in oneOf definition of {}, since discriminator is used" , type );
5787
- } else {
5788
- LOGGER .warn ("Inline models are not supported in oneOf definition right now" );
5789
- }
5790
- continue ;
5783
+
5784
+ for (Schema o : cs .getOneOf ()) {
5785
+ if (o .get$ref () == null ) {
5786
+ if (cm .discriminator != null && o .get$ref () == null ) {
5787
+ // OpenAPI spec states that inline objects should not be considered when discriminator is used
5788
+ // https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#discriminatorObject
5789
+ LOGGER .warn ("Ignoring inline object in oneOf definition of {}, since discriminator is used" , type );
5790
+ } else {
5791
+ LOGGER .warn ("Inline models are not supported in oneOf definition right now" );
5791
5792
}
5792
- cm . oneOf . add ( toModelName ( ModelUtils . getSimpleRef ( o . get$ref ()))) ;
5793
+ continue ;
5793
5794
}
5795
+ cm .oneOf .add (toModelName (ModelUtils .getSimpleRef (o .get$ref ())));
5794
5796
}
5795
5797
cm .name = type ;
5796
5798
cm .classname = type ;
0 commit comments