Fixing QOSType encoding and decoding of FAILURE qos (0x80). This was causing bug with decoding a SubAck with failure qos type. See Appendix B: MQTT-3.9.3-2

2015-09-23 16:30:40 -07:00
parent 33bc23b4e1
commit 767e2ba4b7
12 changed files with 95 additions and 23 deletions
@@ -173,7 +173,7 @@ public class Utils {
            flags |= 0x01;
        }
        
-        flags |= ((message.getQos().ordinal() & 0x03) << 1);
+        flags |= ((message.getQos().byteValue() & 0x03) << 1);
        return flags;
    }

@@ -39,9 +39,39 @@ public abstract class AbstractMessage {

    public static enum QOSType {
        MOST_ONE, LEAST_ONE, EXACTLY_ONCE, RESERVED, FAILURE;
-        
+
+        public static QOSType valueOf(byte qos){
+            switch(qos) {
+                case 0x00:
+                    return MOST_ONE;
+                case 0x01:
+                    return LEAST_ONE;
+                case 0x02:
+                    return EXACTLY_ONCE;
+                case (byte) 0x80:
+                    return FAILURE;
+                default:
+                    throw new IllegalArgumentException("Invalid QOS Type. Expected either 0, 1, 2, or 0x80. Given: " + qos);
+            }
+        }
+
+        public byte byteValue() {
+            switch(this) {
+                case MOST_ONE:
+                    return 0;
+                case LEAST_ONE:
+                    return 1;
+                case EXACTLY_ONCE:
+                    return 2;
+                case FAILURE:
+                    return (byte) 0x80;
+                default:
+                    throw new IllegalArgumentException("Cannot give byteValue of QOSType: " + this.name());
+            }
+        }
+
        public static String formatQoS(QOSType qos) {
-            return String.format("%d - %s", qos.ordinal(), qos.name());
+            return String.format("%d - %s", qos.byteValue(), qos.name());
        }
    }
    //type