Merge branch 'fix-messagetypnotpromotedformessageswithbody' into release-2.1

Author: robinhultman

Src/HttpDisassembler/HttpDisassembler.cs

@@ -100,9 +100,13 @@ public void Disassemble(IPipelineContext pContext, IBaseMessage pInMsg)
             //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)
             {
+                string msgType = GetMessageType(MakeMarkable(pInMsg.BodyPart.Data));
+
                 outMsg = pInMsg;
                 outMsg.BodyPart.Data = pInMsg.BodyPart.Data;
+
                 outMsg.Context = PipelineUtil.CloneMessageContext(pInMsg.Context);
+                outMsg.Context.Promote(new ContextProperty(SystemProperties.MessageType), msgType);
                 var factory = pContext.GetMessageFactory();
                 var queryPart = factory.CreateMessagePart();
                 queryPart.Data = ms;
@@ -142,9 +146,60 @@ public IBaseMessage GetNext(IPipelineContext pContext)
             return null;
         }
 
+        private MarkableForwardOnlyEventingReadStream MakeMarkable(Stream stream)
+        {
+            MarkableForwardOnlyEventingReadStream eventingReadStream = null;
+
+            if (stream != null)
+            {
+                eventingReadStream = stream as MarkableForwardOnlyEventingReadStream ?? new MarkableForwardOnlyEventingReadStream(stream);
+            }
+
+            return eventingReadStream;
+        }
+
+        private string GetMessageType(MarkableForwardOnlyEventingReadStream stm)
+        {
+            string msgType = null;
+
+            stm.MarkPosition();
+            try
+            {
+                XmlTextReader xmlTextReader = null;
+
+                xmlTextReader = new XmlTextReader((Stream)stm);
+
+                while (msgType == null)
+                {
+                    if (xmlTextReader.Read())
+                    {
+                        if (xmlTextReader.NodeType == XmlNodeType.Element && xmlTextReader.Depth == 0)
+                        {
+                            if (xmlTextReader.NamespaceURI == null || xmlTextReader.NamespaceURI.Length <= 0)
+                            {
+                                msgType = xmlTextReader.LocalName;
+                            }
+                            else
+                            {
+                                msgType = xmlTextReader.NamespaceURI + '#' + xmlTextReader.LocalName;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
+            finally
+            {
+                stm.ResetPosition();
+            }
+            return msgType;
+        }
         private bool HasData(Stream data)
         {
-            byte[] buffer= new byte[10];
+            byte[] buffer = new byte[10];
             const int bufferSize = 0x280;
             const int thresholdSize = 0x100000;
 

Tests/UnitTests/HttpDisassemblerTest.cs

@@ -70,6 +70,36 @@ public void CreateMessageWithBodyTest()
             Assert.AreEqual(testMessage, bodyDoc.ToString());
         }
 
+        [TestMethod]
+        public void CreateMessageWithBodyAndNamespaceTest()
+        {
+            var pipeline = PipelineFactory.CreateEmptyReceivePipeline();
+
+            pipeline.AddDocSpec(typeof(TestSchema));
+
+            var disassembler = new PipelineComponents.HttpDisassembler.HttpDisassembler
+            {
+                DocumentSpecName = "BizTalkComponents.HttpDisassembler.Tests.UnitTests.TestSchema"
+            };
+            string testMessage = "<testmessage xmlns=\"testns\"></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.IsTrue(result[0].Context.IsPromoted("MessageType", "http://schemas.microsoft.com/BizTalk/2003/system-properties"));
+            Assert.AreEqual("testns#testmessage", result[0].Context.Read("MessageType", "http://schemas.microsoft.com/BizTalk/2003/system-properties"));
+        }
+
         [TestMethod]
         [ExpectedException(typeof(COMException))]
         public void UnknownDocType()