Add object overloads to MessageBus, these were meant to exist already

Mumfrey
1 parent 76be6c8e
Showing 2 changed files with 56 additions and 3 deletions
src/main/java/com/mumfrey/liteloader/messaging/Message.java
src/main/java/com/mumfrey/liteloader/messaging/MessageBus.java
@@ -16,7 +16,7 @@ import com.google.common.collect.ImmutableMap;
  * 
  * @author Adam Mummery-Smith
  */
-public class Message
+public final class Message
 {
     /**
      * Regex for matching valid channels
@@ -143,7 +143,7 @@ public class Message
  
     /**
      * Gets the payload with the key "value", which is used with messages
-     * constructed using a string-only payload.
+     * constructed using a object-only payload.
      */
     public <T> T getValue()
     {
@@ -167,7 +167,7 @@ public class Message
     {
         return Message.channelPattern.matcher(channel).matches();
     }
-
+    
     /**
      * Build a KV map from interleaved keys and values, convenience function
      * 
@@ -203,6 +203,18 @@ public final class MessageBus implements InterfaceProvider
     }
  
     /**
+     * Send a message with a value on the specified channel
+     * 
+     * @param channel
+     * @param value
+     */
+    public static void send(String channel, Object value)
+    {
+        Message message = new Message(channel, value, null);
+        MessageBus.getInstance().sendMessage(message);
+    }
+
+    /**
      * Send a message with a value on the specified channel from the specified
      * sender.
      * 
@@ -223,6 +235,20 @@ public final class MessageBus implements InterfaceProvider
      * @param channel
      * @param value
      * @param sender
+     */
+    public static void send(String channel, Object value, Messenger sender)
+    {
+        Message message = new Message(channel, value, sender);
+        MessageBus.getInstance().sendMessage(message);
+    }
+
+    /**
+     * Send a message with a value on the specified channel from the specified
+     * sender.
+     * 
+     * @param channel
+     * @param value
+     * @param sender
      * @param replyChannel
      */
     public static void send(String channel, String value, Messenger sender, String replyChannel)
@@ -232,6 +258,21 @@ public final class MessageBus implements InterfaceProvider
     }
  
     /**
+     * Send a message with a value on the specified channel from the specified
+     * sender.
+     * 
+     * @param channel
+     * @param value
+     * @param sender
+     * @param replyChannel
+     */
+    public static void send(String channel, Object value, Messenger sender, String replyChannel)
+    {
+        Message message = new Message(channel, value, sender, replyChannel);
+        MessageBus.getInstance().sendMessage(message);
+    }
+
+    /**
      * Send a message with a supplied payload on the specified channel
      * 
      * @param channel
@@ -244,6 +285,18 @@ public final class MessageBus implements InterfaceProvider
     }
  
     /**
+     * Send a message with a supplied payload on the specified channel
+     * 
+     * @param channel
+     * @param payload payload as interleaved key/value pairs
+     */
+    public static void send(String channel, Object... payload)
+    {
+        Message message = new Message(channel, Message.buildMap(payload), null);
+        MessageBus.getInstance().sendMessage(message);
+    }
+
+    /**
      * Send a message with a supplied payload on the specified channel from the
      * specified sender.
      *