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

Author: amahadaya

.openapi-generator/FILES

@@ -73,6 +73,7 @@ docs/MessageDeliveryWebhook.md
 docs/MessageDirection.md
 docs/MessageRequest.md
 docs/MessageResult.md
+docs/MessageResultAllOfTfn.md
 docs/MessageStatus.md
 docs/MessageStatusWebhook.md
 docs/MessagesList.md
@@ -132,6 +133,7 @@ docs/SetTalk.md
 docs/Sms.md
 docs/StartRecordCall.md
 docs/TFN.md
+docs/TFNCampaign.md
 docs/TerminateConference.md
 docs/TranscribeReason.md
 docs/TranscribeTermReason.md
@@ -230,6 +232,7 @@ src/main/java/com/github/freeclimbapi/MessageDeliveryWebhook.java
 src/main/java/com/github/freeclimbapi/MessageDirection.java
 src/main/java/com/github/freeclimbapi/MessageRequest.java
 src/main/java/com/github/freeclimbapi/MessageResult.java
+src/main/java/com/github/freeclimbapi/MessageResultAllOfTfn.java
 src/main/java/com/github/freeclimbapi/MessageStatus.java
 src/main/java/com/github/freeclimbapi/MessageStatusWebhook.java
 src/main/java/com/github/freeclimbapi/MessagesList.java
@@ -295,6 +298,7 @@ src/main/java/com/github/freeclimbapi/Sms.java
 src/main/java/com/github/freeclimbapi/StartRecordCall.java
 src/main/java/com/github/freeclimbapi/StringUtil.java
 src/main/java/com/github/freeclimbapi/TFN.java
+src/main/java/com/github/freeclimbapi/TFNCampaign.java
 src/main/java/com/github/freeclimbapi/TerminateConference.java
 src/main/java/com/github/freeclimbapi/TranscribeReason.java
 src/main/java/com/github/freeclimbapi/TranscribeTermReason.java
@@ -379,6 +383,7 @@ src/test/java/com/github/freeclimbapi/MakeCallRequestTest.java
 src/test/java/com/github/freeclimbapi/MessageDeliveryWebhookTest.java
 src/test/java/com/github/freeclimbapi/MessageDirectionTest.java
 src/test/java/com/github/freeclimbapi/MessageRequestTest.java
+src/test/java/com/github/freeclimbapi/MessageResultAllOfTfnTest.java
 src/test/java/com/github/freeclimbapi/MessageResultTest.java
 src/test/java/com/github/freeclimbapi/MessageStatusTest.java
 src/test/java/com/github/freeclimbapi/MessageStatusWebhookTest.java
@@ -438,6 +443,7 @@ src/test/java/com/github/freeclimbapi/SetListenTest.java
 src/test/java/com/github/freeclimbapi/SetTalkTest.java
 src/test/java/com/github/freeclimbapi/SmsTest.java
 src/test/java/com/github/freeclimbapi/StartRecordCallTest.java
+src/test/java/com/github/freeclimbapi/TFNCampaignTest.java
 src/test/java/com/github/freeclimbapi/TFNTest.java
 src/test/java/com/github/freeclimbapi/TerminateConferenceTest.java
 src/test/java/com/github/freeclimbapi/TranscribeReasonTest.java

CHANGELOG.md

@@ -8,19 +8,35 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## [Unreleased]
 
 None
+
+<a name="6.1.0"></a>
+
+## [6.1.0] - 2025-01-08
+
+### Added
+
+- CampaignTFN and MessageResultsAllOfTfn models
+
+### Changed
+
+- PerclCommand serialization bug has been resolved with edits to the build method
+
 <a name="6.0.0"></a>
 
 ## [6.0.0] - 2025-01-08
 
 ### Added
+
 - Webhook classes
 - More idiomated Enum management
 
 ### Changed
+
 - Use upgraded openapi generator
 
 ### Removed
-- *AllOf model files
+
+- \*AllOf model files
 
 <a name="5.9.0"></a>
 

README.md

@@ -40,7 +40,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>com.github.freeclimbapi</groupId>
   <artifactId>freeclimb-java-client</artifactId>
-  <version>6.0.0</version>
+  <version>6.1.0</version>
   <scope>compile</scope>
 </dependency>
 ```
@@ -56,7 +56,7 @@ Add this dependency to your project's build file:
   }
 
   dependencies {
-     implementation "com.github.freeclimbapi:freeclimb-java-client:6.0.0"
+     implementation "com.github.freeclimbapi:freeclimb-java-client:6.1.0"
      implementation("com.squareup.okhttp3:okhttp:4.9.3")
      implementation("com.squareup.okhttp3:logging-interceptor:4.9.3")
   }
@@ -72,7 +72,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/freeclimb-java-client-6.0.0.jar`
+* `target/freeclimb-java-client-6.1.0.jar`
 * `target/lib/*.jar`
 
 ## Getting Started
@@ -271,6 +271,7 @@ Class | Method | HTTP request | Description
  - [MessageDirection](docs/MessageDirection.md)
  - [MessageRequest](docs/MessageRequest.md)
  - [MessageResult](docs/MessageResult.md)
+ - [MessageResultAllOfTfn](docs/MessageResultAllOfTfn.md)
  - [MessageStatus](docs/MessageStatus.md)
  - [MessageStatusWebhook](docs/MessageStatusWebhook.md)
  - [MessagesList](docs/MessagesList.md)
