feat: Add MMS Text, File and Content message types (#571)

* feat: Add MMS text, file and content types

* chore: Bump version

* ci: Bump action versions

* fix: Validate MMS content types

* refactor: MMS content add media methods

Author: SMadani

.github/workflows/codeql.yml

@@ -27,7 +27,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a
+      uses: github/codeql-action/init@1a7989f3955e0c69f0e0ccc14aee54a387a0fd31
       with:
         languages: java-kotlin
         build-mode: none

.github/workflows/scorecard.yml

@@ -32,7 +32,7 @@ jobs:
           persist-credentials: false
 
       - name: Run analysis
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46
+        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186
         with:
           results_file: results.sarif
           results_format: sarif
@@ -47,7 +47,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: Upload artifact
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
         with:
           name: SARIF file
           path: results.sarif

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# [8.18.0] - 2025-03-??
+- Added MMS Text, File and Content outbound message types
+- Added `getFileName` and `getFileCaption` to `com.vonage.client.messages.InboundMessage`
+
 # [8.17.0] - 2025-02-28
 - Added user/domain name support to `com.vonage.client.voice.ncco.SipEndpoint`
 - Improved Voice API documentation

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.vonage</groupId>
   <artifactId>server-sdk</artifactId>
-  <version>8.17.0</version>
+  <version>8.18.0</version>
 
   <name>Vonage Java Server SDK</name>
   <description>Java client for Vonage APIs</description>
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.15.2</version>
+      <version>5.16.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/main/java/com/vonage/client/HttpWrapper.java

@@ -37,7 +37,7 @@
 public class HttpWrapper {
     private static final String
             CLIENT_NAME = "vonage-java-sdk",
-            CLIENT_VERSION = "8.17.0",
+            CLIENT_VERSION = "8.18.0",
             JAVA_VERSION = System.getProperty("java.version"),
             USER_AGENT = String.format("%s/%s java/%s", CLIENT_NAME, CLIENT_VERSION, JAVA_VERSION);
 

src/main/java/com/vonage/client/common/MessageType.java

@@ -24,9 +24,17 @@
  * @since 8.4.0
  */
 public enum MessageType {
-	TEXT, IMAGE, AUDIO, VIDEO, FILE, VCARD, TEMPLATE, CUSTOM, LOCATION,
-	STICKER, UNSUPPORTED, REPLY, ORDER, RANDOM, BUTTON, REACTION, CONTACT;
+	TEXT, IMAGE, AUDIO, VIDEO, FILE, VCARD, TEMPLATE, CUSTOM, LOCATION, STICKER,
+	UNSUPPORTED, REPLY, ORDER, RANDOM, BUTTON, REACTION, CONTACT, CONTENT;
 
+	/**
+	 * Parse a message type from a string.
+	 *
+	 * @param value The message type as a string.
+	 *
+	 * @return The message type as an enum, or {@code null} if the string is null.
+	 * @throws IllegalArgumentException If the string does not match a known message type.
+	 */
 	@JsonCreator
 	public static MessageType fromString(String value) {
 		if (value == null) return null;

src/main/java/com/vonage/client/messages/Channel.java

@@ -27,7 +27,7 @@
  */
 public enum Channel {
 	SMS (TEXT),
-	MMS (TEXT, IMAGE, VCARD, AUDIO, VIDEO),
+	MMS (TEXT, IMAGE, VCARD, AUDIO, VIDEO, FILE, CONTENT),
 	RCS (TEXT, IMAGE, VIDEO, FILE, CUSTOM, AUDIO, LOCATION, VCARD, REPLY, BUTTON),
 	WHATSAPP (TEXT, IMAGE, AUDIO, VIDEO, FILE, TEMPLATE, CUSTOM, LOCATION,
 			STICKER, ORDER, REPLY, REACTION, CONTACT, BUTTON, UNSUPPORTED),
@@ -59,13 +59,19 @@ public Set<MessageType> getSupportedOutboundMessageTypes() {
 		return getSupportedMessageTypes().stream().filter(mt -> mt != MessageType.UNSUPPORTED &&
 				mt != MessageType.REPLY && mt != MessageType.ORDER &&
 				mt != MessageType.CONTACT && mt != MessageType.BUTTON &&
-				(this != Channel.MMS || mt != MessageType.TEXT) &&
-				(this != Channel.RCS || (
-					mt != AUDIO && mt != LOCATION && mt != VCARD
-				))
+				(this != Channel.RCS || (mt != AUDIO && mt != LOCATION && mt != VCARD))
 		).collect(Collectors.toSet());
 	}
 
+	/**
+	 * Creates a Channel enum from its string representation.
+	 *
+	 * @param value The string value to convert.
+	 *
+	 * @return The Channel enum that corresponds to the given string, or {@code null} if the string is {@code null}.
+	 *
+	 * @throws IllegalArgumentException If the provided value does not correspond to a known Channel enum.
+	 */
 	@JsonCreator
 	public static Channel fromString(String value) {
 		if (value == null) return null;

src/main/java/com/vonage/client/messages/InboundMessage.java

@@ -42,9 +42,6 @@ public class InboundMessage extends JsonableBaseObject {
 	protected static class UrlWrapper extends JsonableBaseObject {
 		@JsonProperty("url") protected URI url;
 		@JsonProperty("name") protected String name;
-	}
-
-	protected static class UrlWrapperWithCaption extends UrlWrapper {
 		@JsonProperty("caption") protected String caption;
 	}
 
@@ -71,7 +68,7 @@ protected InboundMessage() {}
 	@JsonProperty("_self") UrlContainer self;
 
 	@JsonProperty("text") protected String text;
-	@JsonProperty("image") protected UrlWrapperWithCaption image;
+	@JsonProperty("image") protected UrlWrapper image;
 	@JsonProperty("audio") protected UrlWrapper audio;
 	@JsonProperty("video") protected UrlWrapper video;
 	@JsonProperty("file") protected UrlWrapper file;
@@ -199,7 +196,6 @@ public URI getImageUrl() {
 	 * Additional text accompanying the image. Applicable to MMS image messages only.
 	 *
 	 * @return The image caption if present, or {@code null} if not applicable.
-	 *
 	 * @since 8.1.0
 	 */
 	@JsonIgnore
@@ -237,6 +233,28 @@ public URI getFileUrl() {
 		return file != null ? file.url : null;
 	}
 
+	/**
+	 * If {@linkplain #getMessageType()} is {@linkplain MessageType#FILE}, returns the name of the file if available.
+	 *
+	 * @return The file name, or {@code null} if not applicable.
+	 * @since 8.18.0
+	 */
+	@JsonIgnore
+	public String getFileName() {
+		return file != null ? file.name : null;
+	}
+
+	/**
+	 * If {@linkplain #getMessageType()} is {@linkplain MessageType#FILE}, returns the caption of the file if available.
+	 *
+	 * @return The file caption, or {@code null} if not applicable.
+	 * @since 8.18.0
+	 */
+	@JsonIgnore
+	public String getFileCaption() {
+		return file != null ? file.caption : null;
+	}
+
 	/**
 	 * If {@linkplain #getMessageType()} is {@linkplain MessageType#VCARD}, returns the URL of the vCard.
 	 *

src/main/java/com/vonage/client/messages/MessageType.java

@@ -26,7 +26,7 @@
 @Deprecated
 public enum MessageType {
 	TEXT, IMAGE, AUDIO, VIDEO, FILE, VCARD, TEMPLATE, CUSTOM, LOCATION,
-	STICKER, UNSUPPORTED, REPLY, ORDER, CONTACT, BUTTON, REACTION;
+	STICKER, UNSUPPORTED, REPLY, ORDER, CONTACT, BUTTON, REACTION, CONTENT;
 
 	@JsonCreator
 	public static MessageType fromString(String value) {

src/main/java/com/vonage/client/messages/internal/MessagePayload.java

@@ -32,7 +32,10 @@ public class MessagePayload extends JsonableBaseObject {
 	protected String caption, name;
 
 	public MessagePayload(String url) {
-		this.url = URI.create(Objects.requireNonNull(url, "URL is required."));
+		if (Objects.requireNonNull(url, "URL is required.").trim().isEmpty()) {
+			throw new IllegalArgumentException("URL cannot be blank.");
+		}
+		this.url = URI.create(url);
 	}
 
 	public MessagePayload(String url, String caption) {