From 93609b736ca3d5b604091561cb39dce583ee35b0 Mon Sep 17 00:00:00 2001
From: Saurabh Newatiya <saurabh.newatiya@plivo.com>
Date: Thu, 18 Apr 2024 15:25:08 +0530
Subject: [PATCH 1/5] addind support for interactive whatsapp messages

---
 .../com/plivo/api/models/message/Action.java  | 72 +++++++++++++++++++
 .../com/plivo/api/models/message/Body.java    | 16 +++++
 .../com/plivo/api/models/message/Button.java  | 27 +++++++
 .../com/plivo/api/models/message/Footer.java  | 16 +++++
 .../com/plivo/api/models/message/Header.java  | 52 ++++++++++++++
 .../plivo/api/models/message/Interactive.java | 58 +++++++++++++++
 .../com/plivo/api/models/message/Media.java   | 43 +++++++++++
 .../api/models/message/MessageCreator.java    | 45 ++++++++++++
 .../plivo/api/models/message/Parameter.java   | 18 +++++
 .../com/plivo/api/models/message/Reply.java   | 25 +++++++
 .../com/plivo/api/models/message/Row.java     | 34 +++++++++
 .../com/plivo/api/models/message/Section.java | 27 +++++++
 12 files changed, 433 insertions(+)
 create mode 100644 src/main/java/com/plivo/api/models/message/Action.java
 create mode 100644 src/main/java/com/plivo/api/models/message/Body.java
 create mode 100644 src/main/java/com/plivo/api/models/message/Button.java
 create mode 100644 src/main/java/com/plivo/api/models/message/Footer.java
 create mode 100644 src/main/java/com/plivo/api/models/message/Header.java
 create mode 100644 src/main/java/com/plivo/api/models/message/Interactive.java
 create mode 100644 src/main/java/com/plivo/api/models/message/Media.java
 create mode 100644 src/main/java/com/plivo/api/models/message/Reply.java
 create mode 100644 src/main/java/com/plivo/api/models/message/Row.java
 create mode 100644 src/main/java/com/plivo/api/models/message/Section.java

