Added RaceStartStatusEncoder.

Added RaceStartTypeEnum. Refactored RaceStartStatusDecoder to implement the MessageDecoder interface. Documented RaceStartStatus, and it actually exposes its properties now. Updated RaceStartStatusDecoderTest. issue #35 #36 #story[1095]
2017-08-06 19:36:21 +12:00
parent e99ad00294
commit ce63f58429
9 changed files with 355 additions and 87 deletions
@@ -37,7 +37,7 @@ public class DecoderFactory {

            case XMLMESSAGE: return new XMLMessageDecoder();

-            //case RACESTARTSTATUS: return new RaceStartStatusDecoder();//TODO
+            case RACESTARTSTATUS: return new RaceStartStatusDecoder();

            //case YACHTEVENTCODE: return new YachtEventCodeDecoder();//TODO

@@ -1,66 +1,81 @@
 package network.MessageDecoders;


+import network.Messages.AC35Data;
+import network.Messages.Enums.RaceStartTypeEnum;
+import network.Messages.RaceStartStatus;
+
 import java.util.Arrays;

 import static network.Utils.ByteConverter.*;


 /**
- * Created by hba56 on 21/04/17.
+ * Decodes {@link RaceStartStatus} messages.
 */
-public class RaceStartStatusDecoder {
-    private byte messageVersion;
-    private byte[] timestamp;
-    private byte[] ackNumber;
-    private byte[] raceStartTime;
-    private byte[] raceIdentifier;
-    private byte notificationType;
+public class RaceStartStatusDecoder implements MessageDecoder {

-    private long time;
-    private short ack;
-    private long startTime;
-    private int raceID;
-    private char notification;
+    /**
+     * The encoded message.
+     */
+    private byte[] encodedMessage;
+
+    /**
+     * The decoded message.
+     */
+    private RaceStartStatus message;


-    public RaceStartStatusDecoder(byte[] encodedRaceStartStatus) {
-        messageVersion = encodedRaceStartStatus[0];
-        timestamp = Arrays.copyOfRange(encodedRaceStartStatus, 1, 7);
-        ackNumber = Arrays.copyOfRange(encodedRaceStartStatus, 7, 9);
-        raceStartTime = Arrays.copyOfRange(encodedRaceStartStatus, 9, 15);
-        raceIdentifier = Arrays.copyOfRange(encodedRaceStartStatus, 15, 19);
-        notificationType = encodedRaceStartStatus[19];

-        time = bytesToLong(timestamp);
-        ack = bytesToShort(ackNumber);
-        startTime = bytesToLong(raceStartTime);
-        raceID = bytesToInt(raceIdentifier);
-        notification = bytesToChar(notificationType);
+    /**
+     * Constructs a decoder to decode a given message.
+     */
+    public RaceStartStatusDecoder() {
    }


-    public byte getMessageVersion() {
-        return messageVersion;
+    @Override
+    public AC35Data decode(byte[] encodedMessage) {
+        this.encodedMessage = encodedMessage;
+
+
+        byte messageVersion = encodedMessage[0];
+
+        byte[] timestamp = Arrays.copyOfRange(encodedMessage, 1, 7);
+        long time = bytesToLong(timestamp);
+
+        byte[] ackNumber = Arrays.copyOfRange(encodedMessage, 7, 9);
+        short ack = bytesToShort(ackNumber);
+
+        byte[] raceStartTime = Arrays.copyOfRange(encodedMessage, 9, 15);
+        long startTime = bytesToLong(raceStartTime);
+
+        byte[] raceIdentifier = Arrays.copyOfRange(encodedMessage, 15, 19);
+        int raceID = bytesToInt(raceIdentifier);
+
+        byte notificationType = encodedMessage[19];
+
+
+
+        message = new RaceStartStatus(
+                messageVersion,
+                time,
+                ack,
+                startTime,
+                raceID,
+                RaceStartTypeEnum.fromByte(notificationType)
+        );
+
+        return message;
+
    }

-    public long getTime() {
-        return time;
-    }

-    public short getAck() {
-        return ack;
-    }
-
-    public long getStartTime() {
-        return startTime;
-    }
-
-    public int getRaceID() {
-        return raceID;
-    }
-
-    public char getNotification() {
-        return notification;
+    /**
+     * Returns the decoded message.
+     * @return The decoded message.
+     */
+    public RaceStartStatus getMessage() {
+        return message;
    }
 }