Add DugaStartedEvent and fix TestBot

Zomis · Zomis · commit b43d777ffa97 · 2016-02-11T20:34:53.000+01:00
diff --git a/duga-core/src/main/java/net/zomis/duga/chat/ChatBot.java b/duga-core/src/main/java/net/zomis/duga/chat/ChatBot.java
@@ -1,7 +1,11 @@
 package net.zomis.duga.chat;
 
+import net.zomis.duga.chat.events.DugaEvent;
+import net.zomis.duga.chat.events.DugaStartedEvent;
+
 import java.util.List;
 import java.util.concurrent.Future;
+import java.util.function.Consumer;
 
 public interface ChatBot {
 
@@ -26,4 +30,6 @@ public interface ChatBot {
     void start();
 
     void stop();
+
+    <E extends DugaEvent> void registerListener(Class<E> eventClass, Consumer<E> handler);
 }
diff --git a/duga-core/src/main/java/net/zomis/duga/chat/StackExchangeChatBot.java b/duga-core/src/main/java/net/zomis/duga/chat/StackExchangeChatBot.java
@@ -3,10 +3,13 @@
 import java.io.UnsupportedEncodingException;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
+import net.zomis.duga.chat.events.DugaEvent;
+import net.zomis.duga.chat.events.DugaStartedEvent;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.ProtocolException;
@@ -43,8 +46,9 @@ public class StackExchangeChatBot implements ChatBot {
 	private String chatFKey;
 
 	private String undeployGoodbyeText;
+    private final Map<Class<?>, List<Consumer<Object>>> handlers = new HashMap<>();
 
-	public StackExchangeChatBot(BotConfiguration config) {
+    public StackExchangeChatBot(BotConfiguration config) {
         this.configuration = config;
 		this.agent = new MechanizeAgent();
 
@@ -83,6 +87,7 @@ public void start() {
 			try {
 				startBackground();
 				System.out.println("Start draining");
+                executeEvent(new DugaStartedEvent(this));
 				drainMessagesQueue();
 			} catch (Exception ex) {
 				System.out.println("Error!! " + ex);
@@ -192,7 +197,7 @@ public Future<List<ChatMessageResponse>> postMessages(WebhookParameters params,
         return null;
 	}
 
-	private void attemptPostMessageToChat(final ChatMessage message) {
+	private ChatMessageResponse attemptPostMessageToChat(final ChatMessage message) {
 		System.out.println("Real message post: " + message);
         Objects.requireNonNull(message, "message");
         ChatMessageResponse response = postMessageToChat(message);
@@ -209,6 +214,7 @@ private void attemptPostMessageToChat(final ChatMessage message) {
             if (response2.hasException()) {
                 LOGGER.log(Level.SEVERE, "Failed to post message on retry", response2.getException());
             }
+            return response2;
 		}
         if (response.getException() instanceof ProbablyNotLoggedInException) {
 			System.out.println("Probably not logged in");
@@ -218,7 +224,9 @@ private void attemptPostMessageToChat(final ChatMessage message) {
             if (response2.hasException()) {
                 LOGGER.log(Level.SEVERE, "Failed to post message on retry", response2.getException());
             }
+            return response2;
 		}
+        return response;
 	}
 
     @Override
@@ -244,7 +252,7 @@ public ChatMessageResponse postNowOnce(ChatMessage message) {
 
     @Override
     public ChatMessageResponse postNow(ChatMessage message) {
-        return null;
+        return attemptPostMessageToChat(message);
     }
 
     private ChatMessageResponse postMessageToChat(final ChatMessage message) {
@@ -302,7 +310,18 @@ public void stop() {
 		this.executorService.shutdown();
 	}
 
-	private void drainMessagesQueue() {
+    @Override
+    public <E extends DugaEvent> void registerListener(Class<E> eventClass, Consumer<E> handler) {
+        handlers.putIfAbsent(eventClass, new ArrayList<>());
+        handlers.get(eventClass).add(e -> handler.accept((E) e));
+    }
+
+    private void executeEvent(DugaEvent event) {
+        List<Consumer<Object>> list = handlers.get(event.getClass());
+        list.forEach(e -> e.accept(event));
+    }
+
+    private void drainMessagesQueue() {
 		try {
 			while (true) {
 				System.out.println("Posting drained messages...");
diff --git a/duga-core/src/main/java/net/zomis/duga/chat/TestBot.java b/duga-core/src/main/java/net/zomis/duga/chat/TestBot.java
@@ -1,27 +1,62 @@
 package net.zomis.duga.chat;
 
+import net.zomis.duga.chat.events.DugaEvent;
+
 import java.util.*;
+import java.util.concurrent.Future;
+import java.util.function.Consumer;
 
 public class TestBot implements ChatBot {
 
     Map<WebhookParameters, List<String>> messages = new HashMap<>();
 
     WebhookParameters debug = WebhookParameters.toRoom("debug");
 
-    @Override
+    @Deprecated
     public void postDebug(String message) {
         this.postChat(debug, Collections.singletonList(message));
     }
 
     @Override
-    public void postChat(WebhookParameters params, List<String> messages) {
+    public Future<List<ChatMessageResponse>> postChat(WebhookParameters params, List<String> messages) {
         this.messages.putIfAbsent(params, new ArrayList<>());
         this.messages.get(params).addAll(messages);
+        return null;
     }
 
     @Override
     public void postSingle(WebhookParameters params, String message) {
         this.postChat(params, Collections.singletonList(message));
     }
 
+    @Override
+    public Future<ChatMessageResponse> postAsync(ChatMessage message) {
+        return null;
+    }
+
+    @Override
+    public ChatMessageResponse postNowOnce(ChatMessage message) {
+        return null;
+    }
+
+    @Override
+    public ChatMessageResponse postNow(ChatMessage message) {
+        return null;
+    }
+
+    @Override
+    public void start() {
+
+    }
+
+    @Override
+    public void stop() {
+
+    }
+
+    @Override
+    public <E extends DugaEvent> void registerListener(Class<E> eventClass, Consumer<E> handler) {
+
+    }
+
 }
diff --git a/duga-core/src/main/java/net/zomis/duga/chat/events/DugaEvent.java b/duga-core/src/main/java/net/zomis/duga/chat/events/DugaEvent.java
@@ -0,0 +1,17 @@
+package net.zomis.duga.chat.events;
+
+import net.zomis.duga.chat.ChatBot;
+
+public class DugaEvent {
+
+    private final ChatBot bot;
+
+    public DugaEvent(ChatBot bot) {
+        this.bot = bot;
+    }
+
+    public ChatBot getBot() {
+        return bot;
+    }
+
+}
diff --git a/duga-core/src/main/java/net/zomis/duga/chat/events/DugaStartedEvent.java b/duga-core/src/main/java/net/zomis/duga/chat/events/DugaStartedEvent.java
@@ -0,0 +1,11 @@
+package net.zomis.duga.chat.events;
+
+import net.zomis.duga.chat.ChatBot;
+
+public class DugaStartedEvent extends DugaEvent {
+
+    public DugaStartedEvent(ChatBot bot) {
+        super(bot);
+    }
+
+}
diff --git a/duga-core/src/test/java/net/zomis/duga/DugaTest.java b/duga-core/src/test/java/net/zomis/duga/DugaTest.java
@@ -4,6 +4,7 @@
 import net.zomis.duga.chat.ChatBot;
 import net.zomis.duga.chat.StackExchangeChatBot;
 import net.zomis.duga.chat.WebhookParameters;
+import net.zomis.duga.chat.events.DugaStartedEvent;
 
 import java.io.File;
 import java.io.FileReader;
@@ -37,10 +38,16 @@ public static void main(String[] args) {
         config.setChatThrottle(10000);
         config.setChatMaxBurst(2);
         config.setChatMinimumDelay(500);
-        Scanner scanner = new Scanner(System.in);
         ChatBot bot = new StackExchangeChatBot(config);
-        System.out.println("Press enter to start bot");
+        bot.registerListener(DugaStartedEvent.class, DugaTest::interactive);
+        System.out.println("Starting bot...");
         bot.start();
+    }
+
+    private static void interactive(DugaStartedEvent event) {
+        System.out.println("Bot started and ready.");
+        Scanner scanner = new Scanner(System.in);
+        ChatBot bot = event.getBot();
         WebhookParameters room = WebhookParameters.toRoom("16134");
         while (true) {
             String input = scanner.nextLine();