diff --git a/src/main/java/com/plivo/api/models/message/Action.java b/src/main/java/com/plivo/api/models/message/Action.java
new file mode 100644
index 00000000..025faa12
--- /dev/null
+++ b/src/main/java/com/plivo/api/models/message/Action.java
@@ -0,0 +1,72 @@
+package com.plivo.api.models.message;
+
+import java.util.List;
+
+public class Action {
+    private String button; // Single button
+    private List<Button> buttons; // List of buttons for multiple options
+    private String productRetailerID;
+    private String catalogID;
+    private List<Section> sections;
+    private String name; // Name of the action
+    private Parameter parameters; // Additional parameters for the action
+
+    public Action() {
+    }
+
+    public String getButton() {
+        return button;
+    }
+
+    public void setButton(String button) {
+        this.button = button;
+    }
+
+    public List<Button> getButtons() {
+        return buttons;
+    }
+
+    public void setButtons(List<Button> buttons) {
+        this.buttons = buttons;
+    }
+
+    public String getProductRetailerID() {
+        return productRetailerID;
+    }
+
+    public void setProductRetailerID(String productRetailerID) {
+        this.productRetailerID = productRetailerID;
+    }
+
+    public String getCatalogID() {
+        return catalogID;
+    }
+
+    public void setCatalogID(String catalogID) {
+        this.catalogID = catalogID;
+    }
+
+    public List<Section> getSections() {
+        return sections;
+    }
+
+    public void setSections(List<Section> sections) {
+        this.sections = sections;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Parameter getParameters() {
+        return parameters;
+    }
+
+    public void setParameters(Parameter parameters) {
+        this.parameters = parameters;
+    }
+}
diff --git a/src/main/java/com/plivo/api/models/message/Body.java b/src/main/java/com/plivo/api/models/message/Body.java
new file mode 100644
index 00000000..50d45d41
--- /dev/null
+++ b/src/main/java/com/plivo/api/models/message/Body.java
@@ -0,0 +1,16 @@
+package com.plivo.api.models.message;
+
+public class Body {
+    private String text;
+
+    public Body() {
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}
diff --git a/src/main/java/com/plivo/api/models/message/Button.java b/src/main/java/com/plivo/api/models/message/Button.java
new file mode 100644
index 00000000..404773c2
--- /dev/null
+++ b/src/main/java/com/plivo/api/models/message/Button.java
@@ -0,0 +1,27 @@
+package com.plivo.api.models.message;
+
+import java.util.List;
+
+public class Button {
+    private String type;
+    private Reply reply;
+
+    public Button() {
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Reply getReply() {
+        return reply;
+    }
+
+    public void setReply(Reply reply) {
+        this.reply = reply;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/plivo/api/models/message/Footer.java b/src/main/java/com/plivo/api/models/message/Footer.java
new file mode 100644
index 00000000..398964c6
--- /dev/null
+++ b/src/main/java/com/plivo/api/models/message/Footer.java
@@ -0,0 +1,16 @@
+package com.plivo.api.models.message;
+
+public class Footer {
+    private String text;
+
+    public Footer() {
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/plivo/api/models/message/Header.java b/src/main/java/com/plivo/api/models/message/Header.java
new file mode 100644
index 00000000..639dfd97
--- /dev/null
+++ b/src/main/java/com/plivo/api/models/message/Header.java
@@ -0,0 +1,52 @@
+package com.plivo.api.models.message;
+
+public class Header {
+    private String type;
+    private String text;
+    private Media image;
+    private Media document;
+    private Media video;
+
+    public Header() {
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public Media getImage() {
+        return image;
+    }
+
+    public void setImage(Media image) {
+        this.image = image;
+    }
+
+    public Media getDocument() {
+        return document;
+    }
+
+    public void setDocument(Media document) {
+        this.document = document;
+    }
+
+    public Media getVideo() {
+        return video;
+    }
+
+    public void setVideo(Media video) {
+        this.video = video;
+    }
+}
diff --git a/src/main/java/com/plivo/api/models/message/Interactive.java b/src/main/java/com/plivo/api/models/message/Interactive.java
new file mode 100644
index 00000000..ae3ba627
--- /dev/null
+++ b/src/main/java/com/plivo/api/models/message/Interactive.java
@@ -0,0 +1,58 @@
+package com.plivo.api.models.message;
+
+import java.util.List;
+
+public class Interactive {
+    private String type;
+    private Header header;
+    private Body body;
+    private Footer footer;
+    private Action action;
+
+    public Interactive() {
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Header getHeader() {
+        return header;
+    }
+
+    public void setHeader(Header header) {
+        this.header = header;
+    }
+
+    public Body getBody() {
+        return body;
+    }
+
+    public void setBody(Body body) {
+        this.body = body;
+    }
+
+    public Footer getFooter() {
+        return footer;
+    }
+
+    public void setFooter(Footer footer) {
+        this.footer = footer;
+    }
+
+    public Action getAction() {
+        return action;
+    }
+
+    public void setAction(Action action) {
+        this.action = action;
+    }
+}
+
+
+
+
diff --git a/src/main/java/com/plivo/api/models/message/Media.java b/src/main/java/com/plivo/api/models/message/Media.java
new file mode 100644
index 00000000..11075e8a
--- /dev/null
+++ b/src/main/java/com/plivo/api/models/message/Media.java
@@ -0,0 +1,43 @@
+package com.plivo.api.models.message;
+
+public class Media {
+    private String id;
+    private String link;
+    private String caption;
+    private String filename;
+
+    public Media() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getCaption() {
+        return caption;
+    }
+
+    public void setCaption(String caption) {
+        this.caption = caption;
+    }
+
+    public String getFilename() {
+        return filename;
+    }
+
+    public void setFilename(String filename) {
+        this.filename = filename;
+    }
+}
diff --git a/src/main/java/com/plivo/api/models/message/MessageCreator.java b/src/main/java/com/plivo/api/models/message/MessageCreator.java
index 76c265ea..cd5aaf0f 100644
--- a/src/main/java/com/plivo/api/models/message/MessageCreator.java
+++ b/src/main/java/com/plivo/api/models/message/MessageCreator.java
@@ -37,6 +37,8 @@ public class MessageCreator extends Creator < MessageCreateResponse > {
   private String dlt_template_category;
   @JsonProperty("template")
   private Template template;
+  @JsonProperty("interactive")
+  private Interactive interactive;
 
   /**
    * @param source The phone number that will be shown as the sender ID.
@@ -309,6 +311,49 @@ public MessageCreator template(final Template temp) {
     return this;
   }
 
+
+   /**
+   * @param intractv This is the interactive messages passed as a interactive object in the whatsapp message request.
+   */
+  public MessageCreator interactive(final Interactive intractv) {
+    if (type == null) {
+      this.type = MessageType.WHATSAPP;
+    } else {
+      if (type.equals(MessageType.SMS) || (type.equals(MessageType.MMS)))
+      throw new IllegalArgumentException("type parameter should be whatsapp");
+    }
+    if (Utils.allNotNull(this.interactive)) {
+      throw new IllegalArgumentException("interacitve parameter is already set");
+    }
+    this.interactive = intractv;
+    
+    return this;
+  }
+
+   /**
+   * @param interactive_json_string This is the interactive message passed as a json string in the whatsapp message request.
+   */
+  public MessageCreator interactive_json_string(final String interactive_json_string) {
+    if (this.type == null) {
+      this.type = MessageType.WHATSAPP;
+    } else {
+      if (this.type.equals(MessageType.SMS) || (this.type.equals(MessageType.MMS)))
+      throw new IllegalArgumentException("type parameter should be whatsapp");
+    }
+    if (Utils.allNotNull(this.interactive)) {
+      throw new IllegalArgumentException("interactive parameter is already set");
+    }
+    try {
+      ObjectMapper objectMapper = new ObjectMapper();
+      Interactive parsedInteractive = objectMapper.readValue(interactive_json_string, Interactive.class);
+      this.interactive = parsedInteractive;
+    } catch (Exception e) {
+        	e.printStackTrace();
+          throw new IllegalArgumentException("failed to read interactive message");
+    }
+    return this;
+  }
+
   @Override
   protected Call < MessageCreateResponse > obtainCall() {
     return client().getApiService().messageSend(client().getAuthId(), this);
diff --git a/src/main/java/com/plivo/api/models/message/Parameter.java b/src/main/java/com/plivo/api/models/message/Parameter.java
index 2a156ec2..07025583 100644
--- a/src/main/java/com/plivo/api/models/message/Parameter.java
+++ b/src/main/java/com/plivo/api/models/message/Parameter.java
@@ -8,6 +8,8 @@ public class Parameter {
     private String text;
     private String media;
     private Currency currency;
+    private String displayText;
+    private String url;
     private DateTime date_time;
 
     public Parameter() {
@@ -52,4 +54,20 @@ public DateTime getDate_time() {
     public void setDate_time(DateTime date_time) {
         this.date_time = date_time;
     }
+
+    public String getDisplayText() {
+        return displayText;
+    }
+
+    public void setDisplayText(String displayText) {
+        this.displayText = displayText;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/plivo/api/models/message/Reply.java b/src/main/java/com/plivo/api/models/message/Reply.java
new file mode 100644
index 00000000..2f188dcf
--- /dev/null
+++ b/src/main/java/com/plivo/api/models/message/Reply.java
@@ -0,0 +1,25 @@
+package com.plivo.api.models.message;
+
+public class Reply {
+    private String id;
+    private String title;
+
+    public Reply() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/plivo/api/models/message/Row.java b/src/main/java/com/plivo/api/models/message/Row.java
new file mode 100644
index 00000000..0871eaf1
--- /dev/null
+++ b/src/main/java/com/plivo/api/models/message/Row.java
@@ -0,0 +1,34 @@
+package com.plivo.api.models.message;
+
+public class Row {
+    private String id;
+    private String title;
+    private String description;
+
+    public Row() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/plivo/api/models/message/Section.java b/src/main/java/com/plivo/api/models/message/Section.java
new file mode 100644
index 00000000..9b573e3a
--- /dev/null
+++ b/src/main/java/com/plivo/api/models/message/Section.java
@@ -0,0 +1,27 @@
+package com.plivo.api.models.message;
+
+import java.util.List;
+
+public class Section {
+    private String title;
+    private List<Row> rows;
+
+    public Section() {
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public List<Row> getRows() {
+        return rows;
+    }
+
+    public void setRows(List<Row> rows) {
+        this.rows = rows;
+    }
+}

From 80c5824903e333763e3dd62cce8d37e4b91094cc Mon Sep 17 00:00:00 2001
From: Saurabh Newatiya <saurabh.newatiya@plivo.com>
Date: Wed, 24 Apr 2024 23:31:27 +0530
Subject: [PATCH 2/5] Adding support for interactive whatsapp messages

---
 CHANGELOG.md                                  |  4 ++
 README.md                                     |  6 +--
 pom.properties                                |  2 +-
 pom.xml                                       |  2 +-
 .../com/plivo/api/models/message/Action.java  | 49 ++-----------------
 .../com/plivo/api/models/message/Button.java  | 36 +++++++++-----
 .../com/plivo/api/models/message/Header.java  | 27 ++--------
 .../com/plivo/api/models/message/Media.java   | 43 ----------------
 .../plivo/api/models/message/Parameter.java   | 17 -------
 .../com/plivo/api/models/message/Reply.java   | 25 ----------
 src/main/resources/com/plivo/api/version.txt  |  2 +-
 11 files changed, 41 insertions(+), 172 deletions(-)
 delete mode 100644 src/main/java/com/plivo/api/models/message/Media.java
 delete mode 100644 src/main/java/com/plivo/api/models/message/Reply.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96e14f4a..47696c47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## [5.40.0](https://github.com/plivo/plivo-java/tree/v5.40.0) (2024-05-01)
+**Feature - Adding support for interactive whatsapp messages**
+- Added new param `interactive` to [send message API](https://www.plivo.com/docs/sms/api/message#send-a-message) to support interactive `whatsapp` messages
+
 ## [5.39.0](https://github.com/plivo/plivo-java/tree/v5.39.0) (2024-03-13)
 **Feature - Import Campaign API**
 - Import Campaign API
diff --git a/README.md b/README.md
index b6d24ee0..c91e40ca 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.39.0/plivo-java-5.39.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.40.0/plivo-java-5.40.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
 <dependency>
   <groupId>com.plivo</groupId>
   <artifactId>plivo-java</artifactId>
-  <version>5.39.0</version>
+  <version>5.40.0</version>
 </dependency>
 ```
 
 If you are using Gradle, use the following line in your dependencies.
 ```
-compile 'com.plivo:plivo-java:5.39.0'
+compile 'com.plivo:plivo-java:5.40.0'
 ```
 
 ### To Install Beta release
diff --git a/pom.properties b/pom.properties
index 127683b8..508ad172 100644
--- a/pom.properties
+++ b/pom.properties
@@ -1,6 +1,6 @@
 # Written manually.
 
-version=5.39.0
+version=5.40.0
 groupId=com.plivo
 artifactId=plivo-java
 
diff --git a/pom.xml b/pom.xml
index 01283bcf..3f20511b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.plivo</groupId>
   <artifactId>plivo-java</artifactId>
-  <version>5.39.0</version>
+  <version>5.40.0</version>
   <name>plivo-java</name>
   <description>A Java SDK to make voice calls &amp; send SMS using Plivo and to generate Plivo XML</description>
   <licenses>
diff --git a/src/main/java/com/plivo/api/models/message/Action.java b/src/main/java/com/plivo/api/models/message/Action.java
index 025faa12..bcc55557 100644
--- a/src/main/java/com/plivo/api/models/message/Action.java
+++ b/src/main/java/com/plivo/api/models/message/Action.java
@@ -3,25 +3,13 @@
 import java.util.List;
 
 public class Action {
-    private String button; // Single button
     private List<Button> buttons; // List of buttons for multiple options
-    private String productRetailerID;
-    private String catalogID;
-    private List<Section> sections;
-    private String name; // Name of the action
-    private Parameter parameters; // Additional parameters for the action
+    private List<Section> sections; // List of sections
 
     public Action() {
     }
 
-    public String getButton() {
-        return button;
-    }
-
-    public void setButton(String button) {
-        this.button = button;
-    }
-
+    // Getters and setters for buttons
     public List<Button> getButtons() {
         return buttons;
     }
@@ -30,22 +18,7 @@ public void setButtons(List<Button> buttons) {
         this.buttons = buttons;
     }
 
-    public String getProductRetailerID() {
-        return productRetailerID;
-    }
-
-    public void setProductRetailerID(String productRetailerID) {
-        this.productRetailerID = productRetailerID;
-    }
-
-    public String getCatalogID() {
-        return catalogID;
-    }
-
-    public void setCatalogID(String catalogID) {
-        this.catalogID = catalogID;
-    }
-
+    // Getters and setters for sections
     public List<Section> getSections() {
         return sections;
     }
@@ -53,20 +26,4 @@ public List<Section> getSections() {
     public void setSections(List<Section> sections) {
         this.sections = sections;
     }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Parameter getParameters() {
-        return parameters;
-    }
-
-    public void setParameters(Parameter parameters) {
-        this.parameters = parameters;
-    }
 }
diff --git a/src/main/java/com/plivo/api/models/message/Button.java b/src/main/java/com/plivo/api/models/message/Button.java
index 404773c2..8c96848e 100644
--- a/src/main/java/com/plivo/api/models/message/Button.java
+++ b/src/main/java/com/plivo/api/models/message/Button.java
@@ -1,27 +1,37 @@
 package com.plivo.api.models.message;
 
-import java.util.List;
-
 public class Button {
-    private String type;
-    private Reply reply;
+    private String id; // Unique identifier for the button
+    private String title; // Display text for the button
+    private String cta_url;
 
     public Button() {
     }
 
-    public String getType() {
-        return type;
+    // Getters and setters for ID
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    // Getters and setters for Title
+    public String getTitle() {
+        return title;
     }
 
-    public void setType(String type) {
-        this.type = type;
+    public void setTitle(String title) {
+        this.title = title;
     }
 
-    public Reply getReply() {
-        return reply;
+    // Getters and setters for CTA URL
+    public String getCta_url() {
+        return cta_url;
     }
 
-    public void setReply(Reply reply) {
-        this.reply = reply;
+    public void setCta_url(String cta_url) {
+        this.cta_url = cta_url;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/plivo/api/models/message/Header.java b/src/main/java/com/plivo/api/models/message/Header.java
index 639dfd97..24490e84 100644
--- a/src/main/java/com/plivo/api/models/message/Header.java
+++ b/src/main/java/com/plivo/api/models/message/Header.java
@@ -3,9 +3,7 @@
 public class Header {
     private String type;
     private String text;
-    private Media image;
-    private Media document;
-    private Media video;
+    private String media;
 
     public Header() {
     }
@@ -26,27 +24,12 @@ public void setText(String text) {
         this.text = text;
     }
 
-    public Media getImage() {
-        return image;
+    public String getMedia() {
+        return media;
     }
 
-    public void setImage(Media image) {
-        this.image = image;
+    public void setMedia(String media) {
+        this.media = media;
     }
 
-    public Media getDocument() {
-        return document;
-    }
-
-    public void setDocument(Media document) {
-        this.document = document;
-    }
-
-    public Media getVideo() {
-        return video;
-    }
-
-    public void setVideo(Media video) {
-        this.video = video;
-    }
 }
diff --git a/src/main/java/com/plivo/api/models/message/Media.java b/src/main/java/com/plivo/api/models/message/Media.java
deleted file mode 100644
index 11075e8a..00000000
--- a/src/main/java/com/plivo/api/models/message/Media.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.plivo.api.models.message;
-
-public class Media {
-    private String id;
-    private String link;
-    private String caption;
-    private String filename;
-
-    public Media() {
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getLink() {
-        return link;
-    }
-
-    public void setLink(String link) {
-        this.link = link;
-    }
-
-    public String getCaption() {
-        return caption;
-    }
-
-    public void setCaption(String caption) {
-        this.caption = caption;
-    }
-
-    public String getFilename() {
-        return filename;
-    }
-
-    public void setFilename(String filename) {
-        this.filename = filename;
-    }
-}
diff --git a/src/main/java/com/plivo/api/models/message/Parameter.java b/src/main/java/com/plivo/api/models/message/Parameter.java
index 07025583..5d441b3f 100644
--- a/src/main/java/com/plivo/api/models/message/Parameter.java
+++ b/src/main/java/com/plivo/api/models/message/Parameter.java
@@ -8,8 +8,6 @@ public class Parameter {
     private String text;
     private String media;
     private Currency currency;
-    private String displayText;
-    private String url;
     private DateTime date_time;
 
     public Parameter() {
@@ -55,19 +53,4 @@ public void setDate_time(DateTime date_time) {
         this.date_time = date_time;
     }
 
-    public String getDisplayText() {
-        return displayText;
-    }
-
-    public void setDisplayText(String displayText) {
-        this.displayText = displayText;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/plivo/api/models/message/Reply.java b/src/main/java/com/plivo/api/models/message/Reply.java
deleted file mode 100644
index 2f188dcf..00000000
--- a/src/main/java/com/plivo/api/models/message/Reply.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.plivo.api.models.message;
-
-public class Reply {
-    private String id;
-    private String title;
-
-    public Reply() {
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/com/plivo/api/version.txt b/src/main/resources/com/plivo/api/version.txt
index 132ee7b4..3f2ef519 100644
--- a/src/main/resources/com/plivo/api/version.txt
+++ b/src/main/resources/com/plivo/api/version.txt
@@ -1 +1 @@
-5.39.0
\ No newline at end of file
+5.40.0
\ No newline at end of file

From 28b97df68b73c86f018975a2dcb113515201f438 Mon Sep 17 00:00:00 2001
From: Saurabh Newatiya <saurabh.newatiya@plivo.com>
Date: Tue, 7 May 2024 12:40:13 +0530
Subject: [PATCH 3/5] minor update in changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b568e862..89113838 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## [5.41.0](https://github.com/plivo/plivo-java/tree/v5.41.0) (2024-05-01)
+## [5.41.0](https://github.com/plivo/plivo-java/tree/v5.41.0) (2024-05-07)
 **Feature - Adding support for interactive whatsapp messages**
 - Added new param `interactive` to [send message API](https://www.plivo.com/docs/sms/api/message#send-a-message) to support interactive `whatsapp` messages
 

From 15e9ee9fb050e8eb9f108cf0f13eb6e8c1f1ba70 Mon Sep 17 00:00:00 2001
From: Saurabh Newatiya <saurabh.newatiya@plivo.com>
Date: Tue, 7 May 2024 14:59:11 +0530
Subject: [PATCH 4/5] addressing review comment

---
 .../java/com/plivo/api/models/message/MessageCreator.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/plivo/api/models/message/MessageCreator.java b/src/main/java/com/plivo/api/models/message/MessageCreator.java
index cd5aaf0f..284967a9 100644
--- a/src/main/java/com/plivo/api/models/message/MessageCreator.java
+++ b/src/main/java/com/plivo/api/models/message/MessageCreator.java
@@ -291,7 +291,7 @@ public MessageCreator template_json_string(final String template_json_string) {
    * @param temp This is the template passed as a template object in the whatsapp message request.
    */
   public MessageCreator template(final Template temp) {
-    if (type == null) {
+    if (this.type == null) {
       this.type = MessageType.WHATSAPP;
     } else {
       if (type.equals(MessageType.SMS) || (type.equals(MessageType.MMS)))
@@ -316,7 +316,7 @@ public MessageCreator template(final Template temp) {
    * @param intractv This is the interactive messages passed as a interactive object in the whatsapp message request.
    */
   public MessageCreator interactive(final Interactive intractv) {
-    if (type == null) {
+    if (this.type == null) {
       this.type = MessageType.WHATSAPP;
     } else {
       if (type.equals(MessageType.SMS) || (type.equals(MessageType.MMS)))

From e2c10c451d79d9cdc3cb3f49d9783ef400b0786b Mon Sep 17 00:00:00 2001
From: Saurabh Newatiya <saurabh.newatiya@plivo.com>
Date: Tue, 7 May 2024 15:20:40 +0530
Subject: [PATCH 5/5] addressing review comment

---
 src/main/java/com/plivo/api/models/message/MessageCreator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/plivo/api/models/message/MessageCreator.java b/src/main/java/com/plivo/api/models/message/MessageCreator.java
index 284967a9..555e72b6 100644
--- a/src/main/java/com/plivo/api/models/message/MessageCreator.java
+++ b/src/main/java/com/plivo/api/models/message/MessageCreator.java
@@ -294,7 +294,7 @@ public MessageCreator template(final Template temp) {
     if (this.type == null) {
       this.type = MessageType.WHATSAPP;
     } else {
-      if (type.equals(MessageType.SMS) || (type.equals(MessageType.MMS)))
+      if (this.type.equals(MessageType.SMS) || (this.type.equals(MessageType.MMS)))
       throw new IllegalArgumentException("type parameter should be whatsapp");
     }
     if (Utils.allNotNull(this.template)) {