Fixed #6 ExceptionlessClient.Startup overrides ISubmissionClient previously set by user

Author: niemyjski

Source/Extras/Extensions/ExceptionlessClientExtensions.cs

@@ -16,8 +16,12 @@ public static class ExceptionlessClientExtensions {
         /// <param name="client">The ExceptionlessClient.</param>
         /// <param name="appDomain">The AppDomain to register the exception handlers on.</param>
         public static void Startup(this ExceptionlessClient client, AppDomain appDomain = null) {
-            client.Configuration.Resolver.Register<ISubmissionClient, SubmissionClient>();
-            client.Configuration.Resolver.Register<IEnvironmentInfoCollector, EnvironmentInfoCollector>();
+            if (client.Configuration.Resolver.HasDefaultRegistration<ISubmissionClient, DefaultSubmissionClient>())
+                client.Configuration.Resolver.Register<ISubmissionClient, SubmissionClient>();
+
+            if (client.Configuration.Resolver.HasDefaultRegistration<IEnvironmentInfoCollector, DefaultEnvironmentInfoCollector>())
+                client.Configuration.Resolver.Register<IEnvironmentInfoCollector, EnvironmentInfoCollector>();
+
             client.Configuration.ReadAllConfig();
             client.Configuration.UseErrorPlugin();
             client.Configuration.UseTraceLogEntriesPlugin();

Source/Shared/Dependency/DependencyResolverExtensions.cs

@@ -15,6 +15,14 @@ public static bool HasRegistration<TService>(this IDependencyResolver resolver)
             return resolver.Resolve(typeof(TService)) != null;
         }
 
+        public static bool HasDefaultRegistration<TService, TDefaultImplementation>(this IDependencyResolver resolver) where TService : class where TDefaultImplementation : TService {
+            if (resolver == null)
+                return false;
+
+            var instance = resolver.Resolve(typeof(TService));
+            return instance is TDefaultImplementation;
+        }
+
         public static object Resolve(this IDependencyResolver resolver, Type type) {
             if (resolver == null)
                 throw new ArgumentNullException("resolver");

Source/Shared/Services/DefaultEnvironmentInfoCollector.cs

@@ -2,7 +2,7 @@
 using Exceptionless.Models.Data;
 
 namespace Exceptionless.Services {
-    internal class DefaultEnvironmentInfoCollector : IEnvironmentInfoCollector {
+    public class DefaultEnvironmentInfoCollector : IEnvironmentInfoCollector {
         private static EnvironmentInfo _environmentInfo;
 
         public EnvironmentInfo GetEnvironmentInfo() {

Source/Tests/ExceptionlessClientTests.cs

@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
+using Exceptionless.Dependency;
 using Exceptionless.Models;
+using Exceptionless.Models.Data;
 using Exceptionless.Plugins;
+using Exceptionless.Submission;
 using Xunit;
 
 namespace Exceptionless.Tests {
@@ -54,6 +57,22 @@ public void CanFireOnSubmittingEvent() {
             Assert.Equal(2, list.Count);  
         }
 
+        [Fact]
+        public void CanCallStartupWithCustomSubmissionClient() {
+            var client = CreateClient();
+            Assert.True(client.Configuration.Resolver.HasRegistration<ISubmissionClient>());
+            Assert.True(client.Configuration.Resolver.HasDefaultRegistration<ISubmissionClient, DefaultSubmissionClient>());
+            
+            client.Configuration.Resolver.Register<ISubmissionClient, MySubmissionClient>();
+            Assert.False(client.Configuration.Resolver.HasDefaultRegistration<ISubmissionClient, DefaultSubmissionClient>());
+            Assert.True(client.Configuration.Resolver.Resolve<ISubmissionClient>() is MySubmissionClient);
+
+            client.Startup();
+            Assert.True(client.Configuration.Resolver.Resolve<ISubmissionClient>() is MySubmissionClient);
+            Assert.False(client.Configuration.Resolver.HasDefaultRegistration<ISubmissionClient, DefaultSubmissionClient>());
+            client.Shutdown();
+        }
+
         [Fact (Skip = "This test shows off throwing a stack overflow exception: Issue #26")]
         public void WillThrowStackOverflowExceptionDuringOnSubmitting() {
             var client = CreateClient();
@@ -155,5 +174,19 @@ public void WillThrowStackOverflowExceptionDuringOnSubmitting() {
         private class Person {
             public string Name { get; set; }
         }
+
+        public class MySubmissionClient : ISubmissionClient {
+            public SubmissionResponse PostEvents(IEnumerable<Event> events, ExceptionlessConfiguration config, IJsonSerializer serializer) {
+                throw new NotImplementedException();
+            }
+
+            public SubmissionResponse PostUserDescription(string referenceId, UserDescription description, ExceptionlessConfiguration config, IJsonSerializer serializer) {
+                throw new NotImplementedException();
+            }
+
+            public SettingsResponse GetSettings(ExceptionlessConfiguration config, IJsonSerializer serializer) {
+                throw new NotImplementedException();
+            }
+        }
     }
 }