Exposing a useful exception message when an invalid URI is provided.

Signed-off-by: Arne Plöse <aploese@gmx.de>

Author: aploese

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/MqttConnectOptionsTest.java

@@ -0,0 +1,58 @@
+package org.eclipse.paho.client.mqttv3.test;
+
+import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class MqttConnectOptionsTest {
+
+	@Test
+	public void testValidateURI() {
+		try {
+			MqttConnectOptions.validateURI("");
+			fail("Must fail: Empty URI");
+		} catch (IllegalArgumentException e) {
+			assertEquals("Unknown scheme \"null\" of URI \"\"", e.getMessage());
+		}
+		
+		try {
+			MqttConnectOptions.validateURI("udp://localhost:1883");
+			fail("Must fail: Unknow scheme");
+		} catch (IllegalArgumentException e) {
+			assertEquals("Unknown scheme \"udp\" of URI \"udp://localhost:1883\"", e.getMessage());
+		}
+		
+		MqttConnectOptions.validateURI("tcp://localhost:1883");
+		
+		try {
+			MqttConnectOptions.validateURI("tcp://localhost:1883/mqtt");
+			fail("Must fail: URI path must be empty");
+		} catch (IllegalArgumentException e) {
+			assertEquals("URI path must be empty \"tcp://localhost:1883/mqtt\"", e.getMessage());
+		}
+		
+		MqttConnectOptions.validateURI("tcp://localhost");
+		
+		try {
+			MqttConnectOptions.validateURI("localhost:1883");
+			fail("Must fail: Unknow scheme");
+		} catch (IllegalArgumentException e) {
+			assertEquals("Unknown scheme \"localhost\" of URI \"localhost:1883\"", e.getMessage());
+		}
+		
+		try {
+			MqttConnectOptions.validateURI("localhost");
+			fail("Must fail: URI path must be empty");
+		} catch (IllegalArgumentException e) {
+			assertEquals("URI path must be empty \"localhost\"", e.getMessage());
+		}
+		
+		try {
+			MqttConnectOptions.validateURI("tcp://");
+			fail("Must fail: Can't parse string to URI");
+		} catch (IllegalArgumentException e) {
+			assertEquals("Can't parse string to URI \"tcp://\"", e.getMessage());
+		}
+	}
+
+}

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/MqttConnectOptions.java

@@ -525,35 +525,36 @@ public void setServerURIs(String[] array) {
 	 * @return the URI type
 	 */
 	public static int validateURI(String srvURI) {
+		URI vURI;
 		try {
-			URI vURI = new URI(srvURI);
-			if ("ws".equals(vURI.getScheme())){
-				return URI_TYPE_WS;
-			}
-			else if ("wss".equals(vURI.getScheme())) {
-				return URI_TYPE_WSS;
-			}
-
-			if ((vURI.getPath() == null) || vURI.getPath().isEmpty()) {
-				// No op path must be empty
-			}
-			else {
-				throw new IllegalArgumentException(srvURI);
-			} 
-			if ("tcp".equals(vURI.getScheme())) {
-				return URI_TYPE_TCP;
-			}
-			else if ("ssl".equals(vURI.getScheme())) {
-				return URI_TYPE_SSL;
-			}
-			else if ("local".equals(vURI.getScheme())) {
-				return URI_TYPE_LOCAL;
-			}
-			else {
-				throw new IllegalArgumentException(srvURI);
-			}
+			vURI = new URI(srvURI);
 		} catch (URISyntaxException ex) {
-			throw new IllegalArgumentException(srvURI);
+			throw new IllegalArgumentException("Can't parse string to URI \"" + srvURI + "\"", ex);
+		}
+
+		if ("ws".equals(vURI.getScheme())){
+			return URI_TYPE_WS;
+		}
+		else if ("wss".equals(vURI.getScheme())) {
+			return URI_TYPE_WSS;
+		}
+		if ((vURI.getPath() == null) || vURI.getPath().isEmpty()) {
+			// No op path must be empty
+		}
+		else {
+			throw new IllegalArgumentException("URI path must be empty \"" + srvURI + "\"");
+		} 
+		if ("tcp".equals(vURI.getScheme())) {
+			return URI_TYPE_TCP;
+		}
+		else if ("ssl".equals(vURI.getScheme())) {
+			return URI_TYPE_SSL;
+		}
+		else if ("local".equals(vURI.getScheme())) {
+			return URI_TYPE_LOCAL;
+		}
+		else {
+			throw new IllegalArgumentException("Unknown scheme \"" + vURI.getScheme() + "\" of URI \"" + srvURI + "\"");
 		}
 	}