Fixed whatsapp issues, updated CHANGELOG.md

Author: ib-tjuhasz

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to the library will be documented in this file.
 The format of the file is based on [Keep a Changelog](http://keepachangelog.com/)
 and this library adheres to [Semantic Versioning](http://semver.org/) as mentioned in [README.md][readme] file.
 
-## [ [6.1.0](https://github.com/infobip/infobip-api-java-client/releases/tag/6.1.0) ] - 2025-04-07
+## [ [6.1.0](https://github.com/infobip/infobip-api-java-client/releases/tag/6.1.0) ] - 2025-04-09
 
 ⚠️ **IMPORTANT NOTE:** This release contains compile time breaking changes.
 All changes, including breaking changes, are addressed and explained in the list bellow.
@@ -38,6 +38,13 @@ If you find out that something was not addressed properly, please submit an issu
 * **Updated** `CallsSearchResponse.lastUsageDate` field type from `String` → `LocalDate`.
 * **Removed** `EmailWebhookTrackReport` and `EmailWebhookTrackResponse`  in favor of a unified class: `EmailWebhookTrackingPayload`.
 * **Updated** `FormsRequest.formType` field type from `FormType` → `String`.
+* **Removed** `CallSipTrunkLocation` enum class, now processed as a `String`.
+* **Updated** `WhatsAppTemplateEditPublicApiRequest` `category` field: `CategoryEnum` inner enum replaced by the existing `WhatsAppCategory` class enum value.
+* **Updated** `WhatsAppTemplatePublicApiRequest` `category` field: `CategoryEnum` inner enum replaced by the existing `WhatsAppCategory` class enum value.
+* **Replaced** `WhatsAppWebhookAddress` `type` enum with `String` to support more options.
+* **Fixed** `WhatsAppWebhookContact` `birthday` field type: changed from `OffsetDateTime` to `LocalDate`.
+* **Removed** `WhatsAppWebhookPaymentNotification` `CurrencyEnum` inner enum class, replaced by the existing `WhatsAppPaymentStatus` class.
+* **Removed** `WhatsAppTemplateAllowedOrderPaymentDetails` class, replaced by the unified `WhatsAppInteractiveAllowedOrderPaymentDetails` class.
 * Fixed Javadoc.
 
 ### Removed
@@ -54,24 +61,24 @@ If you find out that something was not addressed properly, please submit an issu
 
 ### Added
 * Most recent feature set for:
-    * [Infobip Messages API](https://www.infobip.com/docs/api/platform/messages-api).
-        * Footer support for Messages API Message. For additional details check Messages API documentation.
-        * Add calendar event button support for Messages API Message. For additional details check Messages API documentation.
-        * Card options for Carousel and Rich Link body types in Messages API Message. For additional details check Messages API documentation.
-    * [Infobip Voice API](https://www.infobip.com/docs/api/channels/voice).
-        * Support for Calls Configuration.
-    * [Infobip SMS API](https://www.infobip.com/docs/api/channels/sms).
-    * [Infobip 2FA API](https://www.infobip.com/docs/api/platform/2fa).
-    * [Infobip Email API](https://www.infobip.com/docs/api/channels/email).
-        * Support for Email IP Management instead of set of deprecated Email IP endpoints. Check [Email API documentation](https://www.infobip.com/docs/api/channels/email) for additional details.
-    * [Infobip WhatsApp API](https://www.infobip.com/docs/api/channels/whatsapp).
-    * [Infobip Viber API](https://www.infobip.com/docs/api/channels/viber).
-    * [Infobip WebRTC API](https://www.infobip.com/docs/api/channels/webrtc-calls).
-    * [Infobip Moments](https://www.infobip.com/docs/api/customer-engagement/moments).
-    * [Infobip MMS API](https://www.infobip.com/docs/api/channels/mms).
-        * Introduced `/mms/2/messages (V2)`  replacing the `/mms/1/advanced (V1)` endpoint.
-        * Introduced `/mms/2/reports (V2)` replacing `/mms/1/reports (V1)` endpoint.
-        * Introduced `/mms/2/logs (V2)` replacing `/mms/1/logs (V1)` endpoint.
+  * [Infobip Messages API](https://www.infobip.com/docs/api/platform/messages-api).
+    * Footer support for Messages API Message. For additional details check Messages API documentation.
+    * Add calendar event button support for Messages API Message. For additional details check Messages API documentation.
+    * Card options for Carousel and Rich Link body types in Messages API Message. For additional details check Messages API documentation.
+  * [Infobip Voice API](https://www.infobip.com/docs/api/channels/voice).
+    * Support for Calls Configuration.
+  * [Infobip SMS API](https://www.infobip.com/docs/api/channels/sms).
+  * [Infobip 2FA API](https://www.infobip.com/docs/api/platform/2fa).
+  * [Infobip Email API](https://www.infobip.com/docs/api/channels/email).
+    * Support for Email IP Management instead of set of deprecated Email IP endpoints. Check [Email API documentation](https://www.infobip.com/docs/api/channels/email) for additional details.
+  * [Infobip WhatsApp API](https://www.infobip.com/docs/api/channels/whatsapp).
+  * [Infobip Viber API](https://www.infobip.com/docs/api/channels/viber).
+  * [Infobip WebRTC API](https://www.infobip.com/docs/api/channels/webrtc-calls).
+  * [Infobip Moments](https://www.infobip.com/docs/api/customer-engagement/moments).
+  * [Infobip MMS API](https://www.infobip.com/docs/api/channels/mms).
+    * Introduced `/mms/2/messages (V2)`  replacing the `/mms/1/advanced (V1)` endpoint.
+    * Introduced `/mms/2/reports (V2)` replacing `/mms/1/reports (V1)` endpoint.
+    * Introduced `/mms/2/logs (V2)` replacing `/mms/1/logs (V1)` endpoint.
 * **Added** new Calls error code type: `MACHINE_DETECTED`.
 * **Added** support for `CallsProviderSipTrunkUpdateRequest`.
 * **Created** `RawJsonDeserializer` to handle raw JSON deserialization.
@@ -91,9 +98,9 @@ If you find out that something was not addressed properly, please submit an issu
 
 - Voice API
   -  Adjusted IVR models in script processing. Scenario scripting is now implemented as a raw string to increase usability of the feature. Scripts should be passed as strings to the IVR request model in all upcoming SDK versions.
-      - **Updated** `CallsUpdateScenarioRequest.script` field type from `List<CallsScriptInner>` → `String`.
-      - **Updated** `CallsSearchResponse.script` and `else` fields type from `List<Object>` → `String`.
-      - **Updated** `CallsUpdateScenarioResponse.script` field type from `Object` → `String`.
+    - **Updated** `CallsUpdateScenarioRequest.script` field type from `List<CallsScriptInner>` → `String`.
+    - **Updated** `CallsSearchResponse.script` and `else` fields type from `List<Object>` → `String`.
+    - **Updated** `CallsUpdateScenarioResponse.script` field type from `Object` → `String`.
   - **Updated** `CallsGetVoicesResponses.voices` field type from `List<CallsVoice>` → `List<CallsSynthesisVoice>`.
   - **Updated** `CallsSearchResponse.lastUsageDate` field type from `OffsetDateTime` → `String`.
   - **Updated** `CallsSpeechCaptureRequest.language` field type from `CallsLanguage` → `CallTranscriptionLanguage`.
@@ -161,31 +168,31 @@ If you find out that something was not addressed properly, please submit an issu
   - **Removed** `fcmServerKey` field from `WebRtcAndroidPushNotificationConfig`.
 
 ### Removed:
-  - Deprecated functions for sending Viber `Image`, `File`, and `Text` messages have been removed. Use `ViberApi.sendViberMessages` to send messages.
-  - All the Calls IVR script related class and from now on all the scripts are processed as `String`:
-    - `CallsCallApi`
-    - `CallsCapture`
-    - `CallsCollect`
-    - `CallsDial`
-    - `CallsDialToMany`
-    - `CallsDialToWebRTC`
-    - `CallsDialToConversations`
-    - `CallsForEach`
-    - `CallsGoTo`
-    - `CallsHangup`
-    - `CallsIfThenElse`
-    - `CallsMachineDetection`
-    - `CallsPause`
-    - `CallsPlay`
-    - `CallsPlayFromRecording`
-    - `CallsRecord`
-    - `CallsRepeatUntil`
-    - `CallsRepeatWhile`
-    - `CallsSay`
-    - `CallsSendSms`
-    - `CallsSetVariable`
-    - `CallsSwitchCase`
-    - `CallsWhileDo`
+- Deprecated functions for sending Viber `Image`, `File`, and `Text` messages have been removed. Use `ViberApi.sendViberMessages` to send messages.
+- All the Calls IVR script related class and from now on all the scripts are processed as `String`:
+  - `CallsCallApi`
+  - `CallsCapture`
+  - `CallsCollect`
+  - `CallsDial`
+  - `CallsDialToMany`
+  - `CallsDialToWebRTC`
+  - `CallsDialToConversations`
+  - `CallsForEach`
+  - `CallsGoTo`
+  - `CallsHangup`
+  - `CallsIfThenElse`
+  - `CallsMachineDetection`
+  - `CallsPause`
+  - `CallsPlay`
+  - `CallsPlayFromRecording`
+  - `CallsRecord`
+  - `CallsRepeatUntil`
+  - `CallsRepeatWhile`
+  - `CallsSay`
+  - `CallsSendSms`
+  - `CallsSetVariable`
+  - `CallsSwitchCase`
+  - `CallsWhileDo`
 
 These changes align the SDK with the current API specification, ensuring consistency and reliability in future updates.
 

src/main/java/com/infobip/api/WhatsAppApi.java

@@ -10,7 +10,6 @@
 package com.infobip.api;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.google.common.annotations.Beta;
 import com.infobip.ApiCallback;
 import com.infobip.ApiClient;
 import com.infobip.ApiException;
@@ -141,7 +140,6 @@ public okhttp3.Call executeAsync(ApiCallback<WhatsAppSenderRegistrationResponse>
      * @return AddWhatsappSenderRequest
      * @see <a href="https://www.infobip.com/docs/whatsapp">Learn more about WhatsApp channel and use cases</a>
      */
-    @Beta
     public AddWhatsappSenderRequest addWhatsappSender(
             Long businessAccountId, WhatsAppPhoneNumberRequest whatsAppPhoneNumberRequest) {
         return new AddWhatsappSenderRequest(businessAccountId, whatsAppPhoneNumberRequest);
@@ -1344,7 +1342,6 @@ public okhttp3.Call executeAsync(ApiCallback<Void> callback) {
      * @return RetryWhatsappSenderVerificationRequest
      * @see <a href="https://www.infobip.com/docs/whatsapp">Learn more about WhatsApp channel and use cases</a>
      */
-    @Beta
     public RetryWhatsappSenderVerificationRequest retryWhatsappSenderVerification(
             String sender, WhatsAppOtpRequest whatsAppOtpRequest) {
         return new RetryWhatsappSenderVerificationRequest(sender, whatsAppOtpRequest);
@@ -2394,7 +2391,6 @@ public okhttp3.Call executeAsync(ApiCallback<WhatsAppSingleMessageInfo> callback
      * @return SendWhatsappInteractiveOrderDetailsMessageRequest
      * @see <a href="https://www.infobip.com/docs/whatsapp">Learn more about WhatsApp channel and use cases</a>
      */
-    @Beta
     public SendWhatsappInteractiveOrderDetailsMessageRequest sendWhatsappInteractiveOrderDetailsMessage(
             WhatsAppInteractiveOrderDetailsMessage whatsAppInteractiveOrderDetailsMessage) {
         return new SendWhatsappInteractiveOrderDetailsMessageRequest(whatsAppInteractiveOrderDetailsMessage);
@@ -2464,7 +2460,6 @@ public okhttp3.Call executeAsync(ApiCallback<WhatsAppSingleMessageInfo> callback
      * @return SendWhatsappInteractiveOrderStatusMessageRequest
      * @see <a href="https://www.infobip.com/docs/whatsapp">Learn more about WhatsApp channel and use cases</a>
      */
-    @Beta
     public SendWhatsappInteractiveOrderStatusMessageRequest sendWhatsappInteractiveOrderStatusMessage(
             WhatsAppInteractiveOrderStatusMessage whatsAppInteractiveOrderStatusMessage) {
         return new SendWhatsappInteractiveOrderStatusMessageRequest(whatsAppInteractiveOrderStatusMessage);
@@ -2667,7 +2662,6 @@ public okhttp3.Call executeAsync(ApiCallback<Void> callback) {
      * @return VerifyWhatsappSenderRequest
      * @see <a href="https://www.infobip.com/docs/whatsapp">Learn more about WhatsApp channel and use cases</a>
      */
-    @Beta
     public VerifyWhatsappSenderRequest verifyWhatsappSender(
             String sender, WhatsAppVerifyCodeRequest whatsAppVerifyCodeRequest) {
         return new VerifyWhatsappSenderRequest(sender, whatsAppVerifyCodeRequest);

src/main/java/com/infobip/model/CallRoutingDestination.java

@@ -30,6 +30,8 @@ public abstract class CallRoutingDestination {
 
     private Integer priority;
 
+    private Integer weight;
+
     protected final CallRoutingDestinationType type;
 
     /**
@@ -39,8 +41,6 @@ public CallRoutingDestination(String type) {
         this.type = CallRoutingDestinationType.fromValue(type);
     }
 
-    private Integer weight;
-
     /**
      * Sets priority.
      * <p>
@@ -81,18 +81,6 @@ public void setPriority(Integer priority) {
         this.priority = priority;
     }
 
-    /**
-     * Returns type.
-     * <p>
-     * The field is required.
-     *
-     * @return type
-     */
-    @JsonProperty("type")
-    public CallRoutingDestinationType getType() {
-        return type;
-    }
-
     /**
      * Sets weight.
      * <p>
@@ -133,6 +121,18 @@ public void setWeight(Integer weight) {
         this.weight = weight;
     }
 
+    /**
+     * Returns type.
+     * <p>
+     * The field is required.
+     *
+     * @return type
+     */
+    @JsonProperty("type")
+    public CallRoutingDestinationType getType() {
+        return type;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -143,13 +143,13 @@ public boolean equals(Object o) {
         }
         CallRoutingDestination callRoutingDestination = (CallRoutingDestination) o;
         return Objects.equals(this.priority, callRoutingDestination.priority)
-                && Objects.equals(this.type, callRoutingDestination.type)
-                && Objects.equals(this.weight, callRoutingDestination.weight);
+                && Objects.equals(this.weight, callRoutingDestination.weight)
+                && Objects.equals(this.type, callRoutingDestination.type);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(priority, type, weight);
+        return Objects.hash(priority, weight, type);
     }
 
     @Override
@@ -161,12 +161,12 @@ public String toString() {
                 .append("    priority: ")
                 .append(toIndentedString(priority))
                 .append(newLine)
-                .append("    type: ")
-                .append(toIndentedString(type))
-                .append(newLine)
                 .append("    weight: ")
                 .append(toIndentedString(weight))
                 .append(newLine)
+                .append("    type: ")
+                .append(toIndentedString(type))
+                .append(newLine)
                 .append("}")
                 .toString();
     }

src/main/java/com/infobip/model/CallRoutingPhoneEndpoint.java

@@ -17,6 +17,8 @@
  */
 public class CallRoutingPhoneEndpoint extends CallRoutingEndpoint {
 
+    private String from;
+
     private String phoneNumber;
 
     /**
@@ -26,11 +28,51 @@ public CallRoutingPhoneEndpoint() {
         super("PHONE");
     }
 
+    /**
+     * Sets from.
+     * <p>
+     * Field description:
+     * Phone number in the [E.164](https://en.wikipedia.org/wiki/E.164) format. Defaults to &#x60;from&#x60; value used in inbound call.
+     *
+     * @param from
+     * @return This {@link CallRoutingPhoneEndpoint instance}.
+     */
+    public CallRoutingPhoneEndpoint from(String from) {
+        this.from = from;
+        return this;
+    }
+
+    /**
+     * Returns from.
+     * <p>
+     * Field description:
+     * Phone number in the [E.164](https://en.wikipedia.org/wiki/E.164) format. Defaults to &#x60;from&#x60; value used in inbound call.
+     *
+     * @return from
+     */
+    @JsonProperty("from")
+    public String getFrom() {
+        return from;
+    }
+
+    /**
+     * Sets from.
+     * <p>
+     * Field description:
+     * Phone number in the [E.164](https://en.wikipedia.org/wiki/E.164) format. Defaults to &#x60;from&#x60; value used in inbound call.
+     *
+     * @param from
+     */
+    @JsonProperty("from")
+    public void setFrom(String from) {
+        this.from = from;
+    }
+
     /**
      * Sets phoneNumber.
      * <p>
      * Field description:
-     * Phone number in the [E.164](https://en.wikipedia.org/wiki/E.164) format. Defaults to &#x60;to&#x60; value used in inbound call.
+     * Phone number in the [E.164] format. Defaults to &#x60;to&#x60; value used in inbound call.
      *
      * @param phoneNumber
      * @return This {@link CallRoutingPhoneEndpoint instance}.
@@ -44,7 +86,7 @@ public CallRoutingPhoneEndpoint phoneNumber(String phoneNumber) {
      * Returns phoneNumber.
      * <p>
      * Field description:
-     * Phone number in the [E.164](https://en.wikipedia.org/wiki/E.164) format. Defaults to &#x60;to&#x60; value used in inbound call.
+     * Phone number in the [E.164] format. Defaults to &#x60;to&#x60; value used in inbound call.
      *
      * @return phoneNumber
      */
@@ -57,7 +99,7 @@ public String getPhoneNumber() {
      * Sets phoneNumber.
      * <p>
      * Field description:
-     * Phone number in the [E.164](https://en.wikipedia.org/wiki/E.164) format. Defaults to &#x60;to&#x60; value used in inbound call.
+     * Phone number in the [E.164] format. Defaults to &#x60;to&#x60; value used in inbound call.
      *
      * @param phoneNumber
      */
@@ -75,12 +117,14 @@ public boolean equals(Object o) {
             return false;
         }
         CallRoutingPhoneEndpoint callRoutingPhoneEndpoint = (CallRoutingPhoneEndpoint) o;
-        return Objects.equals(this.phoneNumber, callRoutingPhoneEndpoint.phoneNumber) && super.equals(o);
+        return Objects.equals(this.from, callRoutingPhoneEndpoint.from)
+                && Objects.equals(this.phoneNumber, callRoutingPhoneEndpoint.phoneNumber)
+                && super.equals(o);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(phoneNumber, super.hashCode());
+        return Objects.hash(from, phoneNumber, super.hashCode());
     }
 
     @Override
@@ -92,6 +136,9 @@ public String toString() {
                 .append("    ")
                 .append(toIndentedString(super.toString()))
                 .append(newLine)
+                .append("    from: ")
+                .append(toIndentedString(from))
+                .append(newLine)
                 .append("    phoneNumber: ")
                 .append(toIndentedString(phoneNumber))
                 .append(newLine)