The message encoders and decoders now catch exceptions, and throw InvalidMessageException.

Removed the big switch statement from BinaryMessageDecoder - it now uses the decoder factory instead.
issue #35 #36
#story[1095]

racevisionGame/src/main/java/visualiser/gameController/ControllerClient.java

@@ -56,18 +56,21 @@ public class ControllerClient  {
             BoatAction boatAction = new BoatAction(protocolCode);
 
             //Encode BoatAction.
-            byte[] encodedBoatAction = new byte[0];
             try {
-                encodedBoatAction = RaceVisionByteEncoder.encode(boatAction);
+                byte[] encodedBoatAction = RaceVisionByteEncoder.encode(boatAction);
+
+                BinaryMessageEncoder binaryMessage = new BinaryMessageEncoder(MessageType.BOATACTION, System.currentTimeMillis(), 0,
+                        (short) encodedBoatAction.length, encodedBoatAction);
+
+                System.out.println("Sending out key: " + protocolCode);
+                outputStream.write(binaryMessage.getFullMessage());
+
             } catch (InvalidMessageException e) {
                 Logger.getGlobal().log(Level.WARNING, "Could not encode BoatAction: " + boatAction, e);
+
             }
 
-            BinaryMessageEncoder binaryMessage = new BinaryMessageEncoder(MessageType.BOATACTION, System.currentTimeMillis(), 0,
-                    (short) encodedBoatAction.length, encodedBoatAction);
 
-            System.out.println("Sending out key: " + protocolCode);
-            outputStream.write(binaryMessage.getFullMessage());
         }
     }
 }

racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java

@@ -1,6 +1,7 @@
 package visualiser.gameController;
 
 import network.BinaryMessageDecoder;
+import network.Exceptions.InvalidMessageException;
 import network.MessageDecoders.BoatActionDecoder;
 import network.Messages.BoatAction;
 import network.Messages.Enums.BoatActionEnum;
@@ -10,6 +11,8 @@ import visualiser.gameController.Keys.KeyFactory;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.net.Socket;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Service for dispatching key press data to race from client
@@ -46,12 +49,22 @@ public class ControllerServer implements Runnable {
             byte[] message = new byte[20];
             try {
                 if (inputStream.available() > 0) {
+
                     inputStream.read(message);
+
                     BinaryMessageDecoder encodedMessage = new BinaryMessageDecoder(message);
                     BoatActionDecoder boatActionDecoder = new BoatActionDecoder();
-                    boatActionDecoder.decode(encodedMessage.getMessageBody());
-                    BoatAction boatAction = boatActionDecoder.getMessage();
-                    System.out.println("Received key: " + boatAction.getBoatAction());
+
+                    try {
+                        boatActionDecoder.decode(encodedMessage.getMessageBody());
+                        BoatAction boatAction = boatActionDecoder.getMessage();
+                        System.out.println("Received key: " + boatAction.getBoatAction());
+
+                    } catch (InvalidMessageException e) {
+                        Logger.getGlobal().log(Level.WARNING, "Could not decode BoatAction message.", e);
+                    }
+
+
                 }
             } catch (IOException e) {
                 e.printStackTrace();