use anyOf for request

Author: ckoegel

api/openapi.yaml

@@ -9224,16 +9224,16 @@ components:
       - $ref: "#/components/schemas/multiChannelChannelListMMSObject"
       - $ref: "#/components/schemas/multiChannelChannelListOwnerObject"
     multiChannelChannelListRequestObject:
+      anyOf:
+      - $ref: "#/components/schemas/multiChannelChannelListRBMObject"
+      - $ref: "#/components/schemas/multiChannelChannelListSMSObject"
+      - $ref: "#/components/schemas/multiChannelChannelListMMSObject"
       discriminator:
         mapping:
           RBM: "#/components/schemas/multiChannelChannelListRBMObject"
           SMS: "#/components/schemas/multiChannelChannelListSMSObject"
           MMS: "#/components/schemas/multiChannelChannelListMMSObject"
         propertyName: channel
-      oneOf:
-      - $ref: "#/components/schemas/multiChannelChannelListRBMObject"
-      - $ref: "#/components/schemas/multiChannelChannelListSMSObject"
-      - $ref: "#/components/schemas/multiChannelChannelListMMSObject"
     multiChannelChannelListOwnerObject:
       properties:
         owner:

bandwidth.yml

@@ -2562,7 +2562,7 @@ components:
         - $ref: '#/components/schemas/multiChannelChannelListMMSObject'
         - $ref: '#/components/schemas/multiChannelChannelListOwnerObject'
     multiChannelChannelListRequestObject:
-      oneOf:
+      anyOf:
         - $ref: '#/components/schemas/multiChannelChannelListRBMObject'
         - $ref: '#/components/schemas/multiChannelChannelListSMSObject'
         - $ref: '#/components/schemas/multiChannelChannelListMMSObject'

src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListRequestObject.java

@@ -106,7 +106,7 @@ public void write(JsonWriter out, MultiChannelChannelListRequestObject value) th
                         elementAdapter.write(out, element);
                         return;
                     }
-                    throw new IOException("Failed to serialize as the type doesn't match oneOf schemas: MultiChannelChannelListMMSObject, MultiChannelChannelListRBMObject, MultiChannelChannelListSMSObject");
+                    throw new IOException("Failed to serialize as the type doesn't match anyOf schemas: MultiChannelChannelListMMSObject, MultiChannelChannelListRBMObject, MultiChannelChannelListSMSObject");
                 }
 
                 @Override
@@ -149,8 +149,9 @@ public MultiChannelChannelListRequestObject read(JsonReader in) throws IOExcepti
                         // validate the JSON object to see if any exception is thrown
                         MultiChannelChannelListRBMObject.validateJsonElement(jsonElement);
                         actualAdapter = adapterMultiChannelChannelListRBMObject;
-                        match++;
-                        log.log(Level.FINER, "Input data matches schema 'MultiChannelChannelListRBMObject'");
+                        MultiChannelChannelListRequestObject ret = new MultiChannelChannelListRequestObject();
+                        ret.setActualInstance(actualAdapter.fromJsonTree(jsonElement));
+                        return ret;
                     } catch (Exception e) {
                         // deserialization failed, continue
                         errorMessages.add(String.format(Locale.ROOT, "Deserialization for MultiChannelChannelListRBMObject failed with `%s`.", e.getMessage()));
@@ -161,8 +162,9 @@ public MultiChannelChannelListRequestObject read(JsonReader in) throws IOExcepti
                         // validate the JSON object to see if any exception is thrown
                         MultiChannelChannelListSMSObject.validateJsonElement(jsonElement);
                         actualAdapter = adapterMultiChannelChannelListSMSObject;
-                        match++;
-                        log.log(Level.FINER, "Input data matches schema 'MultiChannelChannelListSMSObject'");
+                        MultiChannelChannelListRequestObject ret = new MultiChannelChannelListRequestObject();
+                        ret.setActualInstance(actualAdapter.fromJsonTree(jsonElement));
+                        return ret;
                     } catch (Exception e) {
                         // deserialization failed, continue
                         errorMessages.add(String.format(Locale.ROOT, "Deserialization for MultiChannelChannelListSMSObject failed with `%s`.", e.getMessage()));
@@ -173,35 +175,30 @@ public MultiChannelChannelListRequestObject read(JsonReader in) throws IOExcepti
                         // validate the JSON object to see if any exception is thrown
                         MultiChannelChannelListMMSObject.validateJsonElement(jsonElement);
                         actualAdapter = adapterMultiChannelChannelListMMSObject;
-                        match++;
-                        log.log(Level.FINER, "Input data matches schema 'MultiChannelChannelListMMSObject'");
+                        MultiChannelChannelListRequestObject ret = new MultiChannelChannelListRequestObject();
+                        ret.setActualInstance(actualAdapter.fromJsonTree(jsonElement));
+                        return ret;
                     } catch (Exception e) {
                         // deserialization failed, continue
                         errorMessages.add(String.format(Locale.ROOT, "Deserialization for MultiChannelChannelListMMSObject failed with `%s`.", e.getMessage()));
                         log.log(Level.FINER, "Input data does not match schema 'MultiChannelChannelListMMSObject'", e);
                     }
 
-                    if (match == 1) {
-                        MultiChannelChannelListRequestObject ret = new MultiChannelChannelListRequestObject();
-                        ret.setActualInstance(actualAdapter.fromJsonTree(jsonElement));
-                        return ret;
-                    }
-
-                    throw new IOException(String.format(Locale.ROOT, "Failed deserialization for MultiChannelChannelListRequestObject: %d classes match result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", match, errorMessages, jsonElement.toString()));
+                    throw new IOException(String.format(Locale.ROOT, "Failed deserialization for MultiChannelChannelListRequestObject: no class matches result, expected at least 1. Detailed failure message for anyOf schemas: %s. JSON: %s", errorMessages, jsonElement.toString()));
                 }
             }.nullSafe();
         }
     }
 
-    // store a list of schema names defined in oneOf
+    // store a list of schema names defined in anyOf
     public static final Map<String, Class<?>> schemas = new HashMap<String, Class<?>>();
 
     public MultiChannelChannelListRequestObject() {
-        super("oneOf", Boolean.FALSE);
+        super("anyOf", Boolean.FALSE);
     }
 
     public MultiChannelChannelListRequestObject(Object o) {
-        super("oneOf", Boolean.FALSE);
+        super("anyOf", Boolean.FALSE);
         setActualInstance(o);
     }
 
@@ -217,11 +214,11 @@ public Map<String, Class<?>> getSchemas() {
     }
 
     /**
-     * Set the instance that matches the oneOf child schema, check
-     * the instance parameter is valid against the oneOf child schemas:
+     * Set the instance that matches the anyOf child schema, check
+     * the instance parameter is valid against the anyOf child schemas:
      * MultiChannelChannelListMMSObject, MultiChannelChannelListRBMObject, MultiChannelChannelListSMSObject
      *
-     * It could be an instance of the 'oneOf' schemas.
+     * It could be an instance of the 'anyOf' schemas.
      */
     @Override
     public void setActualInstance(Object instance) {
@@ -295,36 +292,33 @@ public MultiChannelChannelListMMSObject getMultiChannelChannelListMMSObject() th
      * @throws IOException if the JSON Element is invalid with respect to MultiChannelChannelListRequestObject
      */
     public static void validateJsonElement(JsonElement jsonElement) throws IOException {
-        // validate oneOf schemas one by one
-        int validCount = 0;
+        // validate anyOf schemas one by one
         ArrayList<String> errorMessages = new ArrayList<>();
         // validate the json string with MultiChannelChannelListRBMObject
         try {
             MultiChannelChannelListRBMObject.validateJsonElement(jsonElement);
-            validCount++;
+            return;
         } catch (Exception e) {
             errorMessages.add(String.format(Locale.ROOT, "Deserialization for MultiChannelChannelListRBMObject failed with `%s`.", e.getMessage()));
             // continue to the next one
         }
         // validate the json string with MultiChannelChannelListSMSObject
         try {
             MultiChannelChannelListSMSObject.validateJsonElement(jsonElement);
-            validCount++;
+            return;
         } catch (Exception e) {
             errorMessages.add(String.format(Locale.ROOT, "Deserialization for MultiChannelChannelListSMSObject failed with `%s`.", e.getMessage()));
             // continue to the next one
         }
         // validate the json string with MultiChannelChannelListMMSObject
         try {
             MultiChannelChannelListMMSObject.validateJsonElement(jsonElement);
-            validCount++;
+            return;
         } catch (Exception e) {
             errorMessages.add(String.format(Locale.ROOT, "Deserialization for MultiChannelChannelListMMSObject failed with `%s`.", e.getMessage()));
             // continue to the next one
         }
-        if (validCount != 1) {
-            throw new IOException(String.format(Locale.ROOT, "The JSON string is invalid for MultiChannelChannelListRequestObject with oneOf schemas: MultiChannelChannelListMMSObject, MultiChannelChannelListRBMObject, MultiChannelChannelListSMSObject. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonElement.toString()));
-        }
+        throw new IOException(String.format(Locale.ROOT, "The JSON string is invalid for MultiChannelChannelListRequestObject with anyOf schemas: MultiChannelChannelListMMSObject, MultiChannelChannelListRBMObject, MultiChannelChannelListSMSObject. no class match the result, expected at least 1. Detailed failure message for anyOf schemas: %s. JSON: %s", errorMessages, jsonElement.toString()));
     }
 
     /**