Better OpenAPI spec v3 support: allOf, anyOf, oneOf

bin/utils/ensure-up-to-date

@@ -10,34 +10,43 @@ echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
 sleep 5
 
 # LIST OF SCRIPTS:
-./bin/openapi3/ruby-client-petstore.sh > /dev/null 2>&1
-./bin/java-petstore-all.sh > /dev/null 2>&1
-./bin/java-jaxrs-petstore-server-all.sh > /dev/null 2>&1
-./bin/openapi3/jaxrs-jersey-petstore.sh > /dev/null 2>&1
-./bin/spring-all-pestore.sh > /dev/null 2>&1
-./bin/kotlin-client-petstore.sh > /dev/null 2>&1
-./bin/kotlin-client-string.sh > /dev/null 2>&1
-./bin/kotlin-client-threetenbp.sh > /dev/null 2>&1
-./bin/kotlin-server-petstore.sh > /dev/null 2>&1
-./bin/mysql-schema-petstore.sh > /dev/null 2>&1
-./bin/php-petstore.sh > /dev/null 2>&1
-./bin/php-silex-petstore-server.sh > /dev/null 2>&1
-./bin/php-symfony-petstore.sh > /dev/null 2>&1
-./bin/php-lumen-petstore-server.sh > /dev/null 2>&1
-./bin/php-slim-server-petstore.sh > /dev/null 2>&1
-./bin/php-ze-ph-petstore-server.sh > /dev/null 2>&1
-./bin/openapi3/php-petstore.sh > /dev/null 2>&1
-./bin/typescript-angular-petstore-all.sh > /dev/null 2>&1
-./bin/typescript-fetch-petstore-all.sh > /dev/null 2>&1
-./bin/typescript-node-petstore-all.sh > /dev/null 2>&1
-./bin/typescript-inversify-petstore.sh > /dev/null 2>&1
-./bin/rust-server-petstore.sh > /dev/null 2>&1
-./bin/haskell-http-client-petstore.sh > /dev/null 2>&1
-./bin/csharp-petstore.sh > /dev/null 2>&1
-./bin/meta-codegen.sh > /dev/null 2>&1
-./bin/utils/export_docs_generators.sh > /dev/null 2>&1
-./bin/go-petstore.sh > /dev/null 2>&1
-./bin/go-gin-petstore-server.sh > /dev/null 2>&1
+declare -a scripts=("./bin/openapi3/ruby-client-petstore.sh"
+"./bin/java-petstore-all.sh"
+"./bin/java-jaxrs-petstore-server-all.sh"
+"./bin/openapi3/jaxrs-jersey-petstore.sh"
+"./bin/spring-all-pestore.sh"
+"./bin/kotlin-client-petstore.sh"
+"./bin/kotlin-client-string.sh"
+"./bin/kotlin-client-threetenbp.sh"
+"./bin/kotlin-server-petstore.sh"
+"./bin/mysql-schema-petstore.sh"
+"./bin/php-petstore.sh"
+"./bin/php-silex-petstore-server.sh"
+"./bin/php-symfony-petstore.sh"
+"./bin/php-lumen-petstore-server.sh"
+"./bin/php-slim-server-petstore.sh"
+"./bin/php-ze-ph-petstore-server.sh"
+"./bin/openapi3/php-petstore.sh"
+"./bin/typescript-angular-petstore-all.sh"
+"./bin/typescript-fetch-petstore-all.sh"
+"./bin/typescript-node-petstore-all.sh"
+"./bin/typescript-inversify-petstore.sh"
+"./bin/rust-server-petstore.sh"
+"./bin/haskell-http-client-petstore.sh"
+"./bin/csharp-petstore.sh"
+"./bin/meta-codegen.sh"
+"./bin/utils/export_docs_generators.sh"
+"./bin/go-petstore.sh"
+"./bin/go-gin-petstore-server.sh")
+
+for script in "${scripts[@]}"; do
+  if eval $script > /dev/null 2>&1; then
+    echo "Executed $script successfully!"
+  else
+    echo "ERROR: Failed to run $script"
+    exit 1
+  fi
+done
 
 # Check:
 if [ -n "$(git status --porcelain)" ]; then

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenDiscriminator.java

@@ -1,5 +1,7 @@
 package org.openapitools.codegen;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 import java.util.*;
 
 public class CodegenDiscriminator {
@@ -85,4 +87,13 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(propertyName, mapping, mappedModels);
     }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("propertyName", propertyName)
+                .append("mapping", mapping)
+                .append("mappedModels", mappedModels)
+                .toString();
+    }
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java

@@ -40,6 +40,11 @@ public class CodegenModel {
     public List<CodegenModel> interfaceModels;
     public List<CodegenModel> children;
 
+    // anyOf, oneOf
+    public Set<String> anyOf = new TreeSet<String>();
+    public Set<String> oneOf = new TreeSet<String>();
+    public Set<String> allOf = new TreeSet<String>();
+
     public String name, classname, title, description, classVarName, modelJson, dataType, xmlPrefix, xmlNamespace, xmlName;
     public String classFilename; // store the class file name, mainly used for import
     public String unescapedDescription;