Refactor handle (#75)

* Refactor passing messages to handler

* Add RMIMessage skeleton

* Handle RMI message in RMI module

3 files changed, 45 insertions, 106 deletions

diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/EventBusTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/EventBusTest.java
index f3df887..34b80bb 100644
--- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/EventBusTest.java
+++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/EventBusTest.java
@@ -7,6 +7,7 @@ import org.junit.runners.JUnit4;
 import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.TimerSchedulerMessage;
 import pl.edu.mimuw.cloudatlas.agent.modules.Module;
+import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType;
 import pl.edu.mimuw.cloudatlas.agent.modules.TimerScheduledTask;
 
 import java.util.ArrayList;
@@ -18,29 +19,25 @@ public class EventBusTest {
     public abstract class MessageCounterModule extends Module {
         public int counter = 0;
 
-        MessageCounterModule(AgentMessage.AgentModule moduleType) {
+        MessageCounterModule(ModuleType moduleType) {
             super(moduleType);
         }
     }
 
-    public HashMap<AgentMessage.AgentModule, Module> initializeTwoModules() {
-        HashMap<AgentMessage.AgentModule, Module> modules = new HashMap<AgentMessage.AgentModule, Module>();
-        modules.put(AgentMessage.AgentModule.RMI, new MessageCounterModule(AgentMessage.AgentModule.RMI) {
+    /*
+    public HashMap<ModuleType, Module> initializeTwoModules() {
+        HashMap<ModuleType, Module> modules = new HashMap<ModuleType, Module>();
+        modules.put(ModuleType.RMI, new MessageCounterModule(ModuleType.RMI) {
             @Override
             public void handle(AgentMessage event) throws InterruptedException {
                 System.out.println("Module 1 handle called");
                 // TODO correct message subclass
-                sendMessage(new AgentMessage("1", AgentMessage.AgentModule.UDP) {
-                    @Override
-                    public AgentModule getCorrectMessageType() {
-                        return AgentModule.UDP;
-                    }
-                });
+                sendMessage(new AgentMessage("1", ModuleType.UDP) {});
                 counter ++;
             }
         });
 
-        modules.put(AgentMessage.AgentModule.UDP, new MessageCounterModule(AgentMessage.AgentModule.UDP) {
+        modules.put(ModuleType.UDP, new MessageCounterModule(ModuleType.UDP) {
             @Override
             public void handle(AgentMessage event) {
                 System.out.println("Module 2 handle called");
@@ -51,10 +48,10 @@ public class EventBusTest {
         return modules;
     }
 
-    public HashMap<AgentMessage.AgentModule, Module> initializeModule() {
-        HashMap<AgentMessage.AgentModule, Module> modules = new HashMap<AgentMessage.AgentModule, Module>();
+    public HashMap<ModuleType, Module> initializeModule() {
+        HashMap<ModuleType, Module> modules = new HashMap<ModuleType, Module>();
 
-        modules.put(AgentMessage.AgentModule.RMI, new MessageCounterModule(AgentMessage.AgentModule.RMI) {
+        modules.put(ModuleType.RMI, new MessageCounterModule(ModuleType.RMI) {
             @Override
             public void handle(AgentMessage event) {
                 System.out.println("Module 1 handle called");
@@ -69,55 +66,45 @@ public class EventBusTest {
     @Ignore
     // TODO correct message subclass
     public void messageModule() throws InterruptedException {
-        HashMap<AgentMessage.AgentModule, Module> modules = initializeModule();
-        HashMap<AgentMessage.AgentModule, Executor> executors = Agent.initializeExecutors(modules);
+        HashMap<ModuleType, Module> modules = initializeModule();
+        HashMap<ModuleType, Executor> executors = Agent.initializeExecutors(modules);
         ArrayList<Thread> executorThreads = Agent.initializeExecutorThreads(executors);
         EventBus eventBus = new EventBus(executors);
         Thread eventBusThread = new Thread(eventBus);
 
         eventBusThread.start();
-        eventBus.addMessage(new AgentMessage("0", AgentMessage.AgentModule.RMI) {
-            @Override
-            public AgentModule getCorrectMessageType() {
-                return AgentModule.RMI;
-            }
-        });
+        eventBus.addMessage(new AgentMessage("0", ModuleType.RMI) {});
         Thread.sleep(1000);
         eventBusThread.interrupt();
         Agent.closeExecutors(executorThreads);
-        assertEquals(1, ((MessageCounterModule) modules.get(AgentMessage.AgentModule.RMI)).counter);
+        assertEquals(1, ((MessageCounterModule) modules.get(ModuleType.RMI)).counter);
     }
 
     @Test
     @Ignore
     // TODO correct message subclass
     public void messagingBetweenModules() throws InterruptedException {
-        HashMap<AgentMessage.AgentModule, Module> modules = initializeTwoModules();
-        HashMap<AgentMessage.AgentModule, Executor> executors = Agent.initializeExecutors(modules);
+        HashMap<ModuleType, Module> modules = initializeTwoModules();
+        HashMap<ModuleType, Executor> executors = Agent.initializeExecutors(modules);
         ArrayList<Thread> executorThreads = Agent.initializeExecutorThreads(executors);
         EventBus eventBus = new EventBus(executors);
         Thread eventBusThread = new Thread(eventBus);
         eventBusThread.start();
 
-        eventBus.addMessage(new AgentMessage("0", AgentMessage.AgentModule.RMI) {
-            @Override
-            public AgentModule getCorrectMessageType() {
-                return AgentModule.RMI;
-            }
-        });
+        eventBus.addMessage(new AgentMessage("0", ModuleType.RMI) {});
 
         Thread.sleep(1000);
 
         eventBusThread.interrupt();
         Agent.closeExecutors(executorThreads);
-        assertEquals(1, ((MessageCounterModule) modules.get(AgentMessage.AgentModule.RMI)).counter);
-        assertEquals(1, ((MessageCounterModule) modules.get(AgentMessage.AgentModule.UDP)).counter);
+        assertEquals(1, ((MessageCounterModule) modules.get(ModuleType.RMI)).counter);
+        assertEquals(1, ((MessageCounterModule) modules.get(ModuleType.UDP)).counter);
     }
 
     @Test
     public void sendWrongMessageType1() throws InterruptedException {
-        HashMap<AgentMessage.AgentModule, Module> modules = initializeModule();
-        HashMap<AgentMessage.AgentModule, Executor> executors = Agent.initializeExecutors(modules);
+        HashMap<ModuleType, Module> modules = initializeModule();
+        HashMap<ModuleType, Executor> executors = Agent.initializeExecutors(modules);
         ArrayList<Thread> executorThreads = Agent.initializeExecutorThreads(executors);
         EventBus eventBus = new EventBus(executors);
         Thread eventBusThread = new Thread(eventBus);
@@ -127,7 +114,7 @@ public class EventBusTest {
         try {
             eventBus.addMessage(new TimerSchedulerMessage(
                     "0",
-                    AgentMessage.AgentModule.RMI,
+                    ModuleType.RMI,
                     System.currentTimeMillis() / 1000L,
                     "1",
                     10,
@@ -154,8 +141,8 @@ public class EventBusTest {
 
     @Test
     public void sendWrongMessageType2() throws InterruptedException {
-        HashMap<AgentMessage.AgentModule, Module> modules = initializeModule();
-        HashMap<AgentMessage.AgentModule, Executor> executors = Agent.initializeExecutors(modules);
+        HashMap<ModuleType, Module> modules = initializeModule();
+        HashMap<ModuleType, Executor> executors = Agent.initializeExecutors(modules);
         ArrayList<Thread> executorThreads = Agent.initializeExecutorThreads(executors);
         EventBus eventBus = new EventBus(executors);
         Thread eventBusThread = new Thread(eventBus);
@@ -163,12 +150,7 @@ public class EventBusTest {
         eventBusThread.start();
 
         try {
-            eventBus.addMessage(new AgentMessage("0", AgentMessage.AgentModule.RMI) {
-                @Override
-                public AgentModule getCorrectMessageType() {
-                    return AgentModule.QUERY;
-                }
-            });
+            eventBus.addMessage(new AgentMessage("0", ModuleType.RMI) {});
             Thread.sleep(1000);
         } catch (AssertionError e) {
             System.out.println("Wrong timer-scheduler message type error caught");
@@ -182,4 +164,5 @@ public class EventBusTest {
             Assert.fail("Routing not detected as faulty");
         }
     }
+    */
 }
diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/ExecutorTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/ExecutorTest.java
index 8653258..0ff7a07 100644
--- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/ExecutorTest.java
+++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/ExecutorTest.java
@@ -4,8 +4,8 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage;
-import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage.AgentModule;
 import pl.edu.mimuw.cloudatlas.agent.modules.Module;
+import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType;
 
 // TODO make agent messages specific subclass
 
@@ -13,7 +13,7 @@ public class ExecutorTest {
     public class MessageCounterModule extends Module {
         public int counter = 0;
 
-        MessageCounterModule(AgentModule moduleType) {
+        MessageCounterModule(ModuleType moduleType) {
             super(moduleType);
         }
 
@@ -24,7 +24,7 @@ public class ExecutorTest {
 
     @Test
     public void testDoesntExecuteWhenNoMessages() throws Exception {
-        MessageCounterModule module = new MessageCounterModule(AgentModule.UDP);
+        MessageCounterModule module = new MessageCounterModule(ModuleType.UDP);
         Executor executor = new Executor(module);
         Thread thread = new Thread(executor);
         thread.start();
@@ -33,16 +33,12 @@ public class ExecutorTest {
         assertEquals(0, module.counter);
     }
 
+    /*
     @Test
     public void testExecutesHandlerOnce() throws Exception {
-        MessageCounterModule module = new MessageCounterModule(AgentModule.UDP);
+        MessageCounterModule module = new MessageCounterModule(ModuleType.UDP);
         Executor executor = new Executor(module);
-        executor.addMessage(new AgentMessage("", AgentModule.UDP, 0) {
-            @Override
-            public AgentModule getCorrectMessageType() {
-                return AgentModule.UDP;
-            }
-        });
+        executor.addMessage(new AgentMessage("", ModuleType.UDP, 0) {});
         Thread thread = new Thread(executor);
         thread.start();
         Thread.sleep(100);
@@ -52,31 +48,17 @@ public class ExecutorTest {
 
     @Test
     public void testExecutesHandlerMultipleTimes() throws Exception {
-        MessageCounterModule module = new MessageCounterModule(AgentModule.UDP);
+        MessageCounterModule module = new MessageCounterModule(ModuleType.UDP);
         Executor executor = new Executor(module);
-        executor.addMessage(new AgentMessage("", AgentModule.UDP, 0) {
-            @Override
-            public AgentModule getCorrectMessageType() {
-                return AgentModule.UDP;
-            }
-        });
-        executor.addMessage(new AgentMessage("", AgentModule.UDP, 0) {
-            @Override
-            public AgentModule getCorrectMessageType() {
-                return AgentModule.UDP;
-            }
-        });
+        executor.addMessage(new AgentMessage("", ModuleType.UDP, 0) {});
+        executor.addMessage(new AgentMessage("", ModuleType.UDP, 0) {});
         Thread thread = new Thread(executor);
         thread.start();
         Thread.sleep(100);
-        executor.addMessage(new AgentMessage("", AgentModule.UDP, 0) {
-            @Override
-            public AgentModule getCorrectMessageType() {
-                return AgentModule.UDP;
-            }
-        });
+        executor.addMessage(new AgentMessage("", ModuleType.UDP, 0) {});
         Thread.sleep(100);
         thread.interrupt();
         assertEquals(3, module.counter);
     }
+    */
 }
diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/SchedulerTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/SchedulerTest.java
index 133b3b9..ccb4c8d 100644
--- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/SchedulerTest.java
+++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/SchedulerTest.java
@@ -4,6 +4,7 @@ import org.junit.Test;
 import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.TimerSchedulerMessage;
 import pl.edu.mimuw.cloudatlas.agent.modules.Module;
+import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType;
 import pl.edu.mimuw.cloudatlas.agent.modules.TimerScheduledTask;
 import pl.edu.mimuw.cloudatlas.agent.modules.TimerScheduler;
 
@@ -14,8 +15,8 @@ import java.util.HashMap;
 // TODO add wrong message test with switched types
 
 public class SchedulerTest {
-    private HashMap<AgentMessage.AgentModule, Module> modules;
-    private HashMap<AgentMessage.AgentModule, Executor> executors;
+    private HashMap<ModuleType, Module> modules;
+    private HashMap<ModuleType, Executor> executors;
     private ArrayList<Thread> executorThreads;
     private EventBus eventBus;
     private Thread eventBusThread;
@@ -29,48 +30,25 @@ public class SchedulerTest {
         eventBusThread.start();
     }
 
-    public HashMap<AgentMessage.AgentModule, Module> initializeModule() {
-        HashMap<AgentMessage.AgentModule, Module> modules = new HashMap<AgentMessage.AgentModule, Module>();
-        modules.put(AgentMessage.AgentModule.TIMER_SCHEDULER, new TimerScheduler(AgentMessage.AgentModule.TIMER_SCHEDULER));
+    public HashMap<ModuleType, Module> initializeModule() {
+        HashMap<ModuleType, Module> modules = new HashMap<ModuleType, Module>();
+        modules.put(ModuleType.TIMER_SCHEDULER, new TimerScheduler(ModuleType.TIMER_SCHEDULER));
         return modules;
     }
 
     @Test
     public void initializeWrongModuleType() {
         try {
-            Module timer = new TimerScheduler(AgentMessage.AgentModule.RMI);
+            Module timer = new TimerScheduler(ModuleType.RMI);
         } catch (AssertionError e) {
             System.out.println("Wrong timer type during init error caught");
         }
     }
 
     @Test
-    public void sendWrongMessageType() throws InterruptedException {
-        try {
-            this.eventBus.addMessage(new TimerSchedulerMessage(
-                    "0",
-                    AgentMessage.AgentModule.UDP,
-                    System.currentTimeMillis() / 1000L,
-                    "1",
-                    10,
-                    System.currentTimeMillis() / 1000L,
-                    new TimerScheduledTask() {
-                        @Override
-                        public void run() {
-                            System.out.println("Task executed");
-                        }
-                    }));
-            Thread.sleep(1000);
-        } catch (AssertionError e) {
-            System.out.println("Wrong timer-scheduler message type error caught");
-        }
-    }
-
-    @Test
     public void scheduleTask() throws InterruptedException {
         this.eventBus.addMessage(new TimerSchedulerMessage(
                 "0",
-                AgentMessage.AgentModule.TIMER_SCHEDULER,
                 System.currentTimeMillis() / 1000L,
                 "1",
                 10,
@@ -89,7 +67,6 @@ public class SchedulerTest {
     public void scheduleTwoTasks() throws InterruptedException {
         this.eventBus.addMessage(new TimerSchedulerMessage(
                 "0",
-                AgentMessage.AgentModule.TIMER_SCHEDULER,
                 System.currentTimeMillis() / 1000L,
                 "1",
                 10,
@@ -103,7 +80,6 @@ public class SchedulerTest {
 
         this.eventBus.addMessage(new TimerSchedulerMessage(
                 "0",
-                AgentMessage.AgentModule.TIMER_SCHEDULER,
                 System.currentTimeMillis() / 1000L,
                 "1",
                 20,
@@ -123,7 +99,6 @@ public class SchedulerTest {
     public void scheduleTwoMessagingTasks() throws InterruptedException {
         TimerSchedulerMessage messageToSend = new TimerSchedulerMessage(
                 "0",
-                AgentMessage.AgentModule.TIMER_SCHEDULER,
                 System.currentTimeMillis() / 1000L,
                 "1",
                 20,
@@ -137,7 +112,6 @@ public class SchedulerTest {
 
         this.eventBus.addMessage(new TimerSchedulerMessage(
                 "0",
-                AgentMessage.AgentModule.TIMER_SCHEDULER,
                 System.currentTimeMillis() / 1000L,
                 "1",
                 10,