The byte fields of PacketHeads are now range-limited integers

Author: burdoto

src/main/java/de/kaleidox/vban/Util.java

@@ -79,4 +79,18 @@ public static byte[] createByteArray(Object data) {
         else if (data instanceof ByteArray) return ((ByteArray) data).getBytes();
         else throw new IllegalArgumentException("Unknown Data Type! Please contact the developer.");
     }
+
+    /**
+     * Checks whether the given integer is within the given boundaries,
+     * and if not, throws an {@link IllegalArgumentException}.
+     *
+     * @param check The int to check range of.
+     * @param from The minimum value.
+     * @param to The maximum value.
+     * @throws IllegalArgumentException If the integer is out of bounds.
+     */
+    public static void checkRange(int check, int from, int to) throws IllegalArgumentException {
+        if (check < from || check > to)
+            throw new IllegalArgumentException(String.format("Integer out of range. [%d;%d;%d]", from, check, to));
+    }
 }

src/main/java/de/kaleidox/vban/packet/VBANPacketHead.java

@@ -10,6 +10,7 @@
 import org.intellij.lang.annotations.MagicConstant;
 
 import static de.kaleidox.vban.Util.appendByteArray;
+import static de.kaleidox.vban.Util.checkRange;
 import static de.kaleidox.vban.Util.intToByteArray;
 import static de.kaleidox.vban.Util.stringToBytesASCII;
 import static de.kaleidox.vban.Util.trimArray;
@@ -21,17 +22,19 @@ public class VBANPacketHead implements ByteArray {
 
     private VBANPacketHead(@MagicConstant(flagsFromClass = Protocol.class) int protocol,
                            @MagicConstant(flagsFromClass = SampleRate.class) int sampleRateIndex,
-                           byte samples,
-                           byte channel,
+                           int samples,
+                           int channel,
                            @MagicConstant(flagsFromClass = Format.class) int format,
                            @MagicConstant(flagsFromClass = Codec.class) int codec,
                            String streamName,
                            int frameCounter) {
         byte[] bytes = new byte[0];
+        checkRange(samples, 0, 255);
+        checkRange(channel, 0, 255);
 
         bytes = appendByteArray(bytes, "VBAN".getBytes());
         bytes = appendByteArray(bytes, (byte) (protocol | sampleRateIndex));
-        bytes = appendByteArray(bytes, samples, channel);
+        bytes = appendByteArray(bytes, (byte) samples, (byte) channel);
         bytes = appendByteArray(bytes, (byte) (format | codec));
         bytes = appendByteArray(bytes, trimArray(stringToBytesASCII(streamName), 16));
         bytes = appendByteArray(bytes, intToByteArray(frameCounter, 4));
@@ -114,16 +117,16 @@ public static class Factory implements de.kaleidox.util.model.Factory<VBANPacket
         private final int protocol;
         @MagicConstant(valuesFromClass = SampleRate.class)
         private final int sampleRate;
-        private final byte samples;
-        private final byte channel;
+        private final int samples;
+        private final int channel;
         @MagicConstant(valuesFromClass = Format.class)
         private final int format;
         @MagicConstant(valuesFromClass = Codec.class)
         private final int codec;
         private final String streamName;
         private int counter = 1;
 
-        private Factory(int protocol, int sampleRate, byte samples, byte channel, int format, int codec, String streamName) {
+        private Factory(int protocol, int sampleRate, int samples, int channel, int format, int codec, String streamName) {
             this.protocol = protocol;
             this.sampleRate = sampleRate;
             this.samples = samples;
@@ -152,8 +155,8 @@ public static class Builder implements de.kaleidox.util.model.Builder<Factory> {
             private int protocol = -1;
             @MagicConstant(valuesFromClass = SampleRate.class)
             private int sampleRate = SampleRate.hz48000;
-            private byte samples = -1;
-            private byte channel = 2;
+            private int samples = 255;
+            private int channel = 2;
             @MagicConstant(valuesFromClass = Format.class)
             private int format = Format.INT16;
             @MagicConstant(valuesFromClass = Codec.class)
@@ -181,7 +184,7 @@ public Builder setSampleRate(int sampleRate) {
                 return this;
             }
 
-            public byte getSamples() {
+            public int getSamples() {
                 return samples;
             }
 
@@ -190,7 +193,7 @@ public Builder setSamples(byte samples) {
                 return this;
             }
 
-            public byte getChannel() {
+            public int getChannel() {
                 return channel;
             }