Merge pull request #1 from Microsoft/master

Merging back into fork.
microsoft · Feb 15, 2018 · f5be7f2 · f5be7f2
2 parents 0e88c98 + afb7a57
commit f5be7f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...ries/Microsoft.Bot.Builder.Ai/QnAMaker.cs → ...soft.Bot.Builder.Ai/QnAMakerMiddleware.cs b/...ries/Microsoft.Bot.Builder.Ai/QnAMaker.cs → ...soft.Bot.Builder.Ai/QnAMakerMiddleware.cs
@@ -39,14 +39,14 @@ public class QnAMakerOptions
         public int Top { get; set; }
     }
 
-    public class QnAMaker : Middleware.IReceiveActivity, IDisposable
+    public class QnAMakerMiddleware : Middleware.IReceiveActivity, IDisposable
     {
         public const string qnaMakerServiceEndpoint = "https://westus.api.cognitive.microsoft.com/qnamaker/v2.0/knowledgebases/";
         private string answerUrl;
         private QnAMakerOptions options;
         private HttpClient httpClient;
 
-        public QnAMaker(QnAMakerOptions options)
+        public QnAMakerMiddleware(QnAMakerOptions options)
         {
             this.answerUrl = $"{qnaMakerServiceEndpoint}{options.KnowledgeBaseId}/generateanswer";
             if (options.ScoreThreshold == 0)

diff --git a/samples/Microsoft.Bot.Samples.Ai.QnA/Controllers/MessagesController.cs b/samples/Microsoft.Bot.Samples.Ai.QnA/Controllers/MessagesController.cs
@@ -28,7 +28,7 @@ public MessagesController(IConfiguration configuration)
             };
             var bot = new Builder.Bot(new BotFrameworkAdapter(configuration))
                 // add QnA middleware 
-                .Use(new QnAMaker(qnaOptions));
+                .Use(new QnAMakerMiddleware(qnaOptions));
             bot.OnReceive(BotReceiveHandler);
 
             _adapter = (BotFrameworkAdapter)bot.Adapter;

diff --git a/tests/Microsoft.Bot.Builder.Ai.Tests/QnAMakerTests.cs b/tests/Microsoft.Bot.Builder.Ai.Tests/QnAMakerTests.cs
@@ -19,7 +19,7 @@ public class QnaMakerTests
         [TestCategory("QnAMaker")]
         public async Task QnaMaker_ReturnsAnswer()
         {
-            var qna = new QnAMaker(new QnAMakerOptions()
+            var qna = new QnAMakerMiddleware(new QnAMakerOptions()
             {
                 KnowledgeBaseId = knowlegeBaseId,
                 SubscriptionKey = subscriptionKey,
@@ -38,7 +38,7 @@ public async Task QnaMaker_ReturnsAnswer()
         public async Task QnaMaker_TestThreshold()
         {
 
-            var qna = new QnAMaker(new QnAMakerOptions()
+            var qna = new QnAMakerMiddleware(new QnAMakerOptions()
             {
                 KnowledgeBaseId = knowlegeBaseId,
                 SubscriptionKey = subscriptionKey,
@@ -58,7 +58,7 @@ public async Task QnaMaker_TestMiddleware()
         {
             TestAdapter adapter = new TestAdapter();
             Bot bot = new Bot(adapter)
-                .Use(new QnAMaker(new QnAMakerOptions()
+                .Use(new QnAMakerMiddleware(new QnAMakerOptions()
                 {
                     KnowledgeBaseId = knowlegeBaseId,
                     SubscriptionKey = subscriptionKey,