From f7e01384ea337716949156532e5eddc51dbb20ba Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Wed, 3 Aug 2022 09:04:50 -0400
Subject: [PATCH 01/33] Initial GraphQLManager tests

---
 .../OdpTests/GraphQLManagerTest.cs            | 94 +++++++++++++++++++
 .../OptimizelySDK.Tests.csproj                |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
new file mode 100644
index 00000000..e6ab009e
--- /dev/null
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -0,0 +1,94 @@
+using Moq;
+using NUnit.Framework;
+using OptimizelySDK.Logger;
+using OptimizelySDK.Odp;
+using System;
+
+namespace OptimizelySDK.Tests.OdpTests
+{
+    [TestFixture]
+    public class GraphQLManagerTest
+    {
+        private Mock<ILogger> LoggerMock;
+        
+        [SetUp]
+        public void Setup()
+        {
+            LoggerMock = new Mock<ILogger>();
+            LoggerMock.Setup(i => i.Log(It.IsAny<LogLevel>(), It.IsAny<string>()));
+        }
+
+        [Test]
+        public void ShouldParseSuccessfulResponseData()
+        {
+            #region const string responseJson
+            const string responseJson = @"
+{
+    ""data"": {
+        ""customer"": {
+            ""audiences"": {
+                ""edges"": [
+                {
+                    ""node"": {
+                        ""name"": ""has_email"",
+                        ""state"": ""qualified"",
+                    }
+                },
+                {
+                    ""node"": {
+                        ""name"": ""has_email_opted_in"",
+                        ""state"": ""qualified"",
+                    }
+                },
+                ...
+                    ]
+            }
+        }
+    }
+}";
+            #endregion
+            var manager = new GraphQLManager(LoggerMock.Object);
+
+            var response = manager.ParseResponse(responseJson);
+            
+            Assert.IsNull(response.Errors); 
+            Assert.IsNotNull(response.Data);
+        }
+        
+        [Test]
+        public void ShouldParseErrorResponseWithNullData()
+        {
+            #region const string responseJson
+            const string responseJson = @"
+{
+   ""errors"": [
+        {
+            ""message"": ""Exception while fetching data (/customer) : java.lang.RuntimeException: could not resolve _fs_user_id = asdsdaddddd"",
+            ""locations"": [
+            {
+                ""line"": 2,
+                ""column"": 3
+            }
+            ],
+            ""path"": [
+            ""customer""
+                ],
+            ""extensions"": {
+                ""classification"": ""InvalidIdentifierException""
+            }
+        }
+    ],
+    ""data"": {
+        ""customer"": null
+    }
+}";
+            #endregion
+            var manager = new GraphQLManager(LoggerMock.Object);
+
+            var response = manager.ParseResponse(responseJson);
+            
+            Assert.IsNull(response.Data);
+            Assert.IsNotNull(response.Errors);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OptimizelySDK.Tests/OptimizelySDK.Tests.csproj b/OptimizelySDK.Tests/OptimizelySDK.Tests.csproj
index 2a776bcb..43b6b49b 100644
--- a/OptimizelySDK.Tests/OptimizelySDK.Tests.csproj
+++ b/OptimizelySDK.Tests/OptimizelySDK.Tests.csproj
@@ -79,6 +79,7 @@
     <Compile Include="DecisionServiceTest.cs" />
     <Compile Include="DefaultErrorHandlerTest.cs" />
     <Compile Include="EventTests\EventProcessorProps.cs" />
+    <Compile Include="OdpTests\GraphQLManagerTest.cs" />
     <Compile Include="OptimizelyConfigTests\OptimizelyConfigTest.cs" />
     <Compile Include="OptimizelyDecisions\OptimizelyDecisionTest.cs" />
     <Compile Include="OptimizelyJSONTest.cs" />
@@ -136,7 +137,6 @@
       <Name>OptimizelySDK</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <None Include="packages.config" />
     <EmbeddedResource Include="unsupported_version_datafile.json" />

From 453671946937f0a3ee348a74341a352432ef1213 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Wed, 3 Aug 2022 13:58:49 -0400
Subject: [PATCH 02/33] Correct GraphQLManagerTest.cs

---
 .../OdpTests/GraphQLManagerTest.cs            | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index e6ab009e..295e2ba1 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -2,24 +2,23 @@
 using NUnit.Framework;
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp;
-using System;
 
 namespace OptimizelySDK.Tests.OdpTests
 {
     [TestFixture]
     public class GraphQLManagerTest
     {
-        private Mock<ILogger> LoggerMock;
+        private Mock<ILogger> MockLogger;
         
         [SetUp]
         public void Setup()
         {
-            LoggerMock = new Mock<ILogger>();
-            LoggerMock.Setup(i => i.Log(It.IsAny<LogLevel>(), It.IsAny<string>()));
+            MockLogger = new Mock<ILogger>();
+            MockLogger.Setup(i => i.Log(It.IsAny<LogLevel>(), It.IsAny<string>()));
         }
 
         [Test]
-        public void ShouldParseSuccessfulResponseData()
+        public void ShouldParseSuccessfulResponse()
         {
             #region const string responseJson
             const string responseJson = @"
@@ -40,14 +39,13 @@ public void ShouldParseSuccessfulResponseData()
                         ""state"": ""qualified"",
                     }
                 },
-                ...
-                    ]
+              ]
             }
         }
     }
 }";
             #endregion
-            var manager = new GraphQLManager(LoggerMock.Object);
+            var manager = new GraphQLManager(MockLogger.Object);
 
             var response = manager.ParseResponse(responseJson);
             
@@ -56,7 +54,7 @@ public void ShouldParseSuccessfulResponseData()
         }
         
         [Test]
-        public void ShouldParseErrorResponseWithNullData()
+        public void ShouldParseErrorResponse()
         {
             #region const string responseJson
             const string responseJson = @"
@@ -65,10 +63,10 @@ public void ShouldParseErrorResponseWithNullData()
         {
             ""message"": ""Exception while fetching data (/customer) : java.lang.RuntimeException: could not resolve _fs_user_id = asdsdaddddd"",
             ""locations"": [
-            {
-                ""line"": 2,
-                ""column"": 3
-            }
+                {
+                    ""line"": 2,
+                    ""column"": 3
+                }
             ],
             ""path"": [
             ""customer""
@@ -83,11 +81,11 @@ public void ShouldParseErrorResponseWithNullData()
     }
 }";
             #endregion
-            var manager = new GraphQLManager(LoggerMock.Object);
+            var manager = new GraphQLManager(MockLogger.Object);
 
             var response = manager.ParseResponse(responseJson);
             
-            Assert.IsNull(response.Data);
+            Assert.IsNull(response.Data.Customer);
             Assert.IsNotNull(response.Errors);
         }
     }

From f2b4e79ce485c1606d28847e97b3dd0665b5bad6 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Wed, 3 Aug 2022 14:00:34 -0400
Subject: [PATCH 03/33] Add GraphQL manager and supporting entities

---
 OptimizelySDK/Odp/Entities/Audience.cs  |  7 +++++++
 OptimizelySDK/Odp/Entities/Customer.cs  |  7 +++++++
 OptimizelySDK/Odp/Entities/Data.cs      |  7 +++++++
 OptimizelySDK/Odp/Entities/Edge.cs      |  7 +++++++
 OptimizelySDK/Odp/Entities/Error.cs     | 13 +++++++++++++
 OptimizelySDK/Odp/Entities/Extension.cs |  7 +++++++
 OptimizelySDK/Odp/Entities/Location.cs  |  9 +++++++++
 OptimizelySDK/Odp/Entities/Node.cs      |  9 +++++++++
 OptimizelySDK/Odp/Entities/Response.cs  |  9 +++++++++
 OptimizelySDK/Odp/GraphQLManager.cs     | 24 ++++++++++++++++++++++++
 OptimizelySDK/OptimizelySDK.csproj      | 12 ++++++++++--
 11 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 OptimizelySDK/Odp/Entities/Audience.cs
 create mode 100644 OptimizelySDK/Odp/Entities/Customer.cs
 create mode 100644 OptimizelySDK/Odp/Entities/Data.cs
 create mode 100644 OptimizelySDK/Odp/Entities/Edge.cs
 create mode 100644 OptimizelySDK/Odp/Entities/Error.cs
 create mode 100644 OptimizelySDK/Odp/Entities/Extension.cs
 create mode 100644 OptimizelySDK/Odp/Entities/Location.cs
 create mode 100644 OptimizelySDK/Odp/Entities/Node.cs
 create mode 100644 OptimizelySDK/Odp/Entities/Response.cs
 create mode 100644 OptimizelySDK/Odp/GraphQLManager.cs

diff --git a/OptimizelySDK/Odp/Entities/Audience.cs b/OptimizelySDK/Odp/Entities/Audience.cs
new file mode 100644
index 00000000..251986d1
--- /dev/null
+++ b/OptimizelySDK/Odp/Entities/Audience.cs
@@ -0,0 +1,7 @@
+namespace OptimizelySDK.Odp.Entities
+{
+    public class Audience
+    {
+        public Edge[] Edges { get; set; }
+    }
+}
diff --git a/OptimizelySDK/Odp/Entities/Customer.cs b/OptimizelySDK/Odp/Entities/Customer.cs
new file mode 100644
index 00000000..d3555e99
--- /dev/null
+++ b/OptimizelySDK/Odp/Entities/Customer.cs
@@ -0,0 +1,7 @@
+namespace OptimizelySDK.Odp.Entities
+{
+    public class Customer
+    {
+        public Audience Audiences { get; set; }
+    }
+}
diff --git a/OptimizelySDK/Odp/Entities/Data.cs b/OptimizelySDK/Odp/Entities/Data.cs
new file mode 100644
index 00000000..334e361d
--- /dev/null
+++ b/OptimizelySDK/Odp/Entities/Data.cs
@@ -0,0 +1,7 @@
+namespace OptimizelySDK.Odp.Entities
+{
+    public class Data
+    {
+        public Customer Customer { get; set; }
+    }
+}
diff --git a/OptimizelySDK/Odp/Entities/Edge.cs b/OptimizelySDK/Odp/Entities/Edge.cs
new file mode 100644
index 00000000..259cfda9
--- /dev/null
+++ b/OptimizelySDK/Odp/Entities/Edge.cs
@@ -0,0 +1,7 @@
+namespace OptimizelySDK.Odp.Entities
+{
+    public class Edge
+    {
+        public Node Node { get; set; }
+    }
+}
diff --git a/OptimizelySDK/Odp/Entities/Error.cs b/OptimizelySDK/Odp/Entities/Error.cs
new file mode 100644
index 00000000..c0eae0df
--- /dev/null
+++ b/OptimizelySDK/Odp/Entities/Error.cs
@@ -0,0 +1,13 @@
+namespace OptimizelySDK.Odp.Entities
+{
+    public class Error
+    {
+        public string Message { get; set; }
+        
+        public Location[] Locations { get; set; }
+        
+        public string[] Path { get; set; }
+        
+        public Extension Extensions { get; set; }
+    }
+}
diff --git a/OptimizelySDK/Odp/Entities/Extension.cs b/OptimizelySDK/Odp/Entities/Extension.cs
new file mode 100644
index 00000000..80e5473f
--- /dev/null
+++ b/OptimizelySDK/Odp/Entities/Extension.cs
@@ -0,0 +1,7 @@
+namespace OptimizelySDK.Odp.Entities
+{
+    public class Extension
+    {
+        public string Classification { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Entities/Location.cs b/OptimizelySDK/Odp/Entities/Location.cs
new file mode 100644
index 00000000..d5cebddf
--- /dev/null
+++ b/OptimizelySDK/Odp/Entities/Location.cs
@@ -0,0 +1,9 @@
+namespace OptimizelySDK.Odp.Entities
+{
+    public class Location
+    {
+        public int Line { get; set; }
+        
+        public int Column { get; set; }
+    }
+}
diff --git a/OptimizelySDK/Odp/Entities/Node.cs b/OptimizelySDK/Odp/Entities/Node.cs
new file mode 100644
index 00000000..4f7ab526
--- /dev/null
+++ b/OptimizelySDK/Odp/Entities/Node.cs
@@ -0,0 +1,9 @@
+namespace OptimizelySDK.Odp.Entities
+{
+    public class Node
+    {
+        public string Name { get; set; }
+        
+        public string State { get; set; }
+    }
+}
diff --git a/OptimizelySDK/Odp/Entities/Response.cs b/OptimizelySDK/Odp/Entities/Response.cs
new file mode 100644
index 00000000..b7564f37
--- /dev/null
+++ b/OptimizelySDK/Odp/Entities/Response.cs
@@ -0,0 +1,9 @@
+namespace OptimizelySDK.Odp.Entities
+{
+    public class Response
+    {
+        public Data Data { get; set; }
+
+        public Error[] Errors { get; set; }
+    }
+}
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
new file mode 100644
index 00000000..3adb61c1
--- /dev/null
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -0,0 +1,24 @@
+using Newtonsoft.Json;
+using OptimizelySDK.Logger;
+using OptimizelySDK.Odp.Entities;
+using System.Text.RegularExpressions;
+
+namespace OptimizelySDK.Odp
+{
+    public class GraphQLManager
+    {
+        private readonly ILogger Logger;
+
+        public GraphQLManager(ILogger logger)
+        {
+            Logger = logger;
+        }
+        
+        public Response ParseResponse(string jsonResponse)
+        {
+            var json = Regex.Replace(jsonResponse, @"\s+", string.Empty);
+            
+            return JsonConvert.DeserializeObject<Response>(json);
+        }
+    }
+}
diff --git a/OptimizelySDK/OptimizelySDK.csproj b/OptimizelySDK/OptimizelySDK.csproj
index c8791237..3b2351ae 100644
--- a/OptimizelySDK/OptimizelySDK.csproj
+++ b/OptimizelySDK/OptimizelySDK.csproj
@@ -87,6 +87,16 @@
     <Compile Include="Entity\Group.cs" />
     <Compile Include="Entity\IdKeyEntity.cs" />
     <Compile Include="Event\Entity\DecisionMetadata.cs" />
+    <Compile Include="Odp\Entities\Audience.cs" />
+    <Compile Include="Odp\Entities\Customer.cs" />
+    <Compile Include="Odp\Entities\Data.cs" />
+    <Compile Include="Odp\Entities\Edge.cs" />
+    <Compile Include="Odp\Entities\Error.cs" />
+    <Compile Include="Odp\Entities\Location.cs" />
+    <Compile Include="Odp\Entities\Extension.cs" />
+    <Compile Include="Odp\Entities\Node.cs" />
+    <Compile Include="Odp\Entities\Response.cs" />
+    <Compile Include="Odp\GraphQLManager.cs" />
     <Compile Include="OptimizelyDecisions\DecisionMessage.cs" />
     <Compile Include="OptimizelyDecisions\DecisionReasons.cs" />
     <Compile Include="OptimizelyDecisions\OptimizelyDecideOption.cs" />
@@ -174,8 +184,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

From 1e579ee3d63d6678665ca90503745b1bb7713cee Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Wed, 3 Aug 2022 14:29:21 -0400
Subject: [PATCH 04/33] Fully cover json response

---
 .../OdpTests/GraphQLManagerTest.cs            | 44 +++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index 295e2ba1..6a8b23e1 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -1,7 +1,9 @@
 using Moq;
 using NUnit.Framework;
+using OptimizelySDK.AudienceConditions;
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp;
+using System.Security;
 
 namespace OptimizelySDK.Tests.OdpTests
 {
@@ -9,7 +11,7 @@ namespace OptimizelySDK.Tests.OdpTests
     public class GraphQLManagerTest
     {
         private Mock<ILogger> MockLogger;
-        
+
         [SetUp]
         public void Setup()
         {
@@ -21,7 +23,8 @@ public void Setup()
         public void ShouldParseSuccessfulResponse()
         {
             #region const string responseJson
-            const string responseJson = @"
+
+            var responseJson = @"
 {
     ""data"": {
         ""customer"": {
@@ -44,19 +47,32 @@ public void ShouldParseSuccessfulResponse()
         }
     }
 }";
+
             #endregion
+
             var manager = new GraphQLManager(MockLogger.Object);
 
             var response = manager.ParseResponse(responseJson);
-            
-            Assert.IsNull(response.Errors); 
+
+            Assert.IsNull(response.Errors);
             Assert.IsNotNull(response.Data);
+            Assert.IsNotNull(response.Data.Customer);
+            Assert.IsNotNull(response.Data.Customer.Audiences);
+            Assert.IsNotNull(response.Data.Customer.Audiences.Edges);
+            Assert.IsTrue(response.Data.Customer.Audiences.Edges.Length == 2);
+            var node = response.Data.Customer.Audiences.Edges[0].Node;
+            Assert.IsTrue(node.Name == "has_email");
+            Assert.IsTrue(node.State == "qualified");
+            node = response.Data.Customer.Audiences.Edges[1].Node;
+            Assert.IsTrue(node.Name == "has_email_opted_in");
+            Assert.IsTrue(node.State == "qualified");
         }
-        
+
         [Test]
         public void ShouldParseErrorResponse()
         {
             #region const string responseJson
+
             const string responseJson = @"
 {
    ""errors"": [
@@ -69,8 +85,8 @@ public void ShouldParseErrorResponse()
                 }
             ],
             ""path"": [
-            ""customer""
-                ],
+                ""customer""
+            ],
             ""extensions"": {
                 ""classification"": ""InvalidIdentifierException""
             }
@@ -80,13 +96,25 @@ public void ShouldParseErrorResponse()
         ""customer"": null
     }
 }";
+
             #endregion
+
             var manager = new GraphQLManager(MockLogger.Object);
 
             var response = manager.ParseResponse(responseJson);
-            
+
             Assert.IsNull(response.Data.Customer);
             Assert.IsNotNull(response.Errors);
+            Assert.IsTrue(response.Errors.Length == 1);
+            var error = response.Errors[0];
+            Assert.IsTrue(error.Message.Contains("asdsdaddddd"));
+            Assert.IsTrue(error.Locations.Length == 1);
+            var location = error.Locations[0];
+            Assert.IsTrue(location.Line == 2);
+            Assert.IsTrue(location.Column == 3);
+            Assert.IsTrue(error.Path.Length == 1);
+            Assert.IsTrue(error.Path[0] == "customer");
+            Assert.IsTrue(error.Extensions.Classification=="InvalidIdentifierException");
         }
     }
 }
\ No newline at end of file

From d2df4a0acfc7d562bc91fa6cbab2763325042a7d Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Wed, 3 Aug 2022 15:06:04 -0400
Subject: [PATCH 05/33] Adding GQLManager interface for testing

---
 OptimizelySDK/Odp/GraphQLManager.cs  |  8 +++++++-
 OptimizelySDK/Odp/IGraphQLManager.cs | 13 +++++++++++++
 OptimizelySDK/OptimizelySDK.csproj   |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 OptimizelySDK/Odp/IGraphQLManager.cs

diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 3adb61c1..5c9e96b6 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -1,11 +1,12 @@
 using Newtonsoft.Json;
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp.Entities;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
 namespace OptimizelySDK.Odp
 {
-    public class GraphQLManager
+    public class GraphQLManager : IGraphQLManager
     {
         private readonly ILogger Logger;
 
@@ -20,5 +21,10 @@ public Response ParseResponse(string jsonResponse)
             
             return JsonConvert.DeserializeObject<Response>(json);
         }
+
+        public string FetchSegments(string apiKey, string apiHost, string userKey, string userValue, List<string> segmentToCheck)
+        {
+            
+        }
     }
 }
diff --git a/OptimizelySDK/Odp/IGraphQLManager.cs b/OptimizelySDK/Odp/IGraphQLManager.cs
new file mode 100644
index 00000000..5bc5323c
--- /dev/null
+++ b/OptimizelySDK/Odp/IGraphQLManager.cs
@@ -0,0 +1,13 @@
+using OptimizelySDK.Odp.Entities;
+using System.Collections.Generic;
+
+namespace OptimizelySDK.Odp
+{
+    public interface IGraphQLManager
+    {
+        Response ParseResponse(string jsonResponse);
+        string FetchSegments(string apiKey, string apiHost, string userKey, string userValue,
+            List<string> segmentToCheck
+        );
+    }
+}
diff --git a/OptimizelySDK/OptimizelySDK.csproj b/OptimizelySDK/OptimizelySDK.csproj
index 3b2351ae..cccb1f7d 100644
--- a/OptimizelySDK/OptimizelySDK.csproj
+++ b/OptimizelySDK/OptimizelySDK.csproj
@@ -97,6 +97,7 @@
     <Compile Include="Odp\Entities\Node.cs" />
     <Compile Include="Odp\Entities\Response.cs" />
     <Compile Include="Odp\GraphQLManager.cs" />
+    <Compile Include="Odp\IGraphQLManager.cs" />
     <Compile Include="OptimizelyDecisions\DecisionMessage.cs" />
     <Compile Include="OptimizelyDecisions\DecisionReasons.cs" />
     <Compile Include="OptimizelyDecisions\OptimizelyDecideOption.cs" />

From 368817f58aae3c0aa745ab6359353878fe391695 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Wed, 3 Aug 2022 15:23:09 -0400
Subject: [PATCH 06/33] Tests for common scenarios Swift ref

---
 .../OdpTests/GraphQLManagerTest.cs            | 50 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index 6a8b23e1..3fb54cc9 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -1,9 +1,7 @@
 using Moq;
 using NUnit.Framework;
-using OptimizelySDK.AudienceConditions;
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp;
-using System.Security;
 
 namespace OptimizelySDK.Tests.OdpTests
 {
@@ -116,5 +114,53 @@ public void ShouldParseErrorResponse()
             Assert.IsTrue(error.Path[0] == "customer");
             Assert.IsTrue(error.Extensions.Classification=="InvalidIdentifierException");
         }
