Merge branch 'feature-supportrequestwithbody' into release-2.0

Author: robinhultman

Src/HttpDisassembler/BizTalkComponents.PipelineComponents.HttpDisassembler.csproj

@@ -62,6 +62,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\Windows\assembly\GAC_MSIL\Microsoft.BizTalk.Pipeline\3.0.1.0__31bf3856ad364e35\Microsoft.BizTalk.Pipeline.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.BizTalk.Streaming, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Microsoft BizTalk Server 2013\Microsoft.BizTalk.Streaming.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.XLANGs.RuntimeTypes, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

Src/HttpDisassembler/HttpDisassembler.cs

@@ -11,6 +11,8 @@
 using BizTalkComponents.Utils;
 using BizTalkComponents.Utilities.ComponentInstrumentation;
 using System.Runtime.InteropServices;
+using Microsoft.BizTalk.Streaming;
+
 namespace BizTalkComponents.PipelineComponents.HttpDisassembler
 {
 
@@ -50,6 +52,11 @@ public void Disassemble(IPipelineContext pContext, IBaseMessage pInMsg)
                 throw ex;
             }
 
+            var data = pInMsg.BodyPart.GetOriginalDataStream();
+
+            //Determine of the request body has any data. GET request will not have any body.
+            var hasData = HasData(data);
+
             //Get a reference to the BizTalk schema.
             DocumentSpec documentSpec;
             try
@@ -89,11 +96,26 @@ public void Disassemble(IPipelineContext pContext, IBaseMessage pInMsg)
             ms.Seek(0, SeekOrigin.Begin);
 
             var outMsg = pInMsg;
-            outMsg.BodyPart.Data = ms;
 
-            //Promote message type and SchemaStrongName
-            outMsg.Context.Promote(new ContextProperty(SystemProperties.MessageType), documentSpec.DocType);
-            outMsg.Context.Promote(new ContextProperty(SystemProperties.SchemaStrongName), documentSpec.DocSpecStrongName);
+            //If the request has a body it should be preserved an the query parameters should be written to it's own message part.
+            if (hasData)
+            {
+                outMsg = pInMsg;
+                outMsg.BodyPart.Data = pInMsg.BodyPart.Data;
+                outMsg.Context = PipelineUtil.CloneMessageContext(pInMsg.Context);
+                var factory = pContext.GetMessageFactory();
+                var queryPart = factory.CreateMessagePart();
+                queryPart.Data = ms;
+
+                outMsg.AddPart("querypart", queryPart, false);
+            }
+            else
+            {
+                outMsg.BodyPart.Data = ms;
+                //Promote message type and SchemaStrongName
+                outMsg.Context.Promote(new ContextProperty(SystemProperties.MessageType), documentSpec.DocType);
+                outMsg.Context.Promote(new ContextProperty(SystemProperties.SchemaStrongName), documentSpec.DocSpecStrongName);
+            }
 
             _outputQueue.Enqueue(outMsg);
             _instrumentationHelper.TrackComponentSuccess();
@@ -119,5 +141,23 @@ public IBaseMessage GetNext(IPipelineContext pContext)
 
             return null;
         }
+
+        private bool HasData(Stream data)
+        {
+            byte[] buffer= new byte[10];
+            const int bufferSize = 0x280;
+            const int thresholdSize = 0x100000;
+
+            if (!data.CanSeek || !data.CanRead)
+            {
+                data = new ReadOnlySeekableStream(data, new VirtualStream(bufferSize, thresholdSize), bufferSize);
+            }
+
+            int num = data.Read(buffer, 0, buffer.Length);
+            data.Seek(0, SeekOrigin.Begin);
+            data.Position = 0;
+
+            return num > 0;
+        }
     }
 }

Tests/UnitTests/HttpDisassemblerTest.cs

@@ -31,13 +31,45 @@ public void CreateMessageTest()
             var result = pipeline.Execute(message);
 
             Assert.AreEqual(1, result.Count);
+            Assert.AreEqual(1, result[0].PartCount);
 
             var doc = XDocument.Load(result[0].BodyPart.GetOriginalDataStream());
 
             Assert.AreEqual("value1", doc.Descendants("TestElement1").Single().Value);
             Assert.AreEqual("value2", doc.Descendants("TestElement2").Single().Value);
         }
 
+        [TestMethod]
+        public void CreateMessageWithBodyTest()
+        {
+            var pipeline = PipelineFactory.CreateEmptyReceivePipeline();
+
+            pipeline.AddDocSpec(typeof(TestSchema));
+
+            var disassembler = new PipelineComponents.HttpDisassembler.HttpDisassembler
+            {
+                DocumentSpecName = "BizTalkComponents.HttpDisassembler.Tests.UnitTests.TestSchema"
+            };
+            string testMessage = "<testmessage></testmessage>";
+            var message = MessageHelper.CreateFromString(testMessage);
+            message.Context.Promote(new ContextProperty("http://BiztalkComponents.PropertySchema#TestProperty1"), "value1");
+            message.Context.Promote(new ContextProperty("http://BiztalkComponents.PropertySchema#TestProperty2"), "value2");
+
+            pipeline.AddComponent(disassembler, PipelineStage.Disassemble);
+
+            var result = pipeline.Execute(message);
+
+            Assert.AreEqual(1, result.Count);
+            Assert.AreEqual(2, result[0].PartCount);
+
+            var doc = XDocument.Load(result[0].GetPart("querypart").GetOriginalDataStream());
+            var bodyDoc = XDocument.Load(result[0].BodyPart.GetOriginalDataStream());
+
+            Assert.AreEqual("value1", doc.Descendants("TestElement1").Single().Value);
+            Assert.AreEqual("value2", doc.Descendants("TestElement2").Single().Value);
+            Assert.AreEqual(testMessage, bodyDoc.ToString());
+        }
+
         [TestMethod]
         [ExpectedException(typeof(COMException))]
         public void UnknownDocType()