BotAdapter continueConversation, with Activity

libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotAdapter.java

@@ -269,9 +269,7 @@ public CompletableFuture<Void> continueConversation(
         ConversationReference reference,
         BotCallbackHandler callback
     ) {
-        CompletableFuture<Void> result = new CompletableFuture<>();
-        result.completeExceptionally(new NotImplementedException("continueConversation"));
-        return result;
+        return Async.completeExceptionally(new NotImplementedException("continueConversation"));
     }
 
     /**
@@ -296,8 +294,80 @@ public CompletableFuture<Void> continueConversation(
         String audience,
         BotCallbackHandler callback
     ) {
-        CompletableFuture<Void> result = new CompletableFuture<>();
-        result.completeExceptionally(new NotImplementedException("continueConversation"));
-        return result;
+        return Async.completeExceptionally(new NotImplementedException("continueConversation"));
+    }
+
+    /**
+     * Sends a proactive message to a conversation.
+     *
+     * <p>
+     * Call this method to proactively send a message to a conversation. Most
+     * channels require a user to initiate a conversation with a bot before the bot
+     * can send activities to the user.
+     * </p>
+     *
+     * @param botId The application ID of the bot. This parameter is ignored in single tenant
+     *              the Adapters (Console, Test, etc) but is critical to the BotFrameworkAdapter
+     *              which is multi-tenant aware.
+     * @param continuationActivity  An Activity with the appropriate ConversationReference with
+     *                              which to continue the conversation.
+     * @param callback       The method to call for the result bot turn.
+     * @return A task that represents the work queued to execute.
+     */
+    public CompletableFuture<Void> continueConversation(
+        String botId,
+        Activity continuationActivity,
+        BotCallbackHandler callback
+    ) {
+        return Async.completeExceptionally(new NotImplementedException("continueConversation"));
+    }
+
+    /**
+     * Sends a proactive message to a conversation.
+     *
+     * <p>
+     * Call this method to proactively send a message to a conversation. Most
+     * channels require a user to initiate a conversation with a bot before the bot
+     * can send activities to the user.
+     * </p>
+     *
+     * @param claimsIdentity A ClaimsIdentity for the conversation.
+     * @param continuationActivity  An Activity with the appropriate ConversationReference with
+     *                              which to continue the conversation.
+     * @param callback       The method to call for the result bot turn.
+     * @return A task that represents the work queued to execute.
+     */
+    public CompletableFuture<Void> continueConversation(
+        ClaimsIdentity claimsIdentity,
+        Activity continuationActivity,
+        BotCallbackHandler callback
+    ) {
+        return Async.completeExceptionally(new NotImplementedException("continueConversation"));
+    }
+
+    /**
+     * Sends a proactive message to a conversation.
+     *
+     * <p>
+     * Call this method to proactively send a message to a conversation. Most
+     * channels require a user to initiate a conversation with a bot before the bot
+     * can send activities to the user.
+     * </p>
+     *
+     * @param claimsIdentity A ClaimsIdentity for the conversation.
+     * @param continuationActivity  An Activity with the appropriate ConversationReference with
+     *                              which to continue the conversation.
+     * @param audience       A value signifying the recipient of the proactive
+     *                       message.
+     * @param callback       The method to call for the result bot turn.
+     * @return A task that represents the work queued to execute.
+     */
+    public CompletableFuture<Void> continueConversation(
+        ClaimsIdentity claimsIdentity,
+        Activity continuationActivity,
+        String audience,
+        BotCallbackHandler callback
+    ) {
+        return Async.completeExceptionally(new NotImplementedException("continueConversation"));
     }
 }