Merge pull request #249 from Azure/dev

Merge Dev branch into master for 1.0.0-RC1 release

Author: vinaysurya

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,8 @@
 ## Description
-<!--
-Please add an informative description that covers the changes made by the pull request.
 
-If applicable, reference the bug/issue that this pull request fixes here.
--->
+This following list is used to make sure that common guidelines for a pull request are followed.
 
-This checklist is used to make sure that common guidelines for a pull request are followed.
-
-- [ ] **I have read the [contribution guidelines](./CONTRIBUTING.md).**
-- [ ] Title of the pull request is clear and informative.
-- [ ] There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR.
-- [ ] The pull request does not introduce breaking changes (unless a major version change occurs in the assembly and module).
-- [ ] If applicable, the public code is properly documented.
-- [ ] Pull request includes test coverage for the included changes.
-- [ ] The code builds without any errors.
+- **Read the [contribution guidelines](./CONTRIBUTING.md).** 
+- Make title of the pull request clear and informative. 
+- Link to appropriate [issue](https://github.com/Azure/azure-service-bus-dotnet/issues).
+- Include test coverage for the changes.

.github/SUPPORT.md

@@ -0,0 +1,5 @@
+## Support resources to check prior to raising issues
+
+1. Azure Service Bus [samples](https://github.com/Azure/azure-service-bus/tree/master/samples)
+1. Already [resolved issues](https://github.com/Azure/azure-service-bus-dotnet/issues?q=is%3Aissue+is%3Aclosed)
+1. [StackOverflow](https://stackoverflow.com/questions/tagged/azureservicebus)

README.md

@@ -1,4 +1,4 @@
-<p align="center">
+<p align="center">
   <img src="service-bus.png" alt="Microsoft Azure Relay" width="100"/>
 </p>
 
@@ -8,8 +8,8 @@
 
 |Build/Package|Status|
 |------|-------------|
-|master|[![Build status](https://ci.appveyor.com/api/projects/status/anpaipqto58ka5lk/branch/master?svg=true)](https://ci.appveyor.com/project/vinaysurya/azure-service-bus-dotnet/branch/master) [![codecov](https://codecov.io/gh/Azure/azure-service-bus-dotnet/branch/master/graph/badge.svg)](https://codecov.io/gh/Azure/azure-service-bus-dotnet)|
-|dev|[![Build status](https://ci.appveyor.com/api/projects/status/anpaipqto58ka5lk/branch/master?svg=true)](https://ci.appveyor.com/project/vinaysurya/azure-service-bus-dotnet/branch/dev) [![codecov](https://codecov.io/gh/Azure/azure-service-bus-dotnet/branch/dev/graph/badge.svg)](https://codecov.io/gh/Azure/azure-service-bus-dotnet)|
+|master|[![Build status](https://ci.appveyor.com/api/projects/status/o4kaqt06h62d0ugp/branch/master?svg=true)](https://ci.appveyor.com/project/vinaysurya/azure-service-bus-dotnet/branch/master) [![codecov](https://codecov.io/gh/Azure/azure-service-bus-dotnet/branch/master/graph/badge.svg)](https://codecov.io/gh/Azure/azure-service-bus-dotnet)|
+|dev|[![Build status](https://ci.appveyor.com/api/projects/status/o4kaqt06h62d0ugp/branch/dev?svg=true)](https://ci.appveyor.com/project/vinaysurya/azure-service-bus-dotnet/branch/dev) [![codecov](https://codecov.io/gh/Azure/azure-service-bus-dotnet/branch/dev/graph/badge.svg)](https://codecov.io/gh/Azure/azure-service-bus-dotnet)|
 |Microsoft.Azure.ServiceBus|[![NuGet Version and Downloads count](https://buildstats.info/nuget/Microsoft.Azure.ServiceBus?includePreReleases=true)](https://www.nuget.org/packages/Microsoft.Azure.ServiceBus/)|
 
 This is the next generation Service Bus .NET client library that focuses on queues & topics. If you are looking for Event Hubs and Relay clients, follow the below links:
@@ -26,6 +26,10 @@ This library is built using .NET Standard 1.3. For more information on what plat
 
 See our [Contribution Guidelines](./.github/CONTRIBUTING.md).
 
+## How to get support
+
+See our [Support Guidelines](./.github/SUPPORT.md)
+
 ## FAQ
 
 ### Where can I find examples that use this library?
@@ -36,7 +40,7 @@ See our [Contribution Guidelines](./.github/CONTRIBUTING.md).
 
 In order to run the unit tests, you will need to do the following:
 
-1. Deploy the Azure Resource Manager template located at [/build/azuredeploy.json](/templates/azuredeploy.json) by clicking the following button:
+1. Deploy the Azure Resource Manager template located at [/build/azuredeploy.json](/build/azuredeploy.json) by clicking the following button:
 
     <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-service-bus-dotnet%2Fmaster%2Fbuild%2Fazuredeploy.json" target="_blank">
         <img src="http://azuredeploy.net/deploybutton.png"/>

src/Microsoft.Azure.ServiceBus/Amqp/AmqpExceptionHelper.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.Azure.ServiceBus.Primitives;
-
 namespace Microsoft.Azure.ServiceBus.Amqp
 {
     using System;
@@ -82,7 +80,7 @@ public static Exception ToMessagingContractException(this AmqpMessage responseMe
             return exception;
         }
 
-        public static Exception ToMessagingContractException(Error error, bool connectionError = false)
+        public static Exception ToMessagingContractException(this Error error, bool connectionError = false)
         {
             if (error == null)
             {
@@ -92,7 +90,7 @@ public static Exception ToMessagingContractException(Error error, bool connectio
             return ToMessagingContractException(error.Condition.Value, error.Description, connectionError);
         }
 
-        public static Exception ToMessagingContractException(string condition, string message, bool connectionError = false)
+        static Exception ToMessagingContractException(string condition, string message, bool connectionError = false)
         {
             if (string.Equals(condition, AmqpClientConstants.TimeoutError.Value))
             {
@@ -162,12 +160,7 @@ public static Exception ToMessagingContractException(string condition, string me
             return new ServiceBusException(true, message);
         }
 
-        public static Exception GetClientException(Exception exception)
-        {
-            return GetClientException(exception, null);
-        }
-
-        public static Exception GetClientException(Exception exception, string referenceId)
+        public static Exception GetClientException(Exception exception, string referenceId = null, Exception innerException = null)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(CultureInfo.InvariantCulture, exception.Message);
@@ -177,27 +170,36 @@ public static Exception GetClientException(Exception exception, string reference
             }
 
             string message = builder.ToString();
+            var aggregateException = innerException == null ? exception : new AggregateException(exception, innerException);
 
             switch (exception)
             {
                 case SocketException _:
+                    message = builder.AppendFormat(CultureInfo.InvariantCulture, $" ErrorCode: {((SocketException)exception).SocketErrorCode}").ToString();
+                    return new ServiceBusCommunicationException(message, aggregateException);
+
                 case IOException _:
-                    return new ServiceBusCommunicationException(message, exception);
+                    var socketException = exception.InnerException as SocketException;
+                    if (socketException != null)
+                    {
+                        message = builder.AppendFormat(CultureInfo.InvariantCulture, $" ErrorCode: {socketException.SocketErrorCode}").ToString();
+                    }
+                    return new ServiceBusCommunicationException(message, aggregateException);
 
                 case AmqpException amqpException:
-                    return ToMessagingContractException(amqpException.Error);
+                    return amqpException.Error.ToMessagingContractException();
 
                 case OperationCanceledException operationCanceledException when operationCanceledException.InnerException is AmqpException amqpException:
-                    return ToMessagingContractException(amqpException.Error);
+                    return amqpException.Error.ToMessagingContractException();
 
                 case OperationCanceledException _:
-                    return new ServiceBusException(true, message, exception);
+                    return new ServiceBusException(true, message, aggregateException);
 
                 case TimeoutException _:
-                    return new ServiceBusTimeoutException(message, exception);
+                    return new ServiceBusTimeoutException(message, aggregateException);
             }
 
-            return exception;
+            return aggregateException;
         }
 
         public static string GetTrackingId(this AmqpLink link)
@@ -211,5 +213,29 @@ public static string GetTrackingId(this AmqpLink link)
 
             return null;
         }
+
+        public static Exception GetInnerException(this AmqpObject amqpObject)
+        {
+            Exception innerException;
+            switch (amqpObject)
+            {
+                case AmqpSession amqpSession:
+                    innerException = amqpSession.TerminalException ?? amqpSession.Connection.TerminalException;
+                    break;
+
+                case AmqpLink amqpLink:
+                    innerException = amqpLink.TerminalException ?? amqpLink.Session.TerminalException ?? amqpLink.Session.Connection.TerminalException;
+                    break;
+
+                case RequestResponseAmqpLink amqpReqRespLink:
+                    innerException = amqpReqRespLink.TerminalException ?? amqpReqRespLink.Session.TerminalException ?? amqpReqRespLink.Session.Connection.TerminalException;
+                    break;
+
+                default:
+                    return null;
+            }
+
+            return innerException == null ? null : GetClientException(innerException);
+        }
     }
 }

src/Microsoft.Azure.ServiceBus/Amqp/AmqpLinkCreator.cs

@@ -7,6 +7,7 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using System.Threading.Tasks;
     using Microsoft.Azure.Amqp;
     using Microsoft.Azure.Amqp.Framing;
+    using Microsoft.Azure.ServiceBus.Primitives;
 
     internal abstract class AmqpLinkCreator
     {
@@ -58,13 +59,14 @@ public async Task<AmqpObject> CreateAndOpenAmqpLinkAsync()
             {
                 MessagingEventSource.Log.AmqpSessionCreationException(this.entityPath, connection, exception);
                 session?.Abort();
-                throw;
+                throw AmqpExceptionHelper.GetClientException(exception, null, session.GetInnerException());
             }
 
+            AmqpObject link = null;
             try
             {
                 // Create Link
-                AmqpObject link = this.OnCreateAmqpLink(connection, this.amqpLinkSettings, session);
+                link = this.OnCreateAmqpLink(connection, this.amqpLinkSettings, session);
                 await link.OpenAsync(timeoutHelper.RemainingTime()).ConfigureAwait(false);
                 return link;
             }
@@ -76,7 +78,7 @@ public async Task<AmqpObject> CreateAndOpenAmqpLinkAsync()
                     connection,
                     exception);
 
-                throw;
+                throw AmqpExceptionHelper.GetClientException(exception, null, link?.GetInnerException());
             }
         }
 

src/Microsoft.Azure.ServiceBus/Amqp/AmqpMessageConverter.cs

@@ -8,11 +8,12 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using System.Collections.Generic;
     using System.IO;
     using System.Runtime.Serialization;
-    using Microsoft.Azure.Amqp;
-    using Microsoft.Azure.Amqp.Encoding;
-    using Microsoft.Azure.Amqp.Framing;
-    using Microsoft.Azure.ServiceBus.Filters;
-    using SBMessage = Microsoft.Azure.ServiceBus.Message;
+    using Azure.Amqp;
+    using Azure.Amqp.Encoding;
+    using Azure.Amqp.Framing;
+    using Framing;
+    using Primitives;
+    using SBMessage = Message;
 
     static class AmqpMessageConverter
     {
@@ -357,10 +358,96 @@ public static AmqpMap GetRuleDescriptionMap(RuleDescription description)
 
             AmqpMap amqpAction = GetRuleActionMap(description.Action as SqlRuleAction);
             ruleDescriptionMap[ManagementConstants.Properties.SqlRuleAction] = amqpAction;
+            ruleDescriptionMap[ManagementConstants.Properties.RuleName] = description.Name;
 
             return ruleDescriptionMap;
         }
 
+        public static RuleDescription GetRuleDescription(AmqpRuleDescriptionCodec amqpDescription)
+        {
+            Filter filter = GetFilter(amqpDescription.Filter);
+            RuleAction action = GetRuleAction(amqpDescription.Action);
+
+            RuleDescription description = new RuleDescription(filter)
+            {
+                Action = action,
+                Name = amqpDescription.RuleName
+            };
+
+            return description;
+        }
+
+        public static Filter GetFilter(AmqpFilterCodec amqpFilter)
+        {
+            Filter filter;
+
+            switch (amqpFilter.DescriptorCode)
+            {
+                case AmqpSqlFilterCodec.Code:
+                    var amqpSqlFilter = (AmqpSqlFilterCodec)amqpFilter;
+                    filter = new SqlFilter(amqpSqlFilter.Expression);
+                    break;
+
+                case AmqpTrueFilterCodec.Code:
+                    filter = new TrueFilter();
+                    break;
+
+                case AmqpFalseFilterCodec.Code:
+                    filter = new FalseFilter();
+                    break;
+
+                case AmqpCorrelationFilterCodec.Code:
+                    var amqpCorrelationFilter = (AmqpCorrelationFilterCodec)amqpFilter;
+                    var correlationFilter = new CorrelationFilter()
+                    {
+                        CorrelationId = amqpCorrelationFilter.CorrelationId,
+                        MessageId = amqpCorrelationFilter.MessageId,
+                        To = amqpCorrelationFilter.To,
+                        ReplyTo = amqpCorrelationFilter.ReplyTo,
+                        Label = amqpCorrelationFilter.Label,
+                        SessionId = amqpCorrelationFilter.SessionId,
+                        ReplyToSessionId = amqpCorrelationFilter.ReplyToSessionId,
+                        ContentType = amqpCorrelationFilter.ContentType
+                    };
+
+                    foreach (var property in amqpCorrelationFilter.Properties)
+                    {
+                        correlationFilter.Properties.Add(property.Key.Key.ToString(), property.Value);
+                    }
+
+                    filter = correlationFilter;
+                    break;
+
+                default:
+                    throw new NotSupportedException($"Unknown filter descriptor code: {amqpFilter.DescriptorCode}");
+            }
+
+            return filter;
+        }
+
+        static RuleAction GetRuleAction(AmqpRuleActionCodec amqpAction)
+        {
+            RuleAction action;
+
+            if (amqpAction.DescriptorCode == AmqpEmptyRuleActionCodec.Code)
+            {
+                action = null;
+            }
+            else if (amqpAction.DescriptorCode == AmqpSqlRuleActionCodec.Code)
+            {
+                AmqpSqlRuleActionCodec amqpSqlAction = (AmqpSqlRuleActionCodec)amqpAction;
+                SqlRuleAction sqlAction = new SqlRuleAction(amqpSqlAction.SqlExpression);
+
+                action = sqlAction;
+            }
+            else
+            {
+                throw new NotSupportedException($"Unknown action descriptor code: {amqpAction.DescriptorCode}");
+            }
+
+            return action;
+        }
+
         static bool TryGetAmqpObjectFromNetObject(object netObject, MappingType mappingType, out object amqpObject)
         {
             amqpObject = null;
@@ -585,7 +672,7 @@ static AmqpMap GetCorrelationFilterMap(CorrelationFilter correlationFilter)
 
             return correlationFilterMap;
         }
-
+        
         static AmqpMap GetRuleActionMap(SqlRuleAction sqlRuleAction)
         {
             AmqpMap ruleActionMap = null;

src/Microsoft.Azure.ServiceBus/Amqp/AmqpRequestResponseLinkCreator.cs

@@ -4,6 +4,7 @@
 namespace Microsoft.Azure.ServiceBus.Amqp
 {
     using Microsoft.Azure.Amqp;
+    using Microsoft.Azure.ServiceBus.Primitives;
 
     internal class AmqpRequestResponseLinkCreator : AmqpLinkCreator
     {

src/Microsoft.Azure.ServiceBus/Amqp/AmqpSendReceiveLinkCreator.cs

@@ -4,6 +4,7 @@
 namespace Microsoft.Azure.ServiceBus.Amqp
 {
     using Microsoft.Azure.Amqp;
+    using Microsoft.Azure.ServiceBus.Primitives;
 
     internal class AmqpSendReceiveLinkCreator : AmqpLinkCreator
     {