From bc518f0c4fa0a36c86cbf45a317abfa6518c6d60 Mon Sep 17 00:00:00 2001
From: Chandu <chandra.vedantham@gmail.com>
Date: Wed, 26 Mar 2014 17:43:19 -0400
Subject: [PATCH 1/4] Added System.Net.Http library and removed the WebRequest
 dependency.

---
 .../Cucumber.SimpleDb.Test.csproj             | 46 +++++++++--
 .../Fakes/FakeMessageHandler.cs               | 29 +++++++
 .../Transport/AwsRestServiceTest.cs           | 24 +++++-
 .../Transport/CaptureUriRequestProvider.cs    | 45 -----------
 source/Cucumber.SimpleDb.Test/app.config      | 11 +++
 source/Cucumber.SimpleDb.Test/packages.config |  3 +
 .../Cucumber.SimpleDb.csproj                  | 45 ++++++++++-
 .../Extensions/HttpMethodExtensions.cs        | 21 +++++
 source/Cucumber.SimpleDb/SimpleDbContext.cs   |  2 +-
 .../Transport/AwsRestService.cs               | 81 +++++++++++--------
 .../Transport/IWebRequestProvider.cs          | 11 ---
 .../Transport/WebRequestProvider.cs           | 14 ----
 source/Cucumber.SimpleDb/app.config           | 11 +++
 source/Cucumber.SimpleDb/packages.config      |  6 ++
 14 files changed, 231 insertions(+), 118 deletions(-)
 create mode 100644 source/Cucumber.SimpleDb.Test/Fakes/FakeMessageHandler.cs
 delete mode 100644 source/Cucumber.SimpleDb.Test/Transport/CaptureUriRequestProvider.cs
 create mode 100644 source/Cucumber.SimpleDb.Test/app.config
 create mode 100644 source/Cucumber.SimpleDb/Extensions/HttpMethodExtensions.cs
 delete mode 100644 source/Cucumber.SimpleDb/Transport/IWebRequestProvider.cs
 delete mode 100644 source/Cucumber.SimpleDb/Transport/WebRequestProvider.cs
 create mode 100644 source/Cucumber.SimpleDb/app.config
 create mode 100644 source/Cucumber.SimpleDb/packages.config

diff --git a/source/Cucumber.SimpleDb.Test/Cucumber.SimpleDb.Test.csproj b/source/Cucumber.SimpleDb.Test/Cucumber.SimpleDb.Test.csproj
index 26496d9..5d73b49 100644
--- a/source/Cucumber.SimpleDb.Test/Cucumber.SimpleDb.Test.csproj
+++ b/source/Cucumber.SimpleDb.Test/Cucumber.SimpleDb.Test.csproj
@@ -33,6 +33,29 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.IO.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http, Version=2.2.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest, Version=2.2.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Threading.Tasks.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
     <Reference Include="Moq">
@@ -43,6 +66,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Fakes\FakeMessageHandler.cs" />
     <Compile Include="SimpleDbAttributeValueConversionTest.cs" />
     <Compile Include="SimpleDbAttributeValueAnyTest.cs" />
     <Compile Include="SimpleDbAttributeValueEveryTest.cs" />
@@ -56,7 +80,6 @@
     <Compile Include="Session\SimpleDbSessionTests.cs" />
     <Compile Include="Transport\SimpleDbRestServiceTests.cs" />
     <Compile Include="Transport\AwsRestServiceTest.cs" />
-    <Compile Include="Transport\CaptureUriRequestProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="LINQ\Translation\SimpleDbQueryableTest.cs" />
     <Compile Include="Transport\PassThroughAwsRestService.cs" />
@@ -74,14 +97,21 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(SolutionDir).nuget\NuGet.targets" />
-  <ItemGroup>
-    <Folder Include="LINQ\IntegrationTests\" />
-    <Folder Include="Utilities\" />
-    <Folder Include="Session\" />
-    <Folder Include="Transport\" />
-    <Folder Include="Properties\" />
-  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/source/Cucumber.SimpleDb.Test/Fakes/FakeMessageHandler.cs b/source/Cucumber.SimpleDb.Test/Fakes/FakeMessageHandler.cs
new file mode 100644
index 0000000..4a037f7
--- /dev/null
+++ b/source/Cucumber.SimpleDb.Test/Fakes/FakeMessageHandler.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Cucumber.SimpleDb.Test.Fakes
+{
+	//http://stackoverflow.com/questions/10693955/stubbing-or-mocking-asp-net-web-api-httpclient
+	internal class FakeHttpMessageHandler : HttpMessageHandler
+	{
+		private readonly HttpResponseMessage _responseMessage;
+		private readonly Action<HttpRequestMessage> _requestFilter;
+		
+
+		public FakeHttpMessageHandler(HttpResponseMessage responseMessage, Action<HttpRequestMessage> requestFilter)
+		{
+			_responseMessage = responseMessage;
+			_requestFilter = requestFilter;
+		}
+
+		public HttpRequestMessage RequestMessage { get; private set; }
+
+		protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+		{
+			_requestFilter(request);
+			return Task.Factory.StartNew(() => _responseMessage, cancellationToken);
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Cucumber.SimpleDb.Test/Transport/AwsRestServiceTest.cs b/source/Cucumber.SimpleDb.Test/Transport/AwsRestServiceTest.cs
index dbc1889..cbcc0ad 100644
--- a/source/Cucumber.SimpleDb.Test/Transport/AwsRestServiceTest.cs
+++ b/source/Cucumber.SimpleDb.Test/Transport/AwsRestServiceTest.cs
@@ -1,24 +1,40 @@
-using NUnit.Framework;
-using System;
+using System.Net;
+using System.Net.Http;
+using Cucumber.SimpleDb.Test.Fakes;
+using NUnit.Framework;
 using System.Collections.Specialized;
 using Cucumber.SimpleDb.Transport;
 
 namespace Cucumber.SimpleDb.Test
 {
+		
     [TestFixture ()]
     public class AwsRestServiceTest
     {
+				private HttpRequestMessage _requestMessage;
+				private HttpClient _httpClient;
+				[SetUp]
+				public void Setup()
+				{
+						var responseMessage = new HttpResponseMessage(HttpStatusCode.OK)
+						{
+							Content = new StringContent("<All><Ok/></All>")
+						};
+					_httpClient = new HttpClient(new FakeHttpMessageHandler(responseMessage, req => _requestMessage = req));
+							
+				}
+
         [Test ()]
         public void ValidateRequestSignature ()
         {
             string generatedUri = null;
-            var service = new AwsRestService ("myPublicKey", "myPrivateKey", new CaptureUriRequestProvider(uri => generatedUri = uri));
+						var service = new AwsRestService("myPublicKey", "myPrivateKey", _httpClient);
             service.ExecuteRequest (new NameValueCollection {
                 { "Item.0.ItemName", "TestItem1" },
                 { "Item.0.Attribute.0.Name", "TestAtt1" },
                 { "Item.0.Attribute.0.Value", "123" }
             });
-            //TODO: validate HMAC
+						Assert.NotNull(_requestMessage);
         }
     }
 }
diff --git a/source/Cucumber.SimpleDb.Test/Transport/CaptureUriRequestProvider.cs b/source/Cucumber.SimpleDb.Test/Transport/CaptureUriRequestProvider.cs
deleted file mode 100644
index 8f7f578..0000000
--- a/source/Cucumber.SimpleDb.Test/Transport/CaptureUriRequestProvider.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using Cucumber.SimpleDb.Transport;
-
-namespace Cucumber.SimpleDb.Test
-{
-    public class CaptureUriRequestProvider : IWebRequestProvider
-    {
-        private readonly Action<string> _captureUri;
-
-        public CaptureUriRequestProvider (Action<string> captureUri)
-        {
-            _captureUri = captureUri;
-        }
-            
-        public System.Net.WebRequest Create (string uri)
-        {
-            _captureUri (uri);
-            return new DummyWebRequest();
-        }
-
-        private class DummyWebRequest : WebRequest
-        {
-            public override WebResponse GetResponse ()
-            {
-                return new DummyWebResponse ();
-            }
-
-            private class DummyWebResponse : WebResponse
-            {
-                public override Stream GetResponseStream ()
-                {
-                    return new MemoryStream (Encoding.UTF8.GetBytes ("<Empty />"));
-                }
-
-                public override void Close ()
-                {
-                }
-            }
-        }
-    }
-}
-
diff --git a/source/Cucumber.SimpleDb.Test/app.config b/source/Cucumber.SimpleDb.Test/app.config
new file mode 100644
index 0000000..49d6235
--- /dev/null
+++ b/source/Cucumber.SimpleDb.Test/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.18.0" newVersion="2.2.18.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/source/Cucumber.SimpleDb.Test/packages.config b/source/Cucumber.SimpleDb.Test/packages.config
index d6fcf5d..cbc3eb6 100644
--- a/source/Cucumber.SimpleDb.Test/packages.config
+++ b/source/Cucumber.SimpleDb.Test/packages.config
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40" />
+  <package id="Microsoft.Net.Http" version="2.2.18" targetFramework="net40" />
   <package id="Moq" version="4.2.1402.2112" targetFramework="net40" />
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/source/Cucumber.SimpleDb/Cucumber.SimpleDb.csproj b/source/Cucumber.SimpleDb/Cucumber.SimpleDb.csproj
index 86e00af..8e5093f 100644
--- a/source/Cucumber.SimpleDb/Cucumber.SimpleDb.csproj
+++ b/source/Cucumber.SimpleDb/Cucumber.SimpleDb.csproj
@@ -11,6 +11,8 @@
     <RootNamespace>Cucumber.SimpleDb</RootNamespace>
     <AssemblyName>Cucumber.SimpleDb</AssemblyName>
     <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -33,6 +35,29 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.IO.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http, Version=2.2.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest, Version=2.2.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Threading.Tasks.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -41,6 +66,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Extensions\HttpMethodExtensions.cs" />
     <Compile Include="Session\ISessionAttribute.cs" />
     <Compile Include="Session\ISessionItem.cs" />
     <Compile Include="Session\ISession.cs" />
@@ -96,16 +122,29 @@
     <Compile Include="Transport\IAwsRestService.cs" />
     <Compile Include="Transport\AwsRestService.cs" />
     <Compile Include="Transport\SimpleDbRestService.cs" />
-    <Compile Include="Transport\WebRequestProvider.cs" />
-    <Compile Include="Transport\IWebRequestProvider.cs" />
     <Compile Include="Linq\Translation\ImplicitSelect.cs" />
     <Compile Include="Linq\Structure\CountExpression.cs" />
     <Compile Include="Linq\Structure\ScalarExpression.cs" />
     <Compile Include="Utilities\StringUtilities.cs" />
     <Compile Include="SimpleDbQueryable.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- 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.
   <Target Name="BeforeBuild">
diff --git a/source/Cucumber.SimpleDb/Extensions/HttpMethodExtensions.cs b/source/Cucumber.SimpleDb/Extensions/HttpMethodExtensions.cs
new file mode 100644
index 0000000..1b6a1eb
--- /dev/null
+++ b/source/Cucumber.SimpleDb/Extensions/HttpMethodExtensions.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+
+namespace Cucumber.SimpleDb
+{
+	internal static class HttpMethodExtensions
+	{
+		private static readonly IEnumerable<HttpMethod> NoBodyHttpMethods = new[]
+		{
+			//Not sure if this is the full list. Need to confirm with RFC.
+			HttpMethod.Get,
+			HttpMethod.Head
+		};
+
+		public static bool CanHaveContent(this HttpMethod httpMethod)
+		{
+			return NoBodyHttpMethods.All(a => a != httpMethod);
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Cucumber.SimpleDb/SimpleDbContext.cs b/source/Cucumber.SimpleDb/SimpleDbContext.cs
index 6849af2..5b19a9a 100644
--- a/source/Cucumber.SimpleDb/SimpleDbContext.cs
+++ b/source/Cucumber.SimpleDb/SimpleDbContext.cs
@@ -31,7 +31,7 @@ public static ISimpleDbContext Create(string publicKey, string privateKey)
             {
                 throw new ArgumentNullException("privateKey");
             }
-            return Create(new SimpleDbRestService(new AwsRestService(publicKey, privateKey, new WebRequestProvider())));
+            return Create(new SimpleDbRestService(new AwsRestService(publicKey, privateKey)));
         }
 
         /// <summary>
diff --git a/source/Cucumber.SimpleDb/Transport/AwsRestService.cs b/source/Cucumber.SimpleDb/Transport/AwsRestService.cs
index 68ccb57..9ce2f69 100644
--- a/source/Cucumber.SimpleDb/Transport/AwsRestService.cs
+++ b/source/Cucumber.SimpleDb/Transport/AwsRestService.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Net.Http;
+using System.Threading.Tasks;
 using System.Xml.Linq;
 using System.Collections.Specialized;
 using System.Xml;
@@ -16,51 +18,66 @@ internal class AwsRestService : IAwsRestService
     {
         private readonly string _publicKey;
         private readonly string _privateKey;
-        private readonly IWebRequestProvider _webRequest;
+				private readonly HttpClient _httpClient;
         private static readonly XNamespace sdbNs = "http://sdb.amazonaws.com/doc/2009-04-15/";
 
-        public AwsRestService(string publicKey, string privateKey, IWebRequestProvider webRequest)
+				public AwsRestService(string publicKey, string privateKey)
+					:this(publicKey, privateKey, new HttpClient())
+				{
+				
+				}
+
+        internal AwsRestService(string publicKey, string privateKey, HttpClient httpClient)
         {
             _publicKey = publicKey;
             _privateKey = privateKey;
-            _webRequest = webRequest;
+            _httpClient = httpClient;
         }
 
-        public XElement ExecuteRequest(NameValueCollection arguments)
+				public XElement ExecuteRequest(NameValueCollection arguments)
+				{
+					return ExecuteRequestAsync(arguments).Result;
+				}
+
+        public Task<XElement> ExecuteRequestAsync(NameValueCollection arguments)
         {
             arguments = AddStandardArguments(arguments);
             string argumentString = WriteQueryString(arguments);
-            var request = _webRequest.Create(string.Format(
-                "{0}://{1}/?{2}",
-                simpleDbProtocol,
-                simpleDbUrl,
-                argumentString));
-            try
-            {
-                using (var response = request.GetResponse ())
-                {
-                    return ProcessAwsResponse (response);
-                }
-            }
-            catch (WebException ex)
-            {
-                var response = ex.Response as HttpWebResponse;
-                var errors = ProcessAwsResponse (response);
-                throw new SimpleDbException(string.Format(
-                    "Error {0} {1}: AWS returned the following:\n{2}",
-                    (int)response.StatusCode,
-                    response.StatusCode,
-                    string.Join("\n", errors.Descendants(sdbNs + "Error")
-                        .Select(error => string.Format("{0}: {1}",
-                            error.Element(sdbNs + "Code").Value,
-                            error.Element(sdbNs + "Message").Value)))),
-                    ex);
-            }
+						var requestUrl = string.Format(
+								"{0}://{1}/?{2}",
+								simpleDbProtocol,
+								simpleDbUrl,
+								argumentString);
+						var requestMessage = new HttpRequestMessage(HttpMethod.Get, new Uri(requestUrl));
+						return _httpClient.SendAsync(requestMessage).ContinueWith(task =>
+						{
+							var responseMessage = task.Result;
+
+							if (responseMessage.IsSuccessStatusCode)
+							{
+								return ProcessAwsResponse(responseMessage);
+							}
+
+							var errors = ProcessAwsResponse(responseMessage);
+							throw new SimpleDbException(string.Format(
+									"Error {0} {1}: AWS returned the following:\n{2}",
+									(int)responseMessage.StatusCode,
+									responseMessage.StatusCode,
+									string.Join("\n", errors.Descendants(sdbNs + "Error")
+											.Select(error => string.Format("{0}: {1}",
+													error.Element(sdbNs + "Code").Value,
+													error.Element(sdbNs + "Message").Value)))));
+						});
+
         }
 
-        private static XElement ProcessAwsResponse (WebResponse response)
+        private static XElement ProcessAwsResponse (HttpResponseMessage response)
         {
-            using (var stream = response.GetResponseStream ())
+						if (response.Content == null)
+						{
+							return null;
+						}
+            using (var stream = response.Content.ReadAsStreamAsync().Result)
             {
                 try
                 {
diff --git a/source/Cucumber.SimpleDb/Transport/IWebRequestProvider.cs b/source/Cucumber.SimpleDb/Transport/IWebRequestProvider.cs
deleted file mode 100644
index 701cf80..0000000
--- a/source/Cucumber.SimpleDb/Transport/IWebRequestProvider.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Net;
-
-namespace Cucumber.SimpleDb.Transport
-{
-    internal interface IWebRequestProvider
-    {
-        WebRequest Create(string uri);
-    }
-}
-
diff --git a/source/Cucumber.SimpleDb/Transport/WebRequestProvider.cs b/source/Cucumber.SimpleDb/Transport/WebRequestProvider.cs
deleted file mode 100644
index 406afa6..0000000
--- a/source/Cucumber.SimpleDb/Transport/WebRequestProvider.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Net;
-
-namespace Cucumber.SimpleDb.Transport
-{
-    internal class WebRequestProvider : IWebRequestProvider
-    {
-        public System.Net.WebRequest Create (string uri)
-        {
-            return HttpWebRequest.Create (uri);
-        }
-    }
-}
-
diff --git a/source/Cucumber.SimpleDb/app.config b/source/Cucumber.SimpleDb/app.config
new file mode 100644
index 0000000..49d6235
--- /dev/null
+++ b/source/Cucumber.SimpleDb/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.18.0" newVersion="2.2.18.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/source/Cucumber.SimpleDb/packages.config b/source/Cucumber.SimpleDb/packages.config
new file mode 100644
index 0000000..c608ed1
--- /dev/null
+++ b/source/Cucumber.SimpleDb/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40" />
+  <package id="Microsoft.Net.Http" version="2.2.18" targetFramework="net40" />
+</packages>
\ No newline at end of file

From 41db8d10ba2a289d40246a527fae8300550beae2 Mon Sep 17 00:00:00 2001
From: Chandu <chandra.vedantham@gmail.com>
Date: Wed, 26 Mar 2014 21:41:23 -0400
Subject: [PATCH 2/4] Added .editorconfig file

---
 .editorconfig                                             | 4 ++++
 source/Cucumber.SimpleDb.Test/Fakes/FakeMessageHandler.cs | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..76bdacc
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,4 @@
+root=true
+[*]
+indent_size = 4
+indent_style = tab
\ No newline at end of file
diff --git a/source/Cucumber.SimpleDb.Test/Fakes/FakeMessageHandler.cs b/source/Cucumber.SimpleDb.Test/Fakes/FakeMessageHandler.cs
index 4a037f7..5150d96 100644
--- a/source/Cucumber.SimpleDb.Test/Fakes/FakeMessageHandler.cs
+++ b/source/Cucumber.SimpleDb.Test/Fakes/FakeMessageHandler.cs
@@ -10,7 +10,6 @@ internal class FakeHttpMessageHandler : HttpMessageHandler
 	{
 		private readonly HttpResponseMessage _responseMessage;
 		private readonly Action<HttpRequestMessage> _requestFilter;
-		
 
 		public FakeHttpMessageHandler(HttpResponseMessage responseMessage, Action<HttpRequestMessage> requestFilter)
 		{

From 0f9b414e0e691f51b444e2ca9da339a14ce21223 Mon Sep 17 00:00:00 2001
From: Chandu <chandra.vedantham@gmail.com>
Date: Thu, 27 Mar 2014 19:42:26 -0400
Subject: [PATCH 3/4] Added basic tests for AwsRestService class

---
 .../Transport/AwsRestServiceTest.cs           | 59 +++++++++++++++++--
 .../Cucumber.SimpleDb.csproj                  |  1 +
 .../QueryStringRelatedExtensions.cs           | 30 ++++++++++
 .../Transport/AwsRestService.cs               |  5 +-
 4 files changed, 87 insertions(+), 8 deletions(-)
 create mode 100644 source/Cucumber.SimpleDb/Extensions/QueryStringRelatedExtensions.cs

diff --git a/source/Cucumber.SimpleDb.Test/Transport/AwsRestServiceTest.cs b/source/Cucumber.SimpleDb.Test/Transport/AwsRestServiceTest.cs
index cbcc0ad..6fb127b 100644
--- a/source/Cucumber.SimpleDb.Test/Transport/AwsRestServiceTest.cs
+++ b/source/Cucumber.SimpleDb.Test/Transport/AwsRestServiceTest.cs
@@ -1,4 +1,5 @@
-using System.Net;
+using System.Linq;
+using System.Net;
 using System.Net.Http;
 using Cucumber.SimpleDb.Test.Fakes;
 using NUnit.Framework;
@@ -24,18 +25,64 @@ public void Setup()
 							
 				}
 
-        [Test ()]
-        public void ValidateRequestSignature ()
+        [Test]
+        public void ExecuteRequest_ShouldSerializeArgumentsToRequest ()
         {
-            string generatedUri = null;
 						var service = new AwsRestService("myPublicKey", "myPrivateKey", _httpClient);
-            service.ExecuteRequest (new NameValueCollection {
+						var arguments = new NameValueCollection {
                 { "Item.0.ItemName", "TestItem1" },
                 { "Item.0.Attribute.0.Name", "TestAtt1" },
                 { "Item.0.Attribute.0.Value", "123" }
-            });
+            };
+            service.ExecuteRequest(arguments);
 						Assert.NotNull(_requestMessage);
+
+						var requestData = _requestMessage.RequestUri.ToNameValueCollection();
+						Assert.NotNull(requestData);
+						Assert.IsTrue(requestData.Count > 0);
+						foreach(string key in arguments)
+						{
+							Assert.AreEqual(arguments[key], requestData[key]);	
+						}
+						
         }
+
+				[Test]
+				public void ExecuteRequest_ShouldAddStandardArgumentsToRequest()
+				{
+					var service = new AwsRestService("myPublicKey", "myPrivateKey", _httpClient);
+					service.ExecuteRequest(new NameValueCollection());
+					Assert.NotNull(_requestMessage);
+
+					var requestData = _requestMessage.RequestUri.ToNameValueCollection();
+					Assert.NotNull(requestData);
+					Assert.IsTrue(requestData.Count > 0);
+					new[]
+					{
+						"AWSAccessKeyId",
+						"SignatureVersion",
+						"SignatureMethod",
+						"Timestamp",
+						"Version"
+					}.ToList()
+					.ForEach(key => Assert.IsNotNullOrEmpty(requestData[key]));
+					Assert.AreEqual("myPublicKey", requestData["AWSAccessKeyId"]);
+				}
+
+				[Test]
+				public void ExecuteRequest_ShouldAddSignatureToRequest()
+				{
+					var service = new AwsRestService("myPublicKey", "myPrivateKey", _httpClient);
+					service.ExecuteRequest(new NameValueCollection());
+					Assert.NotNull(_requestMessage);
+
+					var requestData = _requestMessage.RequestUri.ToNameValueCollection();
+					Assert.NotNull(requestData);
+					Assert.IsTrue(requestData.Count > 0);
+					Assert.IsNotNullOrEmpty(requestData["Signature"]);
+
+					//TODO: (CV) Should assert the actual signature. Need to move the signature generation logic out of the AwsRequestService class
+				}
     }
 }
 
diff --git a/source/Cucumber.SimpleDb/Cucumber.SimpleDb.csproj b/source/Cucumber.SimpleDb/Cucumber.SimpleDb.csproj
index 8e5093f..1a5cd8c 100644
--- a/source/Cucumber.SimpleDb/Cucumber.SimpleDb.csproj
+++ b/source/Cucumber.SimpleDb/Cucumber.SimpleDb.csproj
@@ -67,6 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Extensions\HttpMethodExtensions.cs" />
+    <Compile Include="Extensions\QueryStringRelatedExtensions.cs" />
     <Compile Include="Session\ISessionAttribute.cs" />
     <Compile Include="Session\ISessionItem.cs" />
     <Compile Include="Session\ISession.cs" />
diff --git a/source/Cucumber.SimpleDb/Extensions/QueryStringRelatedExtensions.cs b/source/Cucumber.SimpleDb/Extensions/QueryStringRelatedExtensions.cs
new file mode 100644
index 0000000..febd774
--- /dev/null
+++ b/source/Cucumber.SimpleDb/Extensions/QueryStringRelatedExtensions.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Specialized;
+
+namespace Cucumber.SimpleDb
+{
+	public static class QueryStringRelatedExtensions
+	{
+		//http://stackoverflow.com/questions/68624/how-to-parse-a-query-string-into-a-namevaluecollection-in-net
+		static NameValueCollection ToNameValueCollection(this string source)
+		{
+			var queryParameters = new NameValueCollection();
+			var querySegments = source.Split('&');
+			foreach (var segment in querySegments)
+			{
+				var parts = segment.Split('=');
+				if (parts.Length <= 0) continue;
+				var key = parts[0].Trim(new[] { '?', ' ' });
+				var val = parts[1].Trim();
+
+				queryParameters.Add(key, Uri.UnescapeDataString(val));
+			}
+			return queryParameters;
+		}
+
+		public static NameValueCollection ToNameValueCollection(this Uri source)
+		{
+			return source.Query.ToNameValueCollection();
+		}
+	}
+}
\ No newline at end of file
diff --git a/source/Cucumber.SimpleDb/Transport/AwsRestService.cs b/source/Cucumber.SimpleDb/Transport/AwsRestService.cs
index 9ce2f69..e782eff 100644
--- a/source/Cucumber.SimpleDb/Transport/AwsRestService.cs
+++ b/source/Cucumber.SimpleDb/Transport/AwsRestService.cs
@@ -42,7 +42,7 @@ public XElement ExecuteRequest(NameValueCollection arguments)
         public Task<XElement> ExecuteRequestAsync(NameValueCollection arguments)
         {
             arguments = AddStandardArguments(arguments);
-            string argumentString = WriteQueryString(arguments);
+            var argumentString = WriteQueryString(arguments);
 						var requestUrl = string.Format(
 								"{0}://{1}/?{2}",
 								simpleDbProtocol,
@@ -59,6 +59,7 @@ public Task<XElement> ExecuteRequestAsync(NameValueCollection arguments)
 							}
 
 							var errors = ProcessAwsResponse(responseMessage);
+							//TODO: (CV) Should not be throwing from the async handler. Maybe change the method signature to return a result wrapper which indicates the Status of result???.
 							throw new SimpleDbException(string.Format(
 									"Error {0} {1}: AWS returned the following:\n{2}",
 									(int)responseMessage.StatusCode,
@@ -144,7 +145,7 @@ private string GetRequestDescription(NameValueCollection arguments)
                         arguments[k].ToRfc3986()))));
         }
 
-        private string HashString(string requestDescription)
+        internal string HashString(string requestDescription)
         {
             using (HMACSHA256 hmac = new HMACSHA256(Encoding.UTF8.GetBytes(_privateKey)))
             {

From 74a1c7154b0b8fcd09ac2d98a6e10754cc03c829 Mon Sep 17 00:00:00 2001
From: Chandu <chandra.vedantham@gmail.com>
Date: Fri, 28 Mar 2014 17:37:33 -0400
Subject: [PATCH 4/4] Made the QueryStringRelatedExtensions class internal

---
 .../Extensions/QueryStringRelatedExtensions.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/Cucumber.SimpleDb/Extensions/QueryStringRelatedExtensions.cs b/source/Cucumber.SimpleDb/Extensions/QueryStringRelatedExtensions.cs
index febd774..1d22277 100644
--- a/source/Cucumber.SimpleDb/Extensions/QueryStringRelatedExtensions.cs
+++ b/source/Cucumber.SimpleDb/Extensions/QueryStringRelatedExtensions.cs
@@ -3,7 +3,7 @@
 
 namespace Cucumber.SimpleDb
 {
-	public static class QueryStringRelatedExtensions
+	internal static class QueryStringRelatedExtensions
 	{
 		//http://stackoverflow.com/questions/68624/how-to-parse-a-query-string-into-a-namevaluecollection-in-net
 		static NameValueCollection ToNameValueCollection(this string source)