From 45b7d2b757ad75664f0451fb1cbe01150a93f167 Mon Sep 17 00:00:00 2001 From: NirmitiJain Date: Thu, 3 Aug 2023 15:24:49 +0530 Subject: [PATCH 1/4] carrier details in message object --- .../com/plivo/api/models/message/Message.java | 15 ++++++++++ .../api/models/message/MessageLister.java | 28 ++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/plivo/api/models/message/Message.java b/src/main/java/com/plivo/api/models/message/Message.java index e79d67cf..07d2e51d 100644 --- a/src/main/java/com/plivo/api/models/message/Message.java +++ b/src/main/java/com/plivo/api/models/message/Message.java @@ -21,6 +21,9 @@ public class Message extends BaseResource { private String tendlcCampaignID; private String tendlcRegistrationStatus; private String destinationCountryIso2; + private String destinationNetwork; + private String carrierFeesRate; + private String carrierFees; private String requesterIP; private Boolean isDomestic; private String replacedSender; @@ -78,6 +81,18 @@ public String getDestinationCountryIso2() { return destinationCountryIso2; } + public String getDestinationNetwork() { + return destinationNetwork; + } + + public String getCarrierFeesRate() { + return carrierFeesRate; + } + + public String getCarrierFees() { + return carrierFees; + } + public String getFromNumber() { return fromNumber; } diff --git a/src/main/java/com/plivo/api/models/message/MessageLister.java b/src/main/java/com/plivo/api/models/message/MessageLister.java index 21086133..66886c29 100644 --- a/src/main/java/com/plivo/api/models/message/MessageLister.java +++ b/src/main/java/com/plivo/api/models/message/MessageLister.java @@ -27,6 +27,9 @@ public class MessageLister extends Lister { private String tendlcCampaignID = null; private String tendlcRegistrationStatus = null; private String destinationCountryIso2 = null; + private String destinationNetwork = null; + private String carrierFeesRate = null; + private String carrierFees = null; public String subaccount() { return this.subaccount; @@ -60,7 +63,15 @@ public String tendlcRegistrationStatus() { public String destinationCountryIso2() { return this.destinationCountryIso2; } - + public String destinationNetwork() { + return this.destinationNetwork; + } + public String carrierFeesRate() { + return this.carrierFeesRate; + } + public String carrierFees() { + return this.carrierFees; + } public MessageLister subaccount(final String subaccount) { this.subaccount = subaccount; @@ -103,6 +114,21 @@ public MessageLister destinationCountryIso2(final String destinationCountryIso2) return this; } + public MessageLister destinationNetwork(final String destinationNetwork) { + this.destinationNetwork = destinationNetwork; + return this; + } + + public MessageLister carrierFeesRate(final String carrierFeesRate) { + this.carrierFeesRate = carrierFeesRate; + return this; + } + + public MessageLister carrierFees(final String carrierFees) { + this.carrierFees = carrierFees; + return this; + } + public MessageLister powerpackID(final String powerpackID) { this.powerpackID = powerpackID; return this; From ae7260f190bad511d7ae29f4136236fba565db2e Mon Sep 17 00:00:00 2001 From: narayana Date: Mon, 21 Aug 2023 12:21:59 +0530 Subject: [PATCH 2/4] fix --- .../api/models/message/MessageLister.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/src/main/java/com/plivo/api/models/message/MessageLister.java b/src/main/java/com/plivo/api/models/message/MessageLister.java index 66886c29..17265b77 100644 --- a/src/main/java/com/plivo/api/models/message/MessageLister.java +++ b/src/main/java/com/plivo/api/models/message/MessageLister.java @@ -63,15 +63,6 @@ public String tendlcRegistrationStatus() { public String destinationCountryIso2() { return this.destinationCountryIso2; } - public String destinationNetwork() { - return this.destinationNetwork; - } - public String carrierFeesRate() { - return this.carrierFeesRate; - } - public String carrierFees() { - return this.carrierFees; - } public MessageLister subaccount(final String subaccount) { this.subaccount = subaccount; @@ -114,21 +105,6 @@ public MessageLister destinationCountryIso2(final String destinationCountryIso2) return this; } - public MessageLister destinationNetwork(final String destinationNetwork) { - this.destinationNetwork = destinationNetwork; - return this; - } - - public MessageLister carrierFeesRate(final String carrierFeesRate) { - this.carrierFeesRate = carrierFeesRate; - return this; - } - - public MessageLister carrierFees(final String carrierFees) { - this.carrierFees = carrierFees; - return this; - } - public MessageLister powerpackID(final String powerpackID) { this.powerpackID = powerpackID; return this; From f2364db6612bca8f4fb5ec4332c88f46bad221a2 Mon Sep 17 00:00:00 2001 From: narayana Date: Mon, 21 Aug 2023 12:23:06 +0530 Subject: [PATCH 3/4] fix --- src/main/java/com/plivo/api/models/message/MessageLister.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/plivo/api/models/message/MessageLister.java b/src/main/java/com/plivo/api/models/message/MessageLister.java index 17265b77..25a0c450 100644 --- a/src/main/java/com/plivo/api/models/message/MessageLister.java +++ b/src/main/java/com/plivo/api/models/message/MessageLister.java @@ -27,9 +27,6 @@ public class MessageLister extends Lister { private String tendlcCampaignID = null; private String tendlcRegistrationStatus = null; private String destinationCountryIso2 = null; - private String destinationNetwork = null; - private String carrierFeesRate = null; - private String carrierFees = null; public String subaccount() { return this.subaccount; From cac23f84beebd66a426788a166ca8c438e821cb4 Mon Sep 17 00:00:00 2001 From: renoldthomas-plivo Date: Thu, 24 Aug 2023 21:39:58 +0530 Subject: [PATCH 4/4] version update --- CHANGELOG.md | 4 ++++ README.md | 6 +++--- pom.properties | 2 +- pom.xml | 2 +- src/main/resources/com/plivo/api/version.txt | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7197075a..60291a2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## [5.30.0](https://github.com/plivo/plivo-java/tree/v5.30.0) (2023-08-25) +**Feature - Added New Param 'carrier_fees', 'carrier_fees_rate', 'destination_network' in Get Message and List Message APIs** +- Added new params on message get and list response + ## [5.29.0](https://github.com/plivo/plivo-java/tree/v5.29.0) (2023-08-03) **Feature - DLT parameters** - Added new params `DLTEntityID`, `DLTTemplateID`, `DLTTemplateCategory` to the [send message API](https://www.plivo.com/docs/sms/api/message/send-a-message/) diff --git a/README.md b/README.md index 28be2e06..9a98d439 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The Plivo Java SDK makes it simpler to integrate communications into your Java a ### To Install Stable release -You can use this SDK by adding it as a dependency in your dependency management tool. Alternatively, you can use the [JAR file](https://search.maven.org/remotecontent?filepath=com/plivo/plivo-java/5.29.0/plivo-java-5.29.0.jar). +You can use this SDK by adding it as a dependency in your dependency management tool. Alternatively, you can use the [JAR file](https://search.maven.org/remotecontent?filepath=com/plivo/plivo-java/5.30.0/plivo-java-5.30.0.jar). If you are using Maven, use the following XML to include the Plivo SDK as a dependency. @@ -18,13 +18,13 @@ If you are using Maven, use the following XML to include the Plivo SDK as a depe com.plivo plivo-java - 5.29.0 + 5.30.0 ``` If you are using Gradle, use the following line in your dependencies. ``` -compile 'com.plivo:plivo-java:5.29.0' +compile 'com.plivo:plivo-java:5.30.0' ``` ### To Install Beta release diff --git a/pom.properties b/pom.properties index 1da0527b..2bee5c55 100644 --- a/pom.properties +++ b/pom.properties @@ -1,5 +1,5 @@ # Written manually. -version=5.29.0 +version=5.30.0 groupId=com.plivo artifactId=plivo-java diff --git a/pom.xml b/pom.xml index d5d27068..a49523e5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.plivo plivo-java - 5.29.0 + 5.30.0 plivo-java A Java SDK to make voice calls & send SMS using Plivo and to generate Plivo XML diff --git a/src/main/resources/com/plivo/api/version.txt b/src/main/resources/com/plivo/api/version.txt index 9b4c76c6..148cf618 100644 --- a/src/main/resources/com/plivo/api/version.txt +++ b/src/main/resources/com/plivo/api/version.txt @@ -1 +1 @@ -5.29.0 +5.30.0