Resolve VCSWP-23775

.openapi-generator/FILES

@@ -73,7 +73,6 @@ docs/MessageDeliveryWebhook.md
 docs/MessageDirection.md
 docs/MessageRequest.md
 docs/MessageResult.md
-docs/MessageResultAllOfTfn.md
 docs/MessageStatus.md
 docs/MessageStatusWebhook.md
 docs/MessagesList.md
@@ -232,7 +231,6 @@ 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
@@ -383,7 +381,6 @@ 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

CHANGELOG.md

@@ -9,6 +9,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 None
 
+<a name="6.1.1"></a>
+
+## [6.1.1] - 2025-02-05
+
+### Changed
+
+- Convert MessageResultsAllOfTfn to existing TFN model and make SDK updates per latest spec changes
+
 <a name="6.1.0"></a>
 
 ## [6.1.0] - 2025-01-08

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.1.0</version>
+  <version>6.1.1</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.1.0"
+     implementation "com.github.freeclimbapi:freeclimb-java-client:6.1.1"
      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.1.0.jar`
+* `target/freeclimb-java-client-6.1.1.jar`
 * `target/lib/*.jar`
 
 ## Getting Started
@@ -271,7 +271,6 @@ 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)

build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'java'
 apply plugin: 'com.diffplug.spotless'
 
 group = 'com.github.freeclimbapi'
-version = '6.1.0'
+version = '6.1.1'
 
 buildscript {
     repositories {
@@ -146,7 +146,7 @@ spotless {
         // don't need to set target, it is inferred from java
 
         // apply a specific flavor of google-java-format
-        googleJavaFormat('1.8').aosp().reflowLongStrings()
+        googleJavaFormat('1.19.2').aosp().reflowLongStrings()
 
         removeUnusedImports()
         importOrder()

build.sbt

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

docs/MessageResult.md

@@ -23,7 +23,7 @@ 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]
+**tfn** | [**TFN**](TFN.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]
 

openapi.json

@@ -151,12 +151,7 @@
       },
       "GetDigitsReason": {
         "type": "string",
-        "enum": [
-          "finishKey",
-          "timeout",
-          "maxDigits",
-          "tone"
-        ],
+        "enum": ["finishKey", "timeout", "maxDigits", "tone"],
         "description": "This field explains how the GetDigits action ended. The value is one of the below: •finishKey - The finish key as specified had been pressed by the caller. Digit string has all keys up to, but not including, the finish key.  •timeout - The timeout limit was reached prior to any other criteria being met. If any digits were collected, they will be included.  •maxDigits - The maximum number of digits was reached and digit collection ended.  •tone - Answering machine or fax tone detection occurred, interrupting digit collection. Any digits received up to this point are included in this webhook."
       },
       "ConferenceStatus": {
@@ -420,12 +415,7 @@
       "SMSTenDLCBrandIdentityStatus": {
         "type": "string",
         "description": "TCR assessment of the brand identification status.",
-        "enum": [
-          "SELF_DECLARED",
-          "UNVERIFIED",
-          "VERIFIED",
-          "VETTED_VERIFIED"
-        ]
+        "enum": ["SELF_DECLARED", "UNVERIFIED", "VERIFIED", "VETTED_VERIFIED"]
       },
       "CompletionResultStatus": {
         "type": "string",
@@ -494,32 +484,32 @@
       "Webhook": {
         "type": "object",
         "discriminator": {
-         "propertyName": "requestType",
-         "mapping": {
-           "addToConferenceNotification":  "#/components/schemas/AddToConferenceNotificationWebhook",
-           "addToQueueNotification": "#/components/schemas/AddToQueueNotificationWebhook",
-           "callControl": "#/components/schemas/CallControlWebhook",
-           "callStatus": "#/components/schemas/CallStatusWebhook",
-           "conferenceRecordingStatus": "#/components/schemas/ConferenceRecordingStatusWebhook",
-           "conferenceStatus": "#/components/schemas/ConferenceStatusWebhook",
-           "createConference": "#/components/schemas/CreateConferenceWebhook",
-           "dequeue": "#/components/schemas/DequeueWebhook",
-           "getDigits": "#/components/schemas/GetDigitsWebhook",
-           "getSpeech": "#/components/schemas/GetSpeechWebhook",
-           "inboundCall": "#/components/schemas/InboundCallWebhook",
-           "leaveConference": "#/components/schemas/LeaveConferenceWebhook",
-           "machineDetected": "#/components/schemas/MachineDetectedWebhook",
-           "messageDelivery": "#/components/schemas/MessageDeliveryWebhook",
-           "messageStatus": "#/components/schemas/MessageStatusWebhook",
-           "outDialApiConnect": "#/components/schemas/OutDialApiConnectWebhook",
-           "outDialConnect": "#/components/schemas/OutDialConnectWebhook",
-           "outDialStart": "#/components/schemas/OutDialStartWebhook",
-           "queueWait": "#/components/schemas/QueueWaitWebhook",
-           "record": "#/components/schemas/RecordWebhook",
-           "redirect": "#/components/schemas/RedirectWebhook",
-           "removeFromQueueNotification": "#/components/schemas/RemoveFromQueueNotificationWebhook",
-           "transcribe": "#/components/schemas/TranscribeWebhook"
-         }
+          "propertyName": "requestType",
+          "mapping": {
+            "addToConferenceNotification": "#/components/schemas/AddToConferenceNotificationWebhook",
+            "addToQueueNotification": "#/components/schemas/AddToQueueNotificationWebhook",
+            "callControl": "#/components/schemas/CallControlWebhook",
+            "callStatus": "#/components/schemas/CallStatusWebhook",
+            "conferenceRecordingStatus": "#/components/schemas/ConferenceRecordingStatusWebhook",
+            "conferenceStatus": "#/components/schemas/ConferenceStatusWebhook",
+            "createConference": "#/components/schemas/CreateConferenceWebhook",
+            "dequeue": "#/components/schemas/DequeueWebhook",
+            "getDigits": "#/components/schemas/GetDigitsWebhook",
+            "getSpeech": "#/components/schemas/GetSpeechWebhook",
+            "inboundCall": "#/components/schemas/InboundCallWebhook",
+            "leaveConference": "#/components/schemas/LeaveConferenceWebhook",
+            "machineDetected": "#/components/schemas/MachineDetectedWebhook",
+            "messageDelivery": "#/components/schemas/MessageDeliveryWebhook",
+            "messageStatus": "#/components/schemas/MessageStatusWebhook",
+            "outDialApiConnect": "#/components/schemas/OutDialApiConnectWebhook",
+            "outDialConnect": "#/components/schemas/OutDialConnectWebhook",
+            "outDialStart": "#/components/schemas/OutDialStartWebhook",
+            "queueWait": "#/components/schemas/QueueWaitWebhook",
+            "record": "#/components/schemas/RecordWebhook",
+            "redirect": "#/components/schemas/RedirectWebhook",
+            "removeFromQueueNotification": "#/components/schemas/RemoveFromQueueNotificationWebhook",
+            "transcribe": "#/components/schemas/TranscribeWebhook"
+          }
         },
         "properties": {
           "requestType": {
@@ -3598,17 +3588,9 @@
                 "nullable": true
               },
               "tfn": {
-                "type": "object",
-                "required": [
-                  "campaignId"
-                ],
-                "properties": {
-                  "campaignId": {
-                    "$ref": "#/components/schemas/TFNCampaignId"
-                  }
-                },
+                "$ref": "#/components/schemas/TFN",
                 "nullable": true
-              },    
+              },
               "phoneNumberId": {
                 "type": "string",
                 "description": "String that uniquely identifies the phoneNumber resource used to send this Message",

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>freeclimb-java-client</artifactId>
     <packaging>jar</packaging>
     <name>freeclimb-java-client</name>
-    <version>6.1.0</version>
+    <version>6.1.1</version>
     <url>https://github.com/freeclimbapi/java-sdk</url>
     <description>FreeClimb Java Client</description>
     <scm>
@@ -209,7 +209,7 @@
                   <!-- no need to specify files, inferred automatically, but you can if you want -->
                   <!-- apply a specific flavor of google-java-format and reflow long strings -->
                   <googleJavaFormat>
-                    <version>1.17.0</version>
+                    <version>1.19.2</version>
                     <style>AOSP</style>
                     <reflowLongStrings>true</reflowLongStrings>
                   </googleJavaFormat>

src/main/java/com/github/freeclimbapi/ApiClient.java

@@ -121,7 +121,7 @@ private void init() {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/6.1.0/java");
+        setUserAgent("OpenAPI-Generator/6.1.1/java");
 
         authentications = new HashMap<String, Authentication>();
     }

src/main/java/com/github/freeclimbapi/models/MessageResult.java

@@ -114,7 +114,7 @@ public static String getDiscriminatorValue() {
     public static final String SERIALIZED_NAME_TFN = "tfn";
 
     @SerializedName(SERIALIZED_NAME_TFN)
-    private MessageResultAllOfTfn tfn;
+    private TFN tfn;
 
     public static final String SERIALIZED_NAME_PHONE_NUMBER_ID = "phoneNumberId";
 
@@ -484,7 +484,7 @@ public void setMediaUrls(List<URI> mediaUrls) {
         this.mediaUrls = mediaUrls;
     }
 
-    public MessageResult tfn(MessageResultAllOfTfn tfn) {
+    public MessageResult tfn(TFN tfn) {
 
         this.tfn = tfn;
         return this;
@@ -497,11 +497,11 @@ public MessageResult tfn(MessageResultAllOfTfn tfn) {
      */
     @javax.annotation.Nullable
     @ApiModelProperty(value = "")
-    public MessageResultAllOfTfn getTfn() {
+    public TFN getTfn() {
         return tfn;
     }
 
-    public void setTfn(MessageResultAllOfTfn tfn) {
+    public void setTfn(TFN tfn) {
         this.tfn = tfn;
     }