Updates for Issue 1134 (#1139)

Author: LeeParrishMSFT

libraries/bot-dialogs/src/main/java/com/microsoft/bot/dialogs/Dialog.java

@@ -19,6 +19,7 @@
 import com.microsoft.bot.connector.authentication.GovernmentAuthenticationConstants;
 import com.microsoft.bot.connector.authentication.SkillValidation;
 import com.microsoft.bot.dialogs.memory.DialogStateManager;
+import com.microsoft.bot.dialogs.memory.DialogStateManagerConfiguration;
 import com.microsoft.bot.schema.Activity;
 import com.microsoft.bot.schema.ActivityTypes;
 import com.microsoft.bot.schema.EndOfConversationCodes;
@@ -322,24 +323,25 @@ public static CompletableFuture<Void> run(Dialog dialog, TurnContext turnContext
         dialogSet.add(dialog);
 
         return dialogSet.createContext(turnContext)
-                .thenAccept(dialogContext -> innerRun(turnContext, dialog.getId(), dialogContext));
+                .thenAccept(dialogContext -> innerRun(turnContext, dialog.getId(), dialogContext, null));
     }
 
     /**
      * Shared implementation of run with Dialog and DialogManager.
      *
-     * @param turnContext   The turnContext.
-     * @param dialogId      The Id of the Dialog.
-     * @param dialogContext The DialogContext.
+     * @param turnContext        The turnContext.
+     * @param dialogId           The Id of the Dialog.
+     * @param dialogContext      The DialogContext.
+     * @param stateConfiguration The DialogStateManagerConfiguration.
      * @return A DialogTurnResult.
      */
     protected static CompletableFuture<DialogTurnResult> innerRun(TurnContext turnContext, String dialogId,
-            DialogContext dialogContext) {
+            DialogContext dialogContext, DialogStateManagerConfiguration stateConfiguration) {
         for (Entry<String, Object> entry : turnContext.getTurnState().getTurnStateServices().entrySet()) {
             dialogContext.getServices().replace(entry.getKey(), entry.getValue());
         }
 
-        DialogStateManager dialogStateManager = new DialogStateManager(dialogContext);
+        DialogStateManager dialogStateManager = new DialogStateManager(dialogContext, stateConfiguration);
         return dialogStateManager.loadAllScopes().thenCompose(result -> {
             dialogContext.getContext().getTurnState().add(dialogStateManager);
             DialogTurnResult dialogTurnResult = null;

libraries/bot-dialogs/src/main/java/com/microsoft/bot/dialogs/DialogManager.java

@@ -254,7 +254,7 @@ public CompletableFuture<DialogManagerResult> onTurn(TurnContext context) {
         // Create DialogContext
         DialogContext dc = new DialogContext(dialogs, context, dialogState);
 
-        return Dialog.innerRun(context, rootDialogId, dc).thenCompose(turnResult -> {
+        return Dialog.innerRun(context, rootDialogId, dc, getStateManagerConfiguration()).thenCompose(turnResult -> {
             return botStateSet.saveAllChanges(dc.getContext(), false).thenCompose(saveResult -> {
                 DialogManagerResult result = new DialogManagerResult();
                 result.setTurnResult(turnResult);

libraries/bot-dialogs/src/test/java/com/microsoft/bot/dialogs/DialogManagerTests.java

@@ -31,14 +31,20 @@
 import com.microsoft.bot.builder.UserState;
 import com.microsoft.bot.builder.adapters.TestAdapter;
 import com.microsoft.bot.builder.adapters.TestFlow;
+import com.microsoft.bot.dialogs.memory.DialogStateManager;
+import com.microsoft.bot.dialogs.memory.DialogStateManagerConfiguration;
+import com.microsoft.bot.dialogs.memory.PathResolver;
+import com.microsoft.bot.dialogs.memory.scopes.MemoryScope;
 import com.microsoft.bot.dialogs.prompts.PromptOptions;
 import com.microsoft.bot.dialogs.prompts.TextPrompt;
 import com.microsoft.bot.schema.Activity;
 import com.microsoft.bot.schema.ActivityTypes;
+import com.microsoft.bot.schema.ChannelAccount;
 import com.microsoft.bot.schema.ConversationAccount;
 import com.microsoft.bot.schema.ResourceResponse;
 import com.microsoft.bot.schema.ResultPair;
 
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Assert;
 import org.junit.Test;
@@ -462,6 +468,44 @@ public void SkillShouldReturnEmptyOnRepromptWithNoDialog() {
         Assert.assertEquals(DialogTurnStatus.EMPTY, _dmTurnResult.getTurnResult().getStatus());
     }
 
+    @Test
+    public void DialogManager_StateConfigurationTest() {
+                   // Arrange
+        WaterfallDialog dialog = new WaterfallDialog("test-dialog", null);
+
+        CustomMemoryScope memoryScope = new CustomMemoryScope();
+        CustomPathResolver pathResolver = new CustomPathResolver();
+
+        DialogManager dialogManager = new DialogManager(dialog, null);
+        dialogManager.setStateManagerConfiguration(new DialogStateManagerConfiguration());
+        dialogManager.getStateManagerConfiguration().getMemoryScopes().add(memoryScope);
+        dialogManager.getStateManagerConfiguration().getPathResolvers().add(pathResolver);
+
+        // The test dialog being used here happens to not send anything so we only need to mock the type.
+        TestAdapter adapter = new TestAdapter();
+
+        // ChannelId and Conversation.Id are required for ConversationState and
+        // ChannelId and From.Id are required for UserState.
+        Activity activity = new Activity(ActivityTypes.MESSAGE);
+        activity.setChannelId("test-channel");
+        ConversationAccount conversation = new ConversationAccount();
+        conversation.setId("test-conversation-id");
+        ChannelAccount channelAccount = new ChannelAccount();
+        channelAccount.setId("test-id");
+        activity.setConversation(conversation);
+        activity.setFrom(channelAccount);
+
+        // Act
+        TurnContext turnContext = new TurnContextImpl(adapter, activity);
+        turnContext.getTurnState().add(new ConversationState(new MemoryStorage()));
+        dialogManager.onTurn(turnContext).join();
+        DialogStateManager actual = turnContext.getTurnState().get(DialogStateManager.class);
+
+        // Assert
+        Assert.assertTrue(actual.getConfiguration().getMemoryScopes().contains(memoryScope));
+        Assert.assertTrue(actual.getConfiguration().getPathResolvers().contains(pathResolver));
+    }
+
     private Dialog CreateTestDialog(String property) {
         return new AskForNameDialog(property.replace(".", ""), property);
     }
@@ -539,6 +583,33 @@ public CompletableFuture<ResourceResponse[]> invoke(TurnContext context, List<Ac
         }
     }
 
+    private class CustomMemoryScope extends MemoryScope {
+        CustomMemoryScope() {
+            super("custom", false);
+        }
+
+        @Override
+        public Object getMemory(DialogContext dialogContext) {
+            throw new NotImplementedException("Not implemented");
+        }
+
+        @Override
+        public void setMemory(DialogContext dialogContext, Object memory) {
+            throw new NotImplementedException("Not implemented");
+        }
+    }
+
+    private class CustomPathResolver implements PathResolver {
+        CustomPathResolver() {
+        }
+
+        @Override
+        public String transformPath(String path) {
+            throw new NotImplementedException("Not implemented");
+        }
+
+    }
+
     private class AskForNameDialog extends ComponentDialog implements DialogDependencies {
         private final String property;