@@ -359,12 +359,18 @@ public int compare(String o1, String o2) {
359
359
360
360
for (Object object : modelList ) {
361
361
Map <String , Object > modelMap = (Map <String , Object >) object ;
362
+ CodegenModel codegenModel = null ;
362
363
if (modelMap .containsKey ("oneOf-model" )) {
363
- CodegenModel oneOfModel = (CodegenModel ) modelMap .get ("oneOf-model" );
364
- models = processModel (oneOfModel , config , schemas );
365
- models .put ("classname" , config .toModelName (oneOfModel .name ));
364
+ codegenModel = (CodegenModel ) modelMap .get ("oneOf-model" );
365
+ }
366
+ if (modelMap .containsKey ("anyOf-model" )) {
367
+ codegenModel = (CodegenModel ) modelMap .get ("anyOf-model" );
368
+ }
369
+ if (codegenModel != null ) {
370
+ models = processModel (codegenModel , config , schemas );
371
+ models .put ("classname" , config .toModelName (codegenModel .name ));
366
372
models .putAll (config .additionalProperties ());
367
- allProcessedModels .put (oneOfModel .name , models );
373
+ allProcessedModels .put (codegenModel .name , models );
368
374
break ;
369
375
}
370
376
}
@@ -987,6 +993,10 @@ private Map<String, Object> processModels(CodegenConfig config, Map<String, Sche
987
993
CodegenModel oneOfModel = (CodegenModel ) cm .vendorExtensions .get ("oneOf-model" );
988
994
mo .put ("oneOf-model" , oneOfModel );
989
995
}
996
+ if (cm .vendorExtensions .containsKey ("anyOf-model" )) {
997
+ CodegenModel anyOfModel = (CodegenModel ) cm .vendorExtensions .get ("anyOf-model" );
998
+ mo .put ("anyOf-model" , anyOfModel );
999
+ }
990
1000
models .add (mo );
991
1001
992
1002
allImports .addAll (cm .imports );
@@ -1023,7 +1033,9 @@ private Map<String, Object> processModel(CodegenModel codegenModel, CodegenConfi
1023
1033
objs .put ("package" , config .modelPackage ());
1024
1034
List <Object > models = new ArrayList <>();
1025
1035
1026
- objs .put ("x-is-one-of" , codegenModel .vendorExtensions .get ("x-is-one-of" ));
1036
+ if (codegenModel .vendorExtensions .containsKey ("x-is-composed-model" )) {
1037
+ objs .put ("x-is-composed-model" , codegenModel .vendorExtensions .get ("x-is-composed-model" ));
1038
+ }
1027
1039
1028
1040
Map <String , Object > modelObject = new HashMap <>();
1029
1041
modelObject .put ("model" , codegenModel );
0 commit comments