Merge branch 'develop'

Author: jweber

.semver

@@ -1,5 +1,5 @@
 ---
 :major: 1
 :minor: 2
-:patch: 1
+:patch: 2
 :special: ''

README.md

@@ -9,6 +9,19 @@ Installation
 
     NuGet> Install-Package WcfClientProxyGenerator
 
+Usage
+-----
+To create a proxy, use the `WcfClientProxy.Create<TServiceInterface>()` method. There are multiple overloads that can be used to setup and configure the proxy.
+
+#### WcfClientProxy.Create\<TServiceInterface\>()
+Calling create without passing any configuration in will configure the proxy using the `endpoint` section in your config where the `contract` attribute matches `TServiceInterface`. If more than one `endpoint` section exists, an `InvalidOperationException` is thrown. The alternate overloads must be used to select the appropriate endpoint configuration.
+
+#### WcfClientProxy.Create\<TServiceInterface\>(string endpointConfigurationName)
+This is a shortcut to using the overload that accepts an `Action<IRetryingProxyConfigurator>`. It's the same as calling `WcfClientProxy.Create<TServiceInterface>(c => c.SetEndpoint(endpointConfigurationName))`.
+
+#### WcfClientProxy.Create\<TServiceInterface\>(Action\<IRetryingProxyConfigurator\> config)
+Exposes the full configuration available. See the [Configuration](#configuration) section of the documentation.
+	
 Configuration
 -------------
 When calling the `WcfClientProxy.Create<TServiceInterface>()` method, a configuration Action is used to setup the proxy. The following configuration options are available at the proxy creation time:

source/WcfClientProxyGenerator.Tests/App.config

@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <system.serviceModel>
-    <client>
-      <endpoint name="WcfClientProxyGenerator.Tests.Infrastructure.ITestService"
-                address="http://localhost"
-                binding="wsHttpBinding"
-                contract="WcfClientProxyGenerator.Tests.Infrastructure.ITestService"/>
-      
+    <client>    
       <endpoint name="ITestService"
                 address="http://localhost:23456/TestService"
                 binding="wsHttpBinding"
@@ -16,6 +11,11 @@
                 address="http://localhost:23456/TestService2"
                 binding="wsHttpBinding"
                 contract="WcfClientProxyGenerator.Tests.Infrastructure.ITestService"/>
+
+      <endpoint name="ITestServiceSingleEndpointConfig"
+                address="http://localhost:23456/TestService2"
+                binding="wsHttpBinding"
+                contract="WcfClientProxyGenerator.Tests.Infrastructure.ITestServiceSingleEndpointConfig"/>
     </client>
   </system.serviceModel>
 </configuration>

source/WcfClientProxyGenerator.Tests/DefaultProxyConfiguratorTests.cs

@@ -20,7 +20,7 @@ public void SetEndpoint_IsCalledWith_FullNamespaceOfServiceInterface()
             DefaultProxyConfigurator.Configure<ITestService>(mockProxy.Object);
 
             mockProxy.Verify(
-                m => m.SetEndpoint(typeof(ITestService).FullName), 
+                m => m.UseDefaultEndpoint(), 
                 Times.Once());
         }
     }

source/WcfClientProxyGenerator.Tests/Infrastructure/IChildService.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.ServiceModel;
-using System.Text;
-using System.Threading.Tasks;
-using NUnit.Framework;
+using System.ServiceModel;
 
 namespace WcfClientProxyGenerator.Tests.Infrastructure
 {

source/WcfClientProxyGenerator.Tests/Infrastructure/ITestServiceSingleEndpointConfig.cs

@@ -0,0 +1,11 @@
+using System.ServiceModel;
+
+namespace WcfClientProxyGenerator.Tests.Infrastructure
+{
+    [ServiceContract]
+    public interface ITestServiceSingleEndpointConfig
+    {
+        [OperationContract]
+        string TestMethod(string input);
+    }
+}

source/WcfClientProxyGenerator.Tests/ProxyTests.cs

@@ -13,10 +13,19 @@ namespace WcfClientProxyGenerator.Tests
     public class ProxyTests
     {
         [Test] 
-        [Description("Asserts that when no conguration is given in the Create proxy call, the endpoint with the full namespace of the service interface will be used")]
-        public void CreatingProxy_WithNoConfigurator_GetsDefaultClientConfiguration()
+        [Description("Asserts that when no conguration is given in the Create proxy call, the endpoint config that matches the contract will be used")]
+        public void CreatingProxy_WithNoConfigurator_AndSingleEndpointConfig_GetsDefaultClientConfiguration()
         {
-            WcfClientProxy.Create<ITestService>();
+            WcfClientProxy.Create<ITestServiceSingleEndpointConfig>();
+        }
+
+        [Test] 
+        [Description("Asserts that when no conguration is given in the Create proxy call, and multiple endpoint configs for the contract exist, an exception is thrown")]
+        public void CreatingProxy_WithNoConfigurator_AndMultipleEndpointConfigs_ThrowsException()
+        {
+            Assert.That(
+                () => WcfClientProxy.Create<ITestService>(),
+                Throws.TypeOf<InvalidOperationException>());
         }
 
         [Test]
@@ -27,6 +36,20 @@ public void CreatingProxy_WithNoConfigurator_AndNoDefaultConfiguration_ThrowsExc
                 Throws.TypeOf<InvalidOperationException>());
         }
 
