MQTT V5 common packet updates

Author: Ian Craggs

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 IBM Corp.
+ * Copyright (c) 2016, 2019 IBM Corp.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -19,7 +19,7 @@
 /**
  * Abstract super-class of all acknowledgement messages.
  */
-public abstract class MqttAck extends MqttWireMessage {
+public abstract class MqttAck extends MqttPersistableWireMessage {
 	public MqttAck(byte type) {
 		super(type);
 	}

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

@@ -15,7 +15,7 @@ public class MqttDataTypes {
 
 	private static final int TWO_BYTE_INT_MAX = 65535;
 	private static final long FOUR_BYTE_INT_MAX = 4294967295L;
-	private static final int VARIABLE_BYTE_INT_MAX = 268435455;
+	public static final int VARIABLE_BYTE_INT_MAX = 268435455;
 
 	public MqttDataTypes() throws IllegalAccessException {
 		throw new IllegalAccessException("Utility Class");

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 IBM Corp.
+ * Copyright (c) 2016, 2019 IBM Corp.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -28,7 +28,7 @@
 import org.eclipse.paho.mqttv5.common.MqttSubscription;
 import org.eclipse.paho.mqttv5.common.packet.util.CountingInputStream;
 
-public class MqttSubscribe extends MqttWireMessage {
+public class MqttSubscribe extends MqttPersistableWireMessage {
 
 	private static final Byte[] validProperties = { MqttProperties.SUBSCRIPTION_IDENTIFIER,
 			MqttProperties.SUBSCRIPTION_IDENTIFIER_SINGLE,

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 IBM Corp.
+ * Copyright (c) 2016, 2019 IBM Corp.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -27,7 +27,7 @@
 import org.eclipse.paho.mqttv5.common.MqttException;
 import org.eclipse.paho.mqttv5.common.packet.util.CountingInputStream;
 
-public class MqttUnsubscribe extends MqttWireMessage{
+public class MqttUnsubscribe extends MqttPersistableWireMessage{
 
 	private static final Byte[] validProperties = { MqttProperties.USER_DEFINED_PAIR_IDENTIFIER };
 

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

@@ -403,5 +403,15 @@ public int[] getReasonCodes() {
 			return null;
 		}
 	}
+	
+	public byte[] serialize() throws MqttException {
+		byte[] a = getHeader();
+		byte[] b = getPayload();
+		
+		byte[] c = new byte[a.length + b.length];
+		System.arraycopy(a, 0, c, 0, a.length);
+		System.arraycopy(b, 0, c, a.length, b.length);
+		return c;
+	}
 
 }