Merge pull request #555 from vit21ik/PropertiesToMap502

Changed Propertiest to Map for custom WebSocket Headers (502)

Author: Ranjan Dasgupta

MQTTv3.md

@@ -107,10 +107,10 @@ The included code below is a extended basic sample that connects to a server wit
 MqttClient client = new MqttClient("wss://<BROKER_URI>", "MyClient");
 
 MqttConnectOptions connectOptions = new MqttConnectOptions();
-Properties properties = new Properties();
-properties.setProperty("X-Amz-CustomAuthorizer-Name", <SOME_VALUE>);
-properties.setProperty("X-Amz-CustomAuthorizer-Signature", <SOME_VALUE>);
-properties.setProperty(<SOME_VALUE>, <SOME_VALUE>);
+Map<String, String> properties = new HashMap<>();
+properties.put("X-Amz-CustomAuthorizer-Name", <SOME_VALUE>);
+properties.put("X-Amz-CustomAuthorizer-Signature", <SOME_VALUE>);
+properties.put(<SOME_KEY>, <SOME_VALUE>);
 connectOptions.setCustomWebSocketHeaders(properties);
 
 client.connect(connectOptions);

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

@@ -17,6 +17,7 @@
  */
 package org.eclipse.paho.client.mqttv3;
 
+import java.util.Map;
 import java.util.Properties;
 
 import javax.net.SocketFactory;
@@ -73,7 +74,7 @@ public class MqttConnectOptions {
 	private int mqttVersion = MQTT_VERSION_DEFAULT;
 	private boolean automaticReconnect = false;
 	private int maxReconnectDelay = 128000;
-	private Properties customWebSocketHeaders = null;
+	private Map<String, String> customWebSocketHeaders = null;
 
 	// Client Operation Parameters
 	private int executorServiceTimeout = 1; // How long to wait in seconds when terminating the executor service.
@@ -685,15 +686,14 @@ public Properties getDebug() {
 	/**
 	 * Sets the Custom WebSocket Headers for the WebSocket Connection.
 	 *
-	 * @param props
-	 *            The custom websocket headers {@link Properties}
+	 * @param props The custom WebSocket headers {@link Map<String, String>}
 	 */
 
-	public void setCustomWebSocketHeaders(Properties props) {
+	public void setCustomWebSocketHeaders(Map<String, String> props) {
 		this.customWebSocketHeaders = props;
 	}
 
-	public Properties getCustomWebSocketHeaders() {
+	public Map<String, String> getCustomWebSocketHeaders() {
 		return customWebSocketHeaders;
 	}
 

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketHandshake.java

@@ -55,9 +55,9 @@ public class WebSocketHandshake {
 	String uri;
 	String host;
 	int port;
-	Properties customWebSocketHeaders;
+	Map<String, String> customWebSocketHeaders;
 
-	public WebSocketHandshake(InputStream input, OutputStream output, String uri, String host, int port, Properties customWebSocketHeaders){
+	public WebSocketHandshake(InputStream input, OutputStream output, String uri, String host, int port, Map<String, String> customWebSocketHeaders){
 		this.input = input;
 		this.output = output;
 		this.uri = uri;
@@ -113,12 +113,9 @@ private void sendHandshakeRequest(String key) throws IOException{
 			pw.print("Sec-WebSocket-Version: 13" + LINE_SEPARATOR);
 
 			if (customWebSocketHeaders != null) {
-				Set keys = customWebSocketHeaders.keySet();
-				Iterator i = keys.iterator();
-				while (i.hasNext()) {
-					String k = (String) i.next();
-					String value = customWebSocketHeaders.getProperty(k);
-					pw.print(k + ": " + value + LINE_SEPARATOR);
+				for (String headerKey : customWebSocketHeaders.keySet()) {
+					String headerValue = customWebSocketHeaders.get(headerKey);
+					pw.print(headerKey + ": " + headerValue + LINE_SEPARATOR);
 				}
 			}
 

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketNetworkModule.java

@@ -21,7 +21,7 @@
 import java.io.OutputStream;
 import java.io.PipedInputStream;
 import java.nio.ByteBuffer;
-import java.util.Properties;
+import java.util.Map;
 
 import javax.net.SocketFactory;
 
@@ -38,7 +38,7 @@ public class WebSocketNetworkModule extends TCPNetworkModule {
 	private String uri;
 	private String host;
 	private int port;
-	private Properties customWebsocketHeaders;
+	private Map<String, String> customWebsocketHeaders;
 	private PipedInputStream pipedInputStream;
 	private WebSocketReceiver webSocketReceiver;
 	ByteBuffer recievedPayload;
@@ -50,7 +50,7 @@ public class WebSocketNetworkModule extends TCPNetworkModule {
 	 */
 	private ByteArrayOutputStream outputStream = new ExtendedByteArrayOutputStream(this);
 
-	public WebSocketNetworkModule(SocketFactory factory, String uri, String host, int port, String resourceContext, Properties customWebsocketHeaders){
+	public WebSocketNetworkModule(SocketFactory factory, String uri, String host, int port, String resourceContext, Map<String, String> customWebsocketHeaders){
 		super(factory, host, port, resourceContext);
 		this.uri = uri;
 		this.host = host;

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketSecureNetworkModule.java

@@ -21,7 +21,7 @@
 import java.io.OutputStream;
 import java.io.PipedInputStream;
 import java.nio.ByteBuffer;
-import java.util.Properties;
+import java.util.Map;
 import javax.net.ssl.SSLSocketFactory;
 
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -39,7 +39,7 @@ public class WebSocketSecureNetworkModule extends SSLNetworkModule{
 	private String uri;
 	private String host;
 	private int port;
-	private Properties customWebSocketHeaders;
+	private Map<String, String> customWebSocketHeaders;
 	ByteBuffer recievedPayload;
 
 	/**
@@ -49,7 +49,7 @@ public class WebSocketSecureNetworkModule extends SSLNetworkModule{
 	 */
 	private ByteArrayOutputStream outputStream = new ExtendedByteArrayOutputStream(this);
 
-	public WebSocketSecureNetworkModule(SSLSocketFactory factory, String uri, String host, int port, String clientId, Properties customWebSocketHeaders) {
+	public WebSocketSecureNetworkModule(SSLSocketFactory factory, String uri, String host, int port, String clientId, Map<String, String> customWebSocketHeaders) {
 		super(factory, host, port, clientId);
 		this.uri = uri;
 		this.host = host;