+        [Test]
+        public void CreatingProxy_WithEndpointConfigurationName_ThatExists_CreatesProxy()
+        {
+            WcfClientProxy.Create<ITestService>("ITestService2");
+        }
+
+        [Test]
+        public void CreatingProxy_WithEndpointConfigurationName_ThatDoesNotExist_ThrowsException()
+        {
+            Assert.That(
+                () => WcfClientProxy.Create<ITestService>("DoesNotExist"),
+                Throws.TypeOf<InvalidOperationException>());
+        }
+
         [Test]
         public void Proxy_ReturnsExpectedValue_WhenCallingService()
         {

source/WcfClientProxyGenerator.Tests/WcfClientProxyGenerator.Tests.csproj

@@ -65,6 +65,7 @@
     <Compile Include="Infrastructure\ChildServiceImpl.cs" />
     <Compile Include="Infrastructure\IChildService.cs" />
     <Compile Include="Infrastructure\ITestService2.cs" />
+    <Compile Include="Infrastructure\ITestServiceSingleEndpointConfig.cs" />
     <Compile Include="Infrastructure\TestService2Impl.cs" />
     <Compile Include="DelayPolicyTests.cs" />
     <Compile Include="ProxyTests.cs" />

source/WcfClientProxyGenerator/ChannelFactoryProvider.cs

@@ -11,28 +11,42 @@ internal static class ChannelFactoryProvider
         private static readonly ConcurrentDictionary<string, Lazy<object>> ChannelFactoryCache
             = new ConcurrentDictionary<string, Lazy<object>>();
 
+        public static ChannelFactory<TServiceInterface> GetChannelFactory<TServiceInterface>()
+            where TServiceInterface : class
+        {
+            string cacheKey = GetCacheKey<TServiceInterface>();
+            return GetChannelFactory(cacheKey, () => new ChannelFactory<TServiceInterface>("*"));
+        }
+        
         public static ChannelFactory<TServiceInterface> GetChannelFactory<TServiceInterface>(string endpointConfigurationName)
             where TServiceInterface : class
         {
             string cacheKey = GetCacheKey<TServiceInterface>(endpointConfigurationName);
-            var channelFactory = ChannelFactoryCache.GetOrAddSafe(
-                cacheKey,
-                _ => new ChannelFactory<TServiceInterface>(endpointConfigurationName));
-
-            return channelFactory as ChannelFactory<TServiceInterface>;
+            return GetChannelFactory(cacheKey, () => new ChannelFactory<TServiceInterface>(endpointConfigurationName));
         }
 
         public static ChannelFactory<TServiceInterface> GetChannelFactory<TServiceInterface>(Binding binding, EndpointAddress endpointAddress)
             where TServiceInterface : class
         {
             string cacheKey = GetCacheKey<TServiceInterface>(binding, endpointAddress);
+            return GetChannelFactory(cacheKey, () => new ChannelFactory<TServiceInterface>(binding, endpointAddress));
+        }
+
+        private static ChannelFactory<TServiceInterface> GetChannelFactory<TServiceInterface>(string cacheKey, Func<ChannelFactory<TServiceInterface>> factory)
+            where TServiceInterface : class
+        {
             var channelFactory = ChannelFactoryCache.GetOrAddSafe(
                 cacheKey,
-                _ => new ChannelFactory<TServiceInterface>(binding, endpointAddress));
+                _ => factory());
 
             return channelFactory as ChannelFactory<TServiceInterface>;
         }
 
+        private static string GetCacheKey<TServiceInterface>()
+        {
+            return string.Format("type:{0}", typeof(TServiceInterface).FullName);
+        }
+
         private static string GetCacheKey<TServiceInterface>(string endpointConfigurationName)
         {
             return string.Format("type:{0};config:{1}",

source/WcfClientProxyGenerator/DefaultProxyConfigurator.cs

@@ -7,7 +7,7 @@ internal static class DefaultProxyConfigurator
     {
         public static void Configure<TServiceInterface>(IRetryingProxyConfigurator proxy)
         {
-            proxy.SetEndpoint(typeof(TServiceInterface).FullName);
+            proxy.UseDefaultEndpoint();
         }
 
         public static readonly Func<LinearBackoffDelayPolicy> DefaultDelayPolicyFactory