Issue #478 - Connection properties needs to use Mqtt Variable properties correctly.

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>

Author: jpwsutton

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttConnectionOptions.java

@@ -68,14 +68,21 @@ enum UriType {
 	private int maxInflight = 10; // Max inflight messages
 	private int connectionTimeout = 30; // Connection timeout in seconds
 
-	MqttProperties connectionProperties = new MqttProperties();
+	
 	public MqttProperties getConnectionProperties() {
+		MqttProperties connectionProperties = new MqttProperties();
+		connectionProperties.setSessionExpiryInterval(sessionExpiryInterval);
+		connectionProperties.setReceiveMaximum(receiveMaximum);
+		connectionProperties.setMaximumPacketSize(maximumPacketSize);
+		connectionProperties.setTopicAliasMaximum(topicAliasMaximum);
+		connectionProperties.setRequestResponseInfo(requestResponseInfo);
+		connectionProperties.setRequestProblemInfo(requestProblemInfo);
+		connectionProperties.setUserProperties(userProperties);
+		connectionProperties.setAuthenticationMethod(authMethod);
+		connectionProperties.setAuthenticationData(authData);
 		return connectionProperties;
 	}
 
-	public void setConnectionProperties(MqttProperties connectionProperties) {
-		this.connectionProperties = connectionProperties;
-	}
 
 	public MqttProperties getWillMessageProperties() {
 		return willMessageProperties;
@@ -94,11 +101,10 @@ public void setWillMessageProperties(MqttProperties willMessageProperties) {
 	private MqttMessage willMessage = null; // Will Message
 	private String userName; // Username
 	private byte[] password; // Password
-	private Integer sessionExpiryInterval = null; // The Session expiry Interval in seconds, null is the default of
+	private Long sessionExpiryInterval = null; // The Session expiry Interval in seconds, null is the default of
 													// never.
-	private Integer willDelayInterval = null; // The Will Delay Interval in seconds, null is the default of 0.
 	private Integer receiveMaximum = null; // The Receive Maximum, null defaults to 65,535, cannot be 0.
-	private Integer maximumPacketSize = null; // The Maximum packet size, null defaults to no limit.
+	private Long maximumPacketSize = null; // The Maximum packet size, null defaults to no limit.
 	private Integer topicAliasMaximum = null; // The Topic Alias Maximum, null defaults to 0.
 	private Boolean requestResponseInfo = null; // Request Response Information, null defaults to false.
 	private Boolean requestProblemInfo = null; // Request Problem Information, null defaults to true.
@@ -476,7 +482,7 @@ public int getAutomaticReconnectMaxDelay() {
 	 * 
 	 * @return the Session Expiry Interval in seconds.
 	 */
-	public Integer getSessionExpiryInterval() {
+	public Long getSessionExpiryInterval() {
 		return sessionExpiryInterval;
 	}
 
@@ -499,45 +505,16 @@ public Integer getSessionExpiryInterval() {
 	 * @param sessionExpiryInterval
 	 *            The Session Expiry Interval in seconds.
 	 */
-	public void setSessionExpiryInterval(Integer sessionExpiryInterval) {
+	public void setSessionExpiryInterval(Long sessionExpiryInterval) {
 		this.sessionExpiryInterval = sessionExpiryInterval;
 	}
 
-	/**
-	 * Returns the Will Delay Interval. If <code>null</code>, it will default to 0
-	 * and there is no will delay before the will message is published.
-	 * 
-	 * @return The Will Delay Interval in seconds.
-	 */
-	public Integer getWillDelayInterval() {
-		return willDelayInterval;
-	}
-
-	/**
-	 * Sets the Will Delay Interval. This value, measured in seconds, defines the
-	 * time that the server will wait to send the Client's will message after it has
-	 * disconnected.
-	 * <ul>
-	 * <li>By default this value is null and so will not be sent, in this case, the
-	 * default value is 0.</li>
-	 * <li>If a 0 is sent, the will message will be sent immediately.</li>
-	 * </ul>
-	 * 
-	 * The Server delays publishing the Client's Will Message until the Will Delay
-	 * Interval has passed or the Session ends, whichever happens first.
-	 * 
-	 * @param willDelayInterval
-	 *            The will delay interval
-	 */
-	public void setWillDelayInterval(Integer willDelayInterval) {
-		this.willDelayInterval = willDelayInterval;
-	}
 
 	/**
 	 * Returns the Receive Maximum value. If <code>null</code>, it will default to
 	 * 65,535.
 	 * 
-	 * @return the Receive Maxumum
+	 * @return the Receive Maximum
 	 */
 	public Integer getReceiveMaximum() {
 		return receiveMaximum;
@@ -569,7 +546,7 @@ public void setReceiveMaximum(Integer receiveMaximum) {
 	 * 
 	 * @return the Maximum Packet Size in bytes.
 	 */
-	public Integer getMaximumPacketSize() {
+	public Long getMaximumPacketSize() {
 		return maximumPacketSize;
 	}
 
@@ -587,7 +564,7 @@ public Integer getMaximumPacketSize() {
 	 * @param maximumPacketSize
 	 *            The Maximum packet size.
 	 */
-	public void setMaximumPacketSize(Integer maximumPacketSize) {
+	public void setMaximumPacketSize(Long maximumPacketSize) {
 		this.maximumPacketSize = maximumPacketSize;
 	}
 

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttConnectionOptionsBuilder.java

@@ -67,17 +67,12 @@ public MqttConnectionOptionsBuilder will(String topic, MqttMessage message) {
 		return this;
 	}
 
-	public MqttConnectionOptionsBuilder sessionExpiryInterval(Integer sessionExpiryInterval) {
+	public MqttConnectionOptionsBuilder sessionExpiryInterval(Long sessionExpiryInterval) {
 		mqttConnectionOptions.setSessionExpiryInterval(sessionExpiryInterval);
 		return this;
 	}
 
-	public MqttConnectionOptionsBuilder willDelayInterval(Integer willDelayInterval) {
-		mqttConnectionOptions.setWillDelayInterval(willDelayInterval);
-		return this;
-	}
-	
-	public MqttConnectionOptionsBuilder maximumPacketSize(Integer maximumPacketSize) {
+	public MqttConnectionOptionsBuilder maximumPacketSize(Long maximumPacketSize) {
 		mqttConnectionOptions.setMaximumPacketSize(maximumPacketSize);
 		return this;
 	}

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsSender.java

@@ -177,7 +177,7 @@ public void run() {
 	private void handleRunException(MqttWireMessage message, Exception ex) {
 		final String methodName = "handleRunException";
 		//@TRACE 804=exception
-		log.fine(CLASS_NAME,methodName,"804",null, ex);
+		log.severe(CLASS_NAME,methodName,"804",null, ex);
 		MqttException mex;
 		if ( !(ex instanceof MqttException)) {
 			mex = new MqttException(MqttClientException.REASON_CODE_CONNECTION_LOST, ex);

org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttDataTypes.java

@@ -19,15 +19,21 @@ public MqttDataTypes() throws IllegalAccessException {
 		throw new IllegalAccessException("Utility Class");
 	}
 
-	public static void validateTwoByteInt(int value) throws IllegalArgumentException {
+	public static void validateTwoByteInt(Integer value) throws IllegalArgumentException {
+		if(value == null) {
+			return;
+		}
 		if (value >= 0 && value <= TWO_BYTE_INT_MAX) {
 			return;
 		} else {
 			throw new IllegalArgumentException("This property must be a number between 0 and " + TWO_BYTE_INT_MAX);
 		}
 	}
 
-	public static void validateFourByteInt(long value) throws IllegalArgumentException {
+	public static void validateFourByteInt(Long value) throws IllegalArgumentException {
+		if(value == null) {
+			return;
+		}
 		if (value >= 0 && value <= FOUR_BYTE_INT_MAX) {
 			return;
 		} else {

org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttProperties.java

@@ -344,7 +344,7 @@ public byte[] encodeProperties() throws MqttException {
 			}
 
 			// User Defined Properties
-			if (!userProperties.isEmpty() && validProperties.contains(USER_DEFINED_PAIR_IDENTIFIER)) {
+			if (userProperties != null && !userProperties.isEmpty() && validProperties.contains(USER_DEFINED_PAIR_IDENTIFIER)) {
 				for (UserProperty property : userProperties) {
 					// outputStream.write(USER_DEFINED_PAIR_IDENTIFIER);
 					outputStream.writeByte(USER_DEFINED_PAIR_IDENTIFIER);
@@ -1359,7 +1359,7 @@ public String toString() {
 		if (reasonString != null) {
 			sb.append(", reasonString=" + reasonString);
 		}
-		if (userProperties.size() != 0) {
+		if (userProperties != null && userProperties.size() != 0) {
 			sb.append(", userProperties=" + userProperties);
 		}
 		if (payloadFormat) {

org.eclipse.paho.mqttv5.testclient/src/main/java/org/eclipse/paho/mqttv5/testclient/V5Client.java

@@ -35,7 +35,7 @@ public V5Client() throws InterruptedException {
 			// Lets build our Connection Options:
 			MqttConnectionOptionsBuilder conOptsBuilder = new MqttConnectionOptionsBuilder();
 			MqttConnectionOptions conOpts = conOptsBuilder.serverURI(broker).cleanSession(true)
-					.sessionExpiryInterval(120).automaticReconnect(true)
+					.sessionExpiryInterval(120L).automaticReconnect(true)
 					.will(topic, new MqttMessage(willContent.getBytes(), qos, false, null)).topicAliasMaximum(1000).build();
 			asyncClient.setCallback(this);