Skip to content

Commit 7bcd815

Browse files
ckoegelckoegel
authored
SWI-8645 Fix Multi-Channel Messaging Schemas (#210)
* update generator version * update gitignore * update SDK * use 7.17 * regenerate and cleanup * bring tests back * switch rbm action to anyOf * anyOf * smoke test * model unit tests * use anyOf for request * api unit test * small bxml cleanup * try to fix Java 25 abstract interface issue * remove java 25 * Revert "small bxml cleanup" This reverts commit 68ebdd2. * Revert "try to fix Java 25 abstract interface issue" This reverts commit 26f93f0. * sleep more before unit tests * update smoke test wf * remove flaky assertions * cleanup test file
1 parent 2ad919a commit 7bcd815

File tree

55 files changed

+4826
-485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+4826
-485
lines changed

‎.github/workflows/test-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ jobs:
5858
run: |
5959
mvn -B package --file pom.xml -DskipTests
6060
npm install -g @stoplight/prism-cli
61-
prism mock ./bandwidth.yml & (sleep 3; mvn test -Punit-tests)
61+
prism mock ./bandwidth.yml & (sleep 4; mvn test -Punit-tests)
6262
shell: bash

‎.github/workflows/test-smoke.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
3939
steps:
4040
- name: Checkout
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v5
4242

4343
- name: Set up JDK
44-
uses: actions/setup-java@v4
44+
uses: actions/setup-java@v5
4545
with:
4646
distribution: zulu
4747
java-version: 21

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
1515
hs_err_pid*
1616

17+
*.prefs
18+
1719
# build files
1820
**/target
1921
target

‎.openapi-generator/FILES‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,22 @@ docs/MmsMessageContentFile.md
101101
docs/MultiChannelAction.md
102102
docs/MultiChannelActionCalendarEvent.md
103103
docs/MultiChannelApi.md
104-
docs/MultiChannelChannelListObject.md
105-
docs/MultiChannelChannelListObjectContent.md
104+
docs/MultiChannelChannelListMMSObject.md
105+
docs/MultiChannelChannelListMMSResponseObject.md
106+
docs/MultiChannelChannelListObjectBase.md
107+
docs/MultiChannelChannelListOwnerObject.md
108+
docs/MultiChannelChannelListRBMObject.md
109+
docs/MultiChannelChannelListRBMObjectAllOfContent.md
110+
docs/MultiChannelChannelListRBMResponseObject.md
111+
docs/MultiChannelChannelListRequestObject.md
112+
docs/MultiChannelChannelListResponseObject.md
113+
docs/MultiChannelChannelListSMSObject.md
114+
docs/MultiChannelChannelListSMSResponseObject.md
106115
docs/MultiChannelError.md
107116
docs/MultiChannelMessageChannelEnum.md
108117
docs/MultiChannelMessageContent.md
109118
docs/MultiChannelMessageRequest.md
110119
docs/MultiChannelMessageResponseData.md
111-
docs/MultiChannelMessageResponseDataChannelListInner.md
112120
docs/OptInWorkflow.md
113121
docs/PageInfo.md
114122
docs/PhoneNumberLookupApi.md
@@ -310,14 +318,22 @@ src/main/java/com/bandwidth/sdk/model/MmsMessageContent.java
310318
src/main/java/com/bandwidth/sdk/model/MmsMessageContentFile.java
311319
src/main/java/com/bandwidth/sdk/model/MultiChannelAction.java
312320
src/main/java/com/bandwidth/sdk/model/MultiChannelActionCalendarEvent.java
313-
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListObject.java
314-
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListObjectContent.java
321+
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListMMSObject.java
322+
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListMMSResponseObject.java
323+
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListObjectBase.java
324+
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListOwnerObject.java
325+
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListRBMObject.java
326+
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListRBMObjectAllOfContent.java
327+
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListRBMResponseObject.java
328+
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListRequestObject.java
329+
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListResponseObject.java
330+
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListSMSObject.java
331+
src/main/java/com/bandwidth/sdk/model/MultiChannelChannelListSMSResponseObject.java
315332
src/main/java/com/bandwidth/sdk/model/MultiChannelError.java
316333
src/main/java/com/bandwidth/sdk/model/MultiChannelMessageChannelEnum.java
317334
src/main/java/com/bandwidth/sdk/model/MultiChannelMessageContent.java
318335
src/main/java/com/bandwidth/sdk/model/MultiChannelMessageRequest.java
319336
src/main/java/com/bandwidth/sdk/model/MultiChannelMessageResponseData.java
320-
src/main/java/com/bandwidth/sdk/model/MultiChannelMessageResponseDataChannelListInner.java
321337
src/main/java/com/bandwidth/sdk/model/OptInWorkflow.java
322338
src/main/java/com/bandwidth/sdk/model/PageInfo.java
323339
src/main/java/com/bandwidth/sdk/model/PriorityEnum.java

‎README.md‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,14 +268,22 @@ Class | Method | HTTP request | Description
268268
- [MmsMessageContentFile](docs/MmsMessageContentFile.md)
269269
- [MultiChannelAction](docs/MultiChannelAction.md)
270270
- [MultiChannelActionCalendarEvent](docs/MultiChannelActionCalendarEvent.md)
271-
- [MultiChannelChannelListObject](docs/MultiChannelChannelListObject.md)
272-
- [MultiChannelChannelListObjectContent](docs/MultiChannelChannelListObjectContent.md)
271+
- [MultiChannelChannelListMMSObject](docs/MultiChannelChannelListMMSObject.md)
272+
- [MultiChannelChannelListMMSResponseObject](docs/MultiChannelChannelListMMSResponseObject.md)
273+
- [MultiChannelChannelListObjectBase](docs/MultiChannelChannelListObjectBase.md)
274+
- [MultiChannelChannelListOwnerObject](docs/MultiChannelChannelListOwnerObject.md)
275+
- [MultiChannelChannelListRBMObject](docs/MultiChannelChannelListRBMObject.md)
276+
- [MultiChannelChannelListRBMObjectAllOfContent](docs/MultiChannelChannelListRBMObjectAllOfContent.md)
277+
- [MultiChannelChannelListRBMResponseObject](docs/MultiChannelChannelListRBMResponseObject.md)
278+
- [MultiChannelChannelListRequestObject](docs/MultiChannelChannelListRequestObject.md)
279+
- [MultiChannelChannelListResponseObject](docs/MultiChannelChannelListResponseObject.md)
280+
- [MultiChannelChannelListSMSObject](docs/MultiChannelChannelListSMSObject.md)
281+
- [MultiChannelChannelListSMSResponseObject](docs/MultiChannelChannelListSMSResponseObject.md)
273282
- [MultiChannelError](docs/MultiChannelError.md)
274283
- [MultiChannelMessageChannelEnum](docs/MultiChannelMessageChannelEnum.md)
275284
- [MultiChannelMessageContent](docs/MultiChannelMessageContent.md)
276285
- [MultiChannelMessageRequest](docs/MultiChannelMessageRequest.md)
277286
- [MultiChannelMessageResponseData](docs/MultiChannelMessageResponseData.md)
278-
- [MultiChannelMessageResponseDataChannelListInner](docs/MultiChannelMessageResponseDataChannelListInner.md)
279287
- [OptInWorkflow](docs/OptInWorkflow.md)
280288
- [PageInfo](docs/PageInfo.md)
281289
- [PriorityEnum](docs/PriorityEnum.md)

‎api/openapi.yaml‎

Lines changed: 108 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -9122,6 +9122,12 @@ components:
91229122
maxItems: 11
91239123
type: array
91249124
multiChannelAction:
9125+
anyOf:
9126+
- $ref: "#/components/schemas/rbmActionBase"
9127+
- $ref: "#/components/schemas/rbmActionDial"
9128+
- $ref: "#/components/schemas/rbmActionViewLocation"
9129+
- $ref: "#/components/schemas/multiChannelActionCalendarEvent"
9130+
- $ref: "#/components/schemas/rbmActionOpenUrl"
91259131
discriminator:
91269132
mapping:
91279133
REPLY: "#/components/schemas/rbmActionBase"
@@ -9131,13 +9137,7 @@ components:
91319137
OPEN_URL: "#/components/schemas/rbmActionOpenUrl"
91329138
REQUEST_LOCATION: "#/components/schemas/rbmActionBase"
91339139
propertyName: type
9134-
oneOf:
9135-
- $ref: "#/components/schemas/rbmActionBase"
9136-
- $ref: "#/components/schemas/rbmActionDial"
9137-
- $ref: "#/components/schemas/rbmActionViewLocation"
9138-
- $ref: "#/components/schemas/multiChannelActionCalendarEvent"
9139-
- $ref: "#/components/schemas/rbmActionOpenUrl"
9140-
multiChannelChannelListObject:
9140+
multiChannelChannelListObjectBase:
91419141
properties:
91429142
from:
91439143
description: The sender ID of the message. This could be an alphanumeric
@@ -9151,14 +9151,109 @@ components:
91519151
type: string
91529152
channel:
91539153
$ref: "#/components/schemas/multiChannelMessageChannelEnum"
9154-
content:
9155-
$ref: "#/components/schemas/multiChannelChannelListObject_content"
91569154
required:
91579155
- applicationId
91589156
- channel
9159-
- content
91609157
- from
91619158
type: object
9159+
multiChannelChannelListRBMObject:
9160+
allOf:
9161+
- $ref: "#/components/schemas/multiChannelChannelListObjectBase"
9162+
- properties:
9163+
content:
9164+
$ref: "#/components/schemas/multiChannelChannelListRBMObject_allOf_content"
9165+
type: object
9166+
required:
9167+
- content
9168+
multiChannelChannelListSMSObject:
9169+
allOf:
9170+
- $ref: "#/components/schemas/multiChannelChannelListObjectBase"
9171+
- properties:
9172+
content:
9173+
$ref: "#/components/schemas/smsMessageContent"
9174+
type: object
9175+
required:
9176+
- content
9177+
multiChannelChannelListMMSObject:
9178+
allOf:
9179+
- $ref: "#/components/schemas/multiChannelChannelListObjectBase"
9180+
- properties:
9181+
content:
9182+
$ref: "#/components/schemas/mmsMessageContent"
9183+
type: object
9184+
required:
9185+
- content
9186+
multiChannelChannelListRBMResponseObject:
9187+
allOf:
9188+
- $ref: "#/components/schemas/multiChannelChannelListRBMObject"
9189+
- $ref: "#/components/schemas/multiChannelChannelListOwnerObject"
9190+
example:
9191+
owner: owner
9192+
channel: RBM
9193+
from: BandwidthRBM
9194+
applicationId: 93de2206-9669-4e07-948d-329f4b722ee2
9195+
content:
9196+
suggestions:
9197+
- postbackData: !!binary |-
9198+
U0dWc2JHOGdkMjl5YkdRPQ==
9199+
text: Hello world
9200+
type: REPLY
9201+
- postbackData: !!binary |-
9202+
U0dWc2JHOGdkMjl5YkdRPQ==
9203+
text: Hello world
9204+
type: REPLY
9205+
- postbackData: !!binary |-
9206+
U0dWc2JHOGdkMjl5YkdRPQ==
9207+
text: Hello world
9208+
type: REPLY
9209+
- postbackData: !!binary |-
9210+
U0dWc2JHOGdkMjl5YkdRPQ==
9211+
text: Hello world
9212+
type: REPLY
9213+
- postbackData: !!binary |-
9214+
U0dWc2JHOGdkMjl5YkdRPQ==
9215+
text: Hello world
9216+
type: REPLY
9217+
text: Hello world
9218+
multiChannelChannelListSMSResponseObject:
9219+
allOf:
9220+
- $ref: "#/components/schemas/multiChannelChannelListSMSObject"
9221+
- $ref: "#/components/schemas/multiChannelChannelListOwnerObject"
9222+
multiChannelChannelListMMSResponseObject:
9223+
allOf:
9224+
- $ref: "#/components/schemas/multiChannelChannelListMMSObject"
9225+
- $ref: "#/components/schemas/multiChannelChannelListOwnerObject"
9226+
multiChannelChannelListRequestObject:
9227+
anyOf:
9228+
- $ref: "#/components/schemas/multiChannelChannelListRBMObject"
9229+
- $ref: "#/components/schemas/multiChannelChannelListSMSObject"
9230+
- $ref: "#/components/schemas/multiChannelChannelListMMSObject"
9231+
discriminator:
9232+
mapping:
9233+
RBM: "#/components/schemas/multiChannelChannelListRBMObject"
9234+
SMS: "#/components/schemas/multiChannelChannelListSMSObject"
9235+
MMS: "#/components/schemas/multiChannelChannelListMMSObject"
9236+
propertyName: channel
9237+
multiChannelChannelListOwnerObject:
9238+
properties:
9239+
owner:
9240+
description: The Bandwidth senderId associated with the message. Identical
9241+
to 'from'.
9242+
type: string
9243+
required:
9244+
- owner
9245+
type: object
9246+
multiChannelChannelListResponseObject:
9247+
anyOf:
9248+
- $ref: "#/components/schemas/multiChannelChannelListRBMResponseObject"
9249+
- $ref: "#/components/schemas/multiChannelChannelListSMSResponseObject"
9250+
- $ref: "#/components/schemas/multiChannelChannelListMMSResponseObject"
9251+
discriminator:
9252+
mapping:
9253+
RBM: "#/components/schemas/multiChannelChannelListRBMResponseObject"
9254+
SMS: "#/components/schemas/multiChannelChannelListSMSResponseObject"
9255+
MMS: "#/components/schemas/multiChannelChannelListMMSResponseObject"
9256+
propertyName: channel
91629257
multiChannelMessageRequest:
91639258
description: Multi-Channel Message Request
91649259
properties:
@@ -9171,7 +9266,7 @@ components:
91719266
\ the order they are listed. Once a message sends successfully, the others\
91729267
\ will be ignored."
91739268
items:
9174-
$ref: "#/components/schemas/multiChannelChannelListObject"
9269+
$ref: "#/components/schemas/multiChannelChannelListRequestObject"
91759270
maxItems: 4
91769271
type: array
91779272
tag:
@@ -9338,7 +9433,7 @@ components:
93389433
\ the order they are listed. Once a message sends successfully, the others\
93399434
\ will be ignored."
93409435
items:
9341-
$ref: "#/components/schemas/multiChannelMessageResponseData_channelList_inner"
9436+
$ref: "#/components/schemas/multiChannelChannelListResponseObject"
93429437
maxItems: 4
93439438
type: array
93449439
tag:
@@ -14674,53 +14769,12 @@ components:
1467414769
type: object
1467514770
required:
1467614771
- height
14677-
multiChannelChannelListObject_content:
14772+
multiChannelChannelListRBMObject_allOf_content:
1467814773
description: The content of the message.
1467914774
oneOf:
1468014775
- $ref: "#/components/schemas/rbmMessageContentText"
1468114776
- $ref: "#/components/schemas/rbmMessageMedia"
1468214777
- $ref: "#/components/schemas/rbmMessageContentRichCard"
14683-
- $ref: "#/components/schemas/smsMessageContent"
14684-
- $ref: "#/components/schemas/mmsMessageContent"
14685-
multiChannelMessageResponseData_channelList_inner:
14686-
allOf:
14687-
- $ref: "#/components/schemas/multiChannelChannelListObject"
14688-
- properties:
14689-
owner:
14690-
description: The Bandwidth senderId associated with the message. Identical
14691-
to 'from'.
14692-
type: string
14693-
required:
14694-
- owner
14695-
type: object
14696-
example:
14697-
owner: owner
14698-
channel: RBM
14699-
from: BandwidthRBM
14700-
applicationId: 93de2206-9669-4e07-948d-329f4b722ee2
14701-
content:
14702-
suggestions:
14703-
- postbackData: !!binary |-
14704-
U0dWc2JHOGdkMjl5YkdRPQ==
14705-
text: Hello world
14706-
type: REPLY
14707-
- postbackData: !!binary |-
14708-
U0dWc2JHOGdkMjl5YkdRPQ==
14709-
text: Hello world
14710-
type: REPLY
14711-
- postbackData: !!binary |-
14712-
U0dWc2JHOGdkMjl5YkdRPQ==
14713-
text: Hello world
14714-
type: REPLY
14715-
- postbackData: !!binary |-
14716-
U0dWc2JHOGdkMjl5YkdRPQ==
14717-
text: Hello world
14718-
type: REPLY
14719-
- postbackData: !!binary |-
14720-
U0dWc2JHOGdkMjl5YkdRPQ==
14721-
text: Hello world
14722-
type: REPLY
14723-
text: Hello world
1472414778
lookupErrorSchema_meta:
1472514779
example:
1472614780
code: 1001

0 commit comments

Comments
 (0)