@@ -330,6 +331,7 @@ Class | Method | HTTP request | Description
  - [Sms](docs/Sms.md)
  - [StartRecordCall](docs/StartRecordCall.md)
  - [TFN](docs/TFN.md)
+ - [TFNCampaign](docs/TFNCampaign.md)
  - [TerminateConference](docs/TerminateConference.md)
  - [TranscribeReason](docs/TranscribeReason.md)
  - [TranscribeTermReason](docs/TranscribeTermReason.md)

build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'java'
 apply plugin: 'com.diffplug.spotless'
 
 group = 'com.github.freeclimbapi'
-version = '6.0.0'
+version = '6.1.0'
 
 buildscript {
     repositories {
@@ -119,6 +119,7 @@ dependencies {
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
+    implementation 'org.json:json:20171018'
 }
 
 javadoc {

build.sbt

@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.github.freeclimbapi",
     name := "freeclimb-java-client",
-    version := "6.0.0",
+    version := "6.1.0",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),

docs/MessageResult.md

@@ -23,6 +23,9 @@ Name | Type | Description | Notes
 **campaignId** | **String** | The unique identifier for the campaign associated with the message |  [optional]
 **segmentCount** | **BigDecimal** | The number of segments into which the message was split |  [optional]
 **mediaUrls** | **List<URI>** | an array of HTTP URLs which were attached this this message |  [optional]
+**tfn** | [**MessageResultAllOfTfn**](MessageResultAllOfTfn.md) |  |  [optional]
+**phoneNumberId** | **String** | String that uniquely identifies the phoneNumber resource used to send this Message |  [optional]
+**applicationId** | **String** | String that uniquely identifies the Application resource used to send this Message |  [optional]
 
 
 

docs/MessageResultAllOfTfn.md

@@ -0,0 +1,13 @@
+
+
+# MessageResultAllOfTfn
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**campaignId** | **String** | TFNCampaignId | 
+
+
+

docs/TFNCampaign.md

@@ -0,0 +1,21 @@
+
+
+# TFNCampaign
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**accountId** | **String** | ID of the account that created this participant. | 
+**campaignId** | **String** | TFNCampaignId | 
+**useCase** | **String** |  | 
+**registrationStatus** | **SMSTollFreeCampaignRegistrationStatus** |  | 
+**dateCreated** | **String** |  | 
+**dateUpdated** | **String** |  | 
+**dateCreatedISO** | **String** |  | 
+**dateUpdatedISO** | **String** |  | 
+**revision** | **Integer** |  | 
+
+
+

openapi.json

@@ -3596,11 +3596,84 @@
                   "format": "uri"
                 },
                 "nullable": true
+              },
+              "tfn": {
+                "type": "object",
+                "required": [
+                  "campaignId"
+                ],
+                "properties": {
+                  "campaignId": {
+                    "$ref": "#/components/schemas/TFNCampaignId"
+                  }
+                },
+                "nullable": true
+              },    
+              "phoneNumberId": {
+                "type": "string",
+                "description": "String that uniquely identifies the phoneNumber resource used to send this Message",
+                "nullable": true
+              },
+              "applicationId": {
+                "type": "string",
+                "description": "String that uniquely identifies the Application resource used to send this Message",
+                "nullable": true
               }
             }
           }
         ]
       },
+      "TFNCampaign": {
+        "type": "object",
+        "required": [
+          "accountId",
+          "campaignId",
+          "useCase",
+          "registrationStatus",
+          "dateCreated",
+          "dateUpdated",
+          "dateCreatedISO",
+          "dateUpdatedISO",
+          "revision"
+        ],
+        "properties": {
+          "accountId": {
+            "type": "string",
+            "description": "ID of the account that created this participant.",
+            "nullable": true
+          },
+          "campaignId": {
+            "$ref": "#/components/schemas/TFNCampaignId"
+          },
+          "useCase": {
+            "type": "string"
+          },
+          "registrationStatus": {
+            "$ref": "#/components/schemas/SMSTollFreeCampaignRegistrationStatus"
+          },
+          "dateCreated": {
+            "type": "string"
+          },
+          "dateUpdated": {
+            "type": "string"
+          },
+          "dateCreatedISO": {
+            "type": "string"
+          },
+          "dateUpdatedISO": {
+            "type": "string"
+          },
+          "revision": {
+            "type": "integer"
+          }
+        }
+      },
+      "TFNCampaignId": {
+        "type": "string",
+        "description": "TFNCampaignId",
+        "pattern": "cmptfn_[a-fA-F0-9]{40}",
+        "example": "cmptfn_387ec3f6e03b340553f35f29c8f118cdf3eae08a"
+      },
       "CreateConferenceRequest": {
         "type": "object",
         "properties": {

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>freeclimb-java-client</artifactId>
     <packaging>jar</packaging>
     <name>freeclimb-java-client</name>
-    <version>6.0.0</version>
+    <version>6.1.0</version>
     <url>https://github.com/freeclimbapi/java-sdk</url>
     <description>FreeClimb Java Client</description>
     <scm>
@@ -318,6 +318,12 @@
             <version>${mockito-core-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>${org-json-version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <java.version>1.8</java.version>
@@ -334,6 +340,7 @@
         <jackson-databind-nullable-version>0.2.2</jackson-databind-nullable-version>
         <threetenbp-version>1.6.0</threetenbp-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <org-json-version>20171018</org-json-version>
         <junit-version>4.13.2</junit-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spotless.version>2.43.0</spotless.version>