");
+ }
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java
similarity index 98%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java
index 3b30ffa8..2c850e05 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java
@@ -1,779 +1,779 @@
-package com.microsoft.bot.builder;
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import com.microsoft.bot.connector.ConnectorClient;
-import com.microsoft.bot.connector.Conversations;
-import com.microsoft.bot.connector.authentication.*;
-import com.microsoft.bot.connector.implementation.ConnectorClientImpl;
-import com.microsoft.bot.connector.implementation.ConversationsImpl;
-import com.microsoft.bot.schema.ActivityImpl;
-import com.microsoft.bot.schema.models.*;
-import com.microsoft.rest.retry.RetryStrategy;
-import org.apache.commons.lang3.StringUtils;
-import sun.net.www.http.HttpClient;
-
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import static java.util.concurrent.CompletableFuture.completedFuture;
-
-/**
- * A bot adapter that can connect a bot to a service endpoint.
- * The bot adapter encapsulates authentication processes and sends
- * activities to and receives activities from the Bot Connector Service. When your
- * bot receives an activity, the adapter creates a context object, passes it to your
- * bot's application logic, and sends responses back to the user's channel.
- * Use {@link Use(Middleware)} to add {@link Middleware} objects
- * to your adapter’s middleware collection. The adapter processes and directs
- * incoming activities in through the bot middleware pipeline to your bot’s logic
- * and then back out again. As each activity flows in and out of the bot, each piece
- * of middleware can inspect or act upon the activity, both before and after the bot
- * logic runs.
- *
- * {@linkalso TurnContext}
- * {@linkalso Activity}
- * {@linkalso Bot}
- * {@linkalso Middleware}
- */
-public class BotFrameworkAdapter extends BotAdapter {
- private final CredentialProvider _credentialProvider;
-
- private final RetryStrategy connectorClientRetryStrategy;
- private Map appCredentialMap = new HashMap();
-
- private final String InvokeReponseKey = "BotFrameworkAdapter.InvokeResponse";
- private boolean isEmulatingOAuthCards = false;
-
- /**
- * Initializes a new instance of the {@link BotFrameworkAdapter} class,
- * using a credential provider.
- *
- * @param credentialProvider The credential provider.
- * @param connectorClientRetryStrategy Retry strategy for retrying HTTP operations.
- * @param httpClient The HTTP client.
- * @param middleware The middleware to initially add to the adapter.
- * @throws IllegalArgumentException {@code credentialProvider} is {@code null}.
- * Use a {@link MiddlewareSet} object to add multiple middleware
- * components in the conustructor. Use the {@link Use(Middleware)} method to
- * add additional middleware to the adapter after construction.
- */
- public BotFrameworkAdapter(CredentialProvider credentialProvider) {
- this(credentialProvider, null, null, null);
- }
-
- public BotFrameworkAdapter(CredentialProvider credentialProvider, RetryStrategy connectorClientRetryStrategy) {
- this(credentialProvider, connectorClientRetryStrategy, null, null);
- }
-
- public BotFrameworkAdapter(CredentialProvider credentialProvider, RetryStrategy connectorClientRetryStrategy, HttpClient httpClient) {
- this(credentialProvider, connectorClientRetryStrategy, httpClient, null);
- }
-
- public BotFrameworkAdapter(CredentialProvider credentialProvider, RetryStrategy connectorClientRetryStrategy, HttpClient httpClient, Middleware middleware) {
- if (credentialProvider == null)
- throw new IllegalArgumentException("credentialProvider");
- _credentialProvider = credentialProvider;
- //_httpClient = httpClient ?? new HttpClient();
- this.connectorClientRetryStrategy = connectorClientRetryStrategy;
-
- if (middleware != null) {
- this.Use(middleware);
- }
- }
-
- /**
- * Sends a proactive message from the bot to a conversation.
- *
- * @param botAppId The application ID of the bot. This is the appId returned by Portal registration, and is
- * generally found in the "MicrosoftAppId" parameter in appSettings.json.
- * @param reference A reference to the conversation to continue.
- * @param callback The method to call for the resulting bot turn.
- * @return A task that represents the work queued to execute.
- * @throws IllegalArgumentException {@code botAppId}, {@code reference}, or
- * {@code callback} is {@code null}.
- * Call this method to proactively send a message to a conversation.
- * Most channels require a user to initaiate a conversation with a bot
- * before the bot can send activities to the user.
- * This method registers the following.services().for the turn.
- * - {@link ConnectorClient}, the channel connector client to use this turn.
- *
- *
- * This overload differers from the Node implementation by requiring the BotId to be
- * passed in. The .Net code allows multiple bots to be hosted in a single adapter which
- * isn't something supported by Node.
- *
- *
- * {@linkalso ProcessActivity(String, Activity, Func { TurnContext, Task })}
- * {@linkalso BotAdapter.RunPipeline(TurnContext, Func { TurnContext, Task } }
- */
- @Override
- public void ContinueConversation(String botAppId, ConversationReference reference, Consumer callback) throws Exception {
- if (StringUtils.isEmpty(botAppId))
- throw new IllegalArgumentException("botAppId");
-
- if (reference == null)
- throw new IllegalArgumentException("reference");
-
- if (callback == null)
- throw new IllegalArgumentException("callback");
-
- try (TurnContextImpl context = new TurnContextImpl(this, new ConversationReferenceHelper(reference).GetPostToBotMessage())) {
- // Hand craft Claims Identity.
- HashMap claims = new HashMap();
- claims.put(AuthenticationConstants.AudienceClaim, botAppId);
- claims.put(AuthenticationConstants.AppIdClaim, botAppId);
- ClaimsIdentityImpl claimsIdentity = new ClaimsIdentityImpl("ExternalBearer", claims);
-
- context.getServices().Add("BotIdentity", claimsIdentity);
-
- ConnectorClient connectorClient = this.CreateConnectorClientAsync(reference.serviceUrl(), claimsIdentity).join();
- context.getServices().Add("ConnectorClient", connectorClient);
- RunPipeline(context, callback);
- }
- return;
- }
-
- /**
- * Initializes a new instance of the {@link BotFrameworkAdapter} class,
- * using an application ID and secret.
- *
- * @param appId The application ID of the bot.
- * @param appPassword The application secret for the bot.
- * @param connectorClientRetryStrategy Retry policy for retrying HTTP operations.
- * @param httpClient The HTTP client.
- * @param middleware The middleware to initially add to the adapter.
- * Use a {@link MiddlewareSet} object to add multiple middleware
- * components in the conustructor. Use the {@link Use(Middleware)} method to
- * add additional middleware to the adapter after construction.
- */
- public BotFrameworkAdapter(String appId, String appPassword) {
- this(appId, appPassword, null, null, null);
- }
-
- public BotFrameworkAdapter(String appId, String appPassword, RetryStrategy connectorClientRetryStrategy) {
- this(appId, appPassword, connectorClientRetryStrategy, null, null);
- }
-
- public BotFrameworkAdapter(String appId, String appPassword, RetryStrategy connectorClientRetryStrategy, HttpClient httpClient) {
- this(appId, appPassword, connectorClientRetryStrategy, httpClient, null);
- }
-
- public BotFrameworkAdapter(String appId, String appPassword, RetryStrategy connectorClientRetryStrategy, HttpClient httpClient, Middleware middleware) {
- this(new SimpleCredentialProvider(appId, appPassword), connectorClientRetryStrategy, httpClient, middleware);
- }
-
- /**
- * Adds middleware to the adapter's pipeline.
- *
- * @param middleware The middleware to add.
- * @return The updated adapter object.
- * Middleware is added to the adapter at initialization time.
- * For each turn, the adapter calls middleware in the order in which you added it.
- */
-
- public BotFrameworkAdapter Use(Middleware middleware) {
- super._middlewareSet.Use(middleware);
- return this;
- }
-
- /**
- * Creates a turn context and runs the middleware pipeline for an incoming activity.
- *
- * @param authHeader The HTTP authentication header of the request.
- * @param activity The incoming activity.
- * @param callback The code to run at the end of the adapter's middleware
- * pipeline.
- * @return A task that represents the work queued to execute. If the activity type
- * was 'Invoke' and the corresponding key (channelId + activityId) was found
- * then an InvokeResponse is returned, otherwise null is returned.
- * @throws IllegalArgumentException {@code activity} is {@code null}.
- * @throws UnauthorizedAccessException authentication failed.
- * Call this method to reactively send a message to a conversation.
- * This method registers the following.services().for the turn.
- * - {@link ConnectorClient}, the channel connector client to use this turn.
- *
- *
- * {@linkalso ContinueConversation(String, ConversationReference, Func { TurnContext, Task })}
- * {@linkalso BotAdapter.RunPipeline(TurnContext, Func { TurnContext, Task })}
- */
- public CompletableFuture ProcessActivity(String authHeader, ActivityImpl activity, Function callback) throws Exception {
- BotAssert.ActivityNotNull(activity);
-
- //ClaimsIdentity claimsIdentity = await(JwtTokenValidation.validateAuthHeader(activity, authHeader, _credentialProvider));
-
- //return completedFuture(await(ProcessActivity(claimsIdentity, activity, callback)));
- return completedFuture(null);
- }
-
- public CompletableFuture ProcessActivity(ClaimsIdentity identity, ActivityImpl activity, Consumer callback) throws Exception {
- BotAssert.ActivityNotNull(activity);
-
- try (TurnContextImpl context = new TurnContextImpl(this, activity)) {
- context.getServices().Add("BotIdentity", identity);
-
- ConnectorClient connectorClient = this.CreateConnectorClientAsync(activity.serviceUrl(), identity).join();
- // TODO: Verify key that C# uses
- context.getServices().Add("ConnectorClient", connectorClient);
-
- super.RunPipeline(context, callback);
-
- // Handle Invoke scenarios, which deviate from the request/response model in that
- // the Bot will return a specific body and return code.
- if (activity.type() == ActivityTypes.INVOKE) {
- Activity invokeResponse = context.getServices().Get(InvokeReponseKey);
- if (invokeResponse == null) {
- // ToDo: Trace Here
- throw new IllegalStateException("Bot failed to return a valid 'invokeResponse' activity.");
- } else {
- return completedFuture((InvokeResponse) invokeResponse.value());
- }
- }
-
- // For all non-invoke scenarios, the HTTP layers above don't have to mess
- // withthe Body and return codes.
- return null;
- }
- }
-
- /**
- * Sends activities to the conversation.
- *
- * @param context The context object for the turn.
- * @param activities The activities to send.
- * @return A task that represents the work queued to execute.
- * If the activities are successfully sent, the task result contains
- * an array of {@link ResourceResponse} objects containing the IDs that
- * the receiving channel assigned to the activities.
- * {@linkalso TurnContext.OnSendActivities(SendActivitiesHandler)}
- */
- public ResourceResponse[] SendActivities(TurnContext context, Activity[] activities) throws InterruptedException {
- if (context == null) {
- throw new IllegalArgumentException("context");
- }
-
- if (activities == null) {
- throw new IllegalArgumentException("activities");
- }
-
- if (activities.length == 0) {
- throw new IllegalArgumentException("Expecting one or more activities, but the array was empty.");
- }
-
- ResourceResponse[] responses = new ResourceResponse[activities.length];
-
- /*
- * NOTE: we're using for here (vs. foreach) because we want to simultaneously index into the
- * activities array to get the activity to process as well as use that index to assign
- * the response to the responses array and this is the most cost effective way to do that.
- */
- for (int index = 0; index < activities.length; index++) {
- Activity activity = activities[index];
- ResourceResponse response = new ResourceResponse();
-
- if (activity.type().toString().equals("delay")) {
- // The Activity Schema doesn't have a delay type build in, so it's simulated
- // here in the Bot. This matches the behavior in the Node connector.
- int delayMs = (int) activity.value();
- Thread.sleep(delayMs);
- //await(Task.Delay(delayMs));
- // No need to create a response. One will be created below.
- } else if (activity.type().toString().equals("invokeResponse")) // Aligning name with Node
- {
- context.getServices().Add(InvokeReponseKey, activity);
- // No need to create a response. One will be created below.
- } else if (activity.type() == ActivityTypes.TRACE && !activity.channelId().equals("emulator")) {
- // if it is a Trace activity we only send to the channel if it's the emulator.
- } else if (!StringUtils.isEmpty(activity.replyToId())) {
- ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
- response = connectorClient.conversations().replyToActivity(activity.conversation().id(), activity.id(), activity);
- } else {
- ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
- response = connectorClient.conversations().sendToConversation(activity.conversation().id(), activity);
- }
-
- // If No response is set, then defult to a "simple" response. This can't really be done
- // above, as there are cases where the ReplyTo/SendTo methods will also return null
- // (See below) so the check has to happen here.
-
- // Note: In addition to the Invoke / Delay / Activity cases, this code also applies
- // with Skype and Teams with regards to typing events. When sending a typing event in
- // these channels they do not return a RequestResponse which causes the bot to blow up.
- // https://github.com/Microsoft/botbuilder-dotnet/issues/460
- // bug report : https://github.com/Microsoft/botbuilder-dotnet/issues/465
- if (response == null) {
- response = new ResourceResponse().withId((activity.id() == null) ? "" : activity.id());
- }
-
- responses[index] = response;
- }
-
- return responses;
- }
-
- /**
- * Replaces an existing activity in the conversation.
- *
- * @param context The context object for the turn.
- * @param activity New replacement activity.
- * @return A task that represents the work queued to execute.
- * If the activity is successfully sent, the task result contains
- * a {@link ResourceResponse} object containing the ID that the receiving
- * channel assigned to the activity.
- * Before calling this, set the ID of the replacement activity to the ID
- * of the activity to replace.
- * {@linkalso TurnContext.OnUpdateActivity(UpdateActivityHandler)}
- */
- @Override
- public ResourceResponse UpdateActivity(TurnContext context, Activity activity) {
- ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
- // TODO String conversationId, String activityId, Activity activity)
- return connectorClient.conversations().updateActivity(activity.conversation().id(), activity.id(), activity);
- }
-
- /**
- * Deletes an existing activity in the conversation.
- *
- * @param context The context object for the turn.
- * @param reference Conversation reference for the activity to delete.
- * @return A task that represents the work queued to execute.
- * The {@link ConversationReference.ActivityId} of the conversation
- * reference identifies the activity to delete.
- * {@linkalso TurnContext.OnDeleteActivity(DeleteActivityHandler)}
- */
- public void DeleteActivity(TurnContext context, ConversationReference reference) {
- ConnectorClientImpl connectorClient = context.getServices().Get("ConnectorClient");
- try {
- connectorClient.conversations().deleteConversationMemberFuture(reference.conversation().id(), reference.activityId()).join();
- } catch (ExecutionException e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Failed deleting activity (%s)", e.toString()));
- } catch (InterruptedException e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Failed deleting activity (%s)", e.toString()));
- }
- return;
- }
-
- /**
- * Deletes a member from the current conversation
- *
- * @param context The context object for the turn.
- * @param memberId ID of the member to delete from the conversation
- * @return
- */
- public void DeleteConversationMember(TurnContextImpl context, String memberId) {
- if (context.getActivity().conversation() == null)
- throw new IllegalArgumentException("BotFrameworkAdapter.deleteConversationMember(): missing conversation");
-
- if (StringUtils.isEmpty(context.getActivity().conversation().id()))
- throw new IllegalArgumentException("BotFrameworkAdapter.deleteConversationMember(): missing conversation.id");
-
- ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
-
- String conversationId = context.getActivity().conversation().id();
-
- // TODO:
- //await (connectorClient.conversations().DeleteConversationMemberAsync(conversationId, memberId));
- return;
- }
-
- /**
- * Lists the members of a given activity.
- *
- * @param context The context object for the turn.
- * @param activityId (Optional) Activity ID to enumerate. If not specified the current activities ID will be used.
- * @return List of Members of the activity
- */
- public CompletableFuture> GetActivityMembers(TurnContextImpl context) {
- return GetActivityMembers(context, null);
- }
-
- public CompletableFuture> GetActivityMembers(TurnContextImpl context, String activityId) {
- // If no activity was passed in, use the current activity.
- if (activityId == null)
- activityId = context.getActivity().id();
-
- if (context.getActivity().conversation() == null)
- throw new IllegalArgumentException("BotFrameworkAdapter.GetActivityMembers(): missing conversation");
-
- if (StringUtils.isEmpty((context.getActivity().conversation().id())))
- throw new IllegalArgumentException("BotFrameworkAdapter.GetActivityMembers(): missing conversation.id");
-
- ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
- String conversationId = context.getActivity().conversation().id();
-
- // TODO:
- //List accounts = await(connectorClient.conversations().GetActivityMembersAsync(conversationId, activityId));
-
- return completedFuture(null);
- }
-
- /**
- * Lists the members of the current conversation.
- *
- * @param context The context object for the turn.
- * @return List of Members of the current conversation
- */
- public CompletableFuture> GetConversationMembers(TurnContextImpl context) {
- if (context.getActivity().conversation() == null)
- throw new IllegalArgumentException("BotFrameworkAdapter.GetActivityMembers(): missing conversation");
-
- if (StringUtils.isEmpty(context.getActivity().conversation().id()))
- throw new IllegalArgumentException("BotFrameworkAdapter.GetActivityMembers(): missing conversation.id");
-
- ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
- String conversationId = context.getActivity().conversation().id();
-
- // TODO
- //List accounts = await(connectorClient.conversations().getConversationMembersAsync(conversationId));
- return completedFuture(null);
- }
-
- /**
- * Lists the Conversations in which this bot has participated for a given channel server. The
- * channel server returns results in pages and each page will include a `continuationToken`
- * that can be used to fetch the next page of results from the server.
- *
- * @param serviceUrl The URL of the channel server to query. This can be retrieved
- * from `context.activity.serviceUrl`.
- * @param credentials The credentials needed for the Bot to connect to the.services().
- * @param continuationToken (Optional) token used to fetch the next page of results
- * from the channel server. This should be left as `null` to retrieve the first page
- * of results.
- * @return List of Members of the current conversation
- *
- * This overload may be called from outside the context of a conversation, as only the
- * Bot's ServiceUrl and credentials are required.
- */
- public CompletableFuture GetConversations(String serviceUrl, MicrosoftAppCredentials credentials) throws MalformedURLException, URISyntaxException {
- return GetConversations(serviceUrl, credentials, null);
- }
-
- public CompletableFuture GetConversations(String serviceUrl, MicrosoftAppCredentials credentials, String continuationToken) throws MalformedURLException, URISyntaxException {
- if (StringUtils.isEmpty(serviceUrl))
- throw new IllegalArgumentException("serviceUrl");
-
- if (credentials == null)
- throw new IllegalArgumentException("credentials");
-
- ConnectorClient connectorClient = this.CreateConnectorClient(serviceUrl, credentials);
- // TODO
- //ConversationsResult results = await(connectorClient.conversations().getConversationsAsync(continuationToken));
- return completedFuture(null);
- }
-
- /**
- * Lists the Conversations in which this bot has participated for a given channel server. The
- * channel server returns results in pages and each page will include a `continuationToken`
- * that can be used to fetch the next page of results from the server.
- *
- * @param context The context object for the turn.
- * @param continuationToken (Optional) token used to fetch the next page of results
- * from the channel server. This should be left as `null` to retrieve the first page
- * of results.
- * @return List of Members of the current conversation
- *
- * This overload may be called during standard Activity processing, at which point the Bot's
- * service URL and credentials that are part of the current activity processing pipeline
- * will be used.
- */
- public CompletableFuture GetConversations(TurnContextImpl context) {
- return GetConversations(context, null);
- }
-
- public CompletableFuture GetConversations(TurnContextImpl context, String continuationToken) {
- ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
- // TODO
- //ConversationsResult results = await(connectorClient.conversations().getConversationsAsync());
- return completedFuture(null);
- }
-
-
- /**
- * Attempts to retrieve the token for a user that's in a login flow.
- *
- * @param context Context for the current turn of conversation with the user.
- * @param connectionName Name of the auth connection to use.
- * @param magicCode (Optional) Optional user entered code to validate.
- * @return Token Response
- */
- public CompletableFuture GetUserToken(TurnContextImpl context, String connectionName, String magicCode) {
- BotAssert.ContextNotNull(context);
- if (context.getActivity().from() == null || StringUtils.isEmpty(context.getActivity().from().id()))
- throw new IllegalArgumentException("BotFrameworkAdapter.GetuserToken(): missing from or from.id");
-
- if (StringUtils.isEmpty(connectionName))
- throw new IllegalArgumentException("connectionName");
-
- //OAuthClient client = this.CreateOAuthApiClient(context);
- //return await(client.GetUserTokenAsync(context.getActivity().from().id(), connectionName, magicCode));
- return completedFuture(null);
- }
-
- /**
- * Get the raw signin link to be sent to the user for signin for a connection name.
- *
- * @param context Context for the current turn of conversation with the user.
- * @param connectionName Name of the auth connection to use.
- * @return
- */
- public CompletableFuture GetOauthSignInLink(TurnContextImpl context, String connectionName) {
- BotAssert.ContextNotNull(context);
- if (StringUtils.isEmpty(connectionName))
- throw new IllegalArgumentException("connectionName");
-
- //OAuthClient client = this.CreateOAuthApiClient(context);
- //return await(client.GetSignInLinkAsync(context.getActivity(), connectionName));
- return completedFuture(null);
- }
-
- /**
- * Signs the user out with the token server.
- *
- * @param context Context for the current turn of conversation with the user.
- * @param connectionName Name of the auth connection to use.
- * @return
- */
- public CompletableFuture SignOutUser(TurnContextImpl context, String connectionName) {
- BotAssert.ContextNotNull(context);
- if (StringUtils.isEmpty(connectionName))
- throw new IllegalArgumentException("connectionName");
-
- //OAuthClient client = this.CreateOAuthApiClient(context);
- //await(client.SignOutUserAsync(context.Activity.From.Id, connectionName));
- return completedFuture(null);
- }
-
- /**
- * Creates a conversation on the specified channel.
- *
- * @param channelId The ID for the channel.
- * @param serviceUrl The channel's service URL endpoint.
- * @param credentials The application credentials for the bot.
- * @param conversationParameters The conversation information to use to
- * create the conversation.
- * @param callback The method to call for the resulting bot turn.
- * @return A task that represents the work queued to execute.
- * To start a conversation, your bot must know its account information
- * and the user's account information on that channel.
- * Most channels only support initiating a direct message (non-group) conversation.
- * The adapter attempts to create a new conversation on the channel, and
- * then sends a {@code conversationUpdate} activity through its middleware pipeline
- * to the {@code callback} method.
- * If the conversation is established with the
- * specified users, the ID of the activity's {@link Activity.Conversation}
- * will contain the ID of the new conversation.
- */
- public CompletableFuture CreateConversation(String channelId, String serviceUrl, MicrosoftAppCredentials
- credentials, ConversationParameters conversationParameters, Consumer callback) throws Exception {
- // Validate serviceUrl - can throw
- URI uri = new URI(serviceUrl);
- return CompletableFuture.runAsync(() -> {
- ConnectorClient connectorClient = null;
- try {
- connectorClient = this.CreateConnectorClient(serviceUrl, credentials);
- } catch (MalformedURLException e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Bad serviceUrl: %s", serviceUrl));
- } catch (URISyntaxException e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Bad serviceUrl: %s", serviceUrl));
- }
-
- Conversations conv = connectorClient.conversations();
- List results = null;
- if (conv instanceof ConversationsImpl) {
- ConversationsImpl convImpl = (ConversationsImpl) conv;
- results = convImpl.CreateConversationAsync(conversationParameters).join();
- } else {
- results = new ArrayList();
- results.add(conv.createConversation(conversationParameters));
- }
- if (results.size() == 1) {
-
- ConversationResourceResponse result = results.get(0);
- // Create a conversation update activity to represent the result.
-
- ConversationUpdateActivity conversationUpdate = (ConversationUpdateActivity) MessageActivity.CreateConversationUpdateActivity()
- .withChannelId(channelId)
- .withTopicName(conversationParameters.topicName())
- .withServiceUrl(serviceUrl)
- .withMembersAdded(conversationParameters.members())
- .withId((result.activityId() != null) ? result.activityId() : UUID.randomUUID().toString())
- .withConversation(new ConversationAccount().withId(result.id()))
- .withRecipient(conversationParameters.bot());
-
- try (TurnContextImpl context = new TurnContextImpl(this, conversationUpdate)) {
- try {
- this.RunPipeline(context, callback);
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Running pipeline failed : %s", e));
- }
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Turn Context Error: %s", e));
- }
- } else {
- // Should never happen
- throw new RuntimeException(String.format("Conversations create issue - returned %d conversations", results.size()));
- }
- });
-
- }
-
- protected CompletableFuture TrySetEmulatingOAuthCards(TurnContext turnContext) {
- if (!isEmulatingOAuthCards &&
- turnContext.getActivity().channelId().equals("emulator") &&
- (_credentialProvider.isAuthenticationDisabledAsync().join())) {
- isEmulatingOAuthCards = true;
- }
- return completedFuture(isEmulatingOAuthCards);
-
- }
-
- protected OAuthClient CreateOAuthApiClient(TurnContext context) throws MalformedURLException, URISyntaxException {
- ConnectorClientImpl client = context.getServices().Get("ConnectorClient");
- if (client == null) {
- throw new IllegalArgumentException("CreateOAuthApiClient: OAuth requires a valid ConnectorClient instance");
- }
- if (isEmulatingOAuthCards) {
- return new OAuthClient(client, context.getActivity().serviceUrl());
- }
- return new OAuthClient(client, AuthenticationConstants.OAuthUrl);
- }
-
- /**
- * Creates the connector client asynchronous.
- *
- * @param serviceUrl The service URL.
- * @param claimsIdentity The claims identity.
- * @return ConnectorClient instance.
- * @throws UnsupportedOperationException ClaimsIdemtity cannot be null. Pass Anonymous ClaimsIdentity if authentication is turned off.
- */
- private CompletableFuture CreateConnectorClientAsync(String serviceUrl, ClaimsIdentity claimsIdentity) {
-
- return CompletableFuture.supplyAsync(() -> {
- if (claimsIdentity == null) {
- throw new UnsupportedOperationException("ClaimsIdentity cannot be null. Pass Anonymous ClaimsIdentity if authentication is turned off.");
- }
-
- // For requests from channel App Id is in Audience claim of JWT token. For emulator it is in AppId claim. For
- // unauthenticated requests we have anonymous identity provided auth is disabled.
- if (claimsIdentity.claims() == null) {
- try {
- return CreateConnectorClient(serviceUrl);
- } catch (MalformedURLException e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Invalid Service URL: %s", serviceUrl));
- } catch (URISyntaxException e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Invalid Service URL: %s", serviceUrl));
- }
- }
-
- // For Activities coming from Emulator AppId claim contains the Bot's AAD AppId.
- // For anonymous requests (requests with no header) appId is not set in claims.
-
- Map.Entry botAppIdClaim = claimsIdentity.claims().entrySet().stream()
- .filter(claim -> claim.getKey() == AuthenticationConstants.AudienceClaim)
- .findFirst()
- .orElse(null);
- if (botAppIdClaim == null) {
- botAppIdClaim = claimsIdentity.claims().entrySet().stream()
- .filter(claim -> claim.getKey() == AuthenticationConstants.AppIdClaim)
- .findFirst()
- .orElse(null);
- }
-
- if (botAppIdClaim != null) {
- String botId = botAppIdClaim.getValue();
- MicrosoftAppCredentials appCredentials = this.GetAppCredentialsAsync(botId).join();
- try {
- return this.CreateConnectorClient(serviceUrl, appCredentials);
- } catch (MalformedURLException e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Bad Service URL: %s", serviceUrl));
- } catch (URISyntaxException e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Bad Service URL: %s", serviceUrl));
- }
- } else {
- try {
- return this.CreateConnectorClient(serviceUrl);
- } catch (MalformedURLException e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Bad Service URL: %s", serviceUrl));
- } catch (URISyntaxException e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Bad Service URL: %s", serviceUrl));
- }
- }
- });
-
- }
-
- /**
- * Creates the connector client.
- *
- * @param serviceUrl The service URL.
- * @param appCredentials The application credentials for the bot.
- * @return Connector client instance.
- */
- private ConnectorClient CreateConnectorClient(String serviceUrl) throws MalformedURLException, URISyntaxException {
- return CreateConnectorClient(serviceUrl, null);
- }
-
- private ConnectorClient CreateConnectorClient(String serviceUrl, MicrosoftAppCredentials appCredentials) throws MalformedURLException, URISyntaxException {
- ConnectorClientImpl connectorClient = null;
- if (appCredentials != null) {
- connectorClient = new ConnectorClientImpl(new URI(serviceUrl).toURL().toString(), appCredentials);
- }
- // TODO: Constructor necessary?
-// else {
-//
-// connectorClient = new ConnectorClientImpl(new URI(serviceUrl).toURL().toString());
-// }
-
- if (this.connectorClientRetryStrategy != null)
- connectorClient.withRestRetryStrategy(this.connectorClientRetryStrategy);
-
-
- return connectorClient;
-
- }
-
- /**
- * Gets the application credentials. App Credentials are cached so as to ensure we are not refreshing
- * token everytime.
- *
- * @param appId The application identifier (AAD Id for the bot).
- * @return App credentials.
- */
- private CompletableFuture GetAppCredentialsAsync(String appId) {
- CompletableFuture result = CompletableFuture.supplyAsync(() -> {
- if (appId == null) {
- return MicrosoftAppCredentials.Empty;
- }
- if (this.appCredentialMap.containsKey(appId))
- return this.appCredentialMap.get(appId);
- String appPassword = this._credentialProvider.getAppPasswordAsync(appId).join();
- MicrosoftAppCredentials appCredentials = new MicrosoftAppCredentials(appId, appPassword);
- this.appCredentialMap.put(appId, appCredentials);
- return appCredentials;
-
- });
- return result;
- }
-
-}
+package com.microsoft.bot.builder;
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import com.microsoft.bot.connector.ConnectorClient;
+import com.microsoft.bot.connector.Conversations;
+import com.microsoft.bot.connector.authentication.*;
+import com.microsoft.bot.connector.implementation.ConnectorClientImpl;
+import com.microsoft.bot.connector.implementation.ConversationsImpl;
+import com.microsoft.bot.schema.ActivityImpl;
+import com.microsoft.bot.schema.models.*;
+import com.microsoft.rest.retry.RetryStrategy;
+import org.apache.commons.lang3.StringUtils;
+import sun.net.www.http.HttpClient;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import static java.util.concurrent.CompletableFuture.completedFuture;
+
+/**
+ * A bot adapter that can connect a bot to a service endpoint.
+ * The bot adapter encapsulates authentication processes and sends
+ * activities to and receives activities from the Bot Connector Service. When your
+ * bot receives an activity, the adapter creates a context object, passes it to your
+ * bot's application logic, and sends responses back to the user's channel.
+ * Use {@link Use(Middleware)} to add {@link Middleware} objects
+ * to your adapter’s middleware collection. The adapter processes and directs
+ * incoming activities in through the bot middleware pipeline to your bot’s logic
+ * and then back out again. As each activity flows in and out of the bot, each piece
+ * of middleware can inspect or act upon the activity, both before and after the bot
+ * logic runs.
+ *
+ * {@linkalso TurnContext}
+ * {@linkalso Activity}
+ * {@linkalso Bot}
+ * {@linkalso Middleware}
+ */
+public class BotFrameworkAdapter extends BotAdapter {
+ private final CredentialProvider _credentialProvider;
+
+ private final RetryStrategy connectorClientRetryStrategy;
+ private Map appCredentialMap = new HashMap();
+
+ private final String InvokeReponseKey = "BotFrameworkAdapter.InvokeResponse";
+ private boolean isEmulatingOAuthCards = false;
+
+ /**
+ * Initializes a new instance of the {@link BotFrameworkAdapter} class,
+ * using a credential provider.
+ *
+ * @param credentialProvider The credential provider.
+ * @param connectorClientRetryStrategy Retry strategy for retrying HTTP operations.
+ * @param httpClient The HTTP client.
+ * @param middleware The middleware to initially add to the adapter.
+ * @throws IllegalArgumentException {@code credentialProvider} is {@code null}.
+ * Use a {@link MiddlewareSet} object to add multiple middleware
+ * components in the conustructor. Use the {@link Use(Middleware)} method to
+ * add additional middleware to the adapter after construction.
+ */
+ public BotFrameworkAdapter(CredentialProvider credentialProvider) {
+ this(credentialProvider, null, null, null);
+ }
+
+ public BotFrameworkAdapter(CredentialProvider credentialProvider, RetryStrategy connectorClientRetryStrategy) {
+ this(credentialProvider, connectorClientRetryStrategy, null, null);
+ }
+
+ public BotFrameworkAdapter(CredentialProvider credentialProvider, RetryStrategy connectorClientRetryStrategy, HttpClient httpClient) {
+ this(credentialProvider, connectorClientRetryStrategy, httpClient, null);
+ }
+
+ public BotFrameworkAdapter(CredentialProvider credentialProvider, RetryStrategy connectorClientRetryStrategy, HttpClient httpClient, Middleware middleware) {
+ if (credentialProvider == null)
+ throw new IllegalArgumentException("credentialProvider");
+ _credentialProvider = credentialProvider;
+ //_httpClient = httpClient ?? new HttpClient();
+ this.connectorClientRetryStrategy = connectorClientRetryStrategy;
+
+ if (middleware != null) {
+ this.Use(middleware);
+ }
+ }
+
+ /**
+ * Sends a proactive message from the bot to a conversation.
+ *
+ * @param botAppId The application ID of the bot. This is the appId returned by Portal registration, and is
+ * generally found in the "MicrosoftAppId" parameter in appSettings.json.
+ * @param reference A reference to the conversation to continue.
+ * @param callback The method to call for the resulting bot turn.
+ * @return A task that represents the work queued to execute.
+ * @throws IllegalArgumentException {@code botAppId}, {@code reference}, or
+ * {@code callback} is {@code null}.
+ * Call this method to proactively send a message to a conversation.
+ * Most channels require a user to initaiate a conversation with a bot
+ * before the bot can send activities to the user.
+ * This method registers the following.services().for the turn.
+ * - {@link ConnectorClient}, the channel connector client to use this turn.
+ *
+ *
+ * This overload differers from the Node implementation by requiring the BotId to be
+ * passed in. The .Net code allows multiple bots to be hosted in a single adapter which
+ * isn't something supported by Node.
+ *
+ *
+ * {@linkalso ProcessActivity(String, Activity, Func { TurnContext, Task })}
+ * {@linkalso BotAdapter.RunPipeline(TurnContext, Func { TurnContext, Task } }
+ */
+ @Override
+ public void ContinueConversation(String botAppId, ConversationReference reference, Consumer callback) throws Exception {
+ if (StringUtils.isEmpty(botAppId))
+ throw new IllegalArgumentException("botAppId");
+
+ if (reference == null)
+ throw new IllegalArgumentException("reference");
+
+ if (callback == null)
+ throw new IllegalArgumentException("callback");
+
+ try (TurnContextImpl context = new TurnContextImpl(this, new ConversationReferenceHelper(reference).GetPostToBotMessage())) {
+ // Hand craft Claims Identity.
+ HashMap claims = new HashMap();
+ claims.put(AuthenticationConstants.AudienceClaim, botAppId);
+ claims.put(AuthenticationConstants.AppIdClaim, botAppId);
+ ClaimsIdentityImpl claimsIdentity = new ClaimsIdentityImpl("ExternalBearer", claims);
+
+ context.getServices().Add("BotIdentity", claimsIdentity);
+
+ ConnectorClient connectorClient = this.CreateConnectorClientAsync(reference.serviceUrl(), claimsIdentity).join();
+ context.getServices().Add("ConnectorClient", connectorClient);
+ RunPipeline(context, callback);
+ }
+ return;
+ }
+
+ /**
+ * Initializes a new instance of the {@link BotFrameworkAdapter} class,
+ * using an application ID and secret.
+ *
+ * @param appId The application ID of the bot.
+ * @param appPassword The application secret for the bot.
+ * @param connectorClientRetryStrategy Retry policy for retrying HTTP operations.
+ * @param httpClient The HTTP client.
+ * @param middleware The middleware to initially add to the adapter.
+ * Use a {@link MiddlewareSet} object to add multiple middleware
+ * components in the conustructor. Use the {@link Use(Middleware)} method to
+ * add additional middleware to the adapter after construction.
+ */
+ public BotFrameworkAdapter(String appId, String appPassword) {
+ this(appId, appPassword, null, null, null);
+ }
+
+ public BotFrameworkAdapter(String appId, String appPassword, RetryStrategy connectorClientRetryStrategy) {
+ this(appId, appPassword, connectorClientRetryStrategy, null, null);
+ }
+
+ public BotFrameworkAdapter(String appId, String appPassword, RetryStrategy connectorClientRetryStrategy, HttpClient httpClient) {
+ this(appId, appPassword, connectorClientRetryStrategy, httpClient, null);
+ }
+
+ public BotFrameworkAdapter(String appId, String appPassword, RetryStrategy connectorClientRetryStrategy, HttpClient httpClient, Middleware middleware) {
+ this(new SimpleCredentialProvider(appId, appPassword), connectorClientRetryStrategy, httpClient, middleware);
+ }
+
+ /**
+ * Adds middleware to the adapter's pipeline.
+ *
+ * @param middleware The middleware to add.
+ * @return The updated adapter object.
+ * Middleware is added to the adapter at initialization time.
+ * For each turn, the adapter calls middleware in the order in which you added it.
+ */
+
+ public BotFrameworkAdapter Use(Middleware middleware) {
+ super._middlewareSet.Use(middleware);
+ return this;
+ }
+
+ /**
+ * Creates a turn context and runs the middleware pipeline for an incoming activity.
+ *
+ * @param authHeader The HTTP authentication header of the request.
+ * @param activity The incoming activity.
+ * @param callback The code to run at the end of the adapter's middleware
+ * pipeline.
+ * @return A task that represents the work queued to execute. If the activity type
+ * was 'Invoke' and the corresponding key (channelId + activityId) was found
+ * then an InvokeResponse is returned, otherwise null is returned.
+ * @throws IllegalArgumentException {@code activity} is {@code null}.
+ * @throws UnauthorizedAccessException authentication failed.
+ * Call this method to reactively send a message to a conversation.
+ * This method registers the following.services().for the turn.
+ * - {@link ConnectorClient}, the channel connector client to use this turn.
+ *
+ *
+ * {@linkalso ContinueConversation(String, ConversationReference, Func { TurnContext, Task })}
+ * {@linkalso BotAdapter.RunPipeline(TurnContext, Func { TurnContext, Task })}
+ */
+ public CompletableFuture ProcessActivity(String authHeader, ActivityImpl activity, Function callback) throws Exception {
+ BotAssert.ActivityNotNull(activity);
+
+ //ClaimsIdentity claimsIdentity = await(JwtTokenValidation.validateAuthHeader(activity, authHeader, _credentialProvider));
+
+ //return completedFuture(await(ProcessActivity(claimsIdentity, activity, callback)));
+ return completedFuture(null);
+ }
+
+ public CompletableFuture ProcessActivity(ClaimsIdentity identity, ActivityImpl activity, Consumer callback) throws Exception {
+ BotAssert.ActivityNotNull(activity);
+
+ try (TurnContextImpl context = new TurnContextImpl(this, activity)) {
+ context.getServices().Add("BotIdentity", identity);
+
+ ConnectorClient connectorClient = this.CreateConnectorClientAsync(activity.serviceUrl(), identity).join();
+ // TODO: Verify key that C# uses
+ context.getServices().Add("ConnectorClient", connectorClient);
+
+ super.RunPipeline(context, callback);
+
+ // Handle Invoke scenarios, which deviate from the request/response model in that
+ // the Bot will return a specific body and return code.
+ if (activity.type() == ActivityTypes.INVOKE) {
+ Activity invokeResponse = context.getServices().Get(InvokeReponseKey);
+ if (invokeResponse == null) {
+ // ToDo: Trace Here
+ throw new IllegalStateException("Bot failed to return a valid 'invokeResponse' activity.");
+ } else {
+ return completedFuture((InvokeResponse) invokeResponse.value());
+ }
+ }
+
+ // For all non-invoke scenarios, the HTTP layers above don't have to mess
+ // withthe Body and return codes.
+ return null;
+ }
+ }
+
+ /**
+ * Sends activities to the conversation.
+ *
+ * @param context The context object for the turn.
+ * @param activities The activities to send.
+ * @return A task that represents the work queued to execute.
+ * If the activities are successfully sent, the task result contains
+ * an array of {@link ResourceResponse} objects containing the IDs that
+ * the receiving channel assigned to the activities.
+ * {@linkalso TurnContext.OnSendActivities(SendActivitiesHandler)}
+ */
+ public ResourceResponse[] SendActivities(TurnContext context, Activity[] activities) throws InterruptedException {
+ if (context == null) {
+ throw new IllegalArgumentException("context");
+ }
+
+ if (activities == null) {
+ throw new IllegalArgumentException("activities");
+ }
+
+ if (activities.length == 0) {
+ throw new IllegalArgumentException("Expecting one or more activities, but the array was empty.");
+ }
+
+ ResourceResponse[] responses = new ResourceResponse[activities.length];
+
+ /*
+ * NOTE: we're using for here (vs. foreach) because we want to simultaneously index into the
+ * activities array to get the activity to process as well as use that index to assign
+ * the response to the responses array and this is the most cost effective way to do that.
+ */
+ for (int index = 0; index < activities.length; index++) {
+ Activity activity = activities[index];
+ ResourceResponse response = new ResourceResponse();
+
+ if (activity.type().toString().equals("delay")) {
+ // The Activity Schema doesn't have a delay type build in, so it's simulated
+ // here in the Bot. This matches the behavior in the Node connector.
+ int delayMs = (int) activity.value();
+ Thread.sleep(delayMs);
+ //await(Task.Delay(delayMs));
+ // No need to create a response. One will be created below.
+ } else if (activity.type().toString().equals("invokeResponse")) // Aligning name with Node
+ {
+ context.getServices().Add(InvokeReponseKey, activity);
+ // No need to create a response. One will be created below.
+ } else if (activity.type() == ActivityTypes.TRACE && !activity.channelId().equals("emulator")) {
+ // if it is a Trace activity we only send to the channel if it's the emulator.
+ } else if (!StringUtils.isEmpty(activity.replyToId())) {
+ ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
+ response = connectorClient.conversations().replyToActivity(activity.conversation().id(), activity.id(), activity);
+ } else {
+ ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
+ response = connectorClient.conversations().sendToConversation(activity.conversation().id(), activity);
+ }
+
+ // If No response is set, then defult to a "simple" response. This can't really be done
+ // above, as there are cases where the ReplyTo/SendTo methods will also return null
+ // (See below) so the check has to happen here.
+
+ // Note: In addition to the Invoke / Delay / Activity cases, this code also applies
+ // with Skype and Teams with regards to typing events. When sending a typing event in
+ // these channels they do not return a RequestResponse which causes the bot to blow up.
+ // https://github.com/Microsoft/botbuilder-dotnet/issues/460
+ // bug report : https://github.com/Microsoft/botbuilder-dotnet/issues/465
+ if (response == null) {
+ response = new ResourceResponse().withId((activity.id() == null) ? "" : activity.id());
+ }
+
+ responses[index] = response;
+ }
+
+ return responses;
+ }
+
+ /**
+ * Replaces an existing activity in the conversation.
+ *
+ * @param context The context object for the turn.
+ * @param activity New replacement activity.
+ * @return A task that represents the work queued to execute.
+ * If the activity is successfully sent, the task result contains
+ * a {@link ResourceResponse} object containing the ID that the receiving
+ * channel assigned to the activity.
+ * Before calling this, set the ID of the replacement activity to the ID
+ * of the activity to replace.
+ * {@linkalso TurnContext.OnUpdateActivity(UpdateActivityHandler)}
+ */
+ @Override
+ public ResourceResponse UpdateActivity(TurnContext context, Activity activity) {
+ ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
+ // TODO String conversationId, String activityId, Activity activity)
+ return connectorClient.conversations().updateActivity(activity.conversation().id(), activity.id(), activity);
+ }
+
+ /**
+ * Deletes an existing activity in the conversation.
+ *
+ * @param context The context object for the turn.
+ * @param reference Conversation reference for the activity to delete.
+ * @return A task that represents the work queued to execute.
+ * The {@link ConversationReference.ActivityId} of the conversation
+ * reference identifies the activity to delete.
+ * {@linkalso TurnContext.OnDeleteActivity(DeleteActivityHandler)}
+ */
+ public void DeleteActivity(TurnContext context, ConversationReference reference) {
+ ConnectorClientImpl connectorClient = context.getServices().Get("ConnectorClient");
+ try {
+ connectorClient.conversations().deleteConversationMemberFuture(reference.conversation().id(), reference.activityId()).join();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Failed deleting activity (%s)", e.toString()));
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Failed deleting activity (%s)", e.toString()));
+ }
+ return;
+ }
+
+ /**
+ * Deletes a member from the current conversation
+ *
+ * @param context The context object for the turn.
+ * @param memberId ID of the member to delete from the conversation
+ * @return
+ */
+ public void DeleteConversationMember(TurnContextImpl context, String memberId) {
+ if (context.getActivity().conversation() == null)
+ throw new IllegalArgumentException("BotFrameworkAdapter.deleteConversationMember(): missing conversation");
+
+ if (StringUtils.isEmpty(context.getActivity().conversation().id()))
+ throw new IllegalArgumentException("BotFrameworkAdapter.deleteConversationMember(): missing conversation.id");
+
+ ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
+
+ String conversationId = context.getActivity().conversation().id();
+
+ // TODO:
+ //await (connectorClient.conversations().DeleteConversationMemberAsync(conversationId, memberId));
+ return;
+ }
+
+ /**
+ * Lists the members of a given activity.
+ *
+ * @param context The context object for the turn.
+ * @param activityId (Optional) Activity ID to enumerate. If not specified the current activities ID will be used.
+ * @return List of Members of the activity
+ */
+ public CompletableFuture> GetActivityMembers(TurnContextImpl context) {
+ return GetActivityMembers(context, null);
+ }
+
+ public CompletableFuture> GetActivityMembers(TurnContextImpl context, String activityId) {
+ // If no activity was passed in, use the current activity.
+ if (activityId == null)
+ activityId = context.getActivity().id();
+
+ if (context.getActivity().conversation() == null)
+ throw new IllegalArgumentException("BotFrameworkAdapter.GetActivityMembers(): missing conversation");
+
+ if (StringUtils.isEmpty((context.getActivity().conversation().id())))
+ throw new IllegalArgumentException("BotFrameworkAdapter.GetActivityMembers(): missing conversation.id");
+
+ ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
+ String conversationId = context.getActivity().conversation().id();
+
+ // TODO:
+ //List accounts = await(connectorClient.conversations().GetActivityMembersAsync(conversationId, activityId));
+
+ return completedFuture(null);
+ }
+
+ /**
+ * Lists the members of the current conversation.
+ *
+ * @param context The context object for the turn.
+ * @return List of Members of the current conversation
+ */
+ public CompletableFuture> GetConversationMembers(TurnContextImpl context) {
+ if (context.getActivity().conversation() == null)
+ throw new IllegalArgumentException("BotFrameworkAdapter.GetActivityMembers(): missing conversation");
+
+ if (StringUtils.isEmpty(context.getActivity().conversation().id()))
+ throw new IllegalArgumentException("BotFrameworkAdapter.GetActivityMembers(): missing conversation.id");
+
+ ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
+ String conversationId = context.getActivity().conversation().id();
+
+ // TODO
+ //List accounts = await(connectorClient.conversations().getConversationMembersAsync(conversationId));
+ return completedFuture(null);
+ }
+
+ /**
+ * Lists the Conversations in which this bot has participated for a given channel server. The
+ * channel server returns results in pages and each page will include a `continuationToken`
+ * that can be used to fetch the next page of results from the server.
+ *
+ * @param serviceUrl The URL of the channel server to query. This can be retrieved
+ * from `context.activity.serviceUrl`.
+ * @param credentials The credentials needed for the Bot to connect to the.services().
+ * @param continuationToken (Optional) token used to fetch the next page of results
+ * from the channel server. This should be left as `null` to retrieve the first page
+ * of results.
+ * @return List of Members of the current conversation
+ *
+ * This overload may be called from outside the context of a conversation, as only the
+ * Bot's ServiceUrl and credentials are required.
+ */
+ public CompletableFuture GetConversations(String serviceUrl, MicrosoftAppCredentials credentials) throws MalformedURLException, URISyntaxException {
+ return GetConversations(serviceUrl, credentials, null);
+ }
+
+ public CompletableFuture GetConversations(String serviceUrl, MicrosoftAppCredentials credentials, String continuationToken) throws MalformedURLException, URISyntaxException {
+ if (StringUtils.isEmpty(serviceUrl))
+ throw new IllegalArgumentException("serviceUrl");
+
+ if (credentials == null)
+ throw new IllegalArgumentException("credentials");
+
+ ConnectorClient connectorClient = this.CreateConnectorClient(serviceUrl, credentials);
+ // TODO
+ //ConversationsResult results = await(connectorClient.conversations().getConversationsAsync(continuationToken));
+ return completedFuture(null);
+ }
+
+ /**
+ * Lists the Conversations in which this bot has participated for a given channel server. The
+ * channel server returns results in pages and each page will include a `continuationToken`
+ * that can be used to fetch the next page of results from the server.
+ *
+ * @param context The context object for the turn.
+ * @param continuationToken (Optional) token used to fetch the next page of results
+ * from the channel server. This should be left as `null` to retrieve the first page
+ * of results.
+ * @return List of Members of the current conversation
+ *
+ * This overload may be called during standard Activity processing, at which point the Bot's
+ * service URL and credentials that are part of the current activity processing pipeline
+ * will be used.
+ */
+ public CompletableFuture GetConversations(TurnContextImpl context) {
+ return GetConversations(context, null);
+ }
+
+ public CompletableFuture GetConversations(TurnContextImpl context, String continuationToken) {
+ ConnectorClient connectorClient = context.getServices().Get("ConnectorClient");
+ // TODO
+ //ConversationsResult results = await(connectorClient.conversations().getConversationsAsync());
+ return completedFuture(null);
+ }
+
+
+ /**
+ * Attempts to retrieve the token for a user that's in a login flow.
+ *
+ * @param context Context for the current turn of conversation with the user.
+ * @param connectionName Name of the auth connection to use.
+ * @param magicCode (Optional) Optional user entered code to validate.
+ * @return Token Response
+ */
+ public CompletableFuture GetUserToken(TurnContextImpl context, String connectionName, String magicCode) {
+ BotAssert.ContextNotNull(context);
+ if (context.getActivity().from() == null || StringUtils.isEmpty(context.getActivity().from().id()))
+ throw new IllegalArgumentException("BotFrameworkAdapter.GetuserToken(): missing from or from.id");
+
+ if (StringUtils.isEmpty(connectionName))
+ throw new IllegalArgumentException("connectionName");
+
+ //OAuthClient client = this.CreateOAuthApiClient(context);
+ //return await(client.GetUserTokenAsync(context.getActivity().from().id(), connectionName, magicCode));
+ return completedFuture(null);
+ }
+
+ /**
+ * Get the raw signin link to be sent to the user for signin for a connection name.
+ *
+ * @param context Context for the current turn of conversation with the user.
+ * @param connectionName Name of the auth connection to use.
+ * @return
+ */
+ public CompletableFuture GetOauthSignInLink(TurnContextImpl context, String connectionName) {
+ BotAssert.ContextNotNull(context);
+ if (StringUtils.isEmpty(connectionName))
+ throw new IllegalArgumentException("connectionName");
+
+ //OAuthClient client = this.CreateOAuthApiClient(context);
+ //return await(client.GetSignInLinkAsync(context.getActivity(), connectionName));
+ return completedFuture(null);
+ }
+
+ /**
+ * Signs the user out with the token server.
+ *
+ * @param context Context for the current turn of conversation with the user.
+ * @param connectionName Name of the auth connection to use.
+ * @return
+ */
+ public CompletableFuture SignOutUser(TurnContextImpl context, String connectionName) {
+ BotAssert.ContextNotNull(context);
+ if (StringUtils.isEmpty(connectionName))
+ throw new IllegalArgumentException("connectionName");
+
+ //OAuthClient client = this.CreateOAuthApiClient(context);
+ //await(client.SignOutUserAsync(context.Activity.From.Id, connectionName));
+ return completedFuture(null);
+ }
+
+ /**
+ * Creates a conversation on the specified channel.
+ *
+ * @param channelId The ID for the channel.
+ * @param serviceUrl The channel's service URL endpoint.
+ * @param credentials The application credentials for the bot.
+ * @param conversationParameters The conversation information to use to
+ * create the conversation.
+ * @param callback The method to call for the resulting bot turn.
+ * @return A task that represents the work queued to execute.
+ * To start a conversation, your bot must know its account information
+ * and the user's account information on that channel.
+ * Most channels only support initiating a direct message (non-group) conversation.
+ * The adapter attempts to create a new conversation on the channel, and
+ * then sends a {@code conversationUpdate} activity through its middleware pipeline
+ * to the {@code callback} method.
+ * If the conversation is established with the
+ * specified users, the ID of the activity's {@link Activity.Conversation}
+ * will contain the ID of the new conversation.
+ */
+ public CompletableFuture CreateConversation(String channelId, String serviceUrl, MicrosoftAppCredentials
+ credentials, ConversationParameters conversationParameters, Consumer callback) throws Exception {
+ // Validate serviceUrl - can throw
+ URI uri = new URI(serviceUrl);
+ return CompletableFuture.runAsync(() -> {
+ ConnectorClient connectorClient = null;
+ try {
+ connectorClient = this.CreateConnectorClient(serviceUrl, credentials);
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Bad serviceUrl: %s", serviceUrl));
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Bad serviceUrl: %s", serviceUrl));
+ }
+
+ Conversations conv = connectorClient.conversations();
+ List results = null;
+ if (conv instanceof ConversationsImpl) {
+ ConversationsImpl convImpl = (ConversationsImpl) conv;
+ results = convImpl.CreateConversationAsync(conversationParameters).join();
+ } else {
+ results = new ArrayList();
+ results.add(conv.createConversation(conversationParameters));
+ }
+ if (results.size() == 1) {
+
+ ConversationResourceResponse result = results.get(0);
+ // Create a conversation update activity to represent the result.
+
+ ConversationUpdateActivity conversationUpdate = (ConversationUpdateActivity) MessageActivity.CreateConversationUpdateActivity()
+ .withChannelId(channelId)
+ .withTopicName(conversationParameters.topicName())
+ .withServiceUrl(serviceUrl)
+ .withMembersAdded(conversationParameters.members())
+ .withId((result.activityId() != null) ? result.activityId() : UUID.randomUUID().toString())
+ .withConversation(new ConversationAccount().withId(result.id()))
+ .withRecipient(conversationParameters.bot());
+
+ try (TurnContextImpl context = new TurnContextImpl(this, conversationUpdate)) {
+ try {
+ this.RunPipeline(context, callback);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Running pipeline failed : %s", e));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Turn Context Error: %s", e));
+ }
+ } else {
+ // Should never happen
+ throw new RuntimeException(String.format("Conversations create issue - returned %d conversations", results.size()));
+ }
+ });
+
+ }
+
+ protected CompletableFuture TrySetEmulatingOAuthCards(TurnContext turnContext) {
+ if (!isEmulatingOAuthCards &&
+ turnContext.getActivity().channelId().equals("emulator") &&
+ (_credentialProvider.isAuthenticationDisabledAsync().join())) {
+ isEmulatingOAuthCards = true;
+ }
+ return completedFuture(isEmulatingOAuthCards);
+
+ }
+
+ protected OAuthClient CreateOAuthApiClient(TurnContext context) throws MalformedURLException, URISyntaxException {
+ ConnectorClientImpl client = context.getServices().Get("ConnectorClient");
+ if (client == null) {
+ throw new IllegalArgumentException("CreateOAuthApiClient: OAuth requires a valid ConnectorClient instance");
+ }
+ if (isEmulatingOAuthCards) {
+ return new OAuthClient(client, context.getActivity().serviceUrl());
+ }
+ return new OAuthClient(client, AuthenticationConstants.OAuthUrl);
+ }
+
+ /**
+ * Creates the connector client asynchronous.
+ *
+ * @param serviceUrl The service URL.
+ * @param claimsIdentity The claims identity.
+ * @return ConnectorClient instance.
+ * @throws UnsupportedOperationException ClaimsIdemtity cannot be null. Pass Anonymous ClaimsIdentity if authentication is turned off.
+ */
+ private CompletableFuture CreateConnectorClientAsync(String serviceUrl, ClaimsIdentity claimsIdentity) {
+
+ return CompletableFuture.supplyAsync(() -> {
+ if (claimsIdentity == null) {
+ throw new UnsupportedOperationException("ClaimsIdentity cannot be null. Pass Anonymous ClaimsIdentity if authentication is turned off.");
+ }
+
+ // For requests from channel App Id is in Audience claim of JWT token. For emulator it is in AppId claim. For
+ // unauthenticated requests we have anonymous identity provided auth is disabled.
+ if (claimsIdentity.claims() == null) {
+ try {
+ return CreateConnectorClient(serviceUrl);
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Invalid Service URL: %s", serviceUrl));
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Invalid Service URL: %s", serviceUrl));
+ }
+ }
+
+ // For Activities coming from Emulator AppId claim contains the Bot's AAD AppId.
+ // For anonymous requests (requests with no header) appId is not set in claims.
+
+ Map.Entry botAppIdClaim = claimsIdentity.claims().entrySet().stream()
+ .filter(claim -> claim.getKey() == AuthenticationConstants.AudienceClaim)
+ .findFirst()
+ .orElse(null);
+ if (botAppIdClaim == null) {
+ botAppIdClaim = claimsIdentity.claims().entrySet().stream()
+ .filter(claim -> claim.getKey() == AuthenticationConstants.AppIdClaim)
+ .findFirst()
+ .orElse(null);
+ }
+
+ if (botAppIdClaim != null) {
+ String botId = botAppIdClaim.getValue();
+ MicrosoftAppCredentials appCredentials = this.GetAppCredentialsAsync(botId).join();
+ try {
+ return this.CreateConnectorClient(serviceUrl, appCredentials);
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Bad Service URL: %s", serviceUrl));
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Bad Service URL: %s", serviceUrl));
+ }
+ } else {
+ try {
+ return this.CreateConnectorClient(serviceUrl);
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Bad Service URL: %s", serviceUrl));
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Bad Service URL: %s", serviceUrl));
+ }
+ }
+ });
+
+ }
+
+ /**
+ * Creates the connector client.
+ *
+ * @param serviceUrl The service URL.
+ * @param appCredentials The application credentials for the bot.
+ * @return Connector client instance.
+ */
+ private ConnectorClient CreateConnectorClient(String serviceUrl) throws MalformedURLException, URISyntaxException {
+ return CreateConnectorClient(serviceUrl, null);
+ }
+
+ private ConnectorClient CreateConnectorClient(String serviceUrl, MicrosoftAppCredentials appCredentials) throws MalformedURLException, URISyntaxException {
+ ConnectorClientImpl connectorClient = null;
+ if (appCredentials != null) {
+ connectorClient = new ConnectorClientImpl(new URI(serviceUrl).toURL().toString(), appCredentials);
+ }
+ // TODO: Constructor necessary?
+// else {
+//
+// connectorClient = new ConnectorClientImpl(new URI(serviceUrl).toURL().toString());
+// }
+
+ if (this.connectorClientRetryStrategy != null)
+ connectorClient.withRestRetryStrategy(this.connectorClientRetryStrategy);
+
+
+ return connectorClient;
+
+ }
+
+ /**
+ * Gets the application credentials. App Credentials are cached so as to ensure we are not refreshing
+ * token everytime.
+ *
+ * @param appId The application identifier (AAD Id for the bot).
+ * @return App credentials.
+ */
+ private CompletableFuture GetAppCredentialsAsync(String appId) {
+ CompletableFuture result = CompletableFuture.supplyAsync(() -> {
+ if (appId == null) {
+ return MicrosoftAppCredentials.Empty;
+ }
+ if (this.appCredentialMap.containsKey(appId))
+ return this.appCredentialMap.get(appId);
+ String appPassword = this._credentialProvider.getAppPasswordAsync(appId).join();
+ MicrosoftAppCredentials appCredentials = new MicrosoftAppCredentials(appId, appPassword);
+ this.appCredentialMap.put(appId, appCredentials);
+ return appCredentials;
+
+ });
+ return result;
+ }
+
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/BotState.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotState.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/BotState.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotState.java
index 0f480242..871223f1 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/BotState.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotState.java
@@ -1,165 +1,165 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.microsoft.bot.builder;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.StreamSupport;
-
-import static java.util.concurrent.CompletableFuture.completedFuture;
-
-/**
- * Abstract Base class which manages details of automatic loading and saving of bot state.
- *
- * @param TState The type of the bot state object.
- */
-//public class BotState : Middleware
-// where TState : class, new()
-public class BotState implements Middleware {
-
- private final StateSettings settings;
- private final Storage storage;
- private final Function keyDelegate;
- private final String propertyName;
- private final Supplier ctor;
-
- /**
- * Creates a new {@link BotState{TState}} middleware object.
- *
- * @param name The name to use to load or save the state object.
- * @param storage The storage provider to use.
- * @param settings The state persistance options to use.
- */
- public BotState(Storage storage, String propertyName, Function keyDelegate, Supplier ctor) {
- this(storage, propertyName, keyDelegate, ctor, null);
- }
-
- public BotState(Storage storage, String propertyName, Function keyDelegate, Supplier ctor, StateSettings settings) {
- if (null == storage) {
- throw new IllegalArgumentException("Storage");
- }
- if (null == propertyName) {
- throw new IllegalArgumentException("String propertyName");
- }
- if (null == keyDelegate) {
- throw new IllegalArgumentException("Key Delegate");
- }
- if (null == ctor) {
- throw new IllegalArgumentException("ctor");
- }
- this.ctor = ctor;
- this.storage = storage;
- this.propertyName = propertyName;
- this.keyDelegate = keyDelegate;
- if (null == settings)
- this.settings = new StateSettings();
- else
- this.settings = settings;
- }
-
-
- /**
- * Processess an incoming activity.
- *
- * @param context The context object for this turn.
- * @param next The delegate to call to continue the bot middleware pipeline.
- * @return A task that represents the work queued to execute.
- * This middleware loads the state object on the leading edge of the middleware pipeline
- * and persists the state object on the trailing edge.
- */
- public void OnTurn(TurnContext context, NextDelegate next) throws Exception {
- ReadToContextService(context);
- next.next();
- WriteFromContextService(context).join();
- return;
- }
-
- protected void ReadToContextService(TurnContext context) throws IllegalArgumentException, JsonProcessingException {
- String key = this.keyDelegate.apply(context);
- Map items = null;
- try {
- CompletableFuture> result = storage.Read(new String[]{key});
- items = result.get();
- System.out.println(String.format("BotState:OnTurn(tid:%s) ReadToContextService: Found %s items", Thread.currentThread().getId(), items.size()));
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Error waiting context storage read: %s", e.toString()));
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
- e.printStackTrace();
- }
- TState state = StreamSupport.stream(items.entrySet().spliterator(), false)
- .filter(entry -> entry.getKey() == key)
- .map(Map.Entry::getValue)
- .map(entry -> (TState) entry)
- .findFirst()
- .orElse(null);
-
-
- //var state = items.Where(entry => entry.Key == key).Select(entry => entry.Value).OfType().FirstOrDefault();
- if (state == null)
- state = ctor.get();
- context.getServices().Add(this.propertyName, state);
- }
-
- protected CompletableFuture WriteFromContextService(TurnContext context) throws Exception {
- TState state = context.getServices().Get(this.propertyName);
- return Write(context, state);
- }
-
- /**
- * Reads state from storage.
- *
- * @param TState The type of the bot state object.
- * @param context The context object for this turn.
- */
- public CompletableFuture Read(TurnContext context) throws JsonProcessingException {
- String key = this.keyDelegate.apply(context);
- Map items = storage.Read(new String[]{key}).join();
- TState state = StreamSupport.stream(items.entrySet().spliterator(), false)
- .filter(item -> item.getKey() == key)
- .map(Map.Entry::getValue)
- .map(item -> (TState) item)
- .findFirst()
- .orElse(null);
- //var state = items.Where(entry => entry.Key == key).Select(entry => entry.Value).OfType().FirstOrDefault();
- if (state == null)
- state = ctor.get();
- return completedFuture(state);
- }
-
- /**
- * Writes state to storage.
- *
- * @param context The context object for this turn.
- * @param state The state object.
- */
- public CompletableFuture Write(TurnContext context, TState state) throws Exception {
- HashMap changes = new HashMap();
- //List> changes = new ArrayList>();
- if (state == null)
- state = ctor.get();
- String key = keyDelegate.apply(context);
- changes.put(key, state);
-
- if (this.settings.getLastWriterWins()) {
- for (Map.Entry item : changes.entrySet()) {
- if (item.getValue() instanceof StoreItem) {
- StoreItem valueStoreItem = (StoreItem) item.getValue();
- valueStoreItem.seteTag("*");
- }
- }
- }
- return completedFuture(storage.Write(changes).join());
- }
-}
-
-
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.microsoft.bot.builder;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.StreamSupport;
+
+import static java.util.concurrent.CompletableFuture.completedFuture;
+
+/**
+ * Abstract Base class which manages details of automatic loading and saving of bot state.
+ *
+ * @param TState The type of the bot state object.
+ */
+//public class BotState : Middleware
+// where TState : class, new()
+public class BotState implements Middleware {
+
+ private final StateSettings settings;
+ private final Storage storage;
+ private final Function keyDelegate;
+ private final String propertyName;
+ private final Supplier ctor;
+
+ /**
+ * Creates a new {@link BotState{TState}} middleware object.
+ *
+ * @param name The name to use to load or save the state object.
+ * @param storage The storage provider to use.
+ * @param settings The state persistance options to use.
+ */
+ public BotState(Storage storage, String propertyName, Function keyDelegate, Supplier ctor) {
+ this(storage, propertyName, keyDelegate, ctor, null);
+ }
+
+ public BotState(Storage storage, String propertyName, Function keyDelegate, Supplier ctor, StateSettings settings) {
+ if (null == storage) {
+ throw new IllegalArgumentException("Storage");
+ }
+ if (null == propertyName) {
+ throw new IllegalArgumentException("String propertyName");
+ }
+ if (null == keyDelegate) {
+ throw new IllegalArgumentException("Key Delegate");
+ }
+ if (null == ctor) {
+ throw new IllegalArgumentException("ctor");
+ }
+ this.ctor = ctor;
+ this.storage = storage;
+ this.propertyName = propertyName;
+ this.keyDelegate = keyDelegate;
+ if (null == settings)
+ this.settings = new StateSettings();
+ else
+ this.settings = settings;
+ }
+
+
+ /**
+ * Processess an incoming activity.
+ *
+ * @param context The context object for this turn.
+ * @param next The delegate to call to continue the bot middleware pipeline.
+ * @return A task that represents the work queued to execute.
+ * This middleware loads the state object on the leading edge of the middleware pipeline
+ * and persists the state object on the trailing edge.
+ */
+ public void OnTurn(TurnContext context, NextDelegate next) throws Exception {
+ ReadToContextService(context);
+ next.next();
+ WriteFromContextService(context).join();
+ return;
+ }
+
+ protected void ReadToContextService(TurnContext context) throws IllegalArgumentException, JsonProcessingException {
+ String key = this.keyDelegate.apply(context);
+ Map items = null;
+ try {
+ CompletableFuture> result = storage.Read(new String[]{key});
+ items = result.get();
+ System.out.println(String.format("BotState:OnTurn(tid:%s) ReadToContextService: Found %s items", Thread.currentThread().getId(), items.size()));
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Error waiting context storage read: %s", e.toString()));
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ }
+ TState state = StreamSupport.stream(items.entrySet().spliterator(), false)
+ .filter(entry -> entry.getKey() == key)
+ .map(Map.Entry::getValue)
+ .map(entry -> (TState) entry)
+ .findFirst()
+ .orElse(null);
+
+
+ //var state = items.Where(entry => entry.Key == key).Select(entry => entry.Value).OfType().FirstOrDefault();
+ if (state == null)
+ state = ctor.get();
+ context.getServices().Add(this.propertyName, state);
+ }
+
+ protected CompletableFuture WriteFromContextService(TurnContext context) throws Exception {
+ TState state = context.getServices().Get(this.propertyName);
+ return Write(context, state);
+ }
+
+ /**
+ * Reads state from storage.
+ *
+ * @param TState The type of the bot state object.
+ * @param context The context object for this turn.
+ */
+ public CompletableFuture Read(TurnContext context) throws JsonProcessingException {
+ String key = this.keyDelegate.apply(context);
+ Map items = storage.Read(new String[]{key}).join();
+ TState state = StreamSupport.stream(items.entrySet().spliterator(), false)
+ .filter(item -> item.getKey() == key)
+ .map(Map.Entry::getValue)
+ .map(item -> (TState) item)
+ .findFirst()
+ .orElse(null);
+ //var state = items.Where(entry => entry.Key == key).Select(entry => entry.Value).OfType().FirstOrDefault();
+ if (state == null)
+ state = ctor.get();
+ return completedFuture(state);
+ }
+
+ /**
+ * Writes state to storage.
+ *
+ * @param context The context object for this turn.
+ * @param state The state object.
+ */
+ public CompletableFuture Write(TurnContext context, TState state) throws Exception {
+ HashMap changes = new HashMap();
+ //List> changes = new ArrayList>();
+ if (state == null)
+ state = ctor.get();
+ String key = keyDelegate.apply(context);
+ changes.put(key, state);
+
+ if (this.settings.getLastWriterWins()) {
+ for (Map.Entry item : changes.entrySet()) {
+ if (item.getValue() instanceof StoreItem) {
+ StoreItem valueStoreItem = (StoreItem) item.getValue();
+ valueStoreItem.seteTag("*");
+ }
+ }
+ }
+ return completedFuture(storage.Write(changes).join());
+ }
+}
+
+
+
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/CallOnException.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/CallOnException.java
similarity index 96%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/CallOnException.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/CallOnException.java
index 2ad3ba32..f4ff21ac 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/CallOnException.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/CallOnException.java
@@ -1,9 +1,9 @@
-package com.microsoft.bot.builder;
-
-import com.microsoft.bot.builder.TurnContext;
-
-import java.util.concurrent.CompletableFuture;
-
-public interface CallOnException {
- CompletableFuture apply(TurnContext context, T t ) throws Exception;
-}
+package com.microsoft.bot.builder;
+
+import com.microsoft.bot.builder.TurnContext;
+
+import java.util.concurrent.CompletableFuture;
+
+public interface CallOnException {
+ CompletableFuture apply(TurnContext context, T t ) throws Exception;
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/CatchExceptionMiddleware.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/CatchExceptionMiddleware.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/CatchExceptionMiddleware.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/CatchExceptionMiddleware.java
index e684af15..599045cd 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/CatchExceptionMiddleware.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/CatchExceptionMiddleware.java
@@ -1,46 +1,46 @@
-
-
-package com.microsoft.bot.builder;
-
-/**
- * This piece of middleware can be added to allow you to handle exceptions when they are thrown
- * within your bot's code or middleware further down the pipeline. Using this handler you might
- * send an appropriate message to the user to let them know that something has gone wrong.
- * You can specify the type of exception the middleware should catch and this middleware can be added
- * multiple times to allow you to handle different exception types in different ways.
- *
- * @param T The type of the exception that you want to catch. This can be 'Exception' to
- * catch all or a specific type of exception
- */
-public class CatchExceptionMiddleware implements Middleware {
- private final CallOnException _handler;
- private final Class _exceptionType;
-
- public CatchExceptionMiddleware(CallOnException callOnException, Class exceptionType) {
- _handler = callOnException;
- _exceptionType = exceptionType;
- }
-
-
- @Override
- public void OnTurn(TurnContext context, NextDelegate next) throws Exception {
-
- Class c = _exceptionType.getDeclaringClass();
-
- try {
- // Continue to route the activity through the pipeline
- // any errors further down the pipeline will be caught by
- // this try / catch
- next.next();
- } catch (Exception ex) {
-
- if (_exceptionType.isInstance(ex))
- // If an error is thrown and the exception is of type T then invoke the handler
- _handler.apply(context, (T) ex);
- else
- throw ex;
- }
- return;
- }
-
-}
+
+
+package com.microsoft.bot.builder;
+
+/**
+ * This piece of middleware can be added to allow you to handle exceptions when they are thrown
+ * within your bot's code or middleware further down the pipeline. Using this handler you might
+ * send an appropriate message to the user to let them know that something has gone wrong.
+ * You can specify the type of exception the middleware should catch and this middleware can be added
+ * multiple times to allow you to handle different exception types in different ways.
+ *
+ * @param T The type of the exception that you want to catch. This can be 'Exception' to
+ * catch all or a specific type of exception
+ */
+public class CatchExceptionMiddleware implements Middleware {
+ private final CallOnException _handler;
+ private final Class _exceptionType;
+
+ public CatchExceptionMiddleware(CallOnException callOnException, Class exceptionType) {
+ _handler = callOnException;
+ _exceptionType = exceptionType;
+ }
+
+
+ @Override
+ public void OnTurn(TurnContext context, NextDelegate next) throws Exception {
+
+ Class c = _exceptionType.getDeclaringClass();
+
+ try {
+ // Continue to route the activity through the pipeline
+ // any errors further down the pipeline will be caught by
+ // this try / catch
+ next.next();
+ } catch (Exception ex) {
+
+ if (_exceptionType.isInstance(ex))
+ // If an error is thrown and the exception is of type T then invoke the handler
+ _handler.apply(context, (T) ex);
+ else
+ throw ex;
+ }
+ return;
+ }
+
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/ConversationState.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/ConversationState.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/ConversationState.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/ConversationState.java
index 67234b10..a802dd94 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/ConversationState.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/ConversationState.java
@@ -1,49 +1,49 @@
-package com.microsoft.bot.builder;
-
-import com.microsoft.bot.builder.TurnContext;
-
-import java.util.function.Supplier;
-
-/**
- * Handles persistence of a conversation state object using the conversation ID as part of the key.
- * @param TState The type of the conversation state object.
- */
-public class ConversationState extends BotState
-{
- /**
- * The key to use to read and write this conversation state object to storage.
- */
- //
- // Note: Hard coded to maintain compatibility with C#
- // "ConversationState:{typeof(ConversationState).Namespace}.{typeof(ConversationState).Name}"
- public static String PropertyName() {
- return String.format("ConversationState:Microsoft.Bot.Builder.Core.Extensions.ConversationState`1");
- }
-
- /**
- * Creates a new {@link ConversationState{TState}} object.
- * @param storage The storage provider to use.
- * @param settings The state persistance options to use.
- */
- public ConversationState(Storage storage, Supplier ctor) {
- this(storage, null, ctor);
- }
-
- public ConversationState(Storage storage, StateSettings settings, Supplier ctor) {
- super(storage, PropertyName(),
- (context) -> {
- return String.format("conversation/%s/%s", context.getActivity().channelId(), context.getActivity().conversation().id());
- },
- ctor,
- settings);
- }
-
- /**
- * Gets the conversation state object from turn context.
- * @param context The context object for this turn.
- * @return The coversation state object.
- */
- public static TState Get(TurnContext context) throws IllegalArgumentException {
- return context.getServices().Get(PropertyName());
- }
-}
+package com.microsoft.bot.builder;
+
+import com.microsoft.bot.builder.TurnContext;
+
+import java.util.function.Supplier;
+
+/**
+ * Handles persistence of a conversation state object using the conversation ID as part of the key.
+ * @param TState The type of the conversation state object.
+ */
+public class ConversationState extends BotState
+{
+ /**
+ * The key to use to read and write this conversation state object to storage.
+ */
+ //
+ // Note: Hard coded to maintain compatibility with C#
+ // "ConversationState:{typeof(ConversationState).Namespace}.{typeof(ConversationState).Name}"
+ public static String PropertyName() {
+ return String.format("ConversationState:Microsoft.Bot.Builder.Core.Extensions.ConversationState`1");
+ }
+
+ /**
+ * Creates a new {@link ConversationState{TState}} object.
+ * @param storage The storage provider to use.
+ * @param settings The state persistance options to use.
+ */
+ public ConversationState(Storage storage, Supplier ctor) {
+ this(storage, null, ctor);
+ }
+
+ public ConversationState(Storage storage, StateSettings settings, Supplier ctor) {
+ super(storage, PropertyName(),
+ (context) -> {
+ return String.format("conversation/%s/%s", context.getActivity().channelId(), context.getActivity().conversation().id());
+ },
+ ctor,
+ settings);
+ }
+
+ /**
+ * Gets the conversation state object from turn context.
+ * @param context The context object for this turn.
+ * @return The coversation state object.
+ */
+ public static TState Get(TurnContext context) throws IllegalArgumentException {
+ return context.getServices().Get(PropertyName());
+ }
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/DeleteActivityHandler.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/DeleteActivityHandler.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/DeleteActivityHandler.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/DeleteActivityHandler.java
index af7820ca..db6c2568 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/DeleteActivityHandler.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/DeleteActivityHandler.java
@@ -1,25 +1,25 @@
-package com.microsoft.bot.builder;
-
-import com.microsoft.bot.schema.models.ConversationReference;
-
-/**
- * A method that can participate in delete activity events for the current turn.
- * @param context The context object for the turn.
- * @param reference The conversation containing the activity.
- * @param next The delegate to call to continue event processing.
- * @return A task that represents the work queued to execute.
- * A handler calls the {@code next} delegate to pass control to
- * the next registered handler. If a handler doesn’t call the next delegate,
- * the adapter does not call any of the subsequent handlers and does not delete the
- *activity.
- * The conversation reference's {@link ConversationReference.ActivityId}
- * indicates the activity in the conversation to replace.
- *
- * {@linkalso BotAdapter}
- * {@linkalso SendActivitiesHandler}
- * {@linkalso UpdateActivityHandler}
- */
-@FunctionalInterface
-public interface DeleteActivityHandler {
- void handle(TurnContext context, ConversationReference reference, Runnable next) throws Exception;
-}
+package com.microsoft.bot.builder;
+
+import com.microsoft.bot.schema.models.ConversationReference;
+
+/**
+ * A method that can participate in delete activity events for the current turn.
+ * @param context The context object for the turn.
+ * @param reference The conversation containing the activity.
+ * @param next The delegate to call to continue event processing.
+ * @return A task that represents the work queued to execute.
+ * A handler calls the {@code next} delegate to pass control to
+ * the next registered handler. If a handler doesn’t call the next delegate,
+ * the adapter does not call any of the subsequent handlers and does not delete the
+ *activity.
+ * The conversation reference's {@link ConversationReference.ActivityId}
+ * indicates the activity in the conversation to replace.
+ *
+ * {@linkalso BotAdapter}
+ * {@linkalso SendActivitiesHandler}
+ * {@linkalso UpdateActivityHandler}
+ */
+@FunctionalInterface
+public interface DeleteActivityHandler {
+ void handle(TurnContext context, ConversationReference reference, Runnable next) throws Exception;
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/InvokeResponse.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/InvokeResponse.java
similarity index 96%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/InvokeResponse.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/InvokeResponse.java
index accec9cf..d37bae29 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/InvokeResponse.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/InvokeResponse.java
@@ -1,37 +1,37 @@
-package com.microsoft.bot.builder;
-
-/**
- * Tuple class containing an HTTP Status Code and a JSON Serializable
- * object. The HTTP Status code is, in the invoke activity scenario, what will
- * be set in the resulting POST. The Body of the resulting POST will be
- * the JSON Serialized content from the Body property.
- */
-public class InvokeResponse {
- /**
- * The POST that is generated in response to the incoming Invoke Activity
- * will have the HTTP Status code specificied by this field.
- */
- private int _status;
-
- public int getStatus() {
- return this._status;
- }
-
- public void setStatus(int status) {
- this._status = status;
- }
-
- /**
- * The POST that is generated in response to the incoming Invoke Activity
- * will have a body generated by JSON serializing the object in the Body field.
- */
- private Object _body;
-
- public Object getBody() {
- return _body;
- }
-
- public void setBody(Object body) {
- this._body = body;
- }
-}
+package com.microsoft.bot.builder;
+
+/**
+ * Tuple class containing an HTTP Status Code and a JSON Serializable
+ * object. The HTTP Status code is, in the invoke activity scenario, what will
+ * be set in the resulting POST. The Body of the resulting POST will be
+ * the JSON Serialized content from the Body property.
+ */
+public class InvokeResponse {
+ /**
+ * The POST that is generated in response to the incoming Invoke Activity
+ * will have the HTTP Status code specificied by this field.
+ */
+ private int _status;
+
+ public int getStatus() {
+ return this._status;
+ }
+
+ public void setStatus(int status) {
+ this._status = status;
+ }
+
+ /**
+ * The POST that is generated in response to the incoming Invoke Activity
+ * will have a body generated by JSON serializing the object in the Body field.
+ */
+ private Object _body;
+
+ public Object getBody() {
+ return _body;
+ }
+
+ public void setBody(Object body) {
+ this._body = body;
+ }
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/MemoryTranscriptStore.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/MemoryTranscriptStore.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/MemoryTranscriptStore.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/MemoryTranscriptStore.java
index c332058d..cf36ef09 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/MemoryTranscriptStore.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/MemoryTranscriptStore.java
@@ -1,310 +1,310 @@
-package com.microsoft.bot.builder;
-
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-
-import com.microsoft.bot.schema.models.Activity;
-import org.joda.time.DateTime;
-
-import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.ForkJoinWorkerThread;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-/**
- * The memory transcript store stores transcripts in volatile memory in a Dictionary.
- *
- *
- * Because this uses an unbounded volitile dictionary this should only be used for unit tests or non-production environments.
- */
-public class MemoryTranscriptStore implements TranscriptStore {
- private HashMap>> channels = new HashMap>>();
- final ForkJoinPool.ForkJoinWorkerThreadFactory factory = new ForkJoinPool.ForkJoinWorkerThreadFactory() {
- @Override
- public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
- final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
- worker.setName("TestFlow-" + worker.getPoolIndex());
- return worker;
- }
- };
-
- final ExecutorService executor = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), factory, null, false);
-
-
- /**
- * Logs an activity to the transcript.
- *
- * @param activity The activity to log.
- * @return A CompletableFuture that represents the work queued to execute.
- */
- public final void LogActivityAsync(Activity activity) {
- if (activity == null) {
- throw new NullPointerException("activity cannot be null for LogActivity()");
- }
-
- synchronized (this.channels) {
- HashMap> channel;
- if (!this.channels.containsKey(activity.channelId())) {
- channel = new HashMap>();
- this.channels.put(activity.channelId(), channel);
- } else {
- channel = this.channels.get(activity.channelId());
- }
-
- ArrayList transcript = null;
-
-
- if (!channel.containsKey(activity.conversation().id())) {
- transcript = new ArrayList();
- channel.put(activity.conversation().id(), transcript);
- } else {
- transcript = channel.get(activity.conversation().id());
- }
-
- transcript.add(activity);
- }
-
- }
-
- /**
- * Gets from the store activities that match a set of criteria.
- *
- * @param channelId The ID of the channel the conversation is in.
- * @param conversationId The ID of the conversation.
- * @param continuationToken
- * @return A task that represents the work queued to execute.
- * If the task completes successfully, the result contains the matching activities.
- */
-
- public final CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId, String continuationToken) {
- return GetTranscriptActivitiesAsync(channelId, conversationId, continuationToken, null);
- }
-
- /**
- * Gets from the store activities that match a set of criteria.
- *
- * @param channelId The ID of the channel the conversation is in.
- * @param conversationId The ID of the conversation.
- * @return A task that represents the work queued to execute.
- * If the task completes successfully, the result contains the matching activities.
- */
-
- public final CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId) {
- return GetTranscriptActivitiesAsync(channelId, conversationId, null, null);
- }
-
- /**
- * Gets from the store activities that match a set of criteria.
- *
- * @param channelId The ID of the channel the conversation is in.
- * @param conversationId The ID of the conversation.
- * @param continuationToken
- * @param startDate A cutoff date. Activities older than this date are not included.
- * @return A task that represents the work queued to execute.
- * If the task completes successfully, the result contains the matching activities.
- */
- public final CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId, String continuationToken, DateTime startDate) {
- return CompletableFuture.supplyAsync(() -> {
- if (channelId == null) {
- throw new NullPointerException(String.format("missing %1$s", "channelId"));
- }
-
- if (conversationId == null) {
- throw new NullPointerException(String.format("missing %1$s", "conversationId"));
- }
-
- PagedResult pagedResult = new PagedResult();
- synchronized (channels) {
- HashMap> channel;
- if (!channels.containsKey(channelId)) {
- return pagedResult;
- }
- channel = channels.get(channelId);
- ArrayList transcript;
-
- if (!channel.containsKey(conversationId)) {
- return pagedResult;
- }
- transcript = channel.get(conversationId);
- if (continuationToken != null) {
- List items = transcript.stream()
- .sorted(Comparator.comparing(Activity::timestamp))
- .filter(a -> a.timestamp().compareTo(startDate) >= 0)
- .filter(skipwhile(a -> !a.id().equals(continuationToken)))
- .skip(1)
- .limit(20)
- .collect(Collectors.toList());
-
- pagedResult.items(items.toArray(new Activity[items.size()]));
-
- if (pagedResult.getItems().length == 20) {
- pagedResult.withContinuationToken(items.get(items.size() - 1).id());
- }
- } else {
- List items = transcript.stream()
- .sorted(Comparator.comparing(Activity::timestamp))
- .filter(a -> a.timestamp().compareTo((startDate == null) ? new DateTime(Long.MIN_VALUE) : startDate) >= 0)
- .limit(20)
- .collect(Collectors.toList());
- pagedResult.items(items.toArray(new Activity[items.size()]));
- if (items.size() == 20) {
- pagedResult.withContinuationToken(items.get(items.size() - 1).id());
- }
- }
- }
-
- return pagedResult;
-
- }, this.executor);
- }
-
- /**
- * Deletes conversation data from the store.
- *
- * @param channelId The ID of the channel the conversation is in.
- * @param conversationId The ID of the conversation to delete.
- * @return A task that represents the work queued to execute.
- */
- public final CompletableFuture DeleteTranscriptAsync(String channelId, String conversationId) {
- return CompletableFuture.runAsync(() -> {
- if (channelId == null) {
- throw new NullPointerException(String.format("%1$s should not be null", "channelId"));
- }
-
- if (conversationId == null) {
- throw new NullPointerException(String.format("%1$s should not be null", "conversationId"));
- }
-
- synchronized (this.channels) {
- if (!this.channels.containsKey(channelId)) {
- return;
- }
- HashMap> channel = this.channels.get(channelId);
- if (channel.containsKey(conversationId)) {
- channel.remove(conversationId);
- }
- }
- }, this.executor);
- }
-
- /**
- * Gets the conversations on a channel from the store.
- *
- * @param channelId The ID of the channel.
- * @return A task that represents the work queued to execute.
- */
-
- public final CompletableFuture> ListTranscriptsAsync(String channelId) {
- return ListTranscriptsAsync(channelId, null);
- }
-
- /**
- * Gets the conversations on a channel from the store.
- *
- * @param channelId The ID of the channel.
- * @param continuationToken
- * @return A task that represents the work queued to execute.
- */
-
- public final CompletableFuture> ListTranscriptsAsync(String channelId, String continuationToken) {
- return CompletableFuture.supplyAsync(() -> {
- if (channelId == null) {
- throw new NullPointerException(String.format("missing %1$s", "channelId"));
- }
-
- PagedResult pagedResult = new PagedResult();
- synchronized (channels) {
-
- if (!channels.containsKey(channelId)) {
- return pagedResult;
- }
-
- HashMap> channel = channels.get(channelId);
- if (continuationToken != null) {
- List items = channel.entrySet().stream()
- .map(c -> {
- OffsetDateTime offsetDateTime = null;
- if (c.getValue().stream().findFirst().isPresent()) {
- DateTime dt = c.getValue().stream().findFirst().get().timestamp();
- // convert to DateTime to OffsetDateTime
- Instant instant = Instant.ofEpochMilli(dt.getMillis());
- ZoneOffset offset = ZoneId.of(dt.getZone().getID()).getRules().getOffset(instant);
- offsetDateTime = instant.atOffset(offset);
- } else {
- offsetDateTime = OffsetDateTime.now();
- }
- return new Transcript()
- .withChannelId(channelId)
- .withId(c.getKey())
- .withCreated(offsetDateTime);
- }
- )
- .sorted(Comparator.comparing(Transcript::getCreated))
- .filter(skipwhile(c -> !c.getId().equals(continuationToken)))
- .skip(1)
- .limit(20)
- .collect(Collectors.toList());
- pagedResult.items(items.toArray(new Transcript[items.size()]));
- if (items.size() == 20) {
- pagedResult.withContinuationToken(items.get(items.size() - 1).getId());
- }
- } else {
-
- List items = channel.entrySet().stream()
- .map(c -> {
- OffsetDateTime offsetDateTime = null;
- if (c.getValue().stream().findFirst().isPresent()) {
- DateTime dt = c.getValue().stream().findFirst().get().timestamp();
- // convert to DateTime to OffsetDateTime
- Instant instant = Instant.ofEpochMilli(dt.getMillis());
- ZoneOffset offset = ZoneId.of(dt.getZone().getID()).getRules().getOffset(instant);
- offsetDateTime = instant.atOffset(offset);
- } else {
- offsetDateTime = OffsetDateTime.now();
- }
- return new Transcript()
- .withChannelId(channelId)
- .withId(c.getKey())
- .withCreated(offsetDateTime);
- }
- )
- .sorted(Comparator.comparing(Transcript::getCreated))
- .limit(20)
- .collect(Collectors.toList());
- pagedResult.items(items.toArray(new Transcript[items.size()]));
- if (items.size() == 20) {
- pagedResult.withContinuationToken(items.get(items.size() - 1).getId());
- }
- }
- }
- return pagedResult;
- }, this.executor);
- }
-
- /**
- * Emulate C# SkipWhile.
- * Stateful
- *
- * @param func1 predicate to apply
- * @param type
- * @return if the predicate condition is true
- */
- public static Predicate skipwhile(Function func1) {
- final boolean[] started = {false};
- return t -> started[0] || (started[0] = (boolean) func1.apply(t));
- }
-
+package com.microsoft.bot.builder;
+
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+
+import com.microsoft.bot.schema.models.Activity;
+import org.joda.time.DateTime;
+
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinWorkerThread;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+/**
+ * The memory transcript store stores transcripts in volatile memory in a Dictionary.
+ *
+ *
+ * Because this uses an unbounded volitile dictionary this should only be used for unit tests or non-production environments.
+ */
+public class MemoryTranscriptStore implements TranscriptStore {
+ private HashMap>> channels = new HashMap>>();
+ final ForkJoinPool.ForkJoinWorkerThreadFactory factory = new ForkJoinPool.ForkJoinWorkerThreadFactory() {
+ @Override
+ public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
+ final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
+ worker.setName("TestFlow-" + worker.getPoolIndex());
+ return worker;
+ }
+ };
+
+ final ExecutorService executor = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), factory, null, false);
+
+
+ /**
+ * Logs an activity to the transcript.
+ *
+ * @param activity The activity to log.
+ * @return A CompletableFuture that represents the work queued to execute.
+ */
+ public final void LogActivityAsync(Activity activity) {
+ if (activity == null) {
+ throw new NullPointerException("activity cannot be null for LogActivity()");
+ }
+
+ synchronized (this.channels) {
+ HashMap> channel;
+ if (!this.channels.containsKey(activity.channelId())) {
+ channel = new HashMap>();
+ this.channels.put(activity.channelId(), channel);
+ } else {
+ channel = this.channels.get(activity.channelId());
+ }
+
+ ArrayList transcript = null;
+
+
+ if (!channel.containsKey(activity.conversation().id())) {
+ transcript = new ArrayList();
+ channel.put(activity.conversation().id(), transcript);
+ } else {
+ transcript = channel.get(activity.conversation().id());
+ }
+
+ transcript.add(activity);
+ }
+
+ }
+
+ /**
+ * Gets from the store activities that match a set of criteria.
+ *
+ * @param channelId The ID of the channel the conversation is in.
+ * @param conversationId The ID of the conversation.
+ * @param continuationToken
+ * @return A task that represents the work queued to execute.
+ * If the task completes successfully, the result contains the matching activities.
+ */
+
+ public final CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId, String continuationToken) {
+ return GetTranscriptActivitiesAsync(channelId, conversationId, continuationToken, null);
+ }
+
+ /**
+ * Gets from the store activities that match a set of criteria.
+ *
+ * @param channelId The ID of the channel the conversation is in.
+ * @param conversationId The ID of the conversation.
+ * @return A task that represents the work queued to execute.
+ * If the task completes successfully, the result contains the matching activities.
+ */
+
+ public final CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId) {
+ return GetTranscriptActivitiesAsync(channelId, conversationId, null, null);
+ }
+
+ /**
+ * Gets from the store activities that match a set of criteria.
+ *
+ * @param channelId The ID of the channel the conversation is in.
+ * @param conversationId The ID of the conversation.
+ * @param continuationToken
+ * @param startDate A cutoff date. Activities older than this date are not included.
+ * @return A task that represents the work queued to execute.
+ * If the task completes successfully, the result contains the matching activities.
+ */
+ public final CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId, String continuationToken, DateTime startDate) {
+ return CompletableFuture.supplyAsync(() -> {
+ if (channelId == null) {
+ throw new NullPointerException(String.format("missing %1$s", "channelId"));
+ }
+
+ if (conversationId == null) {
+ throw new NullPointerException(String.format("missing %1$s", "conversationId"));
+ }
+
+ PagedResult pagedResult = new PagedResult();
+ synchronized (channels) {
+ HashMap> channel;
+ if (!channels.containsKey(channelId)) {
+ return pagedResult;
+ }
+ channel = channels.get(channelId);
+ ArrayList transcript;
+
+ if (!channel.containsKey(conversationId)) {
+ return pagedResult;
+ }
+ transcript = channel.get(conversationId);
+ if (continuationToken != null) {
+ List items = transcript.stream()
+ .sorted(Comparator.comparing(Activity::timestamp))
+ .filter(a -> a.timestamp().compareTo(startDate) >= 0)
+ .filter(skipwhile(a -> !a.id().equals(continuationToken)))
+ .skip(1)
+ .limit(20)
+ .collect(Collectors.toList());
+
+ pagedResult.items(items.toArray(new Activity[items.size()]));
+
+ if (pagedResult.getItems().length == 20) {
+ pagedResult.withContinuationToken(items.get(items.size() - 1).id());
+ }
+ } else {
+ List items = transcript.stream()
+ .sorted(Comparator.comparing(Activity::timestamp))
+ .filter(a -> a.timestamp().compareTo((startDate == null) ? new DateTime(Long.MIN_VALUE) : startDate) >= 0)
+ .limit(20)
+ .collect(Collectors.toList());
+ pagedResult.items(items.toArray(new Activity[items.size()]));
+ if (items.size() == 20) {
+ pagedResult.withContinuationToken(items.get(items.size() - 1).id());
+ }
+ }
+ }
+
+ return pagedResult;
+
+ }, this.executor);
+ }
+
+ /**
+ * Deletes conversation data from the store.
+ *
+ * @param channelId The ID of the channel the conversation is in.
+ * @param conversationId The ID of the conversation to delete.
+ * @return A task that represents the work queued to execute.
+ */
+ public final CompletableFuture DeleteTranscriptAsync(String channelId, String conversationId) {
+ return CompletableFuture.runAsync(() -> {
+ if (channelId == null) {
+ throw new NullPointerException(String.format("%1$s should not be null", "channelId"));
+ }
+
+ if (conversationId == null) {
+ throw new NullPointerException(String.format("%1$s should not be null", "conversationId"));
+ }
+
+ synchronized (this.channels) {
+ if (!this.channels.containsKey(channelId)) {
+ return;
+ }
+ HashMap> channel = this.channels.get(channelId);
+ if (channel.containsKey(conversationId)) {
+ channel.remove(conversationId);
+ }
+ }
+ }, this.executor);
+ }
+
+ /**
+ * Gets the conversations on a channel from the store.
+ *
+ * @param channelId The ID of the channel.
+ * @return A task that represents the work queued to execute.
+ */
+
+ public final CompletableFuture> ListTranscriptsAsync(String channelId) {
+ return ListTranscriptsAsync(channelId, null);
+ }
+
+ /**
+ * Gets the conversations on a channel from the store.
+ *
+ * @param channelId The ID of the channel.
+ * @param continuationToken
+ * @return A task that represents the work queued to execute.
+ */
+
+ public final CompletableFuture> ListTranscriptsAsync(String channelId, String continuationToken) {
+ return CompletableFuture.supplyAsync(() -> {
+ if (channelId == null) {
+ throw new NullPointerException(String.format("missing %1$s", "channelId"));
+ }
+
+ PagedResult pagedResult = new PagedResult();
+ synchronized (channels) {
+
+ if (!channels.containsKey(channelId)) {
+ return pagedResult;
+ }
+
+ HashMap> channel = channels.get(channelId);
+ if (continuationToken != null) {
+ List items = channel.entrySet().stream()
+ .map(c -> {
+ OffsetDateTime offsetDateTime = null;
+ if (c.getValue().stream().findFirst().isPresent()) {
+ DateTime dt = c.getValue().stream().findFirst().get().timestamp();
+ // convert to DateTime to OffsetDateTime
+ Instant instant = Instant.ofEpochMilli(dt.getMillis());
+ ZoneOffset offset = ZoneId.of(dt.getZone().getID()).getRules().getOffset(instant);
+ offsetDateTime = instant.atOffset(offset);
+ } else {
+ offsetDateTime = OffsetDateTime.now();
+ }
+ return new Transcript()
+ .withChannelId(channelId)
+ .withId(c.getKey())
+ .withCreated(offsetDateTime);
+ }
+ )
+ .sorted(Comparator.comparing(Transcript::getCreated))
+ .filter(skipwhile(c -> !c.getId().equals(continuationToken)))
+ .skip(1)
+ .limit(20)
+ .collect(Collectors.toList());
+ pagedResult.items(items.toArray(new Transcript[items.size()]));
+ if (items.size() == 20) {
+ pagedResult.withContinuationToken(items.get(items.size() - 1).getId());
+ }
+ } else {
+
+ List items = channel.entrySet().stream()
+ .map(c -> {
+ OffsetDateTime offsetDateTime = null;
+ if (c.getValue().stream().findFirst().isPresent()) {
+ DateTime dt = c.getValue().stream().findFirst().get().timestamp();
+ // convert to DateTime to OffsetDateTime
+ Instant instant = Instant.ofEpochMilli(dt.getMillis());
+ ZoneOffset offset = ZoneId.of(dt.getZone().getID()).getRules().getOffset(instant);
+ offsetDateTime = instant.atOffset(offset);
+ } else {
+ offsetDateTime = OffsetDateTime.now();
+ }
+ return new Transcript()
+ .withChannelId(channelId)
+ .withId(c.getKey())
+ .withCreated(offsetDateTime);
+ }
+ )
+ .sorted(Comparator.comparing(Transcript::getCreated))
+ .limit(20)
+ .collect(Collectors.toList());
+ pagedResult.items(items.toArray(new Transcript[items.size()]));
+ if (items.size() == 20) {
+ pagedResult.withContinuationToken(items.get(items.size() - 1).getId());
+ }
+ }
+ }
+ return pagedResult;
+ }, this.executor);
+ }
+
+ /**
+ * Emulate C# SkipWhile.
+ * Stateful
+ *
+ * @param func1 predicate to apply
+ * @param type
+ * @return if the predicate condition is true
+ */
+ public static Predicate skipwhile(Function func1) {
+ final boolean[] started = {false};
+ return t -> started[0] || (started[0] = (boolean) func1.apply(t));
+ }
+
}
\ No newline at end of file
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/Middleware.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/Middleware.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/Middleware.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/Middleware.java
index f76d47ed..fb36c04a 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/Middleware.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/Middleware.java
@@ -1,57 +1,57 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.microsoft.bot.builder;
-
-/**
- * Represents middleware that can operate on incoming activities.
- * A {@link BotAdapter} passes incoming activities from the user's
- * channel to the middleware's {@link OnTurn(TurnContext, NextDelegate)}
- * method.
- * You can add middleware objects to your adapter’s middleware collection. The
- * adapter processes and directs incoming activities in through the bot middleware
- * pipeline to your bot’s logic and then back out again. As each activity flows in
- * and out of the bot, each piece of middleware can inspect or act upon the activity,
- * both before and after the bot logic runs.
- * For each activity, the adapter calls middleware in the order in which you
- * added it.
- *
- *
- * This defines middleware that sends "before" and "after" messages
- * before and after the adapter calls the bot's
- * {@link Bot.OnTurn(TurnContext)} method.
- *
- * public class SampleMiddleware : Middleware
- * {
- * public async Task OnTurn(TurnContext context, MiddlewareSet.NextDelegate next)
- * {
- * context.SendActivity("before");
- * await next().ConfigureAwait(false);
- * context.SendActivity("after");
- * }
- * }
- *
- *
- * {@linkalso Bot}
- */
-public interface Middleware
-{
- /**
- * Processess an incoming activity.
- * @param context The context object for this turn.
- * @param next The delegate to call to continue the bot middleware pipeline.
- * @return A task that represents the work queued to execute.
- * Middleware calls the {@code next} delegate to pass control to
- * the next middleware in the pipeline. If middleware doesn’t call the next delegate,
- * the adapter does not call any of the subsequent middleware’s request handlers or the
- * bot’s receive handler, and the pipeline short circuits.
- * The {@code context} provides information about the
- * incoming activity, and other data needed to process the activity.
- *
- * {@linkalso TurnContext}
- * {@linkalso Bot.Schema.Activity}
- */
- void OnTurn(TurnContext context, NextDelegate next) throws Exception;
-}
-
-
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.microsoft.bot.builder;
+
+/**
+ * Represents middleware that can operate on incoming activities.
+ * A {@link BotAdapter} passes incoming activities from the user's
+ * channel to the middleware's {@link OnTurn(TurnContext, NextDelegate)}
+ * method.
+ * You can add middleware objects to your adapter’s middleware collection. The
+ * adapter processes and directs incoming activities in through the bot middleware
+ * pipeline to your bot’s logic and then back out again. As each activity flows in
+ * and out of the bot, each piece of middleware can inspect or act upon the activity,
+ * both before and after the bot logic runs.
+ * For each activity, the adapter calls middleware in the order in which you
+ * added it.
+ *
+ *
+ * This defines middleware that sends "before" and "after" messages
+ * before and after the adapter calls the bot's
+ * {@link Bot.OnTurn(TurnContext)} method.
+ *
+ * public class SampleMiddleware : Middleware
+ * {
+ * public async Task OnTurn(TurnContext context, MiddlewareSet.NextDelegate next)
+ * {
+ * context.SendActivity("before");
+ * await next().ConfigureAwait(false);
+ * context.SendActivity("after");
+ * }
+ * }
+ *
+ *
+ * {@linkalso Bot}
+ */
+public interface Middleware
+{
+ /**
+ * Processess an incoming activity.
+ * @param context The context object for this turn.
+ * @param next The delegate to call to continue the bot middleware pipeline.
+ * @return A task that represents the work queued to execute.
+ * Middleware calls the {@code next} delegate to pass control to
+ * the next middleware in the pipeline. If middleware doesn’t call the next delegate,
+ * the adapter does not call any of the subsequent middleware’s request handlers or the
+ * bot’s receive handler, and the pipeline short circuits.
+ * The {@code context} provides information about the
+ * incoming activity, and other data needed to process the activity.
+ *
+ * {@linkalso TurnContext}
+ * {@linkalso Bot.Schema.Activity}
+ */
+ void OnTurn(TurnContext context, NextDelegate next) throws Exception;
+}
+
+
+
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/MiddlewareCall.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/MiddlewareCall.java
similarity index 96%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/MiddlewareCall.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/MiddlewareCall.java
index 8ed161ca..e440af0f 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/MiddlewareCall.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/MiddlewareCall.java
@@ -1,6 +1,6 @@
-package com.microsoft.bot.builder;
-
-@FunctionalInterface
-public interface MiddlewareCall {
- void requestHandler(TurnContext tc, NextDelegate nd) throws Exception;
-}
+package com.microsoft.bot.builder;
+
+@FunctionalInterface
+public interface MiddlewareCall {
+ void requestHandler(TurnContext tc, NextDelegate nd) throws Exception;
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/MiddlewareSet.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/MiddlewareSet.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/MiddlewareSet.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/MiddlewareSet.java
index d0414d7a..e02d7bb2 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/MiddlewareSet.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/MiddlewareSet.java
@@ -1,97 +1,97 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.microsoft.bot.builder;
-
-
-import java.util.ArrayList;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
-
-public class MiddlewareSet implements Middleware {
- public NextDelegate Next;
-
- private final ArrayList _middleware = new ArrayList();
-
- public MiddlewareSet Use(Middleware middleware) {
- BotAssert.MiddlewareNotNull(middleware);
- _middleware.add(middleware);
- return this;
- }
-
- public void ReceiveActivity(TurnContextImpl context)
- throws Exception {
- ReceiveActivityInternal(context, null);
- }
-
- @Override
- public void OnTurn(TurnContext context, NextDelegate next) throws Exception {
- ReceiveActivityInternal((TurnContextImpl) context, null);
- try {
- next.next();
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("MiddlewareSet::OnTurn next delegate: %s", e.toString()));
- }
- }
-
-
- public void OnTurn(TurnContextImpl context, CompletableFuture next)
- throws ExecutionException, InterruptedException {
- return;
- }
-
- /**
- * Intended to be called from Bot, this method performs exactly the same as the
- * standard ReceiveActivity, except that it runs a user-defined delegate returns
- * if all Middleware in the receive pipeline was run.
- */
- public void ReceiveActivityWithStatus(TurnContext context, Consumer callback)
- throws Exception {
- ReceiveActivityInternal(context, callback);
- }
-
- private void ReceiveActivityInternal(TurnContext context, Consumer callback)
- throws Exception {
- ReceiveActivityInternal(context, callback, 0);
- }
-
- private void ReceiveActivityInternal(TurnContext context, Consumer callback, int nextMiddlewareIndex)
- throws Exception {
- // Check if we're at the end of the middleware list yet
- if (nextMiddlewareIndex == _middleware.size()) {
- // If all the Middlware ran, the "leading edge" of the tree is now complete.
- // This means it's time to run any developer specified callback.
- // Once this callback is done, the "trailing edge" calls are then completed. This
- // allows code that looks like:
- // Trace.TraceInformation("before");
- // await next();
- // Trace.TraceInformation("after");
- // to run as expected.
-
- // If a callback was provided invoke it now and return its task, otherwise just return the completed task
- if (callback == null) {
- return ;
- } else {
- callback.accept(context);
- return;
- }
- }
-
- // Get the next piece of middleware
- Middleware nextMiddleware = _middleware.get(nextMiddlewareIndex);
- NextDelegate next = new NextDelegate() {
- public void next() throws Exception {
- ReceiveActivityInternal(context, callback, nextMiddlewareIndex + 1);
- }
- };
-
- // Execute the next middleware passing a closure that will recurse back into this method at the next piece of middlware as the NextDelegate
- nextMiddleware.OnTurn(
- context,
- next);
- }
-
-
-}
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.bot.builder;
+
+
+import java.util.ArrayList;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
+
+public class MiddlewareSet implements Middleware {
+ public NextDelegate Next;
+
+ private final ArrayList _middleware = new ArrayList();
+
+ public MiddlewareSet Use(Middleware middleware) {
+ BotAssert.MiddlewareNotNull(middleware);
+ _middleware.add(middleware);
+ return this;
+ }
+
+ public void ReceiveActivity(TurnContextImpl context)
+ throws Exception {
+ ReceiveActivityInternal(context, null);
+ }
+
+ @Override
+ public void OnTurn(TurnContext context, NextDelegate next) throws Exception {
+ ReceiveActivityInternal((TurnContextImpl) context, null);
+ try {
+ next.next();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("MiddlewareSet::OnTurn next delegate: %s", e.toString()));
+ }
+ }
+
+
+ public void OnTurn(TurnContextImpl context, CompletableFuture next)
+ throws ExecutionException, InterruptedException {
+ return;
+ }
+
+ /**
+ * Intended to be called from Bot, this method performs exactly the same as the
+ * standard ReceiveActivity, except that it runs a user-defined delegate returns
+ * if all Middleware in the receive pipeline was run.
+ */
+ public void ReceiveActivityWithStatus(TurnContext context, Consumer callback)
+ throws Exception {
+ ReceiveActivityInternal(context, callback);
+ }
+
+ private void ReceiveActivityInternal(TurnContext context, Consumer callback)
+ throws Exception {
+ ReceiveActivityInternal(context, callback, 0);
+ }
+
+ private void ReceiveActivityInternal(TurnContext context, Consumer callback, int nextMiddlewareIndex)
+ throws Exception {
+ // Check if we're at the end of the middleware list yet
+ if (nextMiddlewareIndex == _middleware.size()) {
+ // If all the Middlware ran, the "leading edge" of the tree is now complete.
+ // This means it's time to run any developer specified callback.
+ // Once this callback is done, the "trailing edge" calls are then completed. This
+ // allows code that looks like:
+ // Trace.TraceInformation("before");
+ // await next();
+ // Trace.TraceInformation("after");
+ // to run as expected.
+
+ // If a callback was provided invoke it now and return its task, otherwise just return the completed task
+ if (callback == null) {
+ return ;
+ } else {
+ callback.accept(context);
+ return;
+ }
+ }
+
+ // Get the next piece of middleware
+ Middleware nextMiddleware = _middleware.get(nextMiddlewareIndex);
+ NextDelegate next = new NextDelegate() {
+ public void next() throws Exception {
+ ReceiveActivityInternal(context, callback, nextMiddlewareIndex + 1);
+ }
+ };
+
+ // Execute the next middleware passing a closure that will recurse back into this method at the next piece of middlware as the NextDelegate
+ nextMiddleware.OnTurn(
+ context,
+ next);
+ }
+
+
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/NextDelegate.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/NextDelegate.java
similarity index 95%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/NextDelegate.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/NextDelegate.java
index d665f4df..8ff4d0f2 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/NextDelegate.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/NextDelegate.java
@@ -1,6 +1,6 @@
-package com.microsoft.bot.builder;
-
-@FunctionalInterface
-public interface NextDelegate {
- void next() throws Exception;
-}
+package com.microsoft.bot.builder;
+
+@FunctionalInterface
+public interface NextDelegate {
+ void next() throws Exception;
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/PagedResult.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/PagedResult.java
similarity index 95%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/PagedResult.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/PagedResult.java
index 33f0418e..a5783ebd 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/PagedResult.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/PagedResult.java
@@ -1,43 +1,43 @@
-package com.microsoft.bot.builder;
-
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-/**
- Page of results from an enumeration.
-
-
- */
-public class PagedResult
-{
- /**
- Page of items.
- */
-
-//C# TO JAVA CONVERTER WARNING: Java does not allow direct instantiation of arrays of generic type parameters:
-//ORIGINAL LINE: private T[] Items = new T[0];
- private T[] items = (T[])new Object[0];
- public final T[] getItems()
- {
- return this.items;
- }
- public final void items(T[] value)
- {
- this.items = value;
- }
-
- /**
- Token used to page through multiple pages.
- */
- private String continuationToken;
- public final String continuationToken()
- {
- return this.continuationToken;
- }
- public final PagedResult withContinuationToken(String value)
- {
- this.continuationToken = value;
- return this;
- }
-}
+package com.microsoft.bot.builder;
+
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+/**
+ Page of results from an enumeration.
+
+
+ */
+public class PagedResult
+{
+ /**
+ Page of items.
+ */
+
+//C# TO JAVA CONVERTER WARNING: Java does not allow direct instantiation of arrays of generic type parameters:
+//ORIGINAL LINE: private T[] Items = new T[0];
+ private T[] items = (T[])new Object[0];
+ public final T[] getItems()
+ {
+ return this.items;
+ }
+ public final void items(T[] value)
+ {
+ this.items = value;
+ }
+
+ /**
+ Token used to page through multiple pages.
+ */
+ private String continuationToken;
+ public final String continuationToken()
+ {
+ return this.continuationToken;
+ }
+ public final PagedResult withContinuationToken(String value)
+ {
+ this.continuationToken = value;
+ return this;
+ }
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/SendActivitiesHandler.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/SendActivitiesHandler.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/SendActivitiesHandler.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/SendActivitiesHandler.java
index b605b2f4..aff09c6f 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/SendActivitiesHandler.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/SendActivitiesHandler.java
@@ -1,13 +1,13 @@
-package com.microsoft.bot.builder;
-
-import com.microsoft.bot.builder.TurnContext;
-import com.microsoft.bot.schema.models.Activity;
-import com.microsoft.bot.schema.models.ResourceResponse;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-
-@FunctionalInterface
-public interface SendActivitiesHandler {
- ResourceResponse[] handle(TurnContext context, List activities, Callable next) throws Exception;
-}
+package com.microsoft.bot.builder;
+
+import com.microsoft.bot.builder.TurnContext;
+import com.microsoft.bot.schema.models.Activity;
+import com.microsoft.bot.schema.models.ResourceResponse;
+
+import java.util.List;
+import java.util.concurrent.Callable;
+
+@FunctionalInterface
+public interface SendActivitiesHandler {
+ ResourceResponse[] handle(TurnContext context, List activities, Callable next) throws Exception;
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StateSettings.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StateSettings.java
similarity index 96%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StateSettings.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StateSettings.java
index 14a7e23f..30b5d06b 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StateSettings.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StateSettings.java
@@ -1,16 +1,16 @@
-//
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.microsoft.bot.builder;
-
-public class StateSettings
-{
- private boolean lastWriterWins = true;
- public boolean getLastWriterWins() {
- return this.lastWriterWins;
- }
- public void setLast(boolean lastWriterWins) {
- this.lastWriterWins = lastWriterWins;
- }
-}
+//
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.bot.builder;
+
+public class StateSettings
+{
+ private boolean lastWriterWins = true;
+ public boolean getLastWriterWins() {
+ return this.lastWriterWins;
+ }
+ public void setLast(boolean lastWriterWins) {
+ this.lastWriterWins = lastWriterWins;
+ }
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StateTurnContextExtensions.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StateTurnContextExtensions.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StateTurnContextExtensions.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StateTurnContextExtensions.java
index 7d49fe56..45ff7aa2 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StateTurnContextExtensions.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StateTurnContextExtensions.java
@@ -1,32 +1,32 @@
-package com.microsoft.bot.builder;
-
-import com.microsoft.bot.builder.ConversationState;
-import com.microsoft.bot.builder.TurnContext;
-import com.microsoft.bot.builder.UserState;
-
-/**
- * Provides helper methods for getting state objects from the turn context.
- */
-public class StateTurnContextExtensions
-{
- /**
- * Gets a conversation state object from the turn context.
- * @param TState The type of the state object to get.
- * @param context The context object for this turn.
- * @return The state object.
- */
- public static TState GetConversationState(TurnContext context) throws IllegalArgumentException {
-
- return ConversationState.Get(context);
- }
-
- /**
- * Gets a user state object from the turn context.
- * @param TState The type of the state object to get.
- * @param context The context object for this turn.
- * @return The state object.
- */
- public static TState GetUserState(TurnContext context) throws IllegalArgumentException {
- return UserState.Get(context);
- }
-}
+package com.microsoft.bot.builder;
+
+import com.microsoft.bot.builder.ConversationState;
+import com.microsoft.bot.builder.TurnContext;
+import com.microsoft.bot.builder.UserState;
+
+/**
+ * Provides helper methods for getting state objects from the turn context.
+ */
+public class StateTurnContextExtensions
+{
+ /**
+ * Gets a conversation state object from the turn context.
+ * @param TState The type of the state object to get.
+ * @param context The context object for this turn.
+ * @return The state object.
+ */
+ public static TState GetConversationState(TurnContext context) throws IllegalArgumentException {
+
+ return ConversationState.Get(context);
+ }
+
+ /**
+ * Gets a user state object from the turn context.
+ * @param TState The type of the state object to get.
+ * @param context The context object for this turn.
+ * @return The state object.
+ */
+ public static TState GetUserState(TurnContext context) throws IllegalArgumentException {
+ return UserState.Get(context);
+ }
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/Storage.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/Storage.java
similarity index 96%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/Storage.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/Storage.java
index c1b8df39..e825604a 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/Storage.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/Storage.java
@@ -1,35 +1,35 @@
-package com.microsoft.bot.builder;
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-public interface Storage
-{
- /**
- * Read StoreItems from storage
- * @param keys keys of the storeItems to read
- * @return StoreItem dictionary
- */
- CompletableFuture> Read(String... keys) throws JsonProcessingException;
-
- /**
- * Write StoreItems to storage
- * @param changes
- */
- CompletableFuture Write(Map changes) throws Exception;
-
- /**
- * Delete StoreItems from storage
- * @param keys keys of the storeItems to delete
- */
- CompletableFuture Delete(String... keys);
-}
-
-
-
+package com.microsoft.bot.builder;
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+public interface Storage
+{
+ /**
+ * Read StoreItems from storage
+ * @param keys keys of the storeItems to read
+ * @return StoreItem dictionary
+ */
+ CompletableFuture> Read(String... keys) throws JsonProcessingException;
+
+ /**
+ * Write StoreItems to storage
+ * @param changes
+ */
+ CompletableFuture Write(Map changes) throws Exception;
+
+ /**
+ * Delete StoreItems from storage
+ * @param keys keys of the storeItems to delete
+ */
+ CompletableFuture Delete(String... keys);
+}
+
+
+
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StorageExtensions.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StorageExtensions.java
similarity index 96%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StorageExtensions.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StorageExtensions.java
index 1899bea9..015e151b 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StorageExtensions.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StorageExtensions.java
@@ -1,37 +1,37 @@
-package com.microsoft.bot.builder;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-
-public class StorageExtensions {
-
-
- /**
- * Storage extension to Read as strong typed StoreItem objects
- *
- * @param StoreItemT
- * @param storage
- * @param keys
- * @return
- */
- @SuppressWarnings("unchecked")
- public static CompletableFuture> Read(Storage storage, String... keys) throws JsonProcessingException {
- Map storeItems = storage.Read(keys).join();
- HashMap result = new HashMap();
- for (Map.Entry entry : storeItems.entrySet()) {
- StoreItemT tempVal;
- try {
- tempVal = (StoreItemT) entry.getValue();
- } catch (Exception ex) {
- // Skip - not an instance of StoreItemT (ugly)
- continue;
- }
- result.put((String) entry.getKey(), tempVal);
- }
- return CompletableFuture.completedFuture(result);
- }
-}
+package com.microsoft.bot.builder;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+
+public class StorageExtensions {
+
+
+ /**
+ * Storage extension to Read as strong typed StoreItem objects
+ *
+ * @param StoreItemT
+ * @param storage
+ * @param keys
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ public static CompletableFuture> Read(Storage storage, String... keys) throws JsonProcessingException {
+ Map storeItems = storage.Read(keys).join();
+ HashMap result = new HashMap();
+ for (Map.Entry entry : storeItems.entrySet()) {
+ StoreItemT tempVal;
+ try {
+ tempVal = (StoreItemT) entry.getValue();
+ } catch (Exception ex) {
+ // Skip - not an instance of StoreItemT (ugly)
+ continue;
+ }
+ result.put((String) entry.getKey(), tempVal);
+ }
+ return CompletableFuture.completedFuture(result);
+ }
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StoreItem.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StoreItem.java
similarity index 93%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StoreItem.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StoreItem.java
index 14a4b24b..fb1a4a94 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/StoreItem.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/StoreItem.java
@@ -1,11 +1,11 @@
-package com.microsoft.bot.builder;
-
-public interface StoreItem
-{
- /**
- * eTag for concurrency
- */
-
- String geteTag();
- void seteTag(String eTag);
-}
+package com.microsoft.bot.builder;
+
+public interface StoreItem
+{
+ /**
+ * eTag for concurrency
+ */
+
+ String geteTag();
+ void seteTag(String eTag);
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TraceTranscriptLogger.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TraceTranscriptLogger.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TraceTranscriptLogger.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TraceTranscriptLogger.java
index 5c884eed..a61cd54e 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TraceTranscriptLogger.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TraceTranscriptLogger.java
@@ -1,58 +1,58 @@
-package com.microsoft.bot.builder;
-
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.microsoft.bot.schema.models.Activity;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.ForkJoinWorkerThread;
-
-/**
- * Represents a transcript logger that writes activites to a object.
- */
-public class TraceTranscriptLogger implements TranscriptLogger {
- // https://github.com/FasterXML/jackson-databind/wiki/Serialization-Features
- private static ObjectMapper mapper = new ObjectMapper()
- .enable(SerializationFeature.INDENT_OUTPUT);
- private static final Logger logger = LogManager.getLogger("HelloWorld");
-
- ForkJoinPool.ForkJoinWorkerThreadFactory factory = new ForkJoinPool.ForkJoinWorkerThreadFactory()
- {
- @Override
- public ForkJoinWorkerThread newThread(ForkJoinPool pool)
- {
- final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
- worker.setName("BotTrace-" + worker.getPoolIndex());
- return worker;
- }
- };
-
- ExecutorService executor = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), factory, null, true);
-
- /**
- * Log an activity to the transcript.
- *
- * @param activity The activity to transcribe.
- * @return A task that represents the work queued to execute.
- */
- @Override
- public void LogActivityAsync(Activity activity) {
- BotAssert.ActivityNotNull(activity);
- String event = null;
- try {
- event = mapper.writeValueAsString(activity);
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
- this.logger.info(event);
- }
-}
+package com.microsoft.bot.builder;
+
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.microsoft.bot.schema.models.Activity;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinWorkerThread;
+
+/**
+ * Represents a transcript logger that writes activites to a object.
+ */
+public class TraceTranscriptLogger implements TranscriptLogger {
+ // https://github.com/FasterXML/jackson-databind/wiki/Serialization-Features
+ private static ObjectMapper mapper = new ObjectMapper()
+ .enable(SerializationFeature.INDENT_OUTPUT);
+ private static final Logger logger = LogManager.getLogger("HelloWorld");
+
+ ForkJoinPool.ForkJoinWorkerThreadFactory factory = new ForkJoinPool.ForkJoinWorkerThreadFactory()
+ {
+ @Override
+ public ForkJoinWorkerThread newThread(ForkJoinPool pool)
+ {
+ final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
+ worker.setName("BotTrace-" + worker.getPoolIndex());
+ return worker;
+ }
+ };
+
+ ExecutorService executor = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), factory, null, true);
+
+ /**
+ * Log an activity to the transcript.
+ *
+ * @param activity The activity to transcribe.
+ * @return A task that represents the work queued to execute.
+ */
+ @Override
+ public void LogActivityAsync(Activity activity) {
+ BotAssert.ActivityNotNull(activity);
+ String event = null;
+ try {
+ event = mapper.writeValueAsString(activity);
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+ this.logger.info(event);
+ }
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/Transcript.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/Transcript.java
similarity index 95%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/Transcript.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/Transcript.java
index 0601a108..76068a66 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/Transcript.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/Transcript.java
@@ -1,54 +1,54 @@
-package com.microsoft.bot.builder;
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-
-import java.time.OffsetDateTime;
-
-/**
- * Transcript store item.
- */
-public class Transcript {
- /**
- * channelId that the transcript was taken from.
- */
- private String channelId;
-
- public String channelId() {
- return this.channelId;
- }
-
- public Transcript withChannelId(String value) {
- this.channelId = value;
- return this;
- }
-
- /**
- * Conversation id.
- */
- private String id;
-
- public String getId() {
- return this.id;
- }
-
- public Transcript withId(String value) {
- this.id = value;
- return this;
- }
-
- /**
- * Date conversation was started.
- */
- private OffsetDateTime created = OffsetDateTime.now();
-
- public OffsetDateTime getCreated() {
- return this.created;
- }
-
- public Transcript withCreated(OffsetDateTime value) {
- this.created = value;
- return this;
- }
-}
+package com.microsoft.bot.builder;
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+
+import java.time.OffsetDateTime;
+
+/**
+ * Transcript store item.
+ */
+public class Transcript {
+ /**
+ * channelId that the transcript was taken from.
+ */
+ private String channelId;
+
+ public String channelId() {
+ return this.channelId;
+ }
+
+ public Transcript withChannelId(String value) {
+ this.channelId = value;
+ return this;
+ }
+
+ /**
+ * Conversation id.
+ */
+ private String id;
+
+ public String getId() {
+ return this.id;
+ }
+
+ public Transcript withId(String value) {
+ this.id = value;
+ return this;
+ }
+
+ /**
+ * Date conversation was started.
+ */
+ private OffsetDateTime created = OffsetDateTime.now();
+
+ public OffsetDateTime getCreated() {
+ return this.created;
+ }
+
+ public Transcript withCreated(OffsetDateTime value) {
+ this.created = value;
+ return this;
+ }
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TranscriptLogger.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TranscriptLogger.java
similarity index 96%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TranscriptLogger.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TranscriptLogger.java
index fe13afa4..4d4204af 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TranscriptLogger.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TranscriptLogger.java
@@ -1,21 +1,21 @@
-package com.microsoft.bot.builder;
-
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-
-import com.microsoft.bot.schema.models.Activity;
-
-/**
- * Transcript logger stores activities for conversations for recall.
- */
-public interface TranscriptLogger {
- /**
- * Log an activity to the transcript.
- *
- * @param activity The activity to transcribe.
- * @return A task that represents the work queued to execute.
- */
- void LogActivityAsync(Activity activity);
-}
+package com.microsoft.bot.builder;
+
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+
+import com.microsoft.bot.schema.models.Activity;
+
+/**
+ * Transcript logger stores activities for conversations for recall.
+ */
+public interface TranscriptLogger {
+ /**
+ * Log an activity to the transcript.
+ *
+ * @param activity The activity to transcribe.
+ * @return A task that represents the work queued to execute.
+ */
+ void LogActivityAsync(Activity activity);
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TranscriptLoggerMiddleware.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TranscriptLoggerMiddleware.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TranscriptLoggerMiddleware.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TranscriptLoggerMiddleware.java
index 12895d29..57562e33 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TranscriptLoggerMiddleware.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TranscriptLoggerMiddleware.java
@@ -1,191 +1,191 @@
-package com.microsoft.bot.builder;
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.microsoft.bot.schema.ActivityImpl;
-import com.microsoft.bot.schema.models.Activity;
-import com.microsoft.bot.schema.models.ActivityTypes;
-import com.microsoft.bot.schema.models.ResourceResponse;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-
-/**
- * When added, this middleware will log incoming and outgoing activitites to a ITranscriptStore.
- */
-public class TranscriptLoggerMiddleware implements Middleware {
- // https://github.com/FasterXML/jackson-databind/wiki/Serialization-Features
- private static ObjectMapper mapper;
-
- static {
- mapper = new ObjectMapper()
- .enable(SerializationFeature.INDENT_OUTPUT);
- mapper.findAndRegisterModules();
- }
-
- private TranscriptLogger logger;
- private static final Logger log4j = LogManager.getLogger("BotFx");
-
- private Queue transcript = new ConcurrentLinkedQueue();
-
- /**
- * Initializes a new instance of the class.
- *
- * @param transcriptLogger The transcript logger to use.
- */
- public TranscriptLoggerMiddleware(TranscriptLogger transcriptLogger) {
- if (transcriptLogger == null)
- throw new NullPointerException("TranscriptLoggerMiddleware requires a ITranscriptLogger implementation. ");
-
- this.logger = transcriptLogger;
-
- }
-
- /**
- * initialization for middleware turn.
- *
- * @param context
- * @param next
- * @return
- */
- @Override
- public void OnTurn(TurnContext context, NextDelegate next) throws Exception {
- // log incoming activity at beginning of turn
- if (context.getActivity() != null) {
- JsonNode role = null;
- if (context.getActivity().from() == null) {
- throw new RuntimeException("Activity does not contain From field");
- }
- if (context.getActivity().from().properties().containsKey("role")) {
- role = context.getActivity().from().properties().get("role");
- }
-
- if (role == null || StringUtils.isBlank(role.asText())) {
- context.getActivity().from().properties().put("role", mapper.createObjectNode().with("user"));
- }
- Activity activityTemp = ActivityImpl.CloneActity(context.getActivity());
-
- LogActivity(ActivityImpl.CloneActity(context.getActivity()));
- }
-
- // hook up onSend pipeline
- context.OnSendActivities((ctx, activities, nextSend) ->
- {
-
- // run full pipeline
- ResourceResponse[] responses = new ResourceResponse[0];
- try {
- if (nextSend != null) {
- responses = nextSend.call();
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- for (Activity activity : activities) {
- LogActivity(ActivityImpl.CloneActity(activity));
- }
-
- return responses;
-
-
- });
-
- // hook up update activity pipeline
- context.OnUpdateActivity((ctx, activity, nextUpdate) ->
- {
-
- // run full pipeline
- ResourceResponse response = null;
- try {
- if (nextUpdate != null) {
- response = nextUpdate.call();
- }
- } catch (Exception e) {
- e.printStackTrace();
-
-
- throw new RuntimeException(String.format("Error on Logging.OnUpdateActivity : %s", e.toString()));
- }
-
- // add Message Update activity
- Activity updateActivity = ActivityImpl.CloneActity(activity);
- updateActivity.withType(ActivityTypes.MESSAGE_UPDATE);
- LogActivity(updateActivity);
- return response;
-
-
- });
-
- // hook up delete activity pipeline
- context.OnDeleteActivity((ctxt, reference, nextDel) -> {
- // run full pipeline
-
- try {
- if (nextDel != null) {
- log4j.error(String.format("Transcript logActivity next delegate: %s)", nextDel));
- nextDel.run();
- }
- } catch (Exception e) {
- e.printStackTrace();
- log4j.error(String.format("Transcript logActivity failed with %s (next delegate: %s)", e.toString(), nextDel));
- throw new RuntimeException(String.format("Transcript logActivity failed with %s", e.getMessage()));
-
- }
-
- // add MessageDelete activity
- // log as MessageDelete activity
- Activity deleteActivity = new Activity()
- .withType(ActivityTypes.MESSAGE_DELETE)
- .withId(reference.activityId())
- .applyConversationReference(reference, false);
-
- LogActivity(deleteActivity);
- return;
-
- });
-
-
- // process bot logic
- try {
- next.next();
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(String.format("Error on Logging.next : %s", e.toString()));
- }
-
- // flush transcript at end of turn
- while (!transcript.isEmpty()) {
- Activity activity = transcript.poll();
- try {
- this.logger.LogActivityAsync(activity);
- } catch (RuntimeException err) {
- log4j.error(String.format("Transcript poll failed : %1$s", err));
- }
- }
-
- }
-
-
- private void LogActivity(Activity activity) {
- if (activity.timestamp() == null) {
- activity.withTimestamp(DateTime.now(DateTimeZone.UTC));
- }
- transcript.offer(activity);
- }
-
-}
-
-
-
+package com.microsoft.bot.builder;
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.microsoft.bot.schema.ActivityImpl;
+import com.microsoft.bot.schema.models.Activity;
+import com.microsoft.bot.schema.models.ActivityTypes;
+import com.microsoft.bot.schema.models.ResourceResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+
+/**
+ * When added, this middleware will log incoming and outgoing activitites to a ITranscriptStore.
+ */
+public class TranscriptLoggerMiddleware implements Middleware {
+ // https://github.com/FasterXML/jackson-databind/wiki/Serialization-Features
+ private static ObjectMapper mapper;
+
+ static {
+ mapper = new ObjectMapper()
+ .enable(SerializationFeature.INDENT_OUTPUT);
+ mapper.findAndRegisterModules();
+ }
+
+ private TranscriptLogger logger;
+ private static final Logger log4j = LogManager.getLogger("BotFx");
+
+ private Queue transcript = new ConcurrentLinkedQueue();
+
+ /**
+ * Initializes a new instance of the class.
+ *
+ * @param transcriptLogger The transcript logger to use.
+ */
+ public TranscriptLoggerMiddleware(TranscriptLogger transcriptLogger) {
+ if (transcriptLogger == null)
+ throw new NullPointerException("TranscriptLoggerMiddleware requires a ITranscriptLogger implementation. ");
+
+ this.logger = transcriptLogger;
+
+ }
+
+ /**
+ * initialization for middleware turn.
+ *
+ * @param context
+ * @param next
+ * @return
+ */
+ @Override
+ public void OnTurn(TurnContext context, NextDelegate next) throws Exception {
+ // log incoming activity at beginning of turn
+ if (context.getActivity() != null) {
+ JsonNode role = null;
+ if (context.getActivity().from() == null) {
+ throw new RuntimeException("Activity does not contain From field");
+ }
+ if (context.getActivity().from().properties().containsKey("role")) {
+ role = context.getActivity().from().properties().get("role");
+ }
+
+ if (role == null || StringUtils.isBlank(role.asText())) {
+ context.getActivity().from().properties().put("role", mapper.createObjectNode().with("user"));
+ }
+ Activity activityTemp = ActivityImpl.CloneActity(context.getActivity());
+
+ LogActivity(ActivityImpl.CloneActity(context.getActivity()));
+ }
+
+ // hook up onSend pipeline
+ context.OnSendActivities((ctx, activities, nextSend) ->
+ {
+
+ // run full pipeline
+ ResourceResponse[] responses = new ResourceResponse[0];
+ try {
+ if (nextSend != null) {
+ responses = nextSend.call();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ for (Activity activity : activities) {
+ LogActivity(ActivityImpl.CloneActity(activity));
+ }
+
+ return responses;
+
+
+ });
+
+ // hook up update activity pipeline
+ context.OnUpdateActivity((ctx, activity, nextUpdate) ->
+ {
+
+ // run full pipeline
+ ResourceResponse response = null;
+ try {
+ if (nextUpdate != null) {
+ response = nextUpdate.call();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+
+
+ throw new RuntimeException(String.format("Error on Logging.OnUpdateActivity : %s", e.toString()));
+ }
+
+ // add Message Update activity
+ Activity updateActivity = ActivityImpl.CloneActity(activity);
+ updateActivity.withType(ActivityTypes.MESSAGE_UPDATE);
+ LogActivity(updateActivity);
+ return response;
+
+
+ });
+
+ // hook up delete activity pipeline
+ context.OnDeleteActivity((ctxt, reference, nextDel) -> {
+ // run full pipeline
+
+ try {
+ if (nextDel != null) {
+ log4j.error(String.format("Transcript logActivity next delegate: %s)", nextDel));
+ nextDel.run();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log4j.error(String.format("Transcript logActivity failed with %s (next delegate: %s)", e.toString(), nextDel));
+ throw new RuntimeException(String.format("Transcript logActivity failed with %s", e.getMessage()));
+
+ }
+
+ // add MessageDelete activity
+ // log as MessageDelete activity
+ Activity deleteActivity = new Activity()
+ .withType(ActivityTypes.MESSAGE_DELETE)
+ .withId(reference.activityId())
+ .applyConversationReference(reference, false);
+
+ LogActivity(deleteActivity);
+ return;
+
+ });
+
+
+ // process bot logic
+ try {
+ next.next();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(String.format("Error on Logging.next : %s", e.toString()));
+ }
+
+ // flush transcript at end of turn
+ while (!transcript.isEmpty()) {
+ Activity activity = transcript.poll();
+ try {
+ this.logger.LogActivityAsync(activity);
+ } catch (RuntimeException err) {
+ log4j.error(String.format("Transcript poll failed : %1$s", err));
+ }
+ }
+
+ }
+
+
+ private void LogActivity(Activity activity) {
+ if (activity.timestamp() == null) {
+ activity.withTimestamp(DateTime.now(DateTimeZone.UTC));
+ }
+ transcript.offer(activity);
+ }
+
+}
+
+
+
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TranscriptStore.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TranscriptStore.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TranscriptStore.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TranscriptStore.java
index 0852735b..085a294f 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TranscriptStore.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TranscriptStore.java
@@ -1,57 +1,57 @@
-package com.microsoft.bot.builder;
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-
-import com.microsoft.bot.schema.models.Activity;
-import org.joda.time.DateTime;
-
-import java.util.concurrent.CompletableFuture;
-
-/**
- * Transcript logger stores activities for conversations for recall.
- */
-public interface TranscriptStore extends TranscriptLogger {
- /**
- * Gets from the store activities that match a set of criteria.
- *
- * @param channelId The ID of the channel the conversation is in.
- * @param conversationId The ID of the conversation.
- * @param continuationToken
- * @param startDate A cutoff date. Activities older than this date are not included.
- * @return A task that represents the work queued to execute.
- * If the task completes successfully, the result contains the matching activities.
- */
-
- CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId, String continuationToken);
-
- CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId);
-
- //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
-//ORIGINAL LINE: Task> GetTranscriptActivitiesAsync(string channelId, string conversationId, string continuationToken = null, DateTime startDate = default(DateTime));
- CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId, String continuationToken, DateTime localStartDate);
-
- /**
- * Gets the conversations on a channel from the store.
- *
- * @param channelId The ID of the channel.
- * @param continuationToken
- * @return A task that represents the work queued to execute.
- */
-
- CompletableFuture> ListTranscriptsAsync(String channelId);
-
- //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
-//ORIGINAL LINE: Task> ListTranscriptsAsync(string channelId, string continuationToken = null);
- CompletableFuture> ListTranscriptsAsync(String channelId, String continuationToken);
-
- /**
- * Deletes conversation data from the store.
- *
- * @param channelId The ID of the channel the conversation is in.
- * @param conversationId The ID of the conversation to delete.
- * @return A task that represents the work queued to execute.
- */
- CompletableFuture DeleteTranscriptAsync(String channelId, String conversationId);
-}
+package com.microsoft.bot.builder;
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+
+import com.microsoft.bot.schema.models.Activity;
+import org.joda.time.DateTime;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Transcript logger stores activities for conversations for recall.
+ */
+public interface TranscriptStore extends TranscriptLogger {
+ /**
+ * Gets from the store activities that match a set of criteria.
+ *
+ * @param channelId The ID of the channel the conversation is in.
+ * @param conversationId The ID of the conversation.
+ * @param continuationToken
+ * @param startDate A cutoff date. Activities older than this date are not included.
+ * @return A task that represents the work queued to execute.
+ * If the task completes successfully, the result contains the matching activities.
+ */
+
+ CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId, String continuationToken);
+
+ CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId);
+
+ //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
+//ORIGINAL LINE: Task> GetTranscriptActivitiesAsync(string channelId, string conversationId, string continuationToken = null, DateTime startDate = default(DateTime));
+ CompletableFuture> GetTranscriptActivitiesAsync(String channelId, String conversationId, String continuationToken, DateTime localStartDate);
+
+ /**
+ * Gets the conversations on a channel from the store.
+ *
+ * @param channelId The ID of the channel.
+ * @param continuationToken
+ * @return A task that represents the work queued to execute.
+ */
+
+ CompletableFuture> ListTranscriptsAsync(String channelId);
+
+ //C# TO JAVA CONVERTER NOTE: Java does not support optional parameters. Overloaded method(s) are created above:
+//ORIGINAL LINE: Task> ListTranscriptsAsync(string channelId, string continuationToken = null);
+ CompletableFuture> ListTranscriptsAsync(String channelId, String continuationToken);
+
+ /**
+ * Deletes conversation data from the store.
+ *
+ * @param channelId The ID of the channel the conversation is in.
+ * @param conversationId The ID of the conversation to delete.
+ * @return A task that represents the work queued to execute.
+ */
+ CompletableFuture DeleteTranscriptAsync(String channelId, String conversationId);
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TurnContext.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TurnContext.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TurnContext.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TurnContext.java
index 957db6c8..edf6ced6 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TurnContext.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TurnContext.java
@@ -1,182 +1,182 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-package com.microsoft.bot.builder;
-
-/**
- * A method that can participate in send activity events for the current turn.
- * @param context The context object for the turn.
- * @param activities The activities to send.
- * @param next The delegate to call to continue event processing.
- * @return A task that represents the work queued to execute.
- * A handler calls the {@code next} delegate to pass control to
- * the next registered handler. If a handler doesn’t call the next delegate,
- * the adapter does not call any of the subsequent handlers and does not send the
- * {@code activities}.
- *
- * {@linkalso BotAdapter}
- * {@linkalso UpdateActivityHandler}
- * {@linkalso DeleteActivityHandler}
- */
-
-import com.microsoft.bot.schema.models.Activity;
-import com.microsoft.bot.schema.models.ConversationReference;
-import com.microsoft.bot.schema.models.ResourceResponse;
-
-import java.util.concurrent.CompletableFuture;
-
-//public delegate Task DeleteActivityHandler(TurnContext context, ConversationReference reference, Func next);
-
-/**
- * Provides context for a turn of a bot.
- * Context provides information needed to process an incoming activity.
- * The context object is created by a {@link BotAdapter} and persists for the
- * length of the turn.
- * {@linkalso Bot}
- * {@linkalso Middleware}
- */
-public interface TurnContext
-{
- /**
- * Gets the bot adapter that created this context object.
- */
- BotAdapter getAdapter();
-
- /**
- * Gets the services registered on this context object.
- */
- TurnContextServiceCollection getServices();
-
- /**
- * Incoming request
- */
- Activity getActivity();
-
-
-
- /**
- * Indicates whether at least one response was sent for the current turn.
- * @return {@code true} if at least one response was sent for the current turn.
- */
- boolean getResponded();
- void setResponded(boolean responded);
-
- /**
- * Sends a message activity to the sender of the incoming activity.
- * @param textReplyToSend The text of the message to send.
- * @param speak Optional, text to be spoken by your bot on a speech-enabled
- * channel.
- * @param inputHint Optional, indicates whether your bot is accepting,
- * expecting, or ignoring user input after the message is delivered to the client.
- * One of: "acceptingInput", "ignoringInput", or "expectingInput".
- * Default is "acceptingInput".
- * @return A task that represents the work queued to execute.
- * If the activity is successfully sent, the task result contains
- * a {@link ResourceResponse} object containing the ID that the receiving
- * channel assigned to the activity.
- * See the channel's documentation for limits imposed upon the contents of
- * {@code textReplyToSend}.
- * To control various characteristics of your bot's speech such as voice,
- * rate, volume, pronunciation, and pitch, specify {@code speak} in
- * Speech Synthesis Markup Language (SSML) format.
- *
- */
- ResourceResponse SendActivity(String textReplyToSend) throws Exception;
- ResourceResponse SendActivity(String textReplyToSend, String speak) throws Exception;
- //CompletableFuture SendActivity(String textReplyToSend, String speak = null, String inputHint = InputHints.AcceptingInput);
- ResourceResponse SendActivity(String textReplyToSend, String speak, String inputHint) throws Exception;
-
- /**
- * Sends an activity to the sender of the incoming activity.
- * @param activity The activity to send.
- * @return A task that represents the work queued to execute.
- * If the activity is successfully sent, the task result contains
- * a {@link ResourceResponse} object containing the ID that the receiving
- * channel assigned to the activity.
- */
- ResourceResponse SendActivity(Activity activity) throws Exception;
-
- /**
- * Sends a set of activities to the sender of the incoming activity.
- * @param activities The activities to send.
- * @return A task that represents the work queued to execute.
- * If the activities are successfully sent, the task result contains
- * an array of {@link ResourceResponse} objects containing the IDs that
- * the receiving channel assigned to the activities.
- */
- ResourceResponse[] SendActivities(Activity[] activities) throws Exception;
-
- /**
- * Replaces an existing activity.
- * @param activity New replacement activity.
- * @return A task that represents the work queued to execute.
- * If the activity is successfully sent, the task result contains
- * a {@link ResourceResponse} object containing the ID that the receiving
- * channel assigned to the activity.
- * Before calling this, set the ID of the replacement activity to the ID
- * of the activity to replace.
- */
- ResourceResponse UpdateActivity(Activity activity) throws Exception;
-
- /**
- * Replaces an existing activity.
- * @param activity New replacement activity.
- * @return A task that represents the work queued to execute.
- * If the activity is successfully sent, the task result contains
- * a {@link ResourceResponse} object containing the ID that the receiving
- * channel assigned to the activity.
- * Before calling this, set the ID of the replacement activity to the ID
- * of the activity to replace.
- */
- //CompletableFuture UpdateActivityAsync(Activity activity) throws Exception;
-
- /**
- * Deletes an existing activity.
- * @param activityId The ID of the activity to delete.
- * @return A task that represents the work queued to execute.
- */
- CompletableFuture DeleteActivity(String activityId) throws Exception;
-
- /**
- * Deletes an existing activity.
- * @param conversationReference The conversation containing the activity to delete.
- * @return A task that represents the work queued to execute.
- * The conversation reference's {@link ConversationReference.ActivityId}
- * indicates the activity in the conversation to delete.
- */
- void DeleteActivity(ConversationReference conversationReference) throws Exception;
-
- /**
- * Adds a response handler for send activity operations.
- * @param handler The handler to add to the context object.
- * @return The updated context object.
- * When the context's {@link SendActivity(Activity)}
- * or {@link SendActivities(Activity[])} methods are called,
- * the adapter calls the registered handlers in the order in which they were
- * added to the context object.
- *
- */
- TurnContext OnSendActivities(SendActivitiesHandler handler);
-
- /**
- * Adds a response handler for update activity operations.
- * @param handler The handler to add to the context object.
- * @return The updated context object.
- * When the context's {@link UpdateActivity(Activity)} is called,
- * the adapter calls the registered handlers in the order in which they were
- * added to the context object.
- *
- */
- TurnContext OnUpdateActivity(UpdateActivityHandler handler);
-
- /**
- * Adds a response handler for delete activity operations.
- * @param handler The handler to add to the context object.
- * @return The updated context object.
- * @throws NullPointerException {@code handler} is {@code null}.
- * When the context's {@link DeleteActivity(String)} is called,
- * the adapter calls the registered handlers in the order in which they were
- * added to the context object.
- *
- */
- TurnContext OnDeleteActivity(DeleteActivityHandler handler);
-}
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.microsoft.bot.builder;
+
+/**
+ * A method that can participate in send activity events for the current turn.
+ * @param context The context object for the turn.
+ * @param activities The activities to send.
+ * @param next The delegate to call to continue event processing.
+ * @return A task that represents the work queued to execute.
+ * A handler calls the {@code next} delegate to pass control to
+ * the next registered handler. If a handler doesn’t call the next delegate,
+ * the adapter does not call any of the subsequent handlers and does not send the
+ * {@code activities}.
+ *
+ * {@linkalso BotAdapter}
+ * {@linkalso UpdateActivityHandler}
+ * {@linkalso DeleteActivityHandler}
+ */
+
+import com.microsoft.bot.schema.models.Activity;
+import com.microsoft.bot.schema.models.ConversationReference;
+import com.microsoft.bot.schema.models.ResourceResponse;
+
+import java.util.concurrent.CompletableFuture;
+
+//public delegate Task DeleteActivityHandler(TurnContext context, ConversationReference reference, Func next);
+
+/**
+ * Provides context for a turn of a bot.
+ * Context provides information needed to process an incoming activity.
+ * The context object is created by a {@link BotAdapter} and persists for the
+ * length of the turn.
+ * {@linkalso Bot}
+ * {@linkalso Middleware}
+ */
+public interface TurnContext
+{
+ /**
+ * Gets the bot adapter that created this context object.
+ */
+ BotAdapter getAdapter();
+
+ /**
+ * Gets the services registered on this context object.
+ */
+ TurnContextServiceCollection getServices();
+
+ /**
+ * Incoming request
+ */
+ Activity getActivity();
+
+
+
+ /**
+ * Indicates whether at least one response was sent for the current turn.
+ * @return {@code true} if at least one response was sent for the current turn.
+ */
+ boolean getResponded();
+ void setResponded(boolean responded);
+
+ /**
+ * Sends a message activity to the sender of the incoming activity.
+ * @param textReplyToSend The text of the message to send.
+ * @param speak Optional, text to be spoken by your bot on a speech-enabled
+ * channel.
+ * @param inputHint Optional, indicates whether your bot is accepting,
+ * expecting, or ignoring user input after the message is delivered to the client.
+ * One of: "acceptingInput", "ignoringInput", or "expectingInput".
+ * Default is "acceptingInput".
+ * @return A task that represents the work queued to execute.
+ * If the activity is successfully sent, the task result contains
+ * a {@link ResourceResponse} object containing the ID that the receiving
+ * channel assigned to the activity.
+ * See the channel's documentation for limits imposed upon the contents of
+ * {@code textReplyToSend}.
+ * To control various characteristics of your bot's speech such as voice,
+ * rate, volume, pronunciation, and pitch, specify {@code speak} in
+ * Speech Synthesis Markup Language (SSML) format.
+ *
+ */
+ ResourceResponse SendActivity(String textReplyToSend) throws Exception;
+ ResourceResponse SendActivity(String textReplyToSend, String speak) throws Exception;
+ //CompletableFuture SendActivity(String textReplyToSend, String speak = null, String inputHint = InputHints.AcceptingInput);
+ ResourceResponse SendActivity(String textReplyToSend, String speak, String inputHint) throws Exception;
+
+ /**
+ * Sends an activity to the sender of the incoming activity.
+ * @param activity The activity to send.
+ * @return A task that represents the work queued to execute.
+ * If the activity is successfully sent, the task result contains
+ * a {@link ResourceResponse} object containing the ID that the receiving
+ * channel assigned to the activity.
+ */
+ ResourceResponse SendActivity(Activity activity) throws Exception;
+
+ /**
+ * Sends a set of activities to the sender of the incoming activity.
+ * @param activities The activities to send.
+ * @return A task that represents the work queued to execute.
+ * If the activities are successfully sent, the task result contains
+ * an array of {@link ResourceResponse} objects containing the IDs that
+ * the receiving channel assigned to the activities.
+ */
+ ResourceResponse[] SendActivities(Activity[] activities) throws Exception;
+
+ /**
+ * Replaces an existing activity.
+ * @param activity New replacement activity.
+ * @return A task that represents the work queued to execute.
+ * If the activity is successfully sent, the task result contains
+ * a {@link ResourceResponse} object containing the ID that the receiving
+ * channel assigned to the activity.
+ * Before calling this, set the ID of the replacement activity to the ID
+ * of the activity to replace.
+ */
+ ResourceResponse UpdateActivity(Activity activity) throws Exception;
+
+ /**
+ * Replaces an existing activity.
+ * @param activity New replacement activity.
+ * @return A task that represents the work queued to execute.
+ * If the activity is successfully sent, the task result contains
+ * a {@link ResourceResponse} object containing the ID that the receiving
+ * channel assigned to the activity.
+ * Before calling this, set the ID of the replacement activity to the ID
+ * of the activity to replace.
+ */
+ //CompletableFuture UpdateActivityAsync(Activity activity) throws Exception;
+
+ /**
+ * Deletes an existing activity.
+ * @param activityId The ID of the activity to delete.
+ * @return A task that represents the work queued to execute.
+ */
+ CompletableFuture DeleteActivity(String activityId) throws Exception;
+
+ /**
+ * Deletes an existing activity.
+ * @param conversationReference The conversation containing the activity to delete.
+ * @return A task that represents the work queued to execute.
+ * The conversation reference's {@link ConversationReference.ActivityId}
+ * indicates the activity in the conversation to delete.
+ */
+ void DeleteActivity(ConversationReference conversationReference) throws Exception;
+
+ /**
+ * Adds a response handler for send activity operations.
+ * @param handler The handler to add to the context object.
+ * @return The updated context object.
+ * When the context's {@link SendActivity(Activity)}
+ * or {@link SendActivities(Activity[])} methods are called,
+ * the adapter calls the registered handlers in the order in which they were
+ * added to the context object.
+ *
+ */
+ TurnContext OnSendActivities(SendActivitiesHandler handler);
+
+ /**
+ * Adds a response handler for update activity operations.
+ * @param handler The handler to add to the context object.
+ * @return The updated context object.
+ * When the context's {@link UpdateActivity(Activity)} is called,
+ * the adapter calls the registered handlers in the order in which they were
+ * added to the context object.
+ *
+ */
+ TurnContext OnUpdateActivity(UpdateActivityHandler handler);
+
+ /**
+ * Adds a response handler for delete activity operations.
+ * @param handler The handler to add to the context object.
+ * @return The updated context object.
+ * @throws NullPointerException {@code handler} is {@code null}.
+ * When the context's {@link DeleteActivity(String)} is called,
+ * the adapter calls the registered handlers in the order in which they were
+ * added to the context object.
+ *
+ */
+ TurnContext OnDeleteActivity(DeleteActivityHandler handler);
+}
diff --git a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TurnContextImpl.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TurnContextImpl.java
similarity index 97%
rename from libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TurnContextImpl.java
rename to libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TurnContextImpl.java
index 58d4ed20..c955db95 100644
--- a/libraries/botbuilder/src/main/java/com/microsoft/bot/builder/TurnContextImpl.java
+++ b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TurnContextImpl.java
@@ -1,615 +1,615 @@
-package com.microsoft.bot.builder;
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-import com.microsoft.bot.schema.ActivityImpl;
-import com.microsoft.bot.schema.models.Activity;
-import com.microsoft.bot.schema.models.ConversationReference;
-import com.microsoft.bot.schema.models.InputHints;
-import com.microsoft.bot.schema.models.ResourceResponse;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.*;
-
-import static com.microsoft.bot.schema.models.ActivityTypes.MESSAGE;
-import static com.microsoft.bot.schema.models.ActivityTypes.TRACE;
-import static java.util.stream.Collectors.toList;
-
-/**
- * Provides context for a turn of a bot.
- * Context provides information needed to process an incoming activity.
- * The context object is created by a {@link BotAdapter} and persists for the
- * length of the turn.
- * {@linkalso Bot}
- * {@linkalso Middleware}
- */
-public class TurnContextImpl implements TurnContext, AutoCloseable {
- private final BotAdapter adapter;
- private final ActivityImpl activity;
- private Boolean responded = false;
-
- private final List