From 83c97423a2c765537c111f475ef582643c154fe5 Mon Sep 17 00:00:00 2001
From: Ryan <dawkinssu@gmail.com>
Date: Wed, 14 Feb 2018 23:07:18 -0800
Subject: [PATCH] Changing QnAMaker to QnAMakerMiddleware to be consistent for
 #120.

---
 .../{QnAMaker.cs => QnAMakerMiddleware.cs}                  | 4 ++--
 .../Controllers/MessagesController.cs                       | 2 +-
 tests/Microsoft.Bot.Builder.Ai.Tests/QnAMakerTests.cs       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename libraries/Microsoft.Bot.Builder.Ai/{QnAMaker.cs => QnAMakerMiddleware.cs} (96%)

diff --git a/libraries/Microsoft.Bot.Builder.Ai/QnAMaker.cs b/libraries/Microsoft.Bot.Builder.Ai/QnAMakerMiddleware.cs
similarity index 96%
rename from libraries/Microsoft.Bot.Builder.Ai/QnAMaker.cs
rename to libraries/Microsoft.Bot.Builder.Ai/QnAMakerMiddleware.cs
index 9c2e291d4c..36b29e9904 100644
--- a/libraries/Microsoft.Bot.Builder.Ai/QnAMaker.cs
+++ b/libraries/Microsoft.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
index 667337bb44..7ae3329f1e 100644
--- 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
index e0bd33f8fb..b2193c2898 100644
--- 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,