SWI-8645 Fix Multi-Channel Messaging Schemas

.github/workflows/test-pr.yml

@@ -36,7 +36,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2022, windows-2025, ubuntu-22.04, ubuntu-24.04]
-        java-version: ["11", "17", "21"]
+        java-version: ["11", "17", "21", "25"]
         distribution: ["zulu", "temurin"]
       fail-fast: false
     steps:

.gitignore

@@ -14,6 +14,8 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+*.prefs
+
 # build files
 **/target
 target

.openapi-generator/FILES

@@ -101,14 +101,22 @@ docs/MmsMessageContentFile.md
 docs/MultiChannelAction.md
 docs/MultiChannelActionCalendarEvent.md
 docs/MultiChannelApi.md
-docs/MultiChannelChannelListObject.md
-docs/MultiChannelChannelListObjectContent.md
+docs/MultiChannelChannelListMMSObject.md
+docs/MultiChannelChannelListMMSResponseObject.md
+docs/MultiChannelChannelListObjectBase.md
+docs/MultiChannelChannelListOwnerObject.md
+docs/MultiChannelChannelListRBMObject.md
+docs/MultiChannelChannelListRBMObjectAllOfContent.md
+docs/MultiChannelChannelListRBMResponseObject.md
+docs/MultiChannelChannelListRequestObject.md
+docs/MultiChannelChannelListResponseObject.md
+docs/MultiChannelChannelListSMSObject.md
+docs/MultiChannelChannelListSMSResponseObject.md
 docs/MultiChannelError.md
 docs/MultiChannelMessageChannelEnum.md
 docs/MultiChannelMessageContent.md
 docs/MultiChannelMessageRequest.md
 docs/MultiChannelMessageResponseData.md
-docs/MultiChannelMessageResponseDataChannelListInner.md
 docs/OptInWorkflow.md
 docs/PageInfo.md
 docs/PhoneNumberLookupApi.md
@@ -310,14 +318,22 @@ src/main/java/com/bandwidth/sdk/model/MmsMessageContent.java
 src/main/java/com/bandwidth/sdk/model/MmsMessageContentFile.java
 src/main/java/com/bandwidth/sdk/model/MultiChannelAction.java
 src/main/java/com/bandwidth/sdk/model/MultiChannelActionCalendarEvent.java
-src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListObject.java
-src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListObjectContent.java
+src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListMMSObject.java
+src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListMMSResponseObject.java
+src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListObjectBase.java
+src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListOwnerObject.java
+src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListRBMObject.java
+src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListRBMObjectAllOfContent.java
+src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListRBMResponseObject.java
+src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListRequestObject.java
+src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListResponseObject.java
+src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListSMSObject.java
+src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListSMSResponseObject.java
 src/main/java/com/bandwidth/sdk/model/MultiChannelError.java
 src/main/java/com/bandwidth/sdk/model/MultiChannelMessageChannelEnum.java
 src/main/java/com/bandwidth/sdk/model/MultiChannelMessageContent.java
 src/main/java/com/bandwidth/sdk/model/MultiChannelMessageRequest.java
 src/main/java/com/bandwidth/sdk/model/MultiChannelMessageResponseData.java
-src/main/java/com/bandwidth/sdk/model/MultiChannelMessageResponseDataChannelListInner.java
 src/main/java/com/bandwidth/sdk/model/OptInWorkflow.java
 src/main/java/com/bandwidth/sdk/model/PageInfo.java
 src/main/java/com/bandwidth/sdk/model/PriorityEnum.java

README.md

@@ -268,14 +268,22 @@ Class | Method | HTTP request | Description
  - [MmsMessageContentFile](docs/MmsMessageContentFile.md)
  - [MultiChannelAction](docs/MultiChannelAction.md)
  - [MultiChannelActionCalendarEvent](docs/MultiChannelActionCalendarEvent.md)
- - [MultiChannelChannelListObject](docs/MultiChannelChannelListObject.md)
- - [MultiChannelChannelListObjectContent](docs/MultiChannelChannelListObjectContent.md)
+ - [MultiChannelChannelListMMSObject](docs/MultiChannelChannelListMMSObject.md)
+ - [MultiChannelChannelListMMSResponseObject](docs/MultiChannelChannelListMMSResponseObject.md)
+ - [MultiChannelChannelListObjectBase](docs/MultiChannelChannelListObjectBase.md)
+ - [MultiChannelChannelListOwnerObject](docs/MultiChannelChannelListOwnerObject.md)
+ - [MultiChannelChannelListRBMObject](docs/MultiChannelChannelListRBMObject.md)
+ - [MultiChannelChannelListRBMObjectAllOfContent](docs/MultiChannelChannelListRBMObjectAllOfContent.md)
+ - [MultiChannelChannelListRBMResponseObject](docs/MultiChannelChannelListRBMResponseObject.md)
+ - [MultiChannelChannelListRequestObject](docs/MultiChannelChannelListRequestObject.md)
+ - [MultiChannelChannelListResponseObject](docs/MultiChannelChannelListResponseObject.md)
+ - [MultiChannelChannelListSMSObject](docs/MultiChannelChannelListSMSObject.md)
+ - [MultiChannelChannelListSMSResponseObject](docs/MultiChannelChannelListSMSResponseObject.md)
  - [MultiChannelError](docs/MultiChannelError.md)
  - [MultiChannelMessageChannelEnum](docs/MultiChannelMessageChannelEnum.md)
  - [MultiChannelMessageContent](docs/MultiChannelMessageContent.md)
  - [MultiChannelMessageRequest](docs/MultiChannelMessageRequest.md)
  - [MultiChannelMessageResponseData](docs/MultiChannelMessageResponseData.md)
- - [MultiChannelMessageResponseDataChannelListInner](docs/MultiChannelMessageResponseDataChannelListInner.md)
  - [OptInWorkflow](docs/OptInWorkflow.md)
  - [PageInfo](docs/PageInfo.md)
  - [PriorityEnum](docs/PriorityEnum.md)

api/openapi.yaml

@@ -9137,7 +9137,7 @@ components:
       - $ref: "#/components/schemas/rbmActionViewLocation"
       - $ref: "#/components/schemas/multiChannelActionCalendarEvent"
       - $ref: "#/components/schemas/rbmActionOpenUrl"
-    multiChannelChannelListObject:
+    multiChannelChannelListObjectBase:
       properties:
         from:
           description: The sender ID of the message. This could be an alphanumeric
@@ -9151,14 +9151,109 @@ components:
           type: string
         channel:
           $ref: "#/components/schemas/multiChannelMessageChannelEnum"
-        content:
-          $ref: "#/components/schemas/multiChannelChannelListObject_content"
       required:
       - applicationId
       - channel
-      - content
       - from
       type: object
+    multiChannelChannelListRBMObject:
+      allOf:
+      - $ref: "#/components/schemas/multiChannelChannelListObjectBase"
+      - properties:
+          content:
+            $ref: "#/components/schemas/multiChannelChannelListRBMObject_allOf_content"
+        type: object
+      required:
+      - content
+    multiChannelChannelListSMSObject:
+      allOf:
+      - $ref: "#/components/schemas/multiChannelChannelListObjectBase"
+      - properties:
+          content:
+            $ref: "#/components/schemas/smsMessageContent"
+        type: object
+      required:
+      - content
+    multiChannelChannelListMMSObject:
+      allOf:
+      - $ref: "#/components/schemas/multiChannelChannelListObjectBase"
+      - properties:
+          content:
+            $ref: "#/components/schemas/mmsMessageContent"
+        type: object
+      required:
+      - content
+    multiChannelChannelListRBMResponseObject:
+      allOf:
+      - $ref: "#/components/schemas/multiChannelChannelListRBMObject"
+      - $ref: "#/components/schemas/multiChannelChannelListOwnerObject"
+      example:
+        owner: owner
+        channel: RBM
+        from: BandwidthRBM
+        applicationId: 93de2206-9669-4e07-948d-329f4b722ee2
+        content:
+          suggestions:
+          - postbackData: !!binary |-
+              U0dWc2JHOGdkMjl5YkdRPQ==
+            text: Hello world
+            type: REPLY
+          - postbackData: !!binary |-
+              U0dWc2JHOGdkMjl5YkdRPQ==
+            text: Hello world
+            type: REPLY
+          - postbackData: !!binary |-
+              U0dWc2JHOGdkMjl5YkdRPQ==
+            text: Hello world
+            type: REPLY
+          - postbackData: !!binary |-
+              U0dWc2JHOGdkMjl5YkdRPQ==
+            text: Hello world
+            type: REPLY
+          - postbackData: !!binary |-
+              U0dWc2JHOGdkMjl5YkdRPQ==
+            text: Hello world
+            type: REPLY
+          text: Hello world
+    multiChannelChannelListSMSResponseObject:
+      allOf:
+      - $ref: "#/components/schemas/multiChannelChannelListSMSObject"
+      - $ref: "#/components/schemas/multiChannelChannelListOwnerObject"
+    multiChannelChannelListMMSResponseObject:
+      allOf:
+      - $ref: "#/components/schemas/multiChannelChannelListMMSObject"
+      - $ref: "#/components/schemas/multiChannelChannelListOwnerObject"
+    multiChannelChannelListRequestObject:
+      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:
+          description: The Bandwidth senderId associated with the message. Identical
+            to 'from'.
+          type: string
+      required:
+      - owner
+      type: object
+    multiChannelChannelListResponseObject:
+      anyOf:
+      - $ref: "#/components/schemas/multiChannelChannelListRBMResponseObject"
+      - $ref: "#/components/schemas/multiChannelChannelListSMSResponseObject"
+      - $ref: "#/components/schemas/multiChannelChannelListMMSResponseObject"
+      discriminator:
+        mapping:
+          RBM: "#/components/schemas/multiChannelChannelListRBMResponseObject"
+          SMS: "#/components/schemas/multiChannelChannelListSMSResponseObject"
+          MMS: "#/components/schemas/multiChannelChannelListMMSResponseObject"
+        propertyName: channel
     multiChannelMessageRequest:
       description: Multi-Channel Message Request
       properties:
@@ -9171,7 +9266,7 @@ components:
             \ the order they are listed. Once a message sends successfully, the others\
             \ will be ignored."
           items:
-            $ref: "#/components/schemas/multiChannelChannelListObject"
+            $ref: "#/components/schemas/multiChannelChannelListRequestObject"
           maxItems: 4
           type: array
         tag:
@@ -9338,7 +9433,7 @@ components:
             \ the order they are listed. Once a message sends successfully, the others\
             \ will be ignored."
           items:
-            $ref: "#/components/schemas/multiChannelMessageResponseData_channelList_inner"
+            $ref: "#/components/schemas/multiChannelChannelListResponseObject"
           maxItems: 4
           type: array
         tag:
@@ -14674,53 +14769,12 @@ components:
         type: object
       required:
       - height
-    multiChannelChannelListObject_content:
+    multiChannelChannelListRBMObject_allOf_content:
       description: The content of the message.
       oneOf:
       - $ref: "#/components/schemas/rbmMessageContentText"
       - $ref: "#/components/schemas/rbmMessageMedia"
       - $ref: "#/components/schemas/rbmMessageContentRichCard"
-      - $ref: "#/components/schemas/smsMessageContent"
-      - $ref: "#/components/schemas/mmsMessageContent"
-    multiChannelMessageResponseData_channelList_inner:
-      allOf:
-      - $ref: "#/components/schemas/multiChannelChannelListObject"
-      - properties:
-          owner:
-            description: The Bandwidth senderId associated with the message. Identical
-              to 'from'.
-            type: string
-        required:
-        - owner
-        type: object
-      example:
-        owner: owner
-        channel: RBM
-        from: BandwidthRBM
-        applicationId: 93de2206-9669-4e07-948d-329f4b722ee2
-        content:
-          suggestions:
-          - postbackData: !!binary |-
-              U0dWc2JHOGdkMjl5YkdRPQ==
-            text: Hello world
-            type: REPLY
-          - postbackData: !!binary |-
-              U0dWc2JHOGdkMjl5YkdRPQ==
-            text: Hello world
-            type: REPLY
-          - postbackData: !!binary |-
-              U0dWc2JHOGdkMjl5YkdRPQ==
-            text: Hello world
-            type: REPLY
-          - postbackData: !!binary |-
-              U0dWc2JHOGdkMjl5YkdRPQ==
-            text: Hello world
-            type: REPLY
-          - postbackData: !!binary |-
-              U0dWc2JHOGdkMjl5YkdRPQ==
-            text: Hello world
-            type: REPLY
-          text: Hello world
     lookupErrorSchema_meta:
       example:
         code: 1001