Skip to content

Commit 182ec7c

Browse files
amahadayaamahadaya
authored
Resolve VCSWP-23872 (#60)
* Update PerclCommand serialization through build method and regenerate SDK with latest spec changes * Reduce git diff * Create easy to read expected Percl Json for testing * Add test dependency for json into pom.xml * Add test scope for new dependency
1 parent 50b1def commit 182ec7c

24 files changed

+1551
-107
lines changed

‎.openapi-generator/FILES

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ docs/MessageDeliveryWebhook.md
7373
docs/MessageDirection.md
7474
docs/MessageRequest.md
7575
docs/MessageResult.md
76+
docs/MessageResultAllOfTfn.md
7677
docs/MessageStatus.md
7778
docs/MessageStatusWebhook.md
7879
docs/MessagesList.md
@@ -132,6 +133,7 @@ docs/SetTalk.md
132133
docs/Sms.md
133134
docs/StartRecordCall.md
134135
docs/TFN.md
136+
docs/TFNCampaign.md
135137
docs/TerminateConference.md
136138
docs/TranscribeReason.md
137139
docs/TranscribeTermReason.md
@@ -230,6 +232,7 @@ src/main/java/com/github/freeclimbapi/MessageDeliveryWebhook.java
230232
src/main/java/com/github/freeclimbapi/MessageDirection.java
231233
src/main/java/com/github/freeclimbapi/MessageRequest.java
232234
src/main/java/com/github/freeclimbapi/MessageResult.java
235+
src/main/java/com/github/freeclimbapi/MessageResultAllOfTfn.java
233236
src/main/java/com/github/freeclimbapi/MessageStatus.java
234237
src/main/java/com/github/freeclimbapi/MessageStatusWebhook.java
235238
src/main/java/com/github/freeclimbapi/MessagesList.java
@@ -295,6 +298,7 @@ src/main/java/com/github/freeclimbapi/Sms.java
295298
src/main/java/com/github/freeclimbapi/StartRecordCall.java
296299
src/main/java/com/github/freeclimbapi/StringUtil.java
297300
src/main/java/com/github/freeclimbapi/TFN.java
301+
src/main/java/com/github/freeclimbapi/TFNCampaign.java
298302
src/main/java/com/github/freeclimbapi/TerminateConference.java
299303
src/main/java/com/github/freeclimbapi/TranscribeReason.java
300304
src/main/java/com/github/freeclimbapi/TranscribeTermReason.java
@@ -379,6 +383,7 @@ src/test/java/com/github/freeclimbapi/MakeCallRequestTest.java
379383
src/test/java/com/github/freeclimbapi/MessageDeliveryWebhookTest.java
380384
src/test/java/com/github/freeclimbapi/MessageDirectionTest.java
381385
src/test/java/com/github/freeclimbapi/MessageRequestTest.java
386+
src/test/java/com/github/freeclimbapi/MessageResultAllOfTfnTest.java
382387
src/test/java/com/github/freeclimbapi/MessageResultTest.java
383388
src/test/java/com/github/freeclimbapi/MessageStatusTest.java
384389
src/test/java/com/github/freeclimbapi/MessageStatusWebhookTest.java
@@ -438,6 +443,7 @@ src/test/java/com/github/freeclimbapi/SetListenTest.java
438443
src/test/java/com/github/freeclimbapi/SetTalkTest.java
439444
src/test/java/com/github/freeclimbapi/SmsTest.java
440445
src/test/java/com/github/freeclimbapi/StartRecordCallTest.java
446+
src/test/java/com/github/freeclimbapi/TFNCampaignTest.java
441447
src/test/java/com/github/freeclimbapi/TFNTest.java
442448
src/test/java/com/github/freeclimbapi/TerminateConferenceTest.java
443449
src/test/java/com/github/freeclimbapi/TranscribeReasonTest.java

‎CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,35 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
88
## [Unreleased]
99

1010
None
11+
12+
<a name="6.1.0"></a>
13+
14+
## [6.1.0] - 2025-01-08
15+
16+
### Added
17+
18+
- CampaignTFN and MessageResultsAllOfTfn models
19+
20+
### Changed
21+
22+
- PerclCommand serialization bug has been resolved with edits to the build method
23+
1124
<a name="6.0.0"></a>
1225

1326
## [6.0.0] - 2025-01-08
1427

1528
### Added
29+
1630
- Webhook classes
1731
- More idiomated Enum management
1832

1933
### Changed
34+
2035
- Use upgraded openapi generator
2136

2237
### Removed
23-
- *AllOf model files
38+
39+
- \*AllOf model files
2440

2541
<a name="5.9.0"></a>
2642

‎README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Add this dependency to your project's POM:
4040
<dependency>
4141
<groupId>com.github.freeclimbapi</groupId>
4242
<artifactId>freeclimb-java-client</artifactId>
43-
<version>6.0.0</version>
43+
<version>6.1.0</version>
4444
<scope>compile</scope>
4545
</dependency>
4646
```
@@ -56,7 +56,7 @@ Add this dependency to your project's build file:
5656
}
5757
5858
dependencies {
59-
implementation "com.github.freeclimbapi:freeclimb-java-client:6.0.0"
59+
implementation "com.github.freeclimbapi:freeclimb-java-client:6.1.0"
6060
implementation("com.squareup.okhttp3:okhttp:4.9.3")
6161
implementation("com.squareup.okhttp3:logging-interceptor:4.9.3")
6262
}
@@ -72,7 +72,7 @@ mvn clean package
7272

7373
Then manually install the following JARs:
7474

75-
* `target/freeclimb-java-client-6.0.0.jar`
75+
* `target/freeclimb-java-client-6.1.0.jar`
7676
* `target/lib/*.jar`
7777

7878
## Getting Started
@@ -271,6 +271,7 @@ Class | Method | HTTP request | Description
271271
- [MessageDirection](docs/MessageDirection.md)
272272
- [MessageRequest](docs/MessageRequest.md)
273273
- [MessageResult](docs/MessageResult.md)
274+
- [MessageResultAllOfTfn](docs/MessageResultAllOfTfn.md)
274275
- [MessageStatus](docs/MessageStatus.md)
275276
- [MessageStatusWebhook](docs/MessageStatusWebhook.md)
276277
- [MessagesList](docs/MessagesList.md)
@@ -330,6 +331,7 @@ Class | Method | HTTP request | Description
330331
- [Sms](docs/Sms.md)
331332
- [StartRecordCall](docs/StartRecordCall.md)
332333
- [TFN](docs/TFN.md)
334+
- [TFNCampaign](docs/TFNCampaign.md)
333335
- [TerminateConference](docs/TerminateConference.md)
334336
- [TranscribeReason](docs/TranscribeReason.md)
335337
- [TranscribeTermReason](docs/TranscribeTermReason.md)

‎build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'java'
44
apply plugin: 'com.diffplug.spotless'
55

66
group = 'com.github.freeclimbapi'
7-
version = '6.0.0'
7+
version = '6.1.0'
88

99
buildscript {
1010
repositories {
@@ -119,6 +119,7 @@ dependencies {
119119
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
120120
testImplementation 'junit:junit:4.13.2'
121121
testImplementation 'org.mockito:mockito-core:3.12.4'
122+
implementation 'org.json:json:20171018'
122123
}
123124

124125
javadoc {

‎build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
22
settings(
33
organization := "com.github.freeclimbapi",
44
name := "freeclimb-java-client",
5-
version := "6.0.0",
5+
version := "6.1.0",
66
scalaVersion := "2.11.4",
77
scalacOptions ++= Seq("-feature"),
88
javacOptions in compile ++= Seq("-Xlint:deprecation"),

‎docs/MessageResult.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ Name | Type | Description | Notes
2323
**campaignId** | **String** | The unique identifier for the campaign associated with the message | [optional]
2424
**segmentCount** | **BigDecimal** | The number of segments into which the message was split | [optional]
2525
**mediaUrls** | **List&lt;URI&gt;** | an array of HTTP URLs which were attached this this message | [optional]
26+
**tfn** | [**MessageResultAllOfTfn**](MessageResultAllOfTfn.md) | | [optional]
27+
**phoneNumberId** | **String** | String that uniquely identifies the phoneNumber resource used to send this Message | [optional]
28+
**applicationId** | **String** | String that uniquely identifies the Application resource used to send this Message | [optional]
2629

2730

2831

‎docs/MessageResultAllOfTfn.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
3+
# MessageResultAllOfTfn
4+
5+
6+
## Properties
7+
8+
Name | Type | Description | Notes
9+
------------ | ------------- | ------------- | -------------
10+
**campaignId** | **String** | TFNCampaignId |
11+
12+
13+

‎docs/TFNCampaign.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2+
3+
# TFNCampaign
4+
5+
6+
## Properties
7+
8+
Name | Type | Description | Notes
9+
------------ | ------------- | ------------- | -------------
10+
**accountId** | **String** | ID of the account that created this participant. |
11+
**campaignId** | **String** | TFNCampaignId |
12+
**useCase** | **String** | |
13+
**registrationStatus** | **SMSTollFreeCampaignRegistrationStatus** | |
14+
**dateCreated** | **String** | |
15+
**dateUpdated** | **String** | |
16+
**dateCreatedISO** | **String** | |
17+
**dateUpdatedISO** | **String** | |
18+
**revision** | **Integer** | |
19+
20+
21+

‎openapi.json

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3596,11 +3596,84 @@
35963596
"format": "uri"
35973597
},
35983598
"nullable": true
3599+
},
3600+
"tfn": {
3601+
"type": "object",
3602+
"required": [
3603+
"campaignId"
3604+
],
3605+
"properties": {
3606+
"campaignId": {
3607+
"$ref": "#/components/schemas/TFNCampaignId"
3608+
}
3609+
},
3610+
"nullable": true
3611+
},
3612+
"phoneNumberId": {
3613+
"type": "string",
3614+
"description": "String that uniquely identifies the phoneNumber resource used to send this Message",
3615+
"nullable": true
3616+
},
3617+
"applicationId": {
3618+
"type": "string",
3619+
"description": "String that uniquely identifies the Application resource used to send this Message",
3620+
"nullable": true
35993621
}
36003622
}
36013623
}
36023624
]
36033625
},
3626+
"TFNCampaign": {
3627+
"type": "object",
3628+
"required": [
3629+
"accountId",
3630+
"campaignId",
3631+
"useCase",
3632+
"registrationStatus",
3633+
"dateCreated",
3634+
"dateUpdated",
3635+
"dateCreatedISO",
3636+
"dateUpdatedISO",
3637+
"revision"
3638+
],
3639+
"properties": {
3640+
"accountId": {
3641+
"type": "string",
3642+
"description": "ID of the account that created this participant.",
3643+
"nullable": true
3644+
},
3645+
"campaignId": {
3646+
"$ref": "#/components/schemas/TFNCampaignId"
3647+
},
3648+
"useCase": {
3649+
"type": "string"
3650+
},
3651+
"registrationStatus": {
3652+
"$ref": "#/components/schemas/SMSTollFreeCampaignRegistrationStatus"
3653+
},
3654+
"dateCreated": {
3655+
"type": "string"
3656+
},
3657+
"dateUpdated": {
3658+
"type": "string"
3659+
},
3660+
"dateCreatedISO": {
3661+
"type": "string"
3662+
},
3663+
"dateUpdatedISO": {
3664+
"type": "string"
3665+
},
3666+
"revision": {
3667+
"type": "integer"
3668+
}
3669+
}
3670+
},
3671+
"TFNCampaignId": {
3672+
"type": "string",
3673+
"description": "TFNCampaignId",
3674+
"pattern": "cmptfn_[a-fA-F0-9]{40}",
3675+
"example": "cmptfn_387ec3f6e03b340553f35f29c8f118cdf3eae08a"
3676+
},
36043677
"CreateConferenceRequest": {
36053678
"type": "object",
36063679
"properties": {

‎pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>freeclimb-java-client</artifactId>
66
<packaging>jar</packaging>
77
<name>freeclimb-java-client</name>
8-
<version>6.0.0</version>
8+
<version>6.1.0</version>
99
<url>https://github.com/freeclimbapi/java-sdk</url>
1010
<description>FreeClimb Java Client</description>
1111
<scm>
@@ -318,6 +318,12 @@
318318
<version>${mockito-core-version}</version>
319319
<scope>test</scope>
320320
</dependency>
321+
<dependency>
322+
<groupId>org.json</groupId>
323+
<artifactId>json</artifactId>
324+
<version>${org-json-version}</version>
325+
<scope>test</scope>
326+
</dependency>
321327
</dependencies>
322328
<properties>
323329
<java.version>1.8</java.version>
@@ -334,6 +340,7 @@
334340
<jackson-databind-nullable-version>0.2.2</jackson-databind-nullable-version>
335341
<threetenbp-version>1.6.0</threetenbp-version>
336342
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
343+
<org-json-version>20171018</org-json-version>
337344
<junit-version>4.13.2</junit-version>
338345
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
339346
<spotless.version>2.43.0</spotless.version>

0 commit comments

Comments
 (0)