Merge pull request #172 from Azure/dev

0.0.6-preview Release

Author: vinaysurya

.gitignore

@@ -202,4 +202,5 @@ Buildx86retail.dat
 
 #OpenCover
 /build/OpenCoverReport/*
-/build/coverage.xml
+/build/coverage.xml
+test/Microsoft.Azure.ServiceBus.UnitTests/API/ApiApprovals.ApproveAzureServiceBus.received.txt

LICENSE

@@ -1,4 +1,4 @@
-MIT License
+MIT License
 
 Copyright © Microsoft Corporation 2016
 
@@ -18,4 +18,8 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
+
+Third Party Programs: The software may include third party programs that Microsoft, not the third party,
+licenses to you under this agreement. Notices, if any, for the third party programs are included for your
+information only.

README.md

@@ -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/jtaubensee/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/jtaubensee/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/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)|
 |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:

appveyor.yml

@@ -3,19 +3,22 @@ branches:
   only:
   - master
   - dev
+skip_tags: true
+matrix:
+  fast_finish: true 
 image: Visual Studio 2017
 environment:
   azure-service-bus-dotnet/ClientSecret:
-    secure: /8H7C81iNS+gVi7LhJCEOPUlNaa30y4KcY4nw/g2C4HGxOv6SrcroyDvMnqD+5GN
+    secure: yO+qgkyY5FO/4a7rMRl60F5eMTrz03L6r3oD/VCzgKhtuYW5APmgvd9Wu+AHM8T7
   azure-service-bus-dotnet/TenantId:
-    secure: xohonz/X8PPLOVIdT3ch2C5XeSa30RwR6NuXFh4e85svXT1mJNGGO1HQEGxCk3wp
+    secure: qHryGNZnkslfefQBj8zMZPNhrxSuoe1NJVauNidhhvVLTGi194jotblSTmExuTKQ
   azure-service-bus-dotnet/AppId:
-    secure: c+H140oRJfHtmFHZxSRLWocv5AU0q33X7kgMcTcXxhJvtVhk2WAk1dRQkSN+SyoA
+    secure: sTox3GxT9oqRUhCe56citfJdYQmdUVMaZlAevCJ0xnC0nV9LyR8+gC/I4Ji/FKoU
   matrix:
     # First build
     - DotNetRunTime: netcoreapp1.0
       azure-service-bus-dotnet/CodeCovSecret:
-        secure: 4/S+CQQJP+gBYrAOj6c1zg3GBMbhKofjIbqq7z6GeVUIWDJCd3ATGsDRT4++bruM
+        secure: m5MmSzWEul80WJWHp+aznaNNgbQpIYcYfSTBNcPMWO2qgPmTls0OjXezx1KoJGTi
     # Second build
     - DotNetRunTime: net46
       azure-service-bus-dotnet/SkipCodeCoverage: true
@@ -26,4 +29,4 @@ artifacts:
 - path: .\build\artifacts\*
 build_script:
 - ps: .\build\build.ps1
-test: off
+test: off

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

@@ -8,7 +8,7 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using Microsoft.Azure.Amqp.Sasl;
     using Microsoft.Azure.Amqp.Transport;
 
-    public class AmqpConnectionHelper
+    internal class AmqpConnectionHelper
     {
         const string CbsSaslMechanismName = "MSSBCBS";
 

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

@@ -62,13 +62,10 @@ public static AmqpSymbol GetResponseErrorCondition(AmqpMessage response, AmqpRes
         public static AmqpResponseStatusCode GetResponseStatusCode(this AmqpMessage responseMessage)
         {
             AmqpResponseStatusCode responseStatusCode = AmqpResponseStatusCode.Unused;
-            if (responseMessage != null)
+            object statusCodeValue = responseMessage?.ApplicationProperties.Map[ManagementConstants.Response.StatusCode];
+            if (statusCodeValue is int && Enum.IsDefined(typeof(AmqpResponseStatusCode), statusCodeValue))
             {
-                object statusCodeValue = responseMessage.ApplicationProperties.Map[ManagementConstants.Response.StatusCode];
-                if (statusCodeValue is int && Enum.IsDefined(typeof(AmqpResponseStatusCode), statusCodeValue))
-                {
-                    responseStatusCode = (AmqpResponseStatusCode)statusCodeValue;
-                }
+                responseStatusCode = (AmqpResponseStatusCode)statusCodeValue;
             }
 
             return responseStatusCode;
@@ -179,31 +176,23 @@ public static Exception GetClientException(Exception exception, string reference
 
             string message = builder.ToString();
 
-            if (exception is SocketException || exception is IOException)
+            switch (exception)
             {
-                return new ServiceBusCommunicationException(message, exception);
-            }
+                case SocketException _:
+                case IOException _:
+                    return new ServiceBusCommunicationException(message, exception);
 
-            if (exception is AmqpException)
-            {
-                AmqpException amqpException = exception as AmqpException;
-                return ToMessagingContractException(amqpException.Error);
-            }
+                case AmqpException amqpException:
+                    return ToMessagingContractException(amqpException.Error);
 
-            if (exception is OperationCanceledException)
-            {
-                AmqpException amqpException = exception.InnerException as AmqpException;
-                if (amqpException != null)
-                {
+                case OperationCanceledException operationCanceledException when operationCanceledException.InnerException is AmqpException amqpException:
                     return ToMessagingContractException(amqpException.Error);
-                }
 
-                return new ServiceBusException(true, message, exception);
-            }
+                case OperationCanceledException _:
+                    return new ServiceBusException(true, message, exception);
 
-            if (exception is TimeoutException && referenceId != null)
-            {
-                return new TimeoutException(message, exception);
+                case TimeoutException _ when referenceId != null:
+                    return new TimeoutException(message, exception);
             }
 
             return exception;

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

@@ -8,7 +8,7 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using Microsoft.Azure.Amqp;
     using Microsoft.Azure.Amqp.Framing;
 
-    public abstract class AmqpLinkCreator
+    internal abstract class AmqpLinkCreator
     {
         readonly string entityPath;
         readonly ServiceBusConnection serviceBusConnection;

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

@@ -362,23 +362,23 @@ public static SBMessage AmqpMessageToSBMessage(AmqpMessage amqpMessage)
         public static AmqpMap GetRuleDescriptionMap(RuleDescription description)
         {
             AmqpMap ruleDescriptionMap = new AmqpMap();
-            if (description.Filter is SqlFilter)
-            {
-                AmqpMap filterMap = GetSqlFilterMap(description.Filter as SqlFilter);
-                ruleDescriptionMap[ManagementConstants.Properties.SqlFilter] = filterMap;
-            }
-            else if (description.Filter is CorrelationFilter)
-            {
-                AmqpMap correlationFilterMap = GetCorrelationFilterMap(description.Filter as CorrelationFilter);
-                ruleDescriptionMap[ManagementConstants.Properties.CorrelationFilter] = correlationFilterMap;
-            }
-            else
+
+            switch (description.Filter)
             {
-                throw new NotSupportedException(
-                    Resources.RuleFilterNotSupported.FormatForUser(
-                        description.Filter.GetType(),
-                        nameof(SqlFilter),
-                        nameof(CorrelationFilter)));
+                case SqlFilter sqlFilter:
+                    AmqpMap filterMap = GetSqlFilterMap(sqlFilter);
+                    ruleDescriptionMap[ManagementConstants.Properties.SqlFilter] = filterMap;
+                    break;
+                case CorrelationFilter correlationFilter:
+                    AmqpMap correlationFilterMap = GetCorrelationFilterMap(correlationFilter);
+                    ruleDescriptionMap[ManagementConstants.Properties.CorrelationFilter] = correlationFilterMap;
+                    break;
+                default:
+                    throw new NotSupportedException(
+                        Resources.RuleFilterNotSupported.FormatForUser(
+                            description.Filter.GetType(),
+                            nameof(SqlFilter),
+                            nameof(CorrelationFilter)));
             }
 
             AmqpMap amqpAction = GetRuleActionMap(description.Action as SqlRuleAction);
@@ -431,29 +431,29 @@ static bool TryGetAmqpObjectFromNetObject(object netObject, MappingType mappingT
                     amqpObject = new DescribedType((AmqpSymbol)TimeSpanName, ((TimeSpan)netObject).Ticks);
                     break;
                 case PropertyValueType.Unknown:
-                    if (netObject is Stream)
+                    if (netObject is Stream netObjectAsStream)
                     {
                         if (mappingType == MappingType.ApplicationProperty)
                         {
-                            amqpObject = StreamToBytes((Stream)netObject);
+                            amqpObject = StreamToBytes(netObjectAsStream);
                         }
                     }
                     else if (mappingType == MappingType.ApplicationProperty)
                     {
                         throw Fx.Exception.AsError(new SerializationException(Resources.FailedToSerializeUnsupportedType.FormatForUser(netObject.GetType().FullName)));
                     }
-                    else if (netObject is byte[])
+                    else if (netObject is byte[] netObjectAsByteArray)
                     {
-                        amqpObject = new ArraySegment<byte>((byte[])netObject);
+                        amqpObject = new ArraySegment<byte>(netObjectAsByteArray);
                     }
                     else if (netObject is IList)
                     {
                         // Array is also an IList
                         amqpObject = netObject;
                     }
-                    else if (netObject is IDictionary)
+                    else if (netObject is IDictionary netObjectAsDictionary)
                     {
-                        amqpObject = new AmqpMap((IDictionary)netObject);
+                        amqpObject = new AmqpMap(netObjectAsDictionary);
                     }
                     break;
             }
@@ -490,13 +490,13 @@ static bool TryGetNetObjectFromAmqpObject(object amqpObject, MappingType mapping
                     netObject = amqpObject;
                     break;
                 case PropertyValueType.Unknown:
-                    if (amqpObject is AmqpSymbol)
+                    if (amqpObject is AmqpSymbol amqpObjectAsAmqpSymbol)
                     {
-                        netObject = ((AmqpSymbol)amqpObject).Value;
+                        netObject = (amqpObjectAsAmqpSymbol).Value;
                     }
-                    else if (amqpObject is ArraySegment<byte>)
+                    else if (amqpObject is ArraySegment<byte> amqpObjectAsArraySegment)
                     {
-                        ArraySegment<byte> binValue = (ArraySegment<byte>)amqpObject;
+                        ArraySegment<byte> binValue = amqpObjectAsArraySegment;
                         if (binValue.Count == binValue.Array.Length)
                         {
                             netObject = binValue.Array;
@@ -508,33 +508,31 @@ static bool TryGetNetObjectFromAmqpObject(object amqpObject, MappingType mapping
                             netObject = buffer;
                         }
                     }
-                    else if (amqpObject is DescribedType)
+                    else if (amqpObject is DescribedType amqpObjectAsDescribedType)
                     {
-                        DescribedType describedType = (DescribedType)amqpObject;
-                        if (describedType.Descriptor is AmqpSymbol)
+                        if (amqpObjectAsDescribedType.Descriptor is AmqpSymbol)
                         {
-                            AmqpSymbol symbol = (AmqpSymbol)describedType.Descriptor;
+                            AmqpSymbol symbol = (AmqpSymbol)amqpObjectAsDescribedType.Descriptor;
                             if (symbol.Equals((AmqpSymbol)UriName))
                             {
-                                netObject = new Uri((string)describedType.Value);
+                                netObject = new Uri((string)amqpObjectAsDescribedType.Value);
                             }
                             else if (symbol.Equals((AmqpSymbol)TimeSpanName))
                             {
-                                netObject = new TimeSpan((long)describedType.Value);
+                                netObject = new TimeSpan((long)amqpObjectAsDescribedType.Value);
                             }
                             else if (symbol.Equals((AmqpSymbol)DateTimeOffsetName))
                             {
-                                netObject = new DateTimeOffset(new DateTime((long)describedType.Value, DateTimeKind.Utc));
+                                netObject = new DateTimeOffset(new DateTime((long)amqpObjectAsDescribedType.Value, DateTimeKind.Utc));
                             }
                         }
                     }
                     else if (mappingType == MappingType.ApplicationProperty)
                     {
                         throw Fx.Exception.AsError(new SerializationException(Resources.FailedToSerializeUnsupportedType.FormatForUser(amqpObject.GetType().FullName)));
                     }
-                    else if (amqpObject is AmqpMap)
+                    else if (amqpObject is AmqpMap map)
                     {
-                        AmqpMap map = (AmqpMap)amqpObject;
                         Dictionary<string, object> dictionary = new Dictionary<string, object>();
                         foreach (var pair in map)
                         {

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

@@ -8,7 +8,7 @@ namespace Microsoft.Azure.ServiceBus.Amqp
     using Azure.Amqp.Encoding;
     using Azure.Amqp.Framing;
 
-    public sealed class AmqpRequestMessage
+    internal sealed class AmqpRequestMessage
     {
         readonly AmqpMessage requestMessage;
 

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

@@ -5,7 +5,7 @@ namespace Microsoft.Azure.ServiceBus.Amqp
 {
     using Microsoft.Azure.Amqp;
 
-    public class AmqpRequestResponseLinkCreator : AmqpLinkCreator
+    internal class AmqpRequestResponseLinkCreator : AmqpLinkCreator
     {
         readonly string entityPath;