+
+        [Test]
+        public void ShouldFetchValidQualifiedSegments()
+        {
+            
+        }
+
+        [Test]
+        public void ShouldHandleEmptyQualifiedSegments()
+        {
+            
+        }
+
+        [Test]
+        public void ShouldHandleErrorWithInvalidIdentifier()
+        {
+            
+        }
+
+        [Test]
+        public void ShouldHandleOtherException()
+        {
+            
+        }
+        
+        [Test]
+        public void ShouldHandleBadResponse()
+        {
+            
+        }
+        
+        [Test]
+        public void ShouldHandleNetworkError()
+        {
+            
+        }
+        
+        [Test]
+        public void ShouldHandle400HttpCode()
+        {
+            
+        }
+        
+        [Test]
+        public void ShouldHandle500HttpCode()
+        {
+            
+        }
     }
 }
\ No newline at end of file

From 728e1a8051569c5d7a073c865f684cf935ca122b Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Wed, 3 Aug 2022 15:23:51 -0400
Subject: [PATCH 07/33] Fix compiler error

---
 OptimizelySDK/Odp/GraphQLManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 5c9e96b6..75915216 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -24,7 +24,7 @@ public Response ParseResponse(string jsonResponse)
 
         public string FetchSegments(string apiKey, string apiHost, string userKey, string userValue, List<string> segmentToCheck)
         {
-            
+            return string.Empty;
         }
     }
 }

From 5e088272a2e8d7a50aa7e01f6326f9059f9b5fac Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Wed, 3 Aug 2022 16:15:31 -0400
Subject: [PATCH 08/33] Refactors

---
 .../OdpTests/GraphQLManagerTest.cs            |  4 ++--
 .../Odp/{Entities => Entity}/Audience.cs      |  2 +-
 .../Odp/{Entities => Entity}/Customer.cs      |  2 +-
 .../Odp/{Entities => Entity}/Data.cs          |  2 +-
 .../Odp/{Entities => Entity}/Edge.cs          |  2 +-
 .../Odp/{Entities => Entity}/Error.cs         |  2 +-
 .../Odp/{Entities => Entity}/Extension.cs     |  2 +-
 .../Odp/{Entities => Entity}/Location.cs      |  2 +-
 .../Odp/{Entities => Entity}/Node.cs          |  2 +-
 .../Odp/{Entities => Entity}/Response.cs      |  2 +-
 OptimizelySDK/Odp/GraphQLManager.cs           | 14 +++++++------
 OptimizelySDK/Odp/IGraphQLManager.cs          |  7 ++++---
 OptimizelySDK/OptimizelySDK.csproj            | 21 +++++++++++--------
 13 files changed, 35 insertions(+), 29 deletions(-)
 rename OptimizelySDK/Odp/{Entities => Entity}/Audience.cs (67%)
 rename OptimizelySDK/Odp/{Entities => Entity}/Customer.cs (69%)
 rename OptimizelySDK/Odp/{Entities => Entity}/Data.cs (68%)
 rename OptimizelySDK/Odp/{Entities => Entity}/Edge.cs (65%)
 rename OptimizelySDK/Odp/{Entities => Entity}/Error.cs (86%)
 rename OptimizelySDK/Odp/{Entities => Entity}/Extension.cs (69%)
 rename OptimizelySDK/Odp/{Entities => Entity}/Location.cs (76%)
 rename OptimizelySDK/Odp/{Entities => Entity}/Node.cs (76%)
 rename OptimizelySDK/Odp/{Entities => Entity}/Response.cs (75%)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index 3fb54cc9..8059c7d3 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -50,7 +50,7 @@ public void ShouldParseSuccessfulResponse()
 
             var manager = new GraphQLManager(MockLogger.Object);
 
-            var response = manager.ParseResponse(responseJson);
+            var response = manager.ParseJson(responseJson);
 
             Assert.IsNull(response.Errors);
             Assert.IsNotNull(response.Data);
@@ -99,7 +99,7 @@ public void ShouldParseErrorResponse()
 
             var manager = new GraphQLManager(MockLogger.Object);
 
-            var response = manager.ParseResponse(responseJson);
+            var response = manager.ParseJson(responseJson);
 
             Assert.IsNull(response.Data.Customer);
             Assert.IsNotNull(response.Errors);
diff --git a/OptimizelySDK/Odp/Entities/Audience.cs b/OptimizelySDK/Odp/Entity/Audience.cs
similarity index 67%
rename from OptimizelySDK/Odp/Entities/Audience.cs
rename to OptimizelySDK/Odp/Entity/Audience.cs
index 251986d1..ef8e86fd 100644
--- a/OptimizelySDK/Odp/Entities/Audience.cs
+++ b/OptimizelySDK/Odp/Entity/Audience.cs
@@ -1,4 +1,4 @@
-namespace OptimizelySDK.Odp.Entities
+namespace OptimizelySDK.Odp.Entity
 {
     public class Audience
     {
diff --git a/OptimizelySDK/Odp/Entities/Customer.cs b/OptimizelySDK/Odp/Entity/Customer.cs
similarity index 69%
rename from OptimizelySDK/Odp/Entities/Customer.cs
rename to OptimizelySDK/Odp/Entity/Customer.cs
index d3555e99..80f127a9 100644
--- a/OptimizelySDK/Odp/Entities/Customer.cs
+++ b/OptimizelySDK/Odp/Entity/Customer.cs
@@ -1,4 +1,4 @@
-namespace OptimizelySDK.Odp.Entities
+namespace OptimizelySDK.Odp.Entity
 {
     public class Customer
     {
diff --git a/OptimizelySDK/Odp/Entities/Data.cs b/OptimizelySDK/Odp/Entity/Data.cs
similarity index 68%
rename from OptimizelySDK/Odp/Entities/Data.cs
rename to OptimizelySDK/Odp/Entity/Data.cs
index 334e361d..8b87fc34 100644
--- a/OptimizelySDK/Odp/Entities/Data.cs
+++ b/OptimizelySDK/Odp/Entity/Data.cs
@@ -1,4 +1,4 @@
-namespace OptimizelySDK.Odp.Entities
+namespace OptimizelySDK.Odp.Entity
 {
     public class Data
     {
diff --git a/OptimizelySDK/Odp/Entities/Edge.cs b/OptimizelySDK/Odp/Entity/Edge.cs
similarity index 65%
rename from OptimizelySDK/Odp/Entities/Edge.cs
rename to OptimizelySDK/Odp/Entity/Edge.cs
index 259cfda9..19dc3a9e 100644
--- a/OptimizelySDK/Odp/Entities/Edge.cs
+++ b/OptimizelySDK/Odp/Entity/Edge.cs
@@ -1,4 +1,4 @@
-namespace OptimizelySDK.Odp.Entities
+namespace OptimizelySDK.Odp.Entity
 {
     public class Edge
     {
diff --git a/OptimizelySDK/Odp/Entities/Error.cs b/OptimizelySDK/Odp/Entity/Error.cs
similarity index 86%
rename from OptimizelySDK/Odp/Entities/Error.cs
rename to OptimizelySDK/Odp/Entity/Error.cs
index c0eae0df..acaa87ca 100644
--- a/OptimizelySDK/Odp/Entities/Error.cs
+++ b/OptimizelySDK/Odp/Entity/Error.cs
@@ -1,4 +1,4 @@
-namespace OptimizelySDK.Odp.Entities
+namespace OptimizelySDK.Odp.Entity
 {
     public class Error
     {
diff --git a/OptimizelySDK/Odp/Entities/Extension.cs b/OptimizelySDK/Odp/Entity/Extension.cs
similarity index 69%
rename from OptimizelySDK/Odp/Entities/Extension.cs
rename to OptimizelySDK/Odp/Entity/Extension.cs
index 80e5473f..56fdd1bc 100644
--- a/OptimizelySDK/Odp/Entities/Extension.cs
+++ b/OptimizelySDK/Odp/Entity/Extension.cs
@@ -1,4 +1,4 @@
-namespace OptimizelySDK.Odp.Entities
+namespace OptimizelySDK.Odp.Entity
 {
     public class Extension
     {
diff --git a/OptimizelySDK/Odp/Entities/Location.cs b/OptimizelySDK/Odp/Entity/Location.cs
similarity index 76%
rename from OptimizelySDK/Odp/Entities/Location.cs
rename to OptimizelySDK/Odp/Entity/Location.cs
index d5cebddf..a6f14c62 100644
--- a/OptimizelySDK/Odp/Entities/Location.cs
+++ b/OptimizelySDK/Odp/Entity/Location.cs
@@ -1,4 +1,4 @@
-namespace OptimizelySDK.Odp.Entities
+namespace OptimizelySDK.Odp.Entity
 {
     public class Location
     {
diff --git a/OptimizelySDK/Odp/Entities/Node.cs b/OptimizelySDK/Odp/Entity/Node.cs
similarity index 76%
rename from OptimizelySDK/Odp/Entities/Node.cs
rename to OptimizelySDK/Odp/Entity/Node.cs
index 4f7ab526..dc2c9354 100644
--- a/OptimizelySDK/Odp/Entities/Node.cs
+++ b/OptimizelySDK/Odp/Entity/Node.cs
@@ -1,4 +1,4 @@
-namespace OptimizelySDK.Odp.Entities
+namespace OptimizelySDK.Odp.Entity
 {
     public class Node
     {
diff --git a/OptimizelySDK/Odp/Entities/Response.cs b/OptimizelySDK/Odp/Entity/Response.cs
similarity index 75%
rename from OptimizelySDK/Odp/Entities/Response.cs
rename to OptimizelySDK/Odp/Entity/Response.cs
index b7564f37..9676a0fc 100644
--- a/OptimizelySDK/Odp/Entities/Response.cs
+++ b/OptimizelySDK/Odp/Entity/Response.cs
@@ -1,4 +1,4 @@
-namespace OptimizelySDK.Odp.Entities
+namespace OptimizelySDK.Odp.Entity
 {
     public class Response
     {
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 75915216..a2d774ee 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 using OptimizelySDK.Logger;
-using OptimizelySDK.Odp.Entities;
+using OptimizelySDK.Odp.Entity;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
@@ -15,16 +15,18 @@ public GraphQLManager(ILogger logger)
             Logger = logger;
         }
         
-        public Response ParseResponse(string jsonResponse)
+        public string[] FetchSegments(string apiKey, string apiHost, string userKey, string userValue, List<string> segmentToCheck)
+        {
+            
+            return new string[0];
+        }
+        
+        public Response ParseJson(string jsonResponse)
         {
             var json = Regex.Replace(jsonResponse, @"\s+", string.Empty);
             
             return JsonConvert.DeserializeObject<Response>(json);
         }
 
-        public string FetchSegments(string apiKey, string apiHost, string userKey, string userValue, List<string> segmentToCheck)
-        {
-            return string.Empty;
-        }
     }
 }
diff --git a/OptimizelySDK/Odp/IGraphQLManager.cs b/OptimizelySDK/Odp/IGraphQLManager.cs
index 5bc5323c..3c0f6872 100644
--- a/OptimizelySDK/Odp/IGraphQLManager.cs
+++ b/OptimizelySDK/Odp/IGraphQLManager.cs
@@ -1,13 +1,14 @@
-using OptimizelySDK.Odp.Entities;
+using OptimizelySDK.Odp.Entity;
 using System.Collections.Generic;
 
 namespace OptimizelySDK.Odp
 {
     public interface IGraphQLManager
     {
-        Response ParseResponse(string jsonResponse);
-        string FetchSegments(string apiKey, string apiHost, string userKey, string userValue,
+        string[] FetchSegments(string apiKey, string apiHost, string userKey, string userValue,
             List<string> segmentToCheck
         );
+        
+        Response ParseJson(string jsonResponse);
     }
 }
diff --git a/OptimizelySDK/OptimizelySDK.csproj b/OptimizelySDK/OptimizelySDK.csproj
index cccb1f7d..2829c5c4 100644
--- a/OptimizelySDK/OptimizelySDK.csproj
+++ b/OptimizelySDK/OptimizelySDK.csproj
@@ -87,15 +87,15 @@
     <Compile Include="Entity\Group.cs" />
     <Compile Include="Entity\IdKeyEntity.cs" />
     <Compile Include="Event\Entity\DecisionMetadata.cs" />
-    <Compile Include="Odp\Entities\Audience.cs" />
-    <Compile Include="Odp\Entities\Customer.cs" />
-    <Compile Include="Odp\Entities\Data.cs" />
-    <Compile Include="Odp\Entities\Edge.cs" />
-    <Compile Include="Odp\Entities\Error.cs" />
-    <Compile Include="Odp\Entities\Location.cs" />
-    <Compile Include="Odp\Entities\Extension.cs" />
-    <Compile Include="Odp\Entities\Node.cs" />
-    <Compile Include="Odp\Entities\Response.cs" />
+    <Compile Include="Odp\Entity\Audience.cs" />
+    <Compile Include="Odp\Entity\Customer.cs" />
+    <Compile Include="Odp\Entity\Data.cs" />
+    <Compile Include="Odp\Entity\Edge.cs" />
+    <Compile Include="Odp\Entity\Error.cs" />
+    <Compile Include="Odp\Entity\Location.cs" />
+    <Compile Include="Odp\Entity\Extension.cs" />
+    <Compile Include="Odp\Entity\Node.cs" />
+    <Compile Include="Odp\Entity\Response.cs" />
     <Compile Include="Odp\GraphQLManager.cs" />
     <Compile Include="Odp\IGraphQLManager.cs" />
     <Compile Include="OptimizelyDecisions\DecisionMessage.cs" />
@@ -185,6 +185,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Odp\Client" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

From 5909f8e4c32aad3954b9517b59f2916056fcc2fe Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Wed, 3 Aug 2022 17:52:58 -0400
Subject: [PATCH 09/33] WIP Handle versions of .NET

---
 .../OdpTests/GraphQLManagerTest.cs            |  8 +--
 .../Odp/Client/HttpClientOdpClient.cs         | 49 ++++++++++++++++
 OptimizelySDK/Odp/Client/IOdpClient.cs        | 11 ++++
 OptimizelySDK/Odp/Client/OdpClient.cs         | 17 ++++++
 .../Odp/Client/WebRequestOdpClient.cs         | 17 ++++++
 OptimizelySDK/Odp/Entity/Error.cs             |  5 ++
 .../Odp/Entity/QuerySegmentsParameters.cs     | 13 +++++
 OptimizelySDK/Odp/Entity/Response.cs          |  8 +++
 OptimizelySDK/Odp/GraphQLManager.cs           | 56 ++++++++++++++++---
 OptimizelySDK/Odp/IGraphQLManager.cs          |  6 +-
 OptimizelySDK/OptimizelySDK.csproj            |  8 ++-
 11 files changed, 177 insertions(+), 21 deletions(-)
 create mode 100644 OptimizelySDK/Odp/Client/HttpClientOdpClient.cs
 create mode 100644 OptimizelySDK/Odp/Client/IOdpClient.cs
 create mode 100644 OptimizelySDK/Odp/Client/OdpClient.cs
 create mode 100644 OptimizelySDK/Odp/Client/WebRequestOdpClient.cs
 create mode 100644 OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index 8059c7d3..dfeffdd0 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -50,7 +50,7 @@ public void ShouldParseSuccessfulResponse()
 
             var manager = new GraphQLManager(MockLogger.Object);
 
-            var response = manager.ParseJson(responseJson);
+            var response = manager.ParseSegmentsResponseJson(responseJson);
 
             Assert.IsNull(response.Errors);
             Assert.IsNotNull(response.Data);
@@ -60,10 +60,10 @@ public void ShouldParseSuccessfulResponse()
             Assert.IsTrue(response.Data.Customer.Audiences.Edges.Length == 2);
             var node = response.Data.Customer.Audiences.Edges[0].Node;
             Assert.IsTrue(node.Name == "has_email");
-            Assert.IsTrue(node.State == "qualified");
+            Assert.IsTrue(node.State == "qualified"); // TODO: replace w/ constant
             node = response.Data.Customer.Audiences.Edges[1].Node;
             Assert.IsTrue(node.Name == "has_email_opted_in");
-            Assert.IsTrue(node.State == "qualified");
+            Assert.IsTrue(node.State == "qualified"); // TODO: replace w/ constant
         }
 
         [Test]
@@ -99,7 +99,7 @@ public void ShouldParseErrorResponse()
 
             var manager = new GraphQLManager(MockLogger.Object);
 
-            var response = manager.ParseJson(responseJson);
+            var response = manager.ParseSegmentsResponseJson(responseJson);
 
             Assert.IsNull(response.Data.Customer);
             Assert.IsNotNull(response.Errors);
diff --git a/OptimizelySDK/Odp/Client/HttpClientOdpClient.cs b/OptimizelySDK/Odp/Client/HttpClientOdpClient.cs
new file mode 100644
index 00000000..89960cf5
--- /dev/null
+++ b/OptimizelySDK/Odp/Client/HttpClientOdpClient.cs
@@ -0,0 +1,49 @@
+using OptimizelySDK.Logger;
+using OptimizelySDK.Odp.Entity;
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace OptimizelySDK.Odp.Client
+{
+    public class HttpClientOdpClient : IOdpClient
+    {
+        public ILogger Logger { get; set; } = new DefaultLogger();
+
+        private static readonly HttpClient Client;
+
+        public static HttpClientOdpClient()
+        {
+            Client = new HttpClient();
+        }
+
+        public string QuerySegments(QuerySegmentsParameters parameters)
+        {
+           return Task.Run(() => QuerySegmentsAsync(parameters)).GetAwaiter().GetResult();
+        }
+
+        private async Task<string> QuerySegmentsAsync(QuerySegmentsParameters parameters)
+        {
+            var request = new HttpRequestMessage
+            {
+                RequestUri = new Uri(parameters.ApiHost),
+                Method = HttpMethod.Post,
+                Headers =
+                {
+                    {
+                        "Content-Type", "application/json"
+                    },
+                    {
+                        "x-api-key", parameters.ApiKey
+                    },
+                },
+                Content = new StringContent(json, System.Text.Encoding.UTF8, "application/json"),
+            };
+
+            var response = await Client.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+
+            return await response.Content.ReadAsStringAsync();
+        }
+    }
+}
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Client/IOdpClient.cs b/OptimizelySDK/Odp/Client/IOdpClient.cs
new file mode 100644
index 00000000..0cb92536
--- /dev/null
+++ b/OptimizelySDK/Odp/Client/IOdpClient.cs
@@ -0,0 +1,11 @@
+using OptimizelySDK.Logger;
+using OptimizelySDK.Odp.Entity;
+
+namespace OptimizelySDK.Odp.Client
+{
+    public interface IOdpClient
+    {
+        ILogger Logger { get; set; }
+        string QuerySegments(QuerySegmentsParameters);
+    }
+}
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
new file mode 100644
index 00000000..23861d05
--- /dev/null
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -0,0 +1,17 @@
+using OptimizelySDK.Logger;
+
+namespace OptimizelySDK.Odp.Client
+{
+    public class OdpClient :
+#if NET35 || NET40
+        WebRequestOdpClient
+#else
+        HttpClientOdpClient
+#endif 
+    {
+        public OdpClient(ILogger logger)
+        {
+            Logger = logger;
+        }
+    }
+}
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Client/WebRequestOdpClient.cs b/OptimizelySDK/Odp/Client/WebRequestOdpClient.cs
new file mode 100644
index 00000000..a688a620
--- /dev/null
+++ b/OptimizelySDK/Odp/Client/WebRequestOdpClient.cs
@@ -0,0 +1,17 @@
+using OptimizelySDK.Logger;
+using System.Collections.Generic;
+
+namespace OptimizelySDK.Odp.Client
+{
+    public class WebRequestOdpClient : IOdpClient
+    {
+        public ILogger Logger { get; set; }
+
+        public string QuerySegments(string apiKey, string apiHost, string userKey, string userValue,
+            List<string> segmentToCheck
+        )
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Entity/Error.cs b/OptimizelySDK/Odp/Entity/Error.cs
index acaa87ca..4de5dac7 100644
--- a/OptimizelySDK/Odp/Entity/Error.cs
+++ b/OptimizelySDK/Odp/Entity/Error.cs
@@ -9,5 +9,10 @@ public class Error
         public string[] Path { get; set; }
         
         public Extension Extensions { get; set; }
+
+        public override string ToString()
+        {
+            return $"{Message}";
+        }
     }
 }
diff --git a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
new file mode 100644
index 00000000..970ea4e4
--- /dev/null
+++ b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace OptimizelySDK.Odp.Entity
+{
+    public class QuerySegmentsParameters
+    {
+        public string ApiKey { get; set; }
+        public string ApiHost { get; set; }
+        public string UserKey { get; set; }
+        public string UserValue { get; set; }
+        public List<string> SegmentToCheck { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Entity/Response.cs b/OptimizelySDK/Odp/Entity/Response.cs
index 9676a0fc..999a393c 100644
--- a/OptimizelySDK/Odp/Entity/Response.cs
+++ b/OptimizelySDK/Odp/Entity/Response.cs
@@ -5,5 +5,13 @@ public class Response
         public Data Data { get; set; }
 
         public Error[] Errors { get; set; }
+
+        public bool HasErrors
+        {
+            get
+            {
+                return Errors != null && Errors.Length > 0;
+            }
+        }
     }
 }
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index a2d774ee..b3d838c8 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -1,7 +1,10 @@
 using Newtonsoft.Json;
 using OptimizelySDK.Logger;
+using OptimizelySDK.Odp.Client;
 using OptimizelySDK.Odp.Entity;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace OptimizelySDK.Odp
@@ -9,24 +12,59 @@ namespace OptimizelySDK.Odp
     public class GraphQLManager : IGraphQLManager
     {
         private readonly ILogger Logger;
+        private readonly IOdpClient OdpClient;
 
         public GraphQLManager(ILogger logger)
         {
             Logger = logger;
+            OdpClient = new OdpClient(logger);
         }
-        
-        public string[] FetchSegments(string apiKey, string apiHost, string userKey, string userValue, List<string> segmentToCheck)
+
+        public string[] FetchSegments(string apiKey, string apiHost, string userKey,
+            string userValue, List<string> segmentToCheck
+        )
         {
-            
-            return new string[0];
+            var parameters = new QuerySegmentsParameters
+            {
+                ApiKey = apiKey,
+                ApiHost = apiHost,
+                UserKey = userKey,
+                UserValue = userValue,
+                SegmentToCheck = segmentToCheck
+            };
+
+            string segmentsResponseJson;
+            try
+            {
+                segmentsResponseJson = OdpClient.QuerySegments(parameters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Log(LogLevel.WARN, ex.Message);
+
+                return new string[0];
+            }
+
+            var response = ParseSegmentsResponseJson(segmentsResponseJson);
+
+            if (response.HasErrors)
+            {
+                var message = string.Join(";", response.Errors.Select(e => e.ToString()));
+                Logger.Log(LogLevel.WARN, message);
+
+                return new string[0];
+            }
+
+            return response.Data?.Customer?.Audiences?.Edges?.
+                Where(e => e.Node.State == "qualified"). // TODO: replace w/ constant
+                Select(e => e.Node.Name).ToArray();
         }
-        
-        public Response ParseJson(string jsonResponse)
+
+        public Response ParseSegmentsResponseJson(string jsonResponse)
         {
             var json = Regex.Replace(jsonResponse, @"\s+", string.Empty);
-            
+
             return JsonConvert.DeserializeObject<Response>(json);
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/IGraphQLManager.cs b/OptimizelySDK/Odp/IGraphQLManager.cs
index 3c0f6872..0db753fb 100644
--- a/OptimizelySDK/Odp/IGraphQLManager.cs
+++ b/OptimizelySDK/Odp/IGraphQLManager.cs
@@ -5,10 +5,6 @@ namespace OptimizelySDK.Odp
 {
     public interface IGraphQLManager
     {
-        string[] FetchSegments(string apiKey, string apiHost, string userKey, string userValue,
-            List<string> segmentToCheck
-        );
-        
-        Response ParseJson(string jsonResponse);
+        Response ParseSegmentsResponseJson(string jsonResponse);
     }
 }
diff --git a/OptimizelySDK/OptimizelySDK.csproj b/OptimizelySDK/OptimizelySDK.csproj
index 2829c5c4..dbf4b98b 100644
--- a/OptimizelySDK/OptimizelySDK.csproj
+++ b/OptimizelySDK/OptimizelySDK.csproj
@@ -87,6 +87,10 @@
     <Compile Include="Entity\Group.cs" />
     <Compile Include="Entity\IdKeyEntity.cs" />
     <Compile Include="Event\Entity\DecisionMetadata.cs" />
+    <Compile Include="Odp\Client\HttpClientOdpClient.cs" />
+    <Compile Include="Odp\Client\IOdpClient.cs" />
+    <Compile Include="Odp\Client\OdpClient.cs" />
+    <Compile Include="Odp\Client\WebRequestOdpClient.cs" />
     <Compile Include="Odp\Entity\Audience.cs" />
     <Compile Include="Odp\Entity\Customer.cs" />
     <Compile Include="Odp\Entity\Data.cs" />
@@ -95,6 +99,7 @@
     <Compile Include="Odp\Entity\Location.cs" />
     <Compile Include="Odp\Entity\Extension.cs" />
     <Compile Include="Odp\Entity\Node.cs" />
+    <Compile Include="Odp\Entity\QuerySegmentsParameters.cs" />
     <Compile Include="Odp\Entity\Response.cs" />
     <Compile Include="Odp\GraphQLManager.cs" />
     <Compile Include="Odp\IGraphQLManager.cs" />
@@ -185,9 +190,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Odp\Client" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

From 5664b757c10a4e938e0eb4331bc04755b40431c7 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Thu, 4 Aug 2022 11:51:54 -0400
Subject: [PATCH 10/33] WebRequest and HttpClient ODP clients

---
 .../Odp/Client/HttpClientOdpClient.cs         | 34 ++++++-----
 OptimizelySDK/Odp/Client/IOdpClient.cs        |  2 +-
 .../Odp/Client/WebRequestOdpClient.cs         | 57 +++++++++++++++++--
 .../Odp/Entity/QuerySegmentsParameters.cs     | 25 +++++++-
 OptimizelySDK/Odp/GraphQLManager.cs           | 12 ++--
 OptimizelySDK/OptimizelySDK.csproj            |  1 +
 6 files changed, 102 insertions(+), 29 deletions(-)

diff --git a/OptimizelySDK/Odp/Client/HttpClientOdpClient.cs b/OptimizelySDK/Odp/Client/HttpClientOdpClient.cs
index 89960cf5..465173db 100644
--- a/OptimizelySDK/Odp/Client/HttpClientOdpClient.cs
+++ b/OptimizelySDK/Odp/Client/HttpClientOdpClient.cs
@@ -1,7 +1,10 @@
-using OptimizelySDK.Logger;
+using Newtonsoft.Json;
+using OptimizelySDK.Logger;
 using OptimizelySDK.Odp.Entity;
 using System;
 using System.Net.Http;
+using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace OptimizelySDK.Odp.Client
@@ -10,12 +13,7 @@ public class HttpClientOdpClient : IOdpClient
     {
         public ILogger Logger { get; set; } = new DefaultLogger();
 
-        private static readonly HttpClient Client;
-
-        public static HttpClientOdpClient()
-        {
-            Client = new HttpClient();
-        }
+        private readonly HttpClient Client = new HttpClient();
 
         public string QuerySegments(QuerySegmentsParameters parameters)
         {
@@ -23,6 +21,18 @@ public string QuerySegments(QuerySegmentsParameters parameters)
         }
 
         private async Task<string> QuerySegmentsAsync(QuerySegmentsParameters parameters)
+        {
+            var request = BuildRequestMessage(parameters.ToJson(), parameters);
+
+            var response = await Client.SendAsync(request);
+            response.EnsureSuccessStatusCode();
+
+            return await response.Content.ReadAsStringAsync();
+        }
+
+        private HttpRequestMessage BuildRequestMessage(string jsonQuery,
+            QuerySegmentsParameters parameters
+        )
         {
             var request = new HttpRequestMessage
             {
@@ -30,20 +40,14 @@ private async Task<string> QuerySegmentsAsync(QuerySegmentsParameters parameters
                 Method = HttpMethod.Post,
                 Headers =
                 {
-                    {
-                        "Content-Type", "application/json"
-                    },
                     {
                         "x-api-key", parameters.ApiKey
                     },
                 },
-                Content = new StringContent(json, System.Text.Encoding.UTF8, "application/json"),
+                Content = new StringContent(jsonQuery, Encoding.UTF8, "application/json"),
             };
 
-            var response = await Client.SendAsync(request);
-            response.EnsureSuccessStatusCode();
-
-            return await response.Content.ReadAsStringAsync();
+            return request;
         }
     }
 }
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Client/IOdpClient.cs b/OptimizelySDK/Odp/Client/IOdpClient.cs
index 0cb92536..f22b96a1 100644
--- a/OptimizelySDK/Odp/Client/IOdpClient.cs
+++ b/OptimizelySDK/Odp/Client/IOdpClient.cs
@@ -6,6 +6,6 @@ namespace OptimizelySDK.Odp.Client
     public interface IOdpClient
     {
         ILogger Logger { get; set; }
-        string QuerySegments(QuerySegmentsParameters);
+        string QuerySegments(QuerySegmentsParameters parameters);
     }
 }
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Client/WebRequestOdpClient.cs b/OptimizelySDK/Odp/Client/WebRequestOdpClient.cs
index a688a620..e06bed87 100644
--- a/OptimizelySDK/Odp/Client/WebRequestOdpClient.cs
+++ b/OptimizelySDK/Odp/Client/WebRequestOdpClient.cs
@@ -1,17 +1,62 @@
 using OptimizelySDK.Logger;
-using System.Collections.Generic;
+using OptimizelySDK.Odp.Entity;
+using System.Net;
+using System;
+using System.IO;
 
 namespace OptimizelySDK.Odp.Client
 {
     public class WebRequestOdpClient : IOdpClient
     {
-        public ILogger Logger { get; set; }
+        public ILogger Logger { get; set; } = new DefaultLogger();
+        
+        private HttpWebRequest Request = null;
+        
+        public string QuerySegments(QuerySegmentsParameters parameters)
+        {
+            Request = (HttpWebRequest)WebRequest.Create(parameters.ApiHost);
+            Request.Method = WebRequestMethods.Http.Post;
+            Request.Headers.Add("x-api-key", parameters.ApiKey);
+            Request.ContentType = "application/json";
+
+            using (var streamWriter = new StreamWriter(Request.GetRequestStream()))
+            {
+                streamWriter.Write(parameters.ToJson());
+                streamWriter.Flush();
+                streamWriter.Close();
+            }
+
+            var result = Request.BeginGetResponse(FinalizeHttpAsyncRequest, this);
+
+            return result.ToString();
+        }
 
-        public string QuerySegments(string apiKey, string apiHost, string userKey, string userValue,
-            List<string> segmentToCheck
-        )
+        private static void FinalizeHttpAsyncRequest(IAsyncResult result)
         {
-            throw new System.NotImplementedException();
+            ((WebRequestOdpClient)result.AsyncState).FinalizeRequest(result);
+        }
+
+        private void FinalizeRequest(IAsyncResult result)
+        {
+            var response = (HttpWebResponse)Request.EndGetResponse(result);
+
+            if (response.StatusCode == HttpStatusCode.OK)
+            {
+                var responseStream = response.GetResponseStream();
+                var streamEncoder = System.Text.Encoding.UTF8;
+                
+                if (responseStream == null)
+                {
+                    return;
+                }
+
+                var responseReader = new StreamReader(responseStream, streamEncoder);
+                responseReader.ReadToEnd();
+            }
+            else
+            {
+                Logger.Log(LogLevel.WARN, "Received HTTP status code other than 200. Unable get ODP data.");
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
index 970ea4e4..40c951ba 100644
--- a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
+++ b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
 
 namespace OptimizelySDK.Odp.Entity
 {
@@ -9,5 +11,26 @@ public class QuerySegmentsParameters
         public string UserKey { get; set; }
         public string UserValue { get; set; }
         public List<string> SegmentToCheck { get; set; }
+        
+        public string ToJson()
+        {
+            var json = @$"
+{{ 
+    ""query"" : ""
+        query {{ 
+            customer({UserKey}: ""{UserValue}"") {{
+                audiences(subset: {JsonConvert.SerializeObject(SegmentToCheck)}) {{
+                    edges {{
+                        node {{
+                            name 
+                            state
+                        }}
+                    }}
+                }}
+            }}
+        }}""
+}}";
+            return Regex.Replace(json, @"\s", string.Empty);
+        }
     }
 }
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index b3d838c8..6b9fc673 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using OptimizelySDK.AudienceConditions;
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp.Client;
 using OptimizelySDK.Odp.Entity;
@@ -12,12 +13,10 @@ namespace OptimizelySDK.Odp
     public class GraphQLManager : IGraphQLManager
     {
         private readonly ILogger Logger;
-        private readonly IOdpClient OdpClient;
 
-        public GraphQLManager(ILogger logger)
+        public GraphQLManager(ILogger logger = null)
         {
-            Logger = logger;
-            OdpClient = new OdpClient(logger);
+            Logger = logger ?? new DefaultLogger();
         }
 
         public string[] FetchSegments(string apiKey, string apiHost, string userKey,
@@ -36,7 +35,8 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
             string segmentsResponseJson;
             try
             {
-                segmentsResponseJson = OdpClient.QuerySegments(parameters);
+                var client = new OdpClient(Logger);
+                segmentsResponseJson = client.QuerySegments(parameters);
             }
             catch (Exception ex)
             {
@@ -56,7 +56,7 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
             }
 
             return response.Data?.Customer?.Audiences?.Edges?.
-                Where(e => e.Node.State == "qualified"). // TODO: replace w/ constant
+                Where(e => e.Node.State == BaseCondition.QUALIFIED).
                 Select(e => e.Node.Name).ToArray();
         }
 
diff --git a/OptimizelySDK/OptimizelySDK.csproj b/OptimizelySDK/OptimizelySDK.csproj
index edcc958a..af9cba43 100644
--- a/OptimizelySDK/OptimizelySDK.csproj
+++ b/OptimizelySDK/OptimizelySDK.csproj
@@ -14,6 +14,7 @@
     <TargetFrameworkProfile />
     <ReleaseVersion>1.2.1</ReleaseVersion>
     <AssemblyOriginatorKeyFile>..\keypair.snk</AssemblyOriginatorKeyFile>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

From 0e96ee108de17d65a9ce4bf5a4678af6da7f1409 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Thu, 4 Aug 2022 15:59:25 -0400
Subject: [PATCH 11/33] Only support NET Standard; Inject & unit test

---
 .../OdpTests/GraphQLManagerTest.cs            | 115 ++++++++++++------
 .../Odp/Client/HttpClientOdpClient.cs         |  53 --------
 OptimizelySDK/Odp/Client/IOdpClient.cs        |   1 -
 OptimizelySDK/Odp/Client/OdpClient.cs         |  64 ++++++++--
 .../Odp/Client/WebRequestOdpClient.cs         |  62 ----------
 .../Odp/Entity/QuerySegmentsParameters.cs     |  30 ++---
 OptimizelySDK/Odp/GraphQLManager.cs           |  14 ++-
 OptimizelySDK/OptimizelySDK.csproj            |   4 +-
 8 files changed, 158 insertions(+), 185 deletions(-)
 delete mode 100644 OptimizelySDK/Odp/Client/HttpClientOdpClient.cs
 delete mode 100644 OptimizelySDK/Odp/Client/WebRequestOdpClient.cs

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index dfeffdd0..aa04fb55 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -1,20 +1,29 @@
 using Moq;
 using NUnit.Framework;
+using OptimizelySDK.AudienceConditions;
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp;
+using OptimizelySDK.Odp.Client;
+using OptimizelySDK.Odp.Entity;
+using System.Collections.Generic;
 
 namespace OptimizelySDK.Tests.OdpTests
 {
     [TestFixture]
     public class GraphQLManagerTest
     {
-        private Mock<ILogger> MockLogger;
+        private const string VALID_ODP_PUBLIC_KEY = "W4WzcEs-ABgXorzY7h1LCQ";
+
+        private Mock<ILogger> _mockLogger;
+        private Mock<IOdpClient> _mockOdpClient;
 
         [SetUp]
         public void Setup()
         {
-            MockLogger = new Mock<ILogger>();
-            MockLogger.Setup(i => i.Log(It.IsAny<LogLevel>(), It.IsAny<string>()));
+            _mockLogger = new Mock<ILogger>();
+            _mockLogger.Setup(i => i.Log(It.IsAny<LogLevel>(), It.IsAny<string>()));
+
+            _mockOdpClient = new Mock<IOdpClient>();
         }
 
         [Test]
@@ -48,7 +57,7 @@ public void ShouldParseSuccessfulResponse()
 
             #endregion
 
-            var manager = new GraphQLManager(MockLogger.Object);
+            var manager = new GraphQLManager(_mockLogger.Object);
 
             var response = manager.ParseSegmentsResponseJson(responseJson);
 
@@ -60,10 +69,10 @@ public void ShouldParseSuccessfulResponse()
             Assert.IsTrue(response.Data.Customer.Audiences.Edges.Length == 2);
             var node = response.Data.Customer.Audiences.Edges[0].Node;
             Assert.IsTrue(node.Name == "has_email");
-            Assert.IsTrue(node.State == "qualified"); // TODO: replace w/ constant
+            Assert.IsTrue(node.State == BaseCondition.QUALIFIED);
             node = response.Data.Customer.Audiences.Edges[1].Node;
             Assert.IsTrue(node.Name == "has_email_opted_in");
-            Assert.IsTrue(node.State == "qualified"); // TODO: replace w/ constant
+            Assert.IsTrue(node.State == BaseCondition.QUALIFIED);
         }
 
         [Test]
@@ -97,7 +106,7 @@ public void ShouldParseErrorResponse()
 
             #endregion
 
-            var manager = new GraphQLManager(MockLogger.Object);
+            var manager = new GraphQLManager(_mockLogger.Object);
 
             var response = manager.ParseSegmentsResponseJson(responseJson);
 
@@ -112,55 +121,85 @@ public void ShouldParseErrorResponse()
             Assert.IsTrue(location.Column == 3);
             Assert.IsTrue(error.Path.Length == 1);
             Assert.IsTrue(error.Path[0] == "customer");
-            Assert.IsTrue(error.Extensions.Classification=="InvalidIdentifierException");
+            Assert.IsTrue(error.Extensions.Classification == "InvalidIdentifierException");
         }
 
         [Test]
         public void ShouldFetchValidQualifiedSegments()
         {
-            
+            var expectedResponseJson = "{\"data\":{\"customer\":{\"audiences\":" +
+                                       "{\"edges\":[{\"node\":{\"name\":\"has_email\"," +
+                                       "\"state\":\"qualified\"}},{\"node\":{\"name\":" +
+                                       "\"has_email_opted_in\",\"state\":\"qualified\"}}]}}}}";
+            _mockOdpClient.Setup(
+                    c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
+                Returns(expectedResponseJson);
+            var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
+
+            var segments = manager.FetchSegments(
+                VALID_ODP_PUBLIC_KEY,
+                "https://api.zaius.com/v3/graphql",
+                "fs_user_id",
+                "tester-101",
+                new List<string>()
+                {
+                    "has_email",
+                    "has_email_opted_in",
+                    "push_on_sale",
+                });
+
+            Assert.IsTrue(segments.Length == 2);
+            Assert.Contains("has_email", segments);
+            Assert.Contains("has_email_opted_in", segments);
+            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Never);
         }
 
         [Test]
-        public void ShouldHandleEmptyQualifiedSegments()
-        {
-            
-        }
+        public void ShouldHandleEmptyQualifiedSegments() { }
 
         [Test]
         public void ShouldHandleErrorWithInvalidIdentifier()
         {
-            
+            var expectedResponseJson = "{\"errors\":[{\"message\":" +
+                                       "\"Exception while fetching data (/customer) : " +
+                                       "java.lang.RuntimeException: could not resolve _fs_user_id = invalid-user\"," +
+                                       "\"locations\":[{\"line\":1,\"column\":8}],\"path\":[\"customer\"]," +
+                                       "\"extensions\":{\"classification\":\"DataFetchingException\"}}]," +
+                                       "\"data\":{\"customer\":null}}";
+            _mockOdpClient.Setup(
+                    c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
+                Returns(expectedResponseJson);
+            var manager = new GraphQLManager(_mockLogger.Object);
+
+            var segments = manager.FetchSegments(
+                VALID_ODP_PUBLIC_KEY,
+                "https://api.zaius.com/v3/graphql",
+                "fs_user_id",
+                "invalid-user", // invalid user
+                new List<string>()
+                {
+                    "has_email",
+                    "has_email_opted_in",
+                    "push_on_sale",
+                });
+
+            Assert.IsTrue(segments.Length == 0);
+            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
         }
 
         [Test]
-        public void ShouldHandleOtherException()
-        {
-            
-        }
-        
+        public void ShouldHandleOtherException() { }
+
         [Test]
-        public void ShouldHandleBadResponse()
-        {
-            
-        }
-        
+        public void ShouldHandleBadResponse() { }
+
         [Test]
-        public void ShouldHandleNetworkError()
-        {
-            
-        }
-        
+        public void ShouldHandleNetworkError() { }
+
         [Test]
-        public void ShouldHandle400HttpCode()
-        {
-            
-        }
-        
+        public void ShouldHandle400HttpCode() { }
+
         [Test]
-        public void ShouldHandle500HttpCode()
-        {
-            
-        }
+        public void ShouldHandle500HttpCode() { }
     }
 }
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Client/HttpClientOdpClient.cs b/OptimizelySDK/Odp/Client/HttpClientOdpClient.cs
deleted file mode 100644
index 465173db..00000000
--- a/OptimizelySDK/Odp/Client/HttpClientOdpClient.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Newtonsoft.Json;
-using OptimizelySDK.Logger;
-using OptimizelySDK.Odp.Entity;
-using System;
-using System.Net.Http;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace OptimizelySDK.Odp.Client
-{
-    public class HttpClientOdpClient : IOdpClient
-    {
-        public ILogger Logger { get; set; } = new DefaultLogger();
-
-        private readonly HttpClient Client = new HttpClient();
-
-        public string QuerySegments(QuerySegmentsParameters parameters)
-        {
-           return Task.Run(() => QuerySegmentsAsync(parameters)).GetAwaiter().GetResult();
-        }
-
-        private async Task<string> QuerySegmentsAsync(QuerySegmentsParameters parameters)
-        {
-            var request = BuildRequestMessage(parameters.ToJson(), parameters);
-
-            var response = await Client.SendAsync(request);
-            response.EnsureSuccessStatusCode();
-
-            return await response.Content.ReadAsStringAsync();
-        }
-
-        private HttpRequestMessage BuildRequestMessage(string jsonQuery,
-            QuerySegmentsParameters parameters
-        )
-        {
-            var request = new HttpRequestMessage
-            {
-                RequestUri = new Uri(parameters.ApiHost),
-                Method = HttpMethod.Post,
-                Headers =
-                {
-                    {
-                        "x-api-key", parameters.ApiKey
-                    },
-                },
-                Content = new StringContent(jsonQuery, Encoding.UTF8, "application/json"),
-            };
-
-            return request;
-        }
-    }
-}
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Client/IOdpClient.cs b/OptimizelySDK/Odp/Client/IOdpClient.cs
index f22b96a1..95eabb60 100644
--- a/OptimizelySDK/Odp/Client/IOdpClient.cs
+++ b/OptimizelySDK/Odp/Client/IOdpClient.cs
@@ -5,7 +5,6 @@ namespace OptimizelySDK.Odp.Client
 {
     public interface IOdpClient
     {
-        ILogger Logger { get; set; }
         string QuerySegments(QuerySegmentsParameters parameters);
     }
 }
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 23861d05..00c904a2 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -1,17 +1,65 @@
 using OptimizelySDK.Logger;
+using OptimizelySDK.Odp.Entity;
+using System;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace OptimizelySDK.Odp.Client
 {
-    public class OdpClient :
-#if NET35 || NET40
-        WebRequestOdpClient
-#else
-        HttpClientOdpClient
-#endif 
+    public class OdpClient : IOdpClient
     {
-        public OdpClient(ILogger logger)
+        private readonly ILogger _logger;
+
+        private readonly HttpClient _client;
+
+        public OdpClient(ILogger logger, HttpClient client = null)
+        {
+            _logger = logger;
+            _client = client ?? new HttpClient();
+        }
+
+        public string QuerySegments(QuerySegmentsParameters parameters)
+        {
+            return Task.Run(() => QuerySegmentsAsync(parameters)).GetAwaiter().GetResult();
+        }
+
+        private async Task<string> QuerySegmentsAsync(QuerySegmentsParameters parameters)
         {
-            Logger = logger;
+            var request = BuildRequestMessage(parameters.ToJson(), parameters);
+
+            try
+            {
+                var response = await _client.SendAsync(request);
+                response.EnsureSuccessStatusCode();
+
+                return await response.Content.ReadAsStringAsync();
+            }
+            catch (Exception ex)
+            {
+                _logger.Log(LogLevel.WARN, $"Unable to query ODP: {ex.Message}");
+                return string.Empty;
+            }
+        }
+
+        private HttpRequestMessage BuildRequestMessage(string jsonQuery,
+            QuerySegmentsParameters parameters
+        )
+        {
+            var request = new HttpRequestMessage
+            {
+                RequestUri = new Uri(parameters.ApiHost),
+                Method = HttpMethod.Post,
+                Headers =
+                {
+                    {
+                        "x-api-key", parameters.ApiKey
+                    },
+                },
+                Content = new StringContent(jsonQuery, Encoding.UTF8, "application/json"),
+            };
+
+            return request;
         }
     }
 }
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Client/WebRequestOdpClient.cs b/OptimizelySDK/Odp/Client/WebRequestOdpClient.cs
deleted file mode 100644
index e06bed87..00000000
--- a/OptimizelySDK/Odp/Client/WebRequestOdpClient.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using OptimizelySDK.Logger;
-using OptimizelySDK.Odp.Entity;
-using System.Net;
-using System;
-using System.IO;
-
-namespace OptimizelySDK.Odp.Client
-{
-    public class WebRequestOdpClient : IOdpClient
-    {
-        public ILogger Logger { get; set; } = new DefaultLogger();
-        
-        private HttpWebRequest Request = null;
-        
-        public string QuerySegments(QuerySegmentsParameters parameters)
-        {
-            Request = (HttpWebRequest)WebRequest.Create(parameters.ApiHost);
-            Request.Method = WebRequestMethods.Http.Post;
-            Request.Headers.Add("x-api-key", parameters.ApiKey);
-            Request.ContentType = "application/json";
-
-            using (var streamWriter = new StreamWriter(Request.GetRequestStream()))
-            {
-                streamWriter.Write(parameters.ToJson());
-                streamWriter.Flush();
-                streamWriter.Close();
-            }
-
-            var result = Request.BeginGetResponse(FinalizeHttpAsyncRequest, this);
-
-            return result.ToString();
-        }
-
-        private static void FinalizeHttpAsyncRequest(IAsyncResult result)
-        {
-            ((WebRequestOdpClient)result.AsyncState).FinalizeRequest(result);
-        }
-
-        private void FinalizeRequest(IAsyncResult result)
-        {
-            var response = (HttpWebResponse)Request.EndGetResponse(result);
-
-            if (response.StatusCode == HttpStatusCode.OK)
-            {
-                var responseStream = response.GetResponseStream();
-                var streamEncoder = System.Text.Encoding.UTF8;
-                
-                if (responseStream == null)
-                {
-                    return;
-                }
-
-                var responseReader = new StreamReader(responseStream, streamEncoder);
-                responseReader.ReadToEnd();
-            }
-            else
-            {
-                Logger.Log(LogLevel.WARN, "Received HTTP status code other than 200. Unable get ODP data.");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
index 40c951ba..658f6fb5 100644
--- a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
+++ b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
+using System.Text;
 using System.Text.RegularExpressions;
 
 namespace OptimizelySDK.Odp.Entity
@@ -14,23 +15,18 @@ public class QuerySegmentsParameters
         
         public string ToJson()
         {
-            var json = @$"
-{{ 
-    ""query"" : ""
-        query {{ 
-            customer({UserKey}: ""{UserValue}"") {{
-                audiences(subset: {JsonConvert.SerializeObject(SegmentToCheck)}) {{
-                    edges {{
-                        node {{
-                            name 
-                            state
-                        }}
-                    }}
-                }}
-            }}
-        }}""
-}}";
-            return Regex.Replace(json, @"\s", string.Empty);
+            var segmentsArryJson =
+                JsonConvert.SerializeObject(SegmentToCheck).Replace("\"", "\\\"");
+            var userValueWithEscapedQuotes = $"\\\"{UserValue}\\\"";
+
+            var json = new StringBuilder();
+            json.Append("{\"query\" : \"query {customer");
+            json.Append($"({UserKey} : {userValueWithEscapedQuotes}) ");
+            json.Append("{audiences");
+            json.Append($"(subset: {segmentsArryJson})");
+            json.Append("{edges {node {name state}}}}}\"}");
+
+            return json.ToString();
         }
     }
 }
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 6b9fc673..28fef93c 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -13,10 +13,12 @@ namespace OptimizelySDK.Odp
     public class GraphQLManager : IGraphQLManager
     {
         private readonly ILogger Logger;
+        private readonly IOdpClient OdpClient;
 
-        public GraphQLManager(ILogger logger = null)
+        public GraphQLManager(ILogger logger = null, IOdpClient odpClient = null)
         {
             Logger = logger ?? new DefaultLogger();
+            OdpClient = odpClient ?? new OdpClient(Logger);
         }
 
         public string[] FetchSegments(string apiKey, string apiHost, string userKey,
@@ -35,8 +37,7 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
             string segmentsResponseJson;
             try
             {
-                var client = new OdpClient(Logger);
-                segmentsResponseJson = client.QuerySegments(parameters);
+                segmentsResponseJson = OdpClient.QuerySegments(parameters);
             }
             catch (Exception ex)
             {
@@ -47,6 +48,13 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
 
             var response = ParseSegmentsResponseJson(segmentsResponseJson);
 
+            if (response is null)
+            {
+                Logger.Log(LogLevel.WARN, "Error while parsing response.");
+
+                return new string[0];
+            }
+
             if (response.HasErrors)
             {
                 var message = string.Join(";", response.Errors.Select(e => e.ToString()));
diff --git a/OptimizelySDK/OptimizelySDK.csproj b/OptimizelySDK/OptimizelySDK.csproj
index af9cba43..1882c97d 100644
--- a/OptimizelySDK/OptimizelySDK.csproj
+++ b/OptimizelySDK/OptimizelySDK.csproj
@@ -14,7 +14,7 @@
     <TargetFrameworkProfile />
     <ReleaseVersion>1.2.1</ReleaseVersion>
     <AssemblyOriginatorKeyFile>..\keypair.snk</AssemblyOriginatorKeyFile>
-    <LangVersion>8</LangVersion>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -89,10 +89,8 @@
     <Compile Include="Entity\IdKeyEntity.cs" />
     <Compile Include="Entity\Integration.cs" />
     <Compile Include="Event\Entity\DecisionMetadata.cs" />
-    <Compile Include="Odp\Client\HttpClientOdpClient.cs" />
     <Compile Include="Odp\Client\IOdpClient.cs" />
     <Compile Include="Odp\Client\OdpClient.cs" />
-    <Compile Include="Odp\Client\WebRequestOdpClient.cs" />
     <Compile Include="Odp\Entity\Audience.cs" />
     <Compile Include="Odp\Entity\Customer.cs" />
     <Compile Include="Odp\Entity\Data.cs" />

From 3b267f38f0135f598e6281b7712213a5ec9980b1 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Thu, 4 Aug 2022 17:54:21 -0400
Subject: [PATCH 12/33] Filled unit tests

---
 .../OdpTests/GraphQLManagerTest.cs            | 178 +++++++++++++-----
 OptimizelySDK/Odp/Client/OdpClient.cs         |  14 +-
 OptimizelySDK/Odp/GraphQLManager.cs           |   9 +-
 3 files changed, 145 insertions(+), 56 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index aa04fb55..aa4a7ea1 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -1,4 +1,5 @@
 using Moq;
+using Moq.Protected;
 using NUnit.Framework;
 using OptimizelySDK.AudienceConditions;
 using OptimizelySDK.Logger;
@@ -6,6 +7,11 @@
 using OptimizelySDK.Odp.Client;
 using OptimizelySDK.Odp.Entity;
 using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace OptimizelySDK.Tests.OdpTests
 {
@@ -13,6 +19,15 @@ namespace OptimizelySDK.Tests.OdpTests
     public class GraphQLManagerTest
     {
         private const string VALID_ODP_PUBLIC_KEY = "W4WzcEs-ABgXorzY7h1LCQ";
+        private const string ODP_GRAPHQL_URL = "https://api.zaius.com/v3/graphql";
+        private const string FS_USER_ID = "fs_user_id";
+
+        private readonly List<string> _segmentsToCheck = new List<string>()
+        {
+            "has_email",
+            "has_email_opted_in",
+            "push_on_sale",
+        };
 
         private Mock<ILogger> _mockLogger;
         private Mock<IOdpClient> _mockOdpClient;
@@ -29,8 +44,6 @@ public void Setup()
         [Test]
         public void ShouldParseSuccessfulResponse()
         {
-            #region const string responseJson
-
             var responseJson = @"
 {
     ""data"": {
@@ -54,9 +67,6 @@ public void ShouldParseSuccessfulResponse()
         }
     }
 }";
-
-            #endregion
-
             var manager = new GraphQLManager(_mockLogger.Object);
 
             var response = manager.ParseSegmentsResponseJson(responseJson);
@@ -78,8 +88,6 @@ public void ShouldParseSuccessfulResponse()
         [Test]
         public void ShouldParseErrorResponse()
         {
-            #region const string responseJson
-
             const string responseJson = @"
 {
    ""errors"": [
@@ -103,9 +111,6 @@ public void ShouldParseErrorResponse()
         ""customer"": null
     }
 }";
-
-            #endregion
-
             var manager = new GraphQLManager(_mockLogger.Object);
 
             var response = manager.ParseSegmentsResponseJson(responseJson);
@@ -127,26 +132,21 @@ public void ShouldParseErrorResponse()
         [Test]
         public void ShouldFetchValidQualifiedSegments()
         {
-            var expectedResponseJson = "{\"data\":{\"customer\":{\"audiences\":" +
-                                       "{\"edges\":[{\"node\":{\"name\":\"has_email\"," +
-                                       "\"state\":\"qualified\"}},{\"node\":{\"name\":" +
-                                       "\"has_email_opted_in\",\"state\":\"qualified\"}}]}}}}";
+            var responseData = "{\"data\":{\"customer\":{\"audiences\":" +
+                               "{\"edges\":[{\"node\":{\"name\":\"has_email\"," +
+                               "\"state\":\"qualified\"}},{\"node\":{\"name\":" +
+                               "\"has_email_opted_in\",\"state\":\"qualified\"}}]}}}}";
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
-                Returns(expectedResponseJson);
+                Returns(responseData);
             var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
                 VALID_ODP_PUBLIC_KEY,
-                "https://api.zaius.com/v3/graphql",
-                "fs_user_id",
+                ODP_GRAPHQL_URL,
+                FS_USER_ID,
                 "tester-101",
-                new List<string>()
-                {
-                    "has_email",
-                    "has_email_opted_in",
-                    "push_on_sale",
-                });
+                _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 2);
             Assert.Contains("has_email", segments);
@@ -155,51 +155,143 @@ public void ShouldFetchValidQualifiedSegments()
         }
 
         [Test]
-        public void ShouldHandleEmptyQualifiedSegments() { }
+        public void ShouldHandleEmptyQualifiedSegments()
+        {
+            var responseData = "{\"data\":{\"customer\":{\"audiences\":" +
+                               "{\"edges\":[ ]}}}}";
+            _mockOdpClient.Setup(
+                    c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
+                Returns(responseData);
+            var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
+
+            var segments = manager.FetchSegments(
+                VALID_ODP_PUBLIC_KEY,
+                ODP_GRAPHQL_URL,
+                FS_USER_ID,
+                "tester-101",
+                _segmentsToCheck);
+
+            Assert.IsTrue(segments.Length == 0);
+            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Never);
+        }
 
         [Test]
         public void ShouldHandleErrorWithInvalidIdentifier()
         {
-            var expectedResponseJson = "{\"errors\":[{\"message\":" +
-                                       "\"Exception while fetching data (/customer) : " +
-                                       "java.lang.RuntimeException: could not resolve _fs_user_id = invalid-user\"," +
-                                       "\"locations\":[{\"line\":1,\"column\":8}],\"path\":[\"customer\"]," +
-                                       "\"extensions\":{\"classification\":\"DataFetchingException\"}}]," +
-                                       "\"data\":{\"customer\":null}}";
+            var responseData = "{\"errors\":[{\"message\":" +
+                               "\"Exception while fetching data (/customer) : " +
+                               "java.lang.RuntimeException: could not resolve _fs_user_id = invalid-user\"," +
+                               "\"locations\":[{\"line\":1,\"column\":8}],\"path\":[\"customer\"]," +
+                               "\"extensions\":{\"classification\":\"DataFetchingException\"}}]," +
+                               "\"data\":{\"customer\":null}}";
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
-                Returns(expectedResponseJson);
+                Returns(responseData);
             var manager = new GraphQLManager(_mockLogger.Object);
 
             var segments = manager.FetchSegments(
                 VALID_ODP_PUBLIC_KEY,
-                "https://api.zaius.com/v3/graphql",
-                "fs_user_id",
+                ODP_GRAPHQL_URL,
+                FS_USER_ID,
                 "invalid-user", // invalid user
-                new List<string>()
-                {
-                    "has_email",
-                    "has_email_opted_in",
-                    "push_on_sale",
-                });
+                _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
             _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
         }
 
         [Test]
-        public void ShouldHandleOtherException() { }
+        public void ShouldHandleOtherException()
+        {
+            var responseData = "{\"errors\":[{\"message\":\"Validation error of type " +
+                               "UnknownArgument: Unknown field argument not_real_userKey @ " +
+                               "'customer'\",\"locations\":[{\"line\":1,\"column\":17}]," +
+                               "\"extensions\":{\"classification\":\"ValidationError\"}}]}";
+
+            _mockOdpClient.Setup(
+                    c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
+                Returns(responseData);
+            var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
+
+            var segments = manager.FetchSegments(
+                VALID_ODP_PUBLIC_KEY,
+                ODP_GRAPHQL_URL,
+                "not_real_userKey",
+                "tester-101",
+                _segmentsToCheck);
+
+            Assert.IsTrue(segments.Length == 0);
+            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
+        }
 
         [Test]
-        public void ShouldHandleBadResponse() { }
+        public void ShouldHandleBadResponse()
+        {
+            var responseData = "{\"data\":{ }}";
+            _mockOdpClient.Setup(
+                    c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
+                Returns(responseData);
+            var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
+
+            var segments = manager.FetchSegments(
+                VALID_ODP_PUBLIC_KEY,
+                ODP_GRAPHQL_URL,
+                "not_real_userKey",
+                "tester-101",
+                _segmentsToCheck);
+
+            Assert.IsNull(segments);
+            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Never);
+        }
 
         [Test]
         public void ShouldHandleNetworkError() { }
 
         [Test]
-        public void ShouldHandle400HttpCode() { }
+        public void ShouldHandle400HttpCode()
+        {
+            var odpClient = new OdpClient(_mockLogger.Object,
+                GetHttpClientThatReturnsStatus(HttpStatusCode.BadRequest));
+            var manager = new GraphQLManager(_mockLogger.Object, odpClient);
+
+            var segments = manager.FetchSegments(
+                VALID_ODP_PUBLIC_KEY,
+                ODP_GRAPHQL_URL,
+                FS_USER_ID,
+                "tester-101",
+                _segmentsToCheck);
+
+            Assert.IsTrue(segments.Length == 0);
+            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
+        }
 
         [Test]
-        public void ShouldHandle500HttpCode() { }
+        public void ShouldHandle500HttpCode()
+        {
+            var odpClient = new OdpClient(_mockLogger.Object,
+                GetHttpClientThatReturnsStatus(HttpStatusCode.InternalServerError));
+            var manager = new GraphQLManager(_mockLogger.Object, odpClient);
+
+            var segments = manager.FetchSegments(
+                VALID_ODP_PUBLIC_KEY,
+                ODP_GRAPHQL_URL,
+                FS_USER_ID,
+                "tester-101",
+                _segmentsToCheck);
+
+            Assert.IsTrue(segments.Length == 0);
+            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
+        }
+
+        private HttpClient GetHttpClientThatReturnsStatus(HttpStatusCode statusCode)
+        {
+            var mockedHandler = new Mock<HttpMessageHandler>();
+            mockedHandler.Protected().Setup<Task<HttpResponseMessage>>(
+                    "SendAsync",
+                    ItExpr.IsAny<HttpRequestMessage>(),
+                    ItExpr.IsAny<CancellationToken>()).
+                ReturnsAsync(() => new HttpResponseMessage(statusCode));
+            return new HttpClient(mockedHandler.Object);
+        }
     }
 }
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 00c904a2..77b6764f 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -28,18 +28,10 @@ private async Task<string> QuerySegmentsAsync(QuerySegmentsParameters parameters
         {
             var request = BuildRequestMessage(parameters.ToJson(), parameters);
 
-            try
-            {
-                var response = await _client.SendAsync(request);
-                response.EnsureSuccessStatusCode();
+            var response = await _client.SendAsync(request);
+            response.EnsureSuccessStatusCode();
 
-                return await response.Content.ReadAsStringAsync();
-            }
-            catch (Exception ex)
-            {
-                _logger.Log(LogLevel.WARN, $"Unable to query ODP: {ex.Message}");
-                return string.Empty;
-            }
+            return await response.Content.ReadAsStringAsync();
         }
 
         private HttpRequestMessage BuildRequestMessage(string jsonQuery,
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 28fef93c..e9797c91 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -15,10 +15,10 @@ public class GraphQLManager : IGraphQLManager
         private readonly ILogger Logger;
         private readonly IOdpClient OdpClient;
 
-        public GraphQLManager(ILogger logger = null, IOdpClient odpClient = null)
+        public GraphQLManager(ILogger logger = null, IOdpClient client = null)
         {
             Logger = logger ?? new DefaultLogger();
-            OdpClient = odpClient ?? new OdpClient(Logger);
+            OdpClient = client ?? new OdpClient(Logger);
         }
 
         public string[] FetchSegments(string apiKey, string apiHost, string userKey,
@@ -70,6 +70,11 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
 
         public Response ParseSegmentsResponseJson(string jsonResponse)
         {
+            if (string.IsNullOrWhiteSpace(jsonResponse))
+            {
+                return default;
+            }
+            
             var json = Regex.Replace(jsonResponse, @"\s+", string.Empty);
 
             return JsonConvert.DeserializeObject<Response>(json);

From ed3f049ee9567b40fd9111874cab20bae0217cc7 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Thu, 4 Aug 2022 17:59:42 -0400
Subject: [PATCH 13/33] Copyright notices and ending line

---
 .../OdpTests/GraphQLManagerTest.cs            | 21 ++++++++++++++++---
 OptimizelySDK/Odp/Client/IOdpClient.cs        | 19 +++++++++++++++--
 OptimizelySDK/Odp/Client/OdpClient.cs         | 20 ++++++++++++++++--
 OptimizelySDK/Odp/Entity/Audience.cs          | 18 +++++++++++++++-
 OptimizelySDK/Odp/Entity/Customer.cs          | 18 +++++++++++++++-
 OptimizelySDK/Odp/Entity/Data.cs              | 18 +++++++++++++++-
 OptimizelySDK/Odp/Entity/Edge.cs              | 18 +++++++++++++++-
 OptimizelySDK/Odp/Entity/Error.cs             | 18 +++++++++++++++-
 OptimizelySDK/Odp/Entity/Extension.cs         | 18 +++++++++++++++-
 OptimizelySDK/Odp/Entity/Location.cs          | 18 +++++++++++++++-
 OptimizelySDK/Odp/Entity/Node.cs              | 18 +++++++++++++++-
 .../Odp/Entity/QuerySegmentsParameters.cs     | 19 +++++++++++++++--
 OptimizelySDK/Odp/Entity/Response.cs          | 18 +++++++++++++++-
 OptimizelySDK/Odp/GraphQLManager.cs           | 20 ++++++++++++++++--
 OptimizelySDK/Odp/IGraphQLManager.cs          | 19 +++++++++++++++--
 15 files changed, 258 insertions(+), 22 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index aa4a7ea1..e7badec3 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -1,4 +1,20 @@
-using Moq;
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Moq;
 using Moq.Protected;
 using NUnit.Framework;
 using OptimizelySDK.AudienceConditions;
@@ -9,7 +25,6 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -294,4 +309,4 @@ private HttpClient GetHttpClientThatReturnsStatus(HttpStatusCode statusCode)
             return new HttpClient(mockedHandler.Object);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OptimizelySDK/Odp/Client/IOdpClient.cs b/OptimizelySDK/Odp/Client/IOdpClient.cs
index 95eabb60..2dccc38b 100644
--- a/OptimizelySDK/Odp/Client/IOdpClient.cs
+++ b/OptimizelySDK/Odp/Client/IOdpClient.cs
@@ -1,4 +1,19 @@
-using OptimizelySDK.Logger;
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 using OptimizelySDK.Odp.Entity;
 
 namespace OptimizelySDK.Odp.Client
@@ -7,4 +22,4 @@ public interface IOdpClient
     {
         string QuerySegments(QuerySegmentsParameters parameters);
     }
-}
\ No newline at end of file
+}
diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 77b6764f..e233c98e 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -1,4 +1,20 @@
-using OptimizelySDK.Logger;
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using OptimizelySDK.Logger;
 using OptimizelySDK.Odp.Entity;
 using System;
 using System.Net.Http;
@@ -54,4 +70,4 @@ QuerySegmentsParameters parameters
             return request;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OptimizelySDK/Odp/Entity/Audience.cs b/OptimizelySDK/Odp/Entity/Audience.cs
index ef8e86fd..caeb1dae 100644
--- a/OptimizelySDK/Odp/Entity/Audience.cs
+++ b/OptimizelySDK/Odp/Entity/Audience.cs
@@ -1,4 +1,20 @@
-namespace OptimizelySDK.Odp.Entity
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace OptimizelySDK.Odp.Entity
 {
     public class Audience
     {
diff --git a/OptimizelySDK/Odp/Entity/Customer.cs b/OptimizelySDK/Odp/Entity/Customer.cs
index 80f127a9..a0d7a05b 100644
--- a/OptimizelySDK/Odp/Entity/Customer.cs
+++ b/OptimizelySDK/Odp/Entity/Customer.cs
@@ -1,4 +1,20 @@
-namespace OptimizelySDK.Odp.Entity
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace OptimizelySDK.Odp.Entity
 {
     public class Customer
     {
diff --git a/OptimizelySDK/Odp/Entity/Data.cs b/OptimizelySDK/Odp/Entity/Data.cs
index 8b87fc34..bfdc3886 100644
--- a/OptimizelySDK/Odp/Entity/Data.cs
+++ b/OptimizelySDK/Odp/Entity/Data.cs
@@ -1,4 +1,20 @@
-namespace OptimizelySDK.Odp.Entity
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace OptimizelySDK.Odp.Entity
 {
     public class Data
     {
diff --git a/OptimizelySDK/Odp/Entity/Edge.cs b/OptimizelySDK/Odp/Entity/Edge.cs
index 19dc3a9e..f2ecc380 100644
--- a/OptimizelySDK/Odp/Entity/Edge.cs
+++ b/OptimizelySDK/Odp/Entity/Edge.cs
@@ -1,4 +1,20 @@
-namespace OptimizelySDK.Odp.Entity
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace OptimizelySDK.Odp.Entity
 {
     public class Edge
     {
diff --git a/OptimizelySDK/Odp/Entity/Error.cs b/OptimizelySDK/Odp/Entity/Error.cs
index 4de5dac7..357249f4 100644
--- a/OptimizelySDK/Odp/Entity/Error.cs
+++ b/OptimizelySDK/Odp/Entity/Error.cs
@@ -1,4 +1,20 @@
-namespace OptimizelySDK.Odp.Entity
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace OptimizelySDK.Odp.Entity
 {
     public class Error
     {
diff --git a/OptimizelySDK/Odp/Entity/Extension.cs b/OptimizelySDK/Odp/Entity/Extension.cs
index 56fdd1bc..d048bc6b 100644
--- a/OptimizelySDK/Odp/Entity/Extension.cs
+++ b/OptimizelySDK/Odp/Entity/Extension.cs
@@ -1,4 +1,20 @@
-namespace OptimizelySDK.Odp.Entity
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace OptimizelySDK.Odp.Entity
 {
     public class Extension
     {
diff --git a/OptimizelySDK/Odp/Entity/Location.cs b/OptimizelySDK/Odp/Entity/Location.cs
index a6f14c62..3e7df4f8 100644
--- a/OptimizelySDK/Odp/Entity/Location.cs
+++ b/OptimizelySDK/Odp/Entity/Location.cs
@@ -1,4 +1,20 @@
-namespace OptimizelySDK.Odp.Entity
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace OptimizelySDK.Odp.Entity
 {
     public class Location
     {
diff --git a/OptimizelySDK/Odp/Entity/Node.cs b/OptimizelySDK/Odp/Entity/Node.cs
index dc2c9354..3fea4df4 100644
--- a/OptimizelySDK/Odp/Entity/Node.cs
+++ b/OptimizelySDK/Odp/Entity/Node.cs
@@ -1,4 +1,20 @@
-namespace OptimizelySDK.Odp.Entity
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace OptimizelySDK.Odp.Entity
 {
     public class Node
     {
diff --git a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
index 658f6fb5..7e7017ff 100644
--- a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
+++ b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
@@ -1,7 +1,22 @@
-using Newtonsoft.Json;
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Text;
-using System.Text.RegularExpressions;
 
 namespace OptimizelySDK.Odp.Entity
 {
diff --git a/OptimizelySDK/Odp/Entity/Response.cs b/OptimizelySDK/Odp/Entity/Response.cs
index 999a393c..2037580f 100644
--- a/OptimizelySDK/Odp/Entity/Response.cs
+++ b/OptimizelySDK/Odp/Entity/Response.cs
@@ -1,4 +1,20 @@
-namespace OptimizelySDK.Odp.Entity
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace OptimizelySDK.Odp.Entity
 {
     public class Response
     {
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index e9797c91..710b4054 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -1,4 +1,20 @@
-using Newtonsoft.Json;
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Newtonsoft.Json;
 using OptimizelySDK.AudienceConditions;
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp.Client;
@@ -80,4 +96,4 @@ public Response ParseSegmentsResponseJson(string jsonResponse)
             return JsonConvert.DeserializeObject<Response>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OptimizelySDK/Odp/IGraphQLManager.cs b/OptimizelySDK/Odp/IGraphQLManager.cs
index 0db753fb..4c51814a 100644
--- a/OptimizelySDK/Odp/IGraphQLManager.cs
+++ b/OptimizelySDK/Odp/IGraphQLManager.cs
@@ -1,5 +1,20 @@
-using OptimizelySDK.Odp.Entity;
-using System.Collections.Generic;
+/* 
+ * Copyright 2022 Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using OptimizelySDK.Odp.Entity;
 
 namespace OptimizelySDK.Odp
 {

From 06a61a59d968f5a2b7b3e5b4ef1b088fa9314db2 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Fri, 5 Aug 2022 08:50:30 -0400
Subject: [PATCH 14/33] Corrections and simplifications

---
 OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs | 4 ++--
 OptimizelySDK/Odp/GraphQLManager.cs                 | 5 +----
 OptimizelySDK/OptimizelySDK.csproj                  | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
index 7e7017ff..58490a67 100644
--- a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
+++ b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
@@ -30,7 +30,7 @@ public class QuerySegmentsParameters
         
         public string ToJson()
         {
-            var segmentsArryJson =
+            var segmentsArrayJson =
                 JsonConvert.SerializeObject(SegmentToCheck).Replace("\"", "\\\"");
             var userValueWithEscapedQuotes = $"\\\"{UserValue}\\\"";
 
@@ -38,7 +38,7 @@ public string ToJson()
             json.Append("{\"query\" : \"query {customer");
             json.Append($"({UserKey} : {userValueWithEscapedQuotes}) ");
             json.Append("{audiences");
-            json.Append($"(subset: {segmentsArryJson})");
+            json.Append($"(subset: {segmentsArrayJson})");
             json.Append("{edges {node {name state}}}}}\"}");
 
             return json.ToString();
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 710b4054..8b417994 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -22,7 +22,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
 
 namespace OptimizelySDK.Odp
 {
@@ -91,9 +90,7 @@ public Response ParseSegmentsResponseJson(string jsonResponse)
                 return default;
             }
             
-            var json = Regex.Replace(jsonResponse, @"\s+", string.Empty);
-
-            return JsonConvert.DeserializeObject<Response>(json);
+            return JsonConvert.DeserializeObject<Response>(jsonResponse);
         }
     }
 }
diff --git a/OptimizelySDK/OptimizelySDK.csproj b/OptimizelySDK/OptimizelySDK.csproj
index 1882c97d..974e8578 100644
--- a/OptimizelySDK/OptimizelySDK.csproj
+++ b/OptimizelySDK/OptimizelySDK.csproj
@@ -14,7 +14,6 @@
     <TargetFrameworkProfile />
     <ReleaseVersion>1.2.1</ReleaseVersion>
     <AssemblyOriginatorKeyFile>..\keypair.snk</AssemblyOriginatorKeyFile>
-    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

From 705ce61781018a6ccddc464814d844f3f93ef481 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Mon, 8 Aug 2022 11:12:26 -0400
Subject: [PATCH 15/33] Corrections logged messages & supporting tests

---
 .../OdpTests/GraphQLManagerTest.cs            | 32 ++++++++++++----
 OptimizelySDK/Odp/Client/OdpClient.cs         | 32 +++++++++++++---
 OptimizelySDK/Odp/GraphQLManager.cs           | 38 ++++++++-----------
 3 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index e7badec3..78839ce4 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -212,7 +212,7 @@ public void ShouldHandleErrorWithInvalidIdentifier()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
+            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, It.IsAny<string>()), Times.Once);
         }
 
         [Test]
@@ -236,7 +236,7 @@ public void ShouldHandleOtherException()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
+            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, It.IsAny<string>()), Times.Once);
         }
 
         [Test]
@@ -255,12 +255,30 @@ public void ShouldHandleBadResponse()
                 "tester-101",
                 _segmentsToCheck);
 
-            Assert.IsNull(segments);
-            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Never);
+            Assert.IsTrue(segments.Length == 0);
+            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (decode error)"), Times.Once);
         }
 
         [Test]
-        public void ShouldHandleNetworkError() { }
+        public void ShouldHandleUnrecognizedJsonResponse()
+        {
+            var responseData = "{\"unExpectedObject\":{ \"withSome\": \"value\", \"thatIsNotParseable\": \"true\" }}";
+            _mockOdpClient.Setup(
+                    c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
+                Returns(responseData);
+            var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
+
+            var segments = manager.FetchSegments(
+                VALID_ODP_PUBLIC_KEY,
+                ODP_GRAPHQL_URL,
+                "not_real_userKey",
+                "tester-101",
+                _segmentsToCheck);
+
+            Assert.IsTrue(segments.Length == 0);
+            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (decode error)"), Times.Once);
+            
+        }
 
         [Test]
         public void ShouldHandle400HttpCode()
@@ -277,7 +295,7 @@ public void ShouldHandle400HttpCode()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
+            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (network error)"), Times.Once);
         }
 
         [Test]
@@ -295,7 +313,7 @@ public void ShouldHandle500HttpCode()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
+            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (network error)"), Times.Once);
         }
 
         private HttpClient GetHttpClientThatReturnsStatus(HttpStatusCode statusCode)
diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index e233c98e..9ebea567 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -17,7 +17,10 @@
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp.Entity;
 using System;
+using System.CodeDom;
+using System.Net;
 using System.Net.Http;
+using System.Runtime.Remoting.Messaging;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -37,17 +40,36 @@ public OdpClient(ILogger logger, HttpClient client = null)
 
         public string QuerySegments(QuerySegmentsParameters parameters)
         {
-            return Task.Run(() => QuerySegmentsAsync(parameters)).GetAwaiter().GetResult();
+            HttpResponseMessage response;
+            try
+            {
+                response = Task.Run(() => QuerySegmentsAsync(parameters)).GetAwaiter().GetResult();
+            }
+            catch (Exception ex)
+            {
+                _logger.Log(LogLevel.ERROR, "Audience segments fetch failed");
+                return default;
+            }
+
+            var responseStatusCode = (int)response.StatusCode;
+            if (responseStatusCode >= 400 && responseStatusCode < 600)
+            {
+                _logger.Log(LogLevel.ERROR, "Audience segments fetch failed (network error)");
+                return default;
+            }
+
+            return response.Content.ReadAsStringAsync().Result;
         }
 
-        private async Task<string> QuerySegmentsAsync(QuerySegmentsParameters parameters)
+        private async Task<HttpResponseMessage> QuerySegmentsAsync(
+            QuerySegmentsParameters parameters
+        )
         {
             var request = BuildRequestMessage(parameters.ToJson(), parameters);
 
             var response = await _client.SendAsync(request);
-            response.EnsureSuccessStatusCode();
 
-            return await response.Content.ReadAsStringAsync();
+            return response;
         }
 
         private HttpRequestMessage BuildRequestMessage(string jsonQuery,
@@ -70,4 +92,4 @@ QuerySegmentsParameters parameters
             return request;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 8b417994..83a6a03c 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -27,13 +27,13 @@ namespace OptimizelySDK.Odp
 {
     public class GraphQLManager : IGraphQLManager
     {
-        private readonly ILogger Logger;
-        private readonly IOdpClient OdpClient;
+        private readonly ILogger _logger;
+        private readonly IOdpClient _odpClient;
 
         public GraphQLManager(ILogger logger = null, IOdpClient client = null)
         {
-            Logger = logger ?? new DefaultLogger();
-            OdpClient = client ?? new OdpClient(Logger);
+            _logger = logger ?? new DefaultLogger();
+            _odpClient = client ?? new OdpClient(_logger);
         }
 
         public string[] FetchSegments(string apiKey, string apiHost, string userKey,
@@ -49,36 +49,30 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
                 SegmentToCheck = segmentToCheck
             };
 
-            string segmentsResponseJson;
-            try
+            var segmentsResponseJson = _odpClient.QuerySegments(parameters);
+            if (string.IsNullOrWhiteSpace(segmentsResponseJson))
             {
-                segmentsResponseJson = OdpClient.QuerySegments(parameters);
-            }
-            catch (Exception ex)
-            {
-                Logger.Log(LogLevel.WARN, ex.Message);
-
                 return new string[0];
             }
 
-            var response = ParseSegmentsResponseJson(segmentsResponseJson);
-
-            if (response is null)
+            var parsedSegments = ParseSegmentsResponseJson(segmentsResponseJson);
+            if (parsedSegments?.Data?.Customer?.Audiences?.Edges is null)
             {
-                Logger.Log(LogLevel.WARN, "Error while parsing response.");
+                _logger.Log(LogLevel.ERROR, "Audience segments fetch failed (decode error)");
 
                 return new string[0];
             }
 
-            if (response.HasErrors)
+            if (parsedSegments.HasErrors)
             {
-                var message = string.Join(";", response.Errors.Select(e => e.ToString()));
-                Logger.Log(LogLevel.WARN, message);
+                var errors = string.Join(";", parsedSegments.Errors.Select(e => e.ToString()));
+
+                _logger.Log(LogLevel.ERROR, $"Audience segments fetch failed ({errors})");
 
                 return new string[0];
             }
 
-            return response.Data?.Customer?.Audiences?.Edges?.
+            return parsedSegments.Data?.Customer?.Audiences?.Edges?.
                 Where(e => e.Node.State == BaseCondition.QUALIFIED).
                 Select(e => e.Node.Name).ToArray();
         }
@@ -89,8 +83,8 @@ public Response ParseSegmentsResponseJson(string jsonResponse)
             {
                 return default;
             }
-            
+
             return JsonConvert.DeserializeObject<Response>(jsonResponse);
         }
     }
-}
+}
\ No newline at end of file

From 9a7ef8f072eddb51e917ca1d1b68593c44610203 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Mon, 8 Aug 2022 11:16:01 -0400
Subject: [PATCH 16/33] Remove excess validations

---
 OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index 78839ce4..1fa8f630 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -132,15 +132,6 @@ public void ShouldParseErrorResponse()
 
             Assert.IsNull(response.Data.Customer);
             Assert.IsNotNull(response.Errors);
-            Assert.IsTrue(response.Errors.Length == 1);
-            var error = response.Errors[0];
-            Assert.IsTrue(error.Message.Contains("asdsdaddddd"));
-            Assert.IsTrue(error.Locations.Length == 1);
-            var location = error.Locations[0];
-            Assert.IsTrue(location.Line == 2);
-            Assert.IsTrue(location.Column == 3);
-            Assert.IsTrue(error.Path.Length == 1);
-            Assert.IsTrue(error.Path[0] == "customer");
             Assert.IsTrue(error.Extensions.Classification == "InvalidIdentifierException");
         }
 

From dd91fce4c7360daf75f3c9df614ad9d69e6c312b Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Mon, 8 Aug 2022 11:25:48 -0400
Subject: [PATCH 17/33] Add unexpected node; Fix test

---
 OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index 1fa8f630..0a0ac377 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -75,10 +75,11 @@ public void ShouldParseSuccessfulResponse()
                     ""node"": {
                         ""name"": ""has_email_opted_in"",
                         ""state"": ""qualified"",
+                        ""unexpected"": ""node value for testing"",
                     }
                 },
               ]
-            }
+            },
         }
     }
 }";
@@ -131,8 +132,8 @@ public void ShouldParseErrorResponse()
             var response = manager.ParseSegmentsResponseJson(responseJson);
 
             Assert.IsNull(response.Data.Customer);
-            Assert.IsNotNull(response.Errors);
-            Assert.IsTrue(error.Extensions.Classification == "InvalidIdentifierException");
+            Assert.IsNotNull(response.Errors);            
+            Assert.IsTrue(response.Errors[0].Extensions.Classification == "InvalidIdentifierException");
         }
 
         [Test]

From 96b84fa741a6f28e1edef75542db359720762ac1 Mon Sep 17 00:00:00 2001
From: Mike Chu <104384559+mikechu-optimizely@users.noreply.github.com>
Date: Mon, 8 Aug 2022 13:55:52 -0400
Subject: [PATCH 18/33] Update
 OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs

Co-authored-by: Jae Kim <45045038+jaeopt@users.noreply.github.com>
---
 OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index 0a0ac377..138d077a 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -74,8 +74,7 @@ public void ShouldParseSuccessfulResponse()
                 {
                     ""node"": {
                         ""name"": ""has_email_opted_in"",
-                        ""state"": ""qualified"",
-                        ""unexpected"": ""node value for testing"",
+                        ""state"": ""not-qualified""
                     }
                 },
               ]

From 0f444dfc30da5844376f6df42de71cc1a34e2c06 Mon Sep 17 00:00:00 2001
From: Mike Chu <104384559+mikechu-optimizely@users.noreply.github.com>
Date: Mon, 8 Aug 2022 13:56:00 -0400
Subject: [PATCH 19/33] Update OptimizelySDK/Odp/Client/OdpClient.cs

Co-authored-by: Jae Kim <45045038+jaeopt@users.noreply.github.com>
---
 OptimizelySDK/Odp/Client/OdpClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 9ebea567..dbe060b9 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -47,7 +47,7 @@ public string QuerySegments(QuerySegmentsParameters parameters)
             }
             catch (Exception ex)
             {
-                _logger.Log(LogLevel.ERROR, "Audience segments fetch failed");
+                _logger.Log(LogLevel.ERROR, "Audience segments fetch failed (network error)");
                 return default;
             }
 

From 8c74e432fe9f05e0a7e429677377bd132601114a Mon Sep 17 00:00:00 2001
From: Mike Chu <104384559+mikechu-optimizely@users.noreply.github.com>
Date: Mon, 8 Aug 2022 13:56:08 -0400
Subject: [PATCH 20/33] Update OptimizelySDK/Odp/Client/OdpClient.cs

Co-authored-by: Jae Kim <45045038+jaeopt@users.noreply.github.com>
---
 OptimizelySDK/Odp/Client/OdpClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index dbe060b9..0654ea5d 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -54,7 +54,7 @@ public string QuerySegments(QuerySegmentsParameters parameters)
             var responseStatusCode = (int)response.StatusCode;
             if (responseStatusCode >= 400 && responseStatusCode < 600)
             {
-                _logger.Log(LogLevel.ERROR, "Audience segments fetch failed (network error)");
+                _logger.Log(LogLevel.ERROR, "Audience segments fetch failed (<response.statusCode or statusMessage here>)");
                 return default;
             }
 

From 6866c8228808807a3ffd03a9d5996c8d69d1a5ed Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Mon, 8 Aug 2022 14:22:28 -0400
Subject: [PATCH 21/33] Enhanced error handling and matching tests

---
 OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs | 10 +++++-----
 OptimizelySDK/Odp/Client/OdpClient.cs              |  2 +-
 OptimizelySDK/Odp/GraphQLManager.cs                | 13 +++++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index 138d077a..7ca58f6f 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -97,7 +97,7 @@ public void ShouldParseSuccessfulResponse()
             Assert.IsTrue(node.State == BaseCondition.QUALIFIED);
             node = response.Data.Customer.Audiences.Edges[1].Node;
             Assert.IsTrue(node.Name == "has_email_opted_in");
-            Assert.IsTrue(node.State == BaseCondition.QUALIFIED);
+            Assert.IsTrue(node.State != BaseCondition.QUALIFIED);
         }
 
         [Test]
@@ -203,7 +203,7 @@ public void ShouldHandleErrorWithInvalidIdentifier()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, It.IsAny<string>()), Times.Once);
+            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
         }
 
         [Test]
@@ -227,7 +227,7 @@ public void ShouldHandleOtherException()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, It.IsAny<string>()), Times.Once);
+            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
         }
 
         [Test]
@@ -286,7 +286,7 @@ public void ShouldHandle400HttpCode()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (network error)"), Times.Once);
+            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (400)"), Times.Once);
         }
 
         [Test]
@@ -304,7 +304,7 @@ public void ShouldHandle500HttpCode()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (network error)"), Times.Once);
+            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (500)"), Times.Once);
         }
 
         private HttpClient GetHttpClientThatReturnsStatus(HttpStatusCode statusCode)
diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 0654ea5d..3ef99f67 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -54,7 +54,7 @@ public string QuerySegments(QuerySegmentsParameters parameters)
             var responseStatusCode = (int)response.StatusCode;
             if (responseStatusCode >= 400 && responseStatusCode < 600)
             {
-                _logger.Log(LogLevel.ERROR, "Audience segments fetch failed (<response.statusCode or statusMessage here>)");
+                _logger.Log(LogLevel.ERROR, $"Audience segments fetch failed ({responseStatusCode})");
                 return default;
             }
 
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 83a6a03c..c93848d3 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -56,18 +56,19 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
             }
 
             var parsedSegments = ParseSegmentsResponseJson(segmentsResponseJson);
-            if (parsedSegments?.Data?.Customer?.Audiences?.Edges is null)
+            
+            if (parsedSegments.HasErrors)
             {
-                _logger.Log(LogLevel.ERROR, "Audience segments fetch failed (decode error)");
+                var errors = string.Join(";", parsedSegments.Errors.Select(e => e.ToString()));
+
+                _logger.Log(LogLevel.WARN, $"Audience segments fetch failed ({errors})");
 
                 return new string[0];
             }
 
-            if (parsedSegments.HasErrors)
+            if (parsedSegments?.Data?.Customer?.Audiences?.Edges is null)
             {
-                var errors = string.Join(";", parsedSegments.Errors.Select(e => e.ToString()));
-
-                _logger.Log(LogLevel.ERROR, $"Audience segments fetch failed ({errors})");
+                _logger.Log(LogLevel.ERROR, "Audience segments fetch failed (decode error)");
 
                 return new string[0];
             }

From 2b2b65d754bad298e3ca868e2fbed9b1a5f41094 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Mon, 8 Aug 2022 14:24:47 -0400
Subject: [PATCH 22/33] Add end of file lines

---
 OptimizelySDK/Odp/Client/OdpClient.cs               | 2 +-
 OptimizelySDK/Odp/Entity/Extension.cs               | 2 +-
 OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs | 2 +-
 OptimizelySDK/Odp/GraphQLManager.cs                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 3ef99f67..5329291b 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -92,4 +92,4 @@ QuerySegmentsParameters parameters
             return request;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OptimizelySDK/Odp/Entity/Extension.cs b/OptimizelySDK/Odp/Entity/Extension.cs
index d048bc6b..541684e8 100644
--- a/OptimizelySDK/Odp/Entity/Extension.cs
+++ b/OptimizelySDK/Odp/Entity/Extension.cs
@@ -20,4 +20,4 @@ public class Extension
     {
         public string Classification { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
index 58490a67..a797a1d2 100644
--- a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
+++ b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
@@ -44,4 +44,4 @@ public string ToJson()
             return json.ToString();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index c93848d3..e53a3b81 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -88,4 +88,4 @@ public Response ParseSegmentsResponseJson(string jsonResponse)
             return JsonConvert.DeserializeObject<Response>(jsonResponse);
         }
     }
-}
\ No newline at end of file
+}

From cd4e8f13a2ace0863c6413abfdfa1b2f04b4b2b5 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Tue, 16 Aug 2022 14:40:38 -0400
Subject: [PATCH 23/33] Add class internal documentation

---
 OptimizelySDK/Odp/Client/OdpClient.cs         | 30 +++++++++++++++++--
 .../Odp/Entity/QuerySegmentsParameters.cs     | 26 ++++++++++++++++
 OptimizelySDK/Odp/GraphQLManager.cs           | 17 +++++++++++
 3 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 5329291b..9dd8fb65 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -26,10 +26,19 @@
 
 namespace OptimizelySDK.Odp.Client
 {
+    /// <summary>
+    /// Http implementation for sending requests and handling responses to Optimizely Data Platform
+    /// </summary>
     public class OdpClient : IOdpClient
     {
+        /// <summary>
+        /// Logger used to record messages that occur within the ODP client 
+        /// </summary>
         private readonly ILogger _logger;
 
+        /// <summary>
+        /// Http client used for handling requests and responses over HTTP
+        /// </summary>
         private readonly HttpClient _client;
 
         public OdpClient(ILogger logger, HttpClient client = null)
@@ -38,6 +47,11 @@ public OdpClient(ILogger logger, HttpClient client = null)
             _client = client ?? new HttpClient();
         }
 
+        /// <summary>
+        /// Synchronous handler for querying the ODP GraphQL endpoint 
+        /// </summary>
+        /// <param name="parameters">Parameters inputs to send to ODP</param>
+        /// <returns>JSON response from ODP</returns>
         public string QuerySegments(QuerySegmentsParameters parameters)
         {
             HttpResponseMessage response;
@@ -54,13 +68,19 @@ public string QuerySegments(QuerySegmentsParameters parameters)
             var responseStatusCode = (int)response.StatusCode;
             if (responseStatusCode >= 400 && responseStatusCode < 600)
             {
-                _logger.Log(LogLevel.ERROR, $"Audience segments fetch failed ({responseStatusCode})");
+                _logger.Log(LogLevel.ERROR,
+                    $"Audience segments fetch failed ({responseStatusCode})");
                 return default;
             }
 
             return response.Content.ReadAsStringAsync().Result;
         }
 
+        /// <summary>
+        /// Asynchronous handler for querying the ODP GraphQL endpoint
+        /// </summary>
+        /// <param name="parameters">Parameters inputs to send to ODP</param>
+        /// <returns>JSON response from ODP</returns>
         private async Task<HttpResponseMessage> QuerySegmentsAsync(
             QuerySegmentsParameters parameters
         )
@@ -72,6 +92,12 @@ QuerySegmentsParameters parameters
             return response;
         }
 
+        /// <summary>
+        /// Produces the request GraphQL query payload 
+        /// </summary>
+        /// <param name="jsonQuery">JSON GraphQL query</param>
+        /// <param name="parameters">Configuration used to connect to ODP</param>
+        /// <returns>Formed HTTP request message ready to be transmitted</returns>
         private HttpRequestMessage BuildRequestMessage(string jsonQuery,
             QuerySegmentsParameters parameters
         )
@@ -92,4 +118,4 @@ QuerySegmentsParameters parameters
             return request;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
index a797a1d2..133628ec 100644
--- a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
+++ b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
@@ -20,14 +20,40 @@
 
 namespace OptimizelySDK.Odp.Entity
 {
+    /// <summary>
+    /// Handles parameters used in querying ODP segments
+    /// </summary>
     public class QuerySegmentsParameters
     {
+        /// <summary>
+        /// Optimizely Data Platform API key
+        /// </summary>
         public string ApiKey { get; set; }
+        
+        /// <summary>
+        /// Fully-qualified URL to ODP endpoint 
+        /// </summary>
         public string ApiHost { get; set; }
+        
+        /// <summary>
+        /// 'vuid' or 'fs_user_id' (client device id or fullstack id)
+        /// </summary>
         public string UserKey { get; set; }
+        
+        /// <summary>
+        /// Value for the user key
+        /// </summary>
         public string UserValue { get; set; }
+        
+        /// <summary>
+        /// Audience segments to check for inclusion in the experiment
+        /// </summary>
         public List<string> SegmentToCheck { get; set; }
         
+        /// <summary>
+        /// Converts the QuerySegmentsParameters into JSON
+        /// </summary>
+        /// <returns>GraphQL JSON payload</returns>
         public string ToJson()
         {
             var segmentsArrayJson =
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index e53a3b81..6c0a2b03 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -25,6 +25,9 @@
 
 namespace OptimizelySDK.Odp
 {
+    /// <summary>
+    /// Manager for communicating with the Optimizely Data Platform GraphQL endpoint
+    /// </summary>
     public class GraphQLManager : IGraphQLManager
     {
         private readonly ILogger _logger;
@@ -36,6 +39,15 @@ public GraphQLManager(ILogger logger = null, IOdpClient client = null)
             _odpClient = client ?? new OdpClient(_logger);
         }
 
+        /// <summary>
+        /// Retrieves the audience segments from ODP
+        /// </summary>
+        /// <param name="apiKey">Public key use</param>
+        /// <param name="apiHost">Fully-qualified URL of ODP</param>
+        /// <param name="userKey">vuid or fs_user_id key</param>
+        /// <param name="userValue">Associated value to query for the user key</param>
+        /// <param name="segmentToCheck">Audience segments to check for experiment inclusion</param>
+        /// <returns>Array of audience segments</returns>
         public string[] FetchSegments(string apiKey, string apiHost, string userKey,
             string userValue, List<string> segmentToCheck
         )
@@ -78,6 +90,11 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
                 Select(e => e.Node.Name).ToArray();
         }
 
+        /// <summary>
+        /// Parses JSON response
+        /// </summary>
+        /// <param name="jsonResponse">JSON response from ODP</param>
+        /// <returns>Strongly-typed ODP Response object</returns>
         public Response ParseSegmentsResponseJson(string jsonResponse)
         {
             if (string.IsNullOrWhiteSpace(jsonResponse))

From d58e6832b56c7d4e8eeb3567a4f043284541ae80 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Tue, 16 Aug 2022 15:01:22 -0400
Subject: [PATCH 24/33] Add line at EOF

---
 OptimizelySDK/Odp/Client/OdpClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 9dd8fb65..9bffde30 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -118,4 +118,4 @@ QuerySegmentsParameters parameters
             return request;
         }
     }
-}
\ No newline at end of file
+}

From 85b9fd34b0fa50a0532179cc594304983498e19c Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Thu, 18 Aug 2022 11:54:12 -0400
Subject: [PATCH 25/33] Refactoring GraphQLManager

---
 .../OdpTests/GraphQLManagerTest.cs            | 60 +++++++++----------
 OptimizelySDK/Odp/GraphQLManager.cs           | 13 ++--
 OptimizelySDK/Odp/IGraphQLManager.cs          |  9 ++-
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index 7ca58f6f..4d000f71 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -59,7 +59,7 @@ public void Setup()
         [Test]
         public void ShouldParseSuccessfulResponse()
         {
-            var responseJson = @"
+            const string RESPONSE_JSON = @"
 {
     ""data"": {
         ""customer"": {
@@ -82,9 +82,8 @@ public void ShouldParseSuccessfulResponse()
         }
     }
 }";
-            var manager = new GraphQLManager(_mockLogger.Object);
 
-            var response = manager.ParseSegmentsResponseJson(responseJson);
+            var response = GraphQLManager.ParseSegmentsResponseJson(RESPONSE_JSON);
 
             Assert.IsNull(response.Errors);
             Assert.IsNotNull(response.Data);
@@ -103,7 +102,7 @@ public void ShouldParseSuccessfulResponse()
         [Test]
         public void ShouldParseErrorResponse()
         {
-            const string responseJson = @"
+            const string RESPONSE_JSON = @"
 {
    ""errors"": [
         {
@@ -126,9 +125,8 @@ public void ShouldParseErrorResponse()
         ""customer"": null
     }
 }";
-            var manager = new GraphQLManager(_mockLogger.Object);
 
-            var response = manager.ParseSegmentsResponseJson(responseJson);
+            var response = GraphQLManager.ParseSegmentsResponseJson(RESPONSE_JSON);
 
             Assert.IsNull(response.Data.Customer);
             Assert.IsNotNull(response.Errors);            
@@ -138,13 +136,13 @@ public void ShouldParseErrorResponse()
         [Test]
         public void ShouldFetchValidQualifiedSegments()
         {
-            var responseData = "{\"data\":{\"customer\":{\"audiences\":" +
-                               "{\"edges\":[{\"node\":{\"name\":\"has_email\"," +
-                               "\"state\":\"qualified\"}},{\"node\":{\"name\":" +
-                               "\"has_email_opted_in\",\"state\":\"qualified\"}}]}}}}";
+            const string RESPONSE_DATA = "{\"data\":{\"customer\":{\"audiences\":" +
+                                        "{\"edges\":[{\"node\":{\"name\":\"has_email\"," +
+                                        "\"state\":\"qualified\"}},{\"node\":{\"name\":" +
+                                        "\"has_email_opted_in\",\"state\":\"qualified\"}}]}}}}";
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
-                Returns(responseData);
+                Returns(RESPONSE_DATA);
             var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
@@ -163,11 +161,11 @@ public void ShouldFetchValidQualifiedSegments()
         [Test]
         public void ShouldHandleEmptyQualifiedSegments()
         {
-            var responseData = "{\"data\":{\"customer\":{\"audiences\":" +
-                               "{\"edges\":[ ]}}}}";
+            const string RESPONSE_DATA = "{\"data\":{\"customer\":{\"audiences\":" +
+                                        "{\"edges\":[ ]}}}}";
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
-                Returns(responseData);
+                Returns(RESPONSE_DATA);
             var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
@@ -184,15 +182,15 @@ public void ShouldHandleEmptyQualifiedSegments()
         [Test]
         public void ShouldHandleErrorWithInvalidIdentifier()
         {
-            var responseData = "{\"errors\":[{\"message\":" +
-                               "\"Exception while fetching data (/customer) : " +
-                               "java.lang.RuntimeException: could not resolve _fs_user_id = invalid-user\"," +
-                               "\"locations\":[{\"line\":1,\"column\":8}],\"path\":[\"customer\"]," +
-                               "\"extensions\":{\"classification\":\"DataFetchingException\"}}]," +
-                               "\"data\":{\"customer\":null}}";
+            const string RESPONSE_DATA = "{\"errors\":[{\"message\":" +
+                                        "\"Exception while fetching data (/customer) : " +
+                                        "java.lang.RuntimeException: could not resolve _fs_user_id = invalid-user\"," +
+                                        "\"locations\":[{\"line\":1,\"column\":8}],\"path\":[\"customer\"]," +
+                                        "\"extensions\":{\"classification\":\"DataFetchingException\"}}]," +
+                                        "\"data\":{\"customer\":null}}";
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
-                Returns(responseData);
+                Returns(RESPONSE_DATA);
             var manager = new GraphQLManager(_mockLogger.Object);
 
             var segments = manager.FetchSegments(
@@ -209,14 +207,14 @@ public void ShouldHandleErrorWithInvalidIdentifier()
         [Test]
         public void ShouldHandleOtherException()
         {
-            var responseData = "{\"errors\":[{\"message\":\"Validation error of type " +
-                               "UnknownArgument: Unknown field argument not_real_userKey @ " +
-                               "'customer'\",\"locations\":[{\"line\":1,\"column\":17}]," +
-                               "\"extensions\":{\"classification\":\"ValidationError\"}}]}";
+            const string RESPONSE_DATA = "{\"errors\":[{\"message\":\"Validation error of type " +
+                                        "UnknownArgument: Unknown field argument not_real_userKey @ " +
+                                        "'customer'\",\"locations\":[{\"line\":1,\"column\":17}]," +
+                                        "\"extensions\":{\"classification\":\"ValidationError\"}}]}";
 
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
-                Returns(responseData);
+                Returns(RESPONSE_DATA);
             var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
@@ -233,10 +231,10 @@ public void ShouldHandleOtherException()
         [Test]
         public void ShouldHandleBadResponse()
         {
-            var responseData = "{\"data\":{ }}";
+            const string RESPONSE_DATA = "{\"data\":{ }}";
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
-                Returns(responseData);
+                Returns(RESPONSE_DATA);
             var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
@@ -253,10 +251,10 @@ public void ShouldHandleBadResponse()
         [Test]
         public void ShouldHandleUnrecognizedJsonResponse()
         {
-            var responseData = "{\"unExpectedObject\":{ \"withSome\": \"value\", \"thatIsNotParseable\": \"true\" }}";
+            const string RESPONSE_DATA = "{\"unExpectedObject\":{ \"withSome\": \"value\", \"thatIsNotParseable\": \"true\" }}";
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
-                Returns(responseData);
+                Returns(RESPONSE_DATA);
             var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
@@ -307,7 +305,7 @@ public void ShouldHandle500HttpCode()
             _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (500)"), Times.Once);
         }
 
-        private HttpClient GetHttpClientThatReturnsStatus(HttpStatusCode statusCode)
+        private static HttpClient GetHttpClientThatReturnsStatus(HttpStatusCode statusCode)
         {
             var mockedHandler = new Mock<HttpMessageHandler>();
             mockedHandler.Protected().Setup<Task<HttpResponseMessage>>(
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 6c0a2b03..9372d4db 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -68,7 +68,7 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
             }
 
             var parsedSegments = ParseSegmentsResponseJson(segmentsResponseJson);
-            
+
             if (parsedSegments.HasErrors)
             {
                 var errors = string.Join(";", parsedSegments.Errors.Select(e => e.ToString()));
@@ -95,14 +95,11 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
         /// </summary>
         /// <param name="jsonResponse">JSON response from ODP</param>
         /// <returns>Strongly-typed ODP Response object</returns>
-        public Response ParseSegmentsResponseJson(string jsonResponse)
+        public static Response ParseSegmentsResponseJson(string jsonResponse)
         {
-            if (string.IsNullOrWhiteSpace(jsonResponse))
-            {
-                return default;
-            }
-
-            return JsonConvert.DeserializeObject<Response>(jsonResponse);
+            return string.IsNullOrWhiteSpace(jsonResponse) ?
+                default :
+                JsonConvert.DeserializeObject<Response>(jsonResponse);
         }
     }
 }
diff --git a/OptimizelySDK/Odp/IGraphQLManager.cs b/OptimizelySDK/Odp/IGraphQLManager.cs
index 4c51814a..edffefba 100644
--- a/OptimizelySDK/Odp/IGraphQLManager.cs
+++ b/OptimizelySDK/Odp/IGraphQLManager.cs
@@ -14,12 +14,17 @@
  * limitations under the License.
  */
 
-using OptimizelySDK.Odp.Entity;
+using System.Collections.Generic;
 
 namespace OptimizelySDK.Odp
 {
     public interface IGraphQLManager
     {
-        Response ParseSegmentsResponseJson(string jsonResponse);
+        string[] FetchSegments(string apiKey,
+            string apiHost,
+            string userKey,
+            string userValue,
+            List<string> segmentToCheck
+        );
     }
 }

From f87d7f7e9b94ff38c4915fd72f8b8ec2bb434817 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Thu, 18 Aug 2022 11:55:53 -0400
Subject: [PATCH 26/33] Refactor OdpClient

---
 OptimizelySDK/Odp/Client/OdpClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 9bffde30..edf64382 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -98,7 +98,7 @@ QuerySegmentsParameters parameters
         /// <param name="jsonQuery">JSON GraphQL query</param>
         /// <param name="parameters">Configuration used to connect to ODP</param>
         /// <returns>Formed HTTP request message ready to be transmitted</returns>
-        private HttpRequestMessage BuildRequestMessage(string jsonQuery,
+        private static HttpRequestMessage BuildRequestMessage(string jsonQuery,
             QuerySegmentsParameters parameters
         )
         {

From c443b52a5bae670d99d85d102175943965e67690 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Mon, 22 Aug 2022 17:02:11 -0400
Subject: [PATCH 27/33] WIP Code review edits

---
 .../OdpTests/GraphQLManagerTest.cs            | 68 +++++++++++--------
 OptimizelySDK/Odp/Client/IOdpClient.cs        |  8 +++
 OptimizelySDK/Odp/Client/OdpClient.cs         | 10 +--
 .../Odp/Entity/QuerySegmentsParameters.cs     |  2 +-
 OptimizelySDK/Odp/GraphQLManager.cs           | 33 ++++++---
 OptimizelySDK/Odp/IGraphQLManager.cs          |  2 +-
 6 files changed, 77 insertions(+), 46 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index 4d000f71..b7e1060f 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -33,11 +33,11 @@ namespace OptimizelySDK.Tests.OdpTests
     [TestFixture]
     public class GraphQLManagerTest
     {
-        private const string VALID_ODP_PUBLIC_KEY = "W4WzcEs-ABgXorzY7h1LCQ";
-        private const string ODP_GRAPHQL_URL = "https://api.zaius.com/v3/graphql";
+        private const string VALID_ODP_PUBLIC_KEY = "not-real-odp-public-key";
+        private const string ODP_GRAPHQL_URL = "https://example.com/endpoint";
         private const string FS_USER_ID = "fs_user_id";
 
-        private readonly List<string> _segmentsToCheck = new List<string>()
+        private readonly List<string> _segmentsToCheck = new List<string>
         {
             "has_email",
             "has_email_opted_in",
@@ -92,11 +92,11 @@ public void ShouldParseSuccessfulResponse()
             Assert.IsNotNull(response.Data.Customer.Audiences.Edges);
             Assert.IsTrue(response.Data.Customer.Audiences.Edges.Length == 2);
             var node = response.Data.Customer.Audiences.Edges[0].Node;
-            Assert.IsTrue(node.Name == "has_email");
-            Assert.IsTrue(node.State == BaseCondition.QUALIFIED);
+            Assert.AreEqual(node.Name, "has_email");
+            Assert.AreEqual(node.State, BaseCondition.QUALIFIED);
             node = response.Data.Customer.Audiences.Edges[1].Node;
-            Assert.IsTrue(node.Name == "has_email_opted_in");
-            Assert.IsTrue(node.State != BaseCondition.QUALIFIED);
+            Assert.AreEqual(node.Name, "has_email_opted_in");
+            Assert.AreNotEqual(node.State, BaseCondition.QUALIFIED);
         }
 
         [Test]
@@ -106,7 +106,7 @@ public void ShouldParseErrorResponse()
 {
    ""errors"": [
         {
-            ""message"": ""Exception while fetching data (/customer) : java.lang.RuntimeException: could not resolve _fs_user_id = asdsdaddddd"",
+            ""message"": ""Exception while fetching data (/customer) : Exception: could not resolve _fs_user_id = asdsdaddddd"",
             ""locations"": [
                 {
                     ""line"": 2,
@@ -129,17 +129,18 @@ public void ShouldParseErrorResponse()
             var response = GraphQLManager.ParseSegmentsResponseJson(RESPONSE_JSON);
 
             Assert.IsNull(response.Data.Customer);
-            Assert.IsNotNull(response.Errors);            
-            Assert.IsTrue(response.Errors[0].Extensions.Classification == "InvalidIdentifierException");
+            Assert.IsNotNull(response.Errors);
+            Assert.AreEqual(response.Errors[0].Extensions.Classification,
+                "InvalidIdentifierException");
         }
 
         [Test]
         public void ShouldFetchValidQualifiedSegments()
         {
             const string RESPONSE_DATA = "{\"data\":{\"customer\":{\"audiences\":" +
-                                        "{\"edges\":[{\"node\":{\"name\":\"has_email\"," +
-                                        "\"state\":\"qualified\"}},{\"node\":{\"name\":" +
-                                        "\"has_email_opted_in\",\"state\":\"qualified\"}}]}}}}";
+                                         "{\"edges\":[{\"node\":{\"name\":\"has_email\"," +
+                                         "\"state\":\"qualified\"}},{\"node\":{\"name\":" +
+                                         "\"has_email_opted_in\",\"state\":\"qualified\"}}]}}}}";
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
                 Returns(RESPONSE_DATA);
@@ -162,7 +163,7 @@ public void ShouldFetchValidQualifiedSegments()
         public void ShouldHandleEmptyQualifiedSegments()
         {
             const string RESPONSE_DATA = "{\"data\":{\"customer\":{\"audiences\":" +
-                                        "{\"edges\":[ ]}}}}";
+                                         "{\"edges\":[ ]}}}}";
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
                 Returns(RESPONSE_DATA);
@@ -183,11 +184,11 @@ public void ShouldHandleEmptyQualifiedSegments()
         public void ShouldHandleErrorWithInvalidIdentifier()
         {
             const string RESPONSE_DATA = "{\"errors\":[{\"message\":" +
-                                        "\"Exception while fetching data (/customer) : " +
-                                        "java.lang.RuntimeException: could not resolve _fs_user_id = invalid-user\"," +
-                                        "\"locations\":[{\"line\":1,\"column\":8}],\"path\":[\"customer\"]," +
-                                        "\"extensions\":{\"classification\":\"DataFetchingException\"}}]," +
-                                        "\"data\":{\"customer\":null}}";
+                                         "\"Exception while fetching data (/customer) : " +
+                                         "Exception: could not resolve _fs_user_id = invalid-user\"," +
+                                         "\"locations\":[{\"line\":1,\"column\":8}],\"path\":[\"customer\"]," +
+                                         "\"extensions\":{\"classification\":\"DataFetchingException\"}}]," +
+                                         "\"data\":{\"customer\":null}}";
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
                 Returns(RESPONSE_DATA);
@@ -197,20 +198,21 @@ public void ShouldHandleErrorWithInvalidIdentifier()
                 VALID_ODP_PUBLIC_KEY,
                 ODP_GRAPHQL_URL,
                 FS_USER_ID,
-                "invalid-user", // invalid user
+                "invalid-user",
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()), Times.Once);
+            _mockLogger.Verify(l => l.Log(LogLevel.WARN, "Audience segments fetch failed"),
+                Times.Once);
         }
 
         [Test]
         public void ShouldHandleOtherException()
         {
             const string RESPONSE_DATA = "{\"errors\":[{\"message\":\"Validation error of type " +
-                                        "UnknownArgument: Unknown field argument not_real_userKey @ " +
-                                        "'customer'\",\"locations\":[{\"line\":1,\"column\":17}]," +
-                                        "\"extensions\":{\"classification\":\"ValidationError\"}}]}";
+                                         "UnknownArgument: Unknown field argument not_real_userKey @ " +
+                                         "'customer'\",\"locations\":[{\"line\":1,\"column\":17}]," +
+                                         "\"extensions\":{\"classification\":\"ValidationError\"}}]}";
 
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
@@ -245,13 +247,16 @@ public void ShouldHandleBadResponse()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (decode error)"), Times.Once);
+            _mockLogger.Verify(
+                l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (decode error)"),
+                Times.Once);
         }
 
         [Test]
         public void ShouldHandleUnrecognizedJsonResponse()
         {
-            const string RESPONSE_DATA = "{\"unExpectedObject\":{ \"withSome\": \"value\", \"thatIsNotParseable\": \"true\" }}";
+            const string RESPONSE_DATA =
+                "{\"unExpectedObject\":{ \"withSome\": \"value\", \"thatIsNotParseable\": \"true\" }}";
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
                 Returns(RESPONSE_DATA);
@@ -265,8 +270,9 @@ public void ShouldHandleUnrecognizedJsonResponse()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (decode error)"), Times.Once);
-            
+            _mockLogger.Verify(
+                l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (decode error)"),
+                Times.Once);
         }
 
         [Test]
@@ -284,7 +290,8 @@ public void ShouldHandle400HttpCode()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (400)"), Times.Once);
+            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (400)"),
+                Times.Once);
         }
 
         [Test]
@@ -302,7 +309,8 @@ public void ShouldHandle500HttpCode()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (500)"), Times.Once);
+            _mockLogger.Verify(l => l.Log(LogLevel.ERROR, "Audience segments fetch failed (500)"),
+                Times.Once);
         }
 
         private static HttpClient GetHttpClientThatReturnsStatus(HttpStatusCode statusCode)
diff --git a/OptimizelySDK/Odp/Client/IOdpClient.cs b/OptimizelySDK/Odp/Client/IOdpClient.cs
index 2dccc38b..17c99d38 100644
--- a/OptimizelySDK/Odp/Client/IOdpClient.cs
+++ b/OptimizelySDK/Odp/Client/IOdpClient.cs
@@ -18,8 +18,16 @@
 
 namespace OptimizelySDK.Odp.Client
 {
+    /// <summary>
+    /// An implementation for sending requests and handling responses to Optimizely Data Platform
+    /// </summary>
     public interface IOdpClient
     {
+        /// <summary>
+        /// Synchronous handler for querying the ODP GraphQL endpoint 
+        /// </summary>
+        /// <param name="parameters">Parameters inputs to send to ODP</param>
+        /// <returns>JSON response from ODP</returns>
         string QuerySegments(QuerySegmentsParameters parameters);
     }
 }
diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index edf64382..88b51fe2 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -41,9 +41,9 @@ public class OdpClient : IOdpClient
         /// </summary>
         private readonly HttpClient _client;
 
-        public OdpClient(ILogger logger, HttpClient client = null)
+        public OdpClient(ILogger logger = null, HttpClient client = null)
         {
-            _logger = logger;
+            _logger = logger ?? new NoOpLogger();
             _client = client ?? new HttpClient();
         }
 
@@ -102,6 +102,8 @@ private static HttpRequestMessage BuildRequestMessage(string jsonQuery,
             QuerySegmentsParameters parameters
         )
         {
+            const string API_HEADER_KEY = "x-api-key";
+            const string CONTENT_TYPE = "application/json";
             var request = new HttpRequestMessage
             {
                 RequestUri = new Uri(parameters.ApiHost),
@@ -109,10 +111,10 @@ QuerySegmentsParameters parameters
                 Headers =
                 {
                     {
-                        "x-api-key", parameters.ApiKey
+                        API_HEADER_KEY, parameters.ApiKey
                     },
                 },
-                Content = new StringContent(jsonQuery, Encoding.UTF8, "application/json"),
+                Content = new StringContent(jsonQuery, Encoding.UTF8, CONTENT_TYPE),
             };
 
             return request;
diff --git a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
index 133628ec..b8da40f2 100644
--- a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
+++ b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
@@ -56,9 +56,9 @@ public class QuerySegmentsParameters
         /// <returns>GraphQL JSON payload</returns>
         public string ToJson()
         {
+            var userValueWithEscapedQuotes = $"\\\"{UserValue}\\\"";
             var segmentsArrayJson =
                 JsonConvert.SerializeObject(SegmentToCheck).Replace("\"", "\\\"");
-            var userValueWithEscapedQuotes = $"\\\"{UserValue}\\\"";
 
             var json = new StringBuilder();
             json.Append("{\"query\" : \"query {customer");
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 9372d4db..5132b5e3 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -35,7 +35,7 @@ public class GraphQLManager : IGraphQLManager
 
         public GraphQLManager(ILogger logger = null, IOdpClient client = null)
         {
-            _logger = logger ?? new DefaultLogger();
+            _logger = logger ?? new NoOpLogger();
             _odpClient = client ?? new OdpClient(_logger);
         }
 
@@ -46,25 +46,28 @@ public GraphQLManager(ILogger logger = null, IOdpClient client = null)
         /// <param name="apiHost">Fully-qualified URL of ODP</param>
         /// <param name="userKey">vuid or fs_user_id key</param>
         /// <param name="userValue">Associated value to query for the user key</param>
-        /// <param name="segmentToCheck">Audience segments to check for experiment inclusion</param>
+        /// <param name="segmentsToCheck">Audience segments to check for experiment inclusion</param>
         /// <returns>Array of audience segments</returns>
         public string[] FetchSegments(string apiKey, string apiHost, string userKey,
-            string userValue, List<string> segmentToCheck
+            string userValue, List<string> segmentsToCheck
         )
         {
+            var emptySegments = new string[0];
+            
             var parameters = new QuerySegmentsParameters
             {
                 ApiKey = apiKey,
                 ApiHost = apiHost,
                 UserKey = userKey,
                 UserValue = userValue,
-                SegmentToCheck = segmentToCheck
+                SegmentToCheck = segmentsToCheck,
             };
 
             var segmentsResponseJson = _odpClient.QuerySegments(parameters);
-            if (string.IsNullOrWhiteSpace(segmentsResponseJson))
+            if (CanBeJsonParsed(segmentsResponseJson))
             {
-                return new string[0];
+                _logger.Log(LogLevel.WARN, $"Audience segments fetch failed");
+                return emptySegments;
             }
 
             var parsedSegments = ParseSegmentsResponseJson(segmentsResponseJson);
@@ -75,17 +78,17 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
 
                 _logger.Log(LogLevel.WARN, $"Audience segments fetch failed ({errors})");
 
-                return new string[0];
+                return emptySegments;
             }
 
             if (parsedSegments?.Data?.Customer?.Audiences?.Edges is null)
             {
                 _logger.Log(LogLevel.ERROR, "Audience segments fetch failed (decode error)");
 
-                return new string[0];
+                return emptySegments;
             }
 
-            return parsedSegments.Data?.Customer?.Audiences?.Edges?.
+            return parsedSegments.Data.Customer.Audiences.Edges.
                 Where(e => e.Node.State == BaseCondition.QUALIFIED).
                 Select(e => e.Node.Name).ToArray();
         }
@@ -97,9 +100,19 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
         /// <returns>Strongly-typed ODP Response object</returns>
         public static Response ParseSegmentsResponseJson(string jsonResponse)
         {
-            return string.IsNullOrWhiteSpace(jsonResponse) ?
+            return CanBeJsonParsed(jsonResponse) ?
                 default :
                 JsonConvert.DeserializeObject<Response>(jsonResponse);
         }
+
+        /// <summary>
+        /// Ensure a string has content that can be parsed from JSON to an object
+        /// </summary>
+        /// <param name="jsonToValidate">Value containing possible JSON</param>
+        /// <returns>True if content could be interpreted as JSON else False</returns>
+        private static bool CanBeJsonParsed(string jsonToValidate)
+        {
+            return string.IsNullOrWhiteSpace(jsonToValidate);
+        }
     }
 }
diff --git a/OptimizelySDK/Odp/IGraphQLManager.cs b/OptimizelySDK/Odp/IGraphQLManager.cs
index edffefba..497087b2 100644
--- a/OptimizelySDK/Odp/IGraphQLManager.cs
+++ b/OptimizelySDK/Odp/IGraphQLManager.cs
@@ -24,7 +24,7 @@ string[] FetchSegments(string apiKey,
             string apiHost,
             string userKey,
             string userValue,
-            List<string> segmentToCheck
+            List<string> segmentsToCheck
         );
     }
 }

From f57b438044068665c8c2f7e78aa2e767bcff0cc6 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Mon, 22 Aug 2022 17:09:53 -0400
Subject: [PATCH 28/33] Update doc

---
 OptimizelySDK/Odp/GraphQLManager.cs  | 4 ++--
 OptimizelySDK/Odp/IGraphQLManager.cs | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 5132b5e3..538f3979 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -42,9 +42,9 @@ public GraphQLManager(ILogger logger = null, IOdpClient client = null)
         /// <summary>
         /// Retrieves the audience segments from ODP
         /// </summary>
-        /// <param name="apiKey">Public key use</param>
+        /// <param name="apiKey">ODP public key</param>
         /// <param name="apiHost">Fully-qualified URL of ODP</param>
-        /// <param name="userKey">vuid or fs_user_id key</param>
+        /// <param name="userKey">'vuid' or 'fs_user_id key'</param>
         /// <param name="userValue">Associated value to query for the user key</param>
         /// <param name="segmentsToCheck">Audience segments to check for experiment inclusion</param>
         /// <returns>Array of audience segments</returns>
diff --git a/OptimizelySDK/Odp/IGraphQLManager.cs b/OptimizelySDK/Odp/IGraphQLManager.cs
index 497087b2..e29c6a40 100644
--- a/OptimizelySDK/Odp/IGraphQLManager.cs
+++ b/OptimizelySDK/Odp/IGraphQLManager.cs
@@ -20,6 +20,15 @@ namespace OptimizelySDK.Odp
 {
     public interface IGraphQLManager
     {
+        /// <summary>
+        /// Retrieves the audience segments from ODP
+        /// </summary>
+        /// <param name="apiKey">ODP public key</param>
+        /// <param name="apiHost">Fully-qualified URL of ODP</param>
+        /// <param name="userKey">'vuid' or 'fs_user_id key'</param>
+        /// <param name="userValue">Associated value to query for the user key</param>
+        /// <param name="segmentsToCheck">Audience segments to check for experiment inclusion</param>
+        /// <returns>Array of audience segments</returns>
         string[] FetchSegments(string apiKey,
             string apiHost,
             string userKey,

From 98ad25d56b7ff3dcfb90e20b584919a10dbda5b0 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Tue, 23 Aug 2022 11:24:22 -0400
Subject: [PATCH 29/33] QuerySegmentsParameters Builder

---
 OptimizelySDK/Odp/Client/OdpClient.cs         |   5 +-
 .../Odp/Entity/QuerySegmentsParameters.cs     | 187 ++++++++++++++++--
 OptimizelySDK/Odp/GraphQLManager.cs           |  14 +-
 3 files changed, 179 insertions(+), 27 deletions(-)

diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 88b51fe2..6228328f 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -17,10 +17,7 @@
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp.Entity;
 using System;
-using System.CodeDom;
-using System.Net;
 using System.Net.Http;
-using System.Runtime.Remoting.Messaging;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -85,7 +82,7 @@ private async Task<HttpResponseMessage> QuerySegmentsAsync(
             QuerySegmentsParameters parameters
         )
         {
-            var request = BuildRequestMessage(parameters.ToJson(), parameters);
+            var request = BuildRequestMessage(parameters.ToGraphQLJson(), parameters);
 
             var response = await _client.SendAsync(request);
 
diff --git a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
index b8da40f2..32e89c1c 100644
--- a/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
+++ b/OptimizelySDK/Odp/Entity/QuerySegmentsParameters.cs
@@ -15,7 +15,10 @@
  */
 
 using Newtonsoft.Json;
+using OptimizelySDK.Logger;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace OptimizelySDK.Odp.Entity
@@ -25,40 +28,198 @@ namespace OptimizelySDK.Odp.Entity
     /// </summary>
     public class QuerySegmentsParameters
     {
+        public class Builder
+        {
+            /// <summary>
+            /// Builder API key
+            /// </summary>
+            private string ApiKey { get; set; }
+
+            /// <summary>
+            /// Builder ODP endpoint 
+            /// </summary>
+            private string ApiHost { get; set; }
+
+            /// <summary>
+            /// Builder user type key
+            /// </summary>
+            private string UserKey { get; set; }
+
+            /// <summary>
+            /// Builder user key value
+            /// </summary>
+            private string UserValue { get; set; }
+
+            /// <summary>
+            /// Builder audience segments
+            /// </summary>
+            private List<string> SegmentsToCheck { get; set; }
+
+            /// <summary>
+            /// Builder logger to report problems during build
+            /// </summary>
+            private ILogger Logger { get; }
+
+            public Builder(ILogger logger)
+            {
+                Logger = logger;
+            }
+
+            /// <summary>
+            /// Sets the API key for accessing ODP
+            /// </summary>
+            /// <param name="apiKey">Optimizely Data Platform API key</param>
+            /// <returns>Current state of builder</returns>
+            public Builder WithApiKey(string apiKey)
+            {
+                ApiKey = apiKey;
+                return this;
+            }
+
+            /// <summary>
+            /// Set the API endpoint for ODP
+            /// </summary>
+            /// <param name="apiHost">Fully-qualified URL to ODP endpoint</param>
+            /// <returns>Current state of builder</returns>
+            public Builder WithApiHost(string apiHost)
+            {
+                ApiHost = apiHost;
+                return this;
+            }
+
+            /// <summary>
+            /// Sets the user key on which to query ODP
+            /// </summary>
+            /// <param name="userKey">'vuid' or 'fs_user_id'</param>
+            /// <returns>Current state of builder</returns>
+            public Builder WithUserKey(string userKey)
+            {
+                UserKey = userKey;
+                return this;
+            }
+
+            /// <summary>
+            /// Set the user key's value
+            /// </summary>
+            /// <param name="userValue">Value for user key</param>
+            /// <returns>Current state of builder</returns>
+            public Builder WithUserValue(string userValue)
+            {
+                UserValue = userValue;
+                return this;
+            }
+
+            /// <summary>
+            /// Sets the segments to check
+            /// </summary>
+            /// <param name="segmentsToCheck">List of audience segments to check</param>
+            /// <returns>Current state of builder</returns>
+            public Builder WithSegmentsToCheck(List<string> segmentsToCheck)
+            {
+                SegmentsToCheck = segmentsToCheck;
+                return this;
+            }
+
+            /// <summary>
+            /// Validates and constructs the QuerySegmentsParameters object based on provided spec 
+            /// </summary>
+            /// <returns>QuerySegmentsParameters object</returns>
+            public QuerySegmentsParameters Build()
+            {
+                const string INVALID_MISSING_BUILDER_INPUT_MESSAGE =
+                    "QuerySegmentsParameters Builder was provided an invalid";
+                
+                if (string.IsNullOrWhiteSpace(ApiKey))
+                {
+                    Logger.Log(LogLevel.ERROR,
+                        $"{INVALID_MISSING_BUILDER_INPUT_MESSAGE} API Key");
+                    return default;
+                }
+
+                if (string.IsNullOrWhiteSpace(ApiHost) ||
+                    !Uri.TryCreate(ApiHost, UriKind.Absolute, out Uri _))
+                {
+                    Logger.Log(LogLevel.ERROR,
+                        $"{INVALID_MISSING_BUILDER_INPUT_MESSAGE} API Host");
+                    return default;
+                }
+
+                if (string.IsNullOrWhiteSpace(UserKey) || !Enum.TryParse(UserKey, out UserKeyType _))
+                {
+                    Logger.Log(LogLevel.ERROR,
+                        $"{INVALID_MISSING_BUILDER_INPUT_MESSAGE} User Key");
+                    return default;
+                }
+
+                if (string.IsNullOrWhiteSpace(UserValue))
+                {
+                    Logger.Log(LogLevel.ERROR,
+                        $"{INVALID_MISSING_BUILDER_INPUT_MESSAGE} User Value");
+                    return default;
+                }
+
+                if (SegmentsToCheck.Any(string.IsNullOrWhiteSpace))
+                {
+                    Logger.Log(LogLevel.ERROR,
+                        $"Segments To Check contained a null or empty segment");
+                    return default;
+                }
+
+                return new QuerySegmentsParameters
+                {
+                    ApiKey = ApiKey,
+                    ApiHost = ApiHost,
+                    UserKey = UserKey,
+                    UserValue = UserValue,
+                    SegmentsToCheck = SegmentsToCheck,
+                };
+            }
+
+            /// <summary>
+            /// Enumeration used during validation of User Key string
+            /// </summary>
+            private enum UserKeyType
+            {
+                vuid = 0, fs_user_id = 1
+            }
+        }
+
         /// <summary>
         /// Optimizely Data Platform API key
         /// </summary>
-        public string ApiKey { get; set; }
-        
+        public string ApiKey { get; private set; }
+
         /// <summary>
         /// Fully-qualified URL to ODP endpoint 
         /// </summary>
-        public string ApiHost { get; set; }
-        
+        public string ApiHost { get; private set; }
+
         /// <summary>
         /// 'vuid' or 'fs_user_id' (client device id or fullstack id)
         /// </summary>
-        public string UserKey { get; set; }
-        
+        private string UserKey { get; set; }
+
         /// <summary>
         /// Value for the user key
         /// </summary>
-        public string UserValue { get; set; }
-        
+        private string UserValue { get; set; }
+
         /// <summary>
         /// Audience segments to check for inclusion in the experiment
         /// </summary>
-        public List<string> SegmentToCheck { get; set; }
-        
+        private List<string> SegmentsToCheck { get; set; }
+
+        private QuerySegmentsParameters() { }
+
         /// <summary>
-        /// Converts the QuerySegmentsParameters into JSON
+        /// Converts the current QuerySegmentsParameters into a GraphQL JSON string
         /// </summary>
         /// <returns>GraphQL JSON payload</returns>
-        public string ToJson()
+        public string ToGraphQLJson()
         {
             var userValueWithEscapedQuotes = $"\\\"{UserValue}\\\"";
             var segmentsArrayJson =
-                JsonConvert.SerializeObject(SegmentToCheck).Replace("\"", "\\\"");
+                JsonConvert.SerializeObject(SegmentsToCheck).Replace("\"", "\\\"");
 
             var json = new StringBuilder();
             json.Append("{\"query\" : \"query {customer");
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 538f3979..c4a81d4c 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -19,7 +19,6 @@
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp.Client;
 using OptimizelySDK.Odp.Entity;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -53,15 +52,10 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
         )
         {
             var emptySegments = new string[0];
-            
-            var parameters = new QuerySegmentsParameters
-            {
-                ApiKey = apiKey,
-                ApiHost = apiHost,
-                UserKey = userKey,
-                UserValue = userValue,
-                SegmentToCheck = segmentsToCheck,
-            };
+
+            var parameters = new QuerySegmentsParameters.Builder(_logger).WithApiKey(apiKey).
+                WithApiHost(apiHost).WithUserKey(userKey).WithUserValue(userValue).
+                WithSegmentsToCheck(segmentsToCheck).Build();
 
             var segmentsResponseJson = _odpClient.QuerySegments(parameters);
             if (CanBeJsonParsed(segmentsResponseJson))

From 2d76e3baee78d079be28272b168db74e001ea68c Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Tue, 23 Aug 2022 11:42:28 -0400
Subject: [PATCH 30/33] Documentation

---
 OptimizelySDK/Odp/Entity/Audience.cs  |  6 ++++++
 OptimizelySDK/Odp/Entity/Customer.cs  |  6 ++++++
 OptimizelySDK/Odp/Entity/Data.cs      |  6 ++++++
 OptimizelySDK/Odp/Entity/Edge.cs      |  6 ++++++
 OptimizelySDK/Odp/Entity/Error.cs     | 15 +++++++++++++++
 OptimizelySDK/Odp/Entity/Extension.cs |  6 ++++++
 OptimizelySDK/Odp/Entity/Location.cs  |  9 +++++++++
 OptimizelySDK/Odp/Entity/Node.cs      |  9 +++++++++
 OptimizelySDK/Odp/Entity/Response.cs  | 12 ++++++++++++
 9 files changed, 75 insertions(+)

diff --git a/OptimizelySDK/Odp/Entity/Audience.cs b/OptimizelySDK/Odp/Entity/Audience.cs
index caeb1dae..0ee7f86c 100644
--- a/OptimizelySDK/Odp/Entity/Audience.cs
+++ b/OptimizelySDK/Odp/Entity/Audience.cs
@@ -16,8 +16,14 @@
 
 namespace OptimizelySDK.Odp.Entity
 {
+    /// <summary>
+    /// Segment of a customer base
+    /// </summary>
     public class Audience
     {
+        /// <summary>
+        /// Collection of nodes within audience
+        /// </summary>
         public Edge[] Edges { get; set; }
     }
 }
diff --git a/OptimizelySDK/Odp/Entity/Customer.cs b/OptimizelySDK/Odp/Entity/Customer.cs
index a0d7a05b..a55006b9 100644
--- a/OptimizelySDK/Odp/Entity/Customer.cs
+++ b/OptimizelySDK/Odp/Entity/Customer.cs
@@ -16,8 +16,14 @@
 
 namespace OptimizelySDK.Odp.Entity
 {
+    /// <summary>
+    /// Profile used to group/segment an addressable market 
+    /// </summary>
     public class Customer
     {
+        /// <summary>
+        /// Segment of a customer base
+        /// </summary>
         public Audience Audiences { get; set; }
     }
 }
diff --git a/OptimizelySDK/Odp/Entity/Data.cs b/OptimizelySDK/Odp/Entity/Data.cs
index bfdc3886..3e1e0176 100644
--- a/OptimizelySDK/Odp/Entity/Data.cs
+++ b/OptimizelySDK/Odp/Entity/Data.cs
@@ -16,8 +16,14 @@
 
 namespace OptimizelySDK.Odp.Entity
 {
+    /// <summary>
+    /// GraphQL response data returned from a valid query
+    /// </summary>
     public class Data
     {
+        /// <summary>
+        /// Grouping of audiences within an overall customer base
+        /// </summary>
         public Customer Customer { get; set; }
     }
 }
diff --git a/OptimizelySDK/Odp/Entity/Edge.cs b/OptimizelySDK/Odp/Entity/Edge.cs
index f2ecc380..288d2b1a 100644
--- a/OptimizelySDK/Odp/Entity/Edge.cs
+++ b/OptimizelySDK/Odp/Entity/Edge.cs
@@ -16,8 +16,14 @@
 
 namespace OptimizelySDK.Odp.Entity
 {
+    /// <summary>
+    /// Grouping of nodes within an audience
+    /// </summary>
     public class Edge
     {
+        /// <summary>
+        /// Atomic portions of a audience
+        /// </summary>
         public Node Node { get; set; }
     }
 }
diff --git a/OptimizelySDK/Odp/Entity/Error.cs b/OptimizelySDK/Odp/Entity/Error.cs
index 357249f4..d5b0ba66 100644
--- a/OptimizelySDK/Odp/Entity/Error.cs
+++ b/OptimizelySDK/Odp/Entity/Error.cs
@@ -16,14 +16,29 @@
 
 namespace OptimizelySDK.Odp.Entity
 {
+    /// <summary>
+    /// GraphQL response from an errant query
+    /// </summary>
     public class Error
     {
+        /// <summary>
+        /// Human-readable message from the error
+        /// </summary>
         public string Message { get; set; }
         
+        /// <summary>
+        /// Points of failure producing the error
+        /// </summary>
         public Location[] Locations { get; set; }
         
+        /// <summary>
+        /// Files or urls producing the error
+        /// </summary>
         public string[] Path { get; set; }
         
+        /// <summary>
+        /// Additional technical error information 
+        /// </summary>
         public Extension Extensions { get; set; }
 
         public override string ToString()
diff --git a/OptimizelySDK/Odp/Entity/Extension.cs b/OptimizelySDK/Odp/Entity/Extension.cs
index 541684e8..766f0a6c 100644
--- a/OptimizelySDK/Odp/Entity/Extension.cs
+++ b/OptimizelySDK/Odp/Entity/Extension.cs
@@ -16,8 +16,14 @@
 
 namespace OptimizelySDK.Odp.Entity
 {
+    /// <summary>
+    /// Extended error information 
+    /// </summary>
     public class Extension
     {
+        /// <summary>
+        /// Named exception type from the error
+        /// </summary>
         public string Classification { get; set; }
     }
 }
diff --git a/OptimizelySDK/Odp/Entity/Location.cs b/OptimizelySDK/Odp/Entity/Location.cs
index 3e7df4f8..2483ff6b 100644
--- a/OptimizelySDK/Odp/Entity/Location.cs
+++ b/OptimizelySDK/Odp/Entity/Location.cs
@@ -16,10 +16,19 @@
 
 namespace OptimizelySDK.Odp.Entity
 {
+    /// <summary>
+    /// Specifies the precise place in code or data where the error occurred
+    /// </summary>
     public class Location
     {
+        /// <summary>
+        /// Code or data line number 
+        /// </summary>
         public int Line { get; set; }
         
+        /// <summary>
+        /// Code or data column number
+        /// </summary>
         public int Column { get; set; }
     }
 }
diff --git a/OptimizelySDK/Odp/Entity/Node.cs b/OptimizelySDK/Odp/Entity/Node.cs
index 3fea4df4..745c0f3d 100644
--- a/OptimizelySDK/Odp/Entity/Node.cs
+++ b/OptimizelySDK/Odp/Entity/Node.cs
@@ -16,10 +16,19 @@
 
 namespace OptimizelySDK.Odp.Entity
 {
+    /// <summary>
+    /// Atomic grouping an audience
+    /// </summary>
     public class Node
     {
+        /// <summary>
+        /// Descriptive label of a node
+        /// </summary>
         public string Name { get; set; }
         
+        /// <summary>
+        /// Status of the node
+        /// </summary>
         public string State { get; set; }
     }
 }
diff --git a/OptimizelySDK/Odp/Entity/Response.cs b/OptimizelySDK/Odp/Entity/Response.cs
index 2037580f..303d0dc1 100644
--- a/OptimizelySDK/Odp/Entity/Response.cs
+++ b/OptimizelySDK/Odp/Entity/Response.cs
@@ -16,12 +16,24 @@
 
 namespace OptimizelySDK.Odp.Entity
 {
+    /// <summary>
+    /// Wrapper around valid data and error responses 
+    /// </summary>
     public class Response
     {
+        /// <summary>
+        /// Valid query response information
+        /// </summary>
         public Data Data { get; set; }
 
+        /// <summary>
+        /// Set of errors produced while querying
+        /// </summary>
         public Error[] Errors { get; set; }
 
+        /// <summary>
+        /// Determines if an error exists
+        /// </summary>
         public bool HasErrors
         {
             get

From 20016f9ba521108947b813e3e760c3daae02c186 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Tue, 23 Aug 2022 11:51:44 -0400
Subject: [PATCH 31/33] Document constructors

---
 OptimizelySDK/Odp/Client/OdpClient.cs | 5 +++++
 OptimizelySDK/Odp/GraphQLManager.cs   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 6228328f..a739b570 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -38,6 +38,11 @@ public class OdpClient : IOdpClient
         /// </summary>
         private readonly HttpClient _client;
 
+        /// <summary>
+        /// An implementation for sending requests and handling responses to Optimizely Data Platform (ODP)
+        /// </summary>
+        /// <param name="logger">Collect and record events/errors for this ODP client</param>
+        /// <param name="client">Client implementation to send/receive requests over HTTP</param>
         public OdpClient(ILogger logger = null, HttpClient client = null)
         {
             _logger = logger ?? new NoOpLogger();
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index c4a81d4c..8dd0eb10 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -32,6 +32,11 @@ public class GraphQLManager : IGraphQLManager
         private readonly ILogger _logger;
         private readonly IOdpClient _odpClient;
 
+        /// <summary>
+        /// Retrieves the audience segments from the Optimizely Data Platform (ODP)
+        /// </summary>
+        /// <param name="logger">Collect and record events/errors for this GraphQL implementation</param>
+        /// <param name="client">Client to use to send queries to ODP</param>
         public GraphQLManager(ILogger logger = null, IOdpClient client = null)
         {
             _logger = logger ?? new NoOpLogger();

From 76e3e9e5de34248127a9ec84d738d62a2cc48f57 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Tue, 23 Aug 2022 17:41:48 -0400
Subject: [PATCH 32/33] Code review changes

---
 .../OdpTests/GraphQLManagerTest.cs            | 33 ++++++++++++-------
 OptimizelySDK/Odp/Client/OdpClient.cs         | 15 +++++++--
 OptimizelySDK/Odp/GraphQLManager.cs           |  7 ++--
 3 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
index b7e1060f..f1024c51 100644
--- a/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
+++ b/OptimizelySDK.Tests/OdpTests/GraphQLManagerTest.cs
@@ -18,6 +18,7 @@
 using Moq.Protected;
 using NUnit.Framework;
 using OptimizelySDK.AudienceConditions;
+using OptimizelySDK.ErrorHandler;
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp;
 using OptimizelySDK.Odp.Client;
@@ -44,12 +45,14 @@ public class GraphQLManagerTest
             "push_on_sale",
         };
 
+        private Mock<IErrorHandler> _mockErrorHandler;
         private Mock<ILogger> _mockLogger;
         private Mock<IOdpClient> _mockOdpClient;
 
         [SetUp]
         public void Setup()
         {
+            _mockErrorHandler = new Mock<IErrorHandler>();
             _mockLogger = new Mock<ILogger>();
             _mockLogger.Setup(i => i.Log(It.IsAny<LogLevel>(), It.IsAny<string>()));
 
@@ -144,7 +147,8 @@ public void ShouldFetchValidQualifiedSegments()
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
                 Returns(RESPONSE_DATA);
-            var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
+            var manager = new GraphQLManager(_mockErrorHandler.Object, _mockLogger.Object,
+                _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
                 VALID_ODP_PUBLIC_KEY,
@@ -167,7 +171,8 @@ public void ShouldHandleEmptyQualifiedSegments()
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
                 Returns(RESPONSE_DATA);
-            var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
+            var manager = new GraphQLManager(_mockErrorHandler.Object, _mockLogger.Object,
+                _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
                 VALID_ODP_PUBLIC_KEY,
@@ -192,7 +197,8 @@ public void ShouldHandleErrorWithInvalidIdentifier()
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
                 Returns(RESPONSE_DATA);
-            var manager = new GraphQLManager(_mockLogger.Object);
+            var manager = new GraphQLManager(_mockErrorHandler.Object, _mockLogger.Object,
+                _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
                 VALID_ODP_PUBLIC_KEY,
@@ -202,7 +208,7 @@ public void ShouldHandleErrorWithInvalidIdentifier()
                 _segmentsToCheck);
 
             Assert.IsTrue(segments.Length == 0);
-            _mockLogger.Verify(l => l.Log(LogLevel.WARN, "Audience segments fetch failed"),
+            _mockLogger.Verify(l => l.Log(LogLevel.WARN, It.IsAny<string>()),
                 Times.Once);
         }
 
@@ -217,7 +223,8 @@ public void ShouldHandleOtherException()
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
                 Returns(RESPONSE_DATA);
-            var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
+            var manager = new GraphQLManager(_mockErrorHandler.Object, _mockLogger.Object,
+                _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
                 VALID_ODP_PUBLIC_KEY,
@@ -237,7 +244,8 @@ public void ShouldHandleBadResponse()
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
                 Returns(RESPONSE_DATA);
-            var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
+            var manager = new GraphQLManager(_mockErrorHandler.Object, _mockLogger.Object,
+                _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
                 VALID_ODP_PUBLIC_KEY,
@@ -260,7 +268,8 @@ public void ShouldHandleUnrecognizedJsonResponse()
             _mockOdpClient.Setup(
                     c => c.QuerySegments(It.IsAny<QuerySegmentsParameters>())).
                 Returns(RESPONSE_DATA);
-            var manager = new GraphQLManager(_mockLogger.Object, _mockOdpClient.Object);
+            var manager = new GraphQLManager(_mockErrorHandler.Object, _mockLogger.Object,
+                _mockOdpClient.Object);
 
             var segments = manager.FetchSegments(
                 VALID_ODP_PUBLIC_KEY,
@@ -278,9 +287,10 @@ public void ShouldHandleUnrecognizedJsonResponse()
         [Test]
         public void ShouldHandle400HttpCode()
         {
-            var odpClient = new OdpClient(_mockLogger.Object,
+            var odpClient = new OdpClient(_mockErrorHandler.Object, _mockLogger.Object,
                 GetHttpClientThatReturnsStatus(HttpStatusCode.BadRequest));
-            var manager = new GraphQLManager(_mockLogger.Object, odpClient);
+            var manager =
+                new GraphQLManager(_mockErrorHandler.Object, _mockLogger.Object, odpClient);
 
             var segments = manager.FetchSegments(
                 VALID_ODP_PUBLIC_KEY,
@@ -297,9 +307,10 @@ public void ShouldHandle400HttpCode()
         [Test]
         public void ShouldHandle500HttpCode()
         {
-            var odpClient = new OdpClient(_mockLogger.Object,
+            var odpClient = new OdpClient(_mockErrorHandler.Object, _mockLogger.Object,
                 GetHttpClientThatReturnsStatus(HttpStatusCode.InternalServerError));
-            var manager = new GraphQLManager(_mockLogger.Object, odpClient);
+            var manager =
+                new GraphQLManager(_mockErrorHandler.Object, _mockLogger.Object, odpClient);
 
             var segments = manager.FetchSegments(
                 VALID_ODP_PUBLIC_KEY,
diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index a739b570..5faae87a 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using OptimizelySDK.ErrorHandler;
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp.Entity;
 using System;
@@ -28,6 +29,11 @@ namespace OptimizelySDK.Odp.Client
     /// </summary>
     public class OdpClient : IOdpClient
     {
+        /// <summary>
+        /// Error handler used to record errors
+        /// </summary>
+        private readonly IErrorHandler _errorHandler;
+
         /// <summary>
         /// Logger used to record messages that occur within the ODP client 
         /// </summary>
@@ -41,10 +47,14 @@ public class OdpClient : IOdpClient
         /// <summary>
         /// An implementation for sending requests and handling responses to Optimizely Data Platform (ODP)
         /// </summary>
+        /// <param name="errorHandler">Handler to record exceptions</param>
         /// <param name="logger">Collect and record events/errors for this ODP client</param>
         /// <param name="client">Client implementation to send/receive requests over HTTP</param>
-        public OdpClient(ILogger logger = null, HttpClient client = null)
+        public OdpClient(IErrorHandler errorHandler = null, ILogger logger = null,
+            HttpClient client = null
+        )
         {
+            _errorHandler = errorHandler ?? new NoOpErrorHandler();
             _logger = logger ?? new NoOpLogger();
             _client = client ?? new HttpClient();
         }
@@ -59,10 +69,11 @@ public string QuerySegments(QuerySegmentsParameters parameters)
             HttpResponseMessage response;
             try
             {
-                response = Task.Run(() => QuerySegmentsAsync(parameters)).GetAwaiter().GetResult();
+                response = Task.Run(() => QuerySegmentsAsync(parameters)).Result;
             }
             catch (Exception ex)
             {
+                _errorHandler.HandleError(ex);
                 _logger.Log(LogLevel.ERROR, "Audience segments fetch failed (network error)");
                 return default;
             }
diff --git a/OptimizelySDK/Odp/GraphQLManager.cs b/OptimizelySDK/Odp/GraphQLManager.cs
index 8dd0eb10..a246c054 100644
--- a/OptimizelySDK/Odp/GraphQLManager.cs
+++ b/OptimizelySDK/Odp/GraphQLManager.cs
@@ -16,6 +16,7 @@
 
 using Newtonsoft.Json;
 using OptimizelySDK.AudienceConditions;
+using OptimizelySDK.ErrorHandler;
 using OptimizelySDK.Logger;
 using OptimizelySDK.Odp.Client;
 using OptimizelySDK.Odp.Entity;
@@ -35,12 +36,13 @@ public class GraphQLManager : IGraphQLManager
         /// <summary>
         /// Retrieves the audience segments from the Optimizely Data Platform (ODP)
         /// </summary>
+        /// <param name="errorHandler">Handler to record exceptions</param>
         /// <param name="logger">Collect and record events/errors for this GraphQL implementation</param>
         /// <param name="client">Client to use to send queries to ODP</param>
-        public GraphQLManager(ILogger logger = null, IOdpClient client = null)
+        public GraphQLManager(IErrorHandler errorHandler = null, ILogger logger = null, IOdpClient client = null)
         {
             _logger = logger ?? new NoOpLogger();
-            _odpClient = client ?? new OdpClient(_logger);
+            _odpClient = client ?? new OdpClient(errorHandler ?? new NoOpErrorHandler(), _logger);
         }
 
         /// <summary>
@@ -70,7 +72,6 @@ public string[] FetchSegments(string apiKey, string apiHost, string userKey,
             }
 
             var parsedSegments = ParseSegmentsResponseJson(segmentsResponseJson);
-
             if (parsedSegments.HasErrors)
             {
                 var errors = string.Join(";", parsedSegments.Errors.Select(e => e.ToString()));

From f5fc25799ef741f55acf5d2edf9e899780afdfc3 Mon Sep 17 00:00:00 2001
From: Mike Chu <michael.chu@optimizely.com>
Date: Wed, 24 Aug 2022 12:45:51 -0400
Subject: [PATCH 33/33] Adjust sync-to-async call methodology

---
 OptimizelySDK/Odp/Client/OdpClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OptimizelySDK/Odp/Client/OdpClient.cs b/OptimizelySDK/Odp/Client/OdpClient.cs
index 5faae87a..f8b4a5a7 100644
--- a/OptimizelySDK/Odp/Client/OdpClient.cs
+++ b/OptimizelySDK/Odp/Client/OdpClient.cs
@@ -69,7 +69,7 @@ public string QuerySegments(QuerySegmentsParameters parameters)
             HttpResponseMessage response;
             try
             {
-                response = Task.Run(() => QuerySegmentsAsync(parameters)).Result;
+                response = QuerySegmentsAsync(parameters).GetAwaiter().GetResult();
             }
             catch (Exception ex)
             {