Added MarkRoundingEncoder.

Refactored MarkRoundingDecoder - it now implements MessageDecoder. Tidied up MarkRounding - it is now documented and has getters. Also Created MarkRoundingBoatStatusEnum, MarkRoundingIDEnum, MarkRoundingSideEnum, MarkRoundingTypeEnum. Added MarkRoundingDecoderTest. issue #35 #36 #story[1095]
2017-08-06 21:38:12 +12:00
parent da800e659a
commit 9c64b678e3
12 changed files with 676 additions and 91 deletions
@@ -47,7 +47,7 @@ public class DecoderFactory {

            case BOATLOCATION: return new BoatLocationDecoder();

-            //case MARKROUNDING: return new MarkRoundingDecoder()//TODO;
+            case MARKROUNDING: return new MarkRoundingDecoder();

            case COURSEWIND: return new CourseWindsDecoder();

@@ -1,52 +1,90 @@
 package network.MessageDecoders;


+import network.Messages.AC35Data;
+import network.Messages.Enums.MarkRoundingBoatStatusEnum;
+import network.Messages.Enums.MarkRoundingSideEnum;
+import network.Messages.Enums.MarkRoundingTypeEnum;
 import network.Messages.MarkRounding;
 import network.Utils.ByteConverter;

 import java.util.Arrays;

 /**
- * Created by hba56 on 23/04/17.
+ * Decoder for {@link MarkRounding} messages.
 */
-public class MarkRoundingDecoder {
-    byte messageVersionNumber;
-    byte[] byteTime;
-    byte[] byteAck;
-    byte[] byteRaceID;
-    byte[] byteSourceID;
-    byte byteBoatStatus;
-    byte byteRoundingSide;
-    byte byteMarkType;
-    byte byteMarkID;
+public class MarkRoundingDecoder implements MessageDecoder {

-    MarkRounding markRounding;
+    /**
+     * The encoded message.
+     */
+    private byte[] encodedMessage;

-    public MarkRoundingDecoder(byte[] encodedMarkRounding) {
-        messageVersionNumber = encodedMarkRounding[0];
-        byteTime = Arrays.copyOfRange(encodedMarkRounding, 1, 7);
-        byteAck = Arrays.copyOfRange(encodedMarkRounding, 7, 9);
-        byteRaceID = Arrays.copyOfRange(encodedMarkRounding, 9, 13);
-        byteSourceID = Arrays.copyOfRange(encodedMarkRounding, 13, 17);
-        byteBoatStatus = encodedMarkRounding[17];
-        byteRoundingSide = encodedMarkRounding[18];
-        byteMarkType = encodedMarkRounding[19];
-        byteMarkID = encodedMarkRounding[20];
+    /**
+     * The decoded message.
+     */
+    private MarkRounding message;

-        int intMsgVer = ByteConverter.bytesToInt(messageVersionNumber);
-        long lngTime = ByteConverter.bytesToLong(byteTime);
-        int intAck = ByteConverter.bytesToInt(byteAck);
-        int intRaceID = ByteConverter.bytesToInt(byteRaceID);
-        int intSourceID = ByteConverter.bytesToInt(byteSourceID);
-        int intBoatState = ByteConverter.bytesToInt(byteBoatStatus);
-        int intRoundingSide = ByteConverter.bytesToInt(byteRoundingSide);
-        int intMarkType = ByteConverter.bytesToInt(byteMarkType);
-        int intMarkID = ByteConverter.bytesToInt(byteMarkID);

-        markRounding = new MarkRounding(intMsgVer, lngTime, intAck, intRaceID, intSourceID, intBoatState, intRoundingSide, intMarkType, intMarkID);
+    /**
+     * Constructs a decoder to decode a given message.
+     */
+    public MarkRoundingDecoder() {
    }

-    public MarkRounding getMarkRounding() {
-        return markRounding;
+    @Override
+    public AC35Data decode(byte[] encodedMessage) {
+        this.encodedMessage = encodedMessage;
+
+        byte messageVersionNumber = encodedMessage[0];
+
+        byte[] byteTime = Arrays.copyOfRange(encodedMessage, 1, 7);
+        long time = ByteConverter.bytesToLong(byteTime);
+
+        byte[] byteAck = Arrays.copyOfRange(encodedMessage, 7, 9);
+        int ackNumber = ByteConverter.bytesToInt(byteAck);
+
+        byte[] byteRaceID = Arrays.copyOfRange(encodedMessage, 9, 13);
+        int raceID = ByteConverter.bytesToInt(byteRaceID);
+
+        byte[] byteSourceID = Arrays.copyOfRange(encodedMessage, 13, 17);
+        int sourceID = ByteConverter.bytesToInt(byteSourceID);
+
+        byte byteBoatStatus = encodedMessage[17];
+        MarkRoundingBoatStatusEnum boatStatus = MarkRoundingBoatStatusEnum.fromByte(byteBoatStatus);
+
+        byte byteRoundingSide = encodedMessage[18];
+        MarkRoundingSideEnum roundingSide = MarkRoundingSideEnum.fromByte(byteRoundingSide);
+
+        byte byteMarkType = encodedMessage[19];
+        MarkRoundingTypeEnum markType = MarkRoundingTypeEnum.fromByte(byteMarkType);
+
+        byte byteMarkID = encodedMessage[20];
+
+
+        message = new MarkRounding(
+                messageVersionNumber,
+                time,
+                ackNumber,
+                raceID,
+                sourceID,
+                boatStatus,
+                roundingSide,
+                markType,
+                byteMarkID);
+
+
+        return message;
    }
+
+    /**
+     * Returns the decoded message.
+     *
+     * @return The decoded message.
+     */
+    public MarkRounding getMessage() {
+        return message;
+    }
+
 }
+