Remove EnterpriseProbe(Task).

grokys · grokys · commit dee143ed95a0 · 2017-11-22T14:12:10.000+01:00
These classes are now present in Octokit, so simply export one of these.
diff --git a/src/DesignTimeStyleHelper/App.xaml.cs b/src/DesignTimeStyleHelper/App.xaml.cs
@@ -73,7 +73,7 @@ public CustomServiceProvider()
                 new AssemblyCatalog(typeof(GitHub.Api.ApiClient).Assembly), // GitHub.App
                 new AssemblyCatalog(typeof(GitHub.Api.SimpleApiClient).Assembly), // GitHub.Api
                 new AssemblyCatalog(typeof(Rothko.Environment).Assembly), // Rothko
-                new AssemblyCatalog(typeof(EnterpriseProbeTask).Assembly) // GitHub.Exports
+                new AssemblyCatalog(typeof(WikiProbe).Assembly) // GitHub.Exports
             );
             container = new CompositionContainer(catalog, CompositionOptions.IsThreadSafe | CompositionOptions.DisableSilentRejection);
 
diff --git a/src/GitHub.Api/SimpleApiClient.cs b/src/GitHub.Api/SimpleApiClient.cs
@@ -14,7 +14,7 @@ public class SimpleApiClient : ISimpleApiClient
         public HostAddress HostAddress { get; }
         public UriString OriginalUrl { get; }
 
-        readonly Lazy<IEnterpriseProbeTask> enterpriseProbe;
+        readonly Lazy<IEnterpriseProbe> enterpriseProbe;
         readonly Lazy<IWikiProbe> wikiProbe;
         static readonly SemaphoreSlim sem = new SemaphoreSlim(1);
 
@@ -24,7 +24,7 @@ public class SimpleApiClient : ISimpleApiClient
         bool? hasWiki;
 
         public SimpleApiClient(UriString repoUrl, IGitHubClient githubClient,
-            Lazy<IEnterpriseProbeTask> enterpriseProbe, Lazy<IWikiProbe> wikiProbe)
+            Lazy<IEnterpriseProbe> enterpriseProbe, Lazy<IWikiProbe> wikiProbe)
         {
             Guard.ArgumentNotNull(repoUrl, nameof(repoUrl));
             Guard.ArgumentNotNull(githubClient, nameof(githubClient));
@@ -127,14 +127,17 @@ async Task<bool> HasWikiInternal(Repository repo)
 
         async Task<bool> IsEnterpriseInternal()
         {
+            if (HostAddress == HostAddress.GitHubDotComHostAddress)
+                return false;
+
             var probe = enterpriseProbe.Value;
             Debug.Assert(probe != null, "Lazy<Enterprise> probe is not set, something is wrong.");
 #if !DEBUG
             if (probe == null)
                 return false;
 #endif
-            var ret = await probe.ProbeAsync(HostAddress.WebUri);
-            return (ret == Services.EnterpriseProbeResult.Ok);
+            var ret = await probe.Probe(HostAddress.WebUri);
+            return (ret == EnterpriseProbeResult.Ok);
         }
     }
 }
diff --git a/src/GitHub.Api/SimpleApiClientFactory.cs b/src/GitHub.Api/SimpleApiClientFactory.cs
@@ -15,7 +15,7 @@ public class SimpleApiClientFactory : ISimpleApiClientFactory
     {
         readonly IKeychain keychain;
         readonly ProductHeaderValue productHeader;
-        readonly Lazy<IEnterpriseProbeTask> lazyEnterpriseProbe;
+        readonly Lazy<IEnterpriseProbe> lazyEnterpriseProbe;
         readonly Lazy<IWikiProbe> lazyWikiProbe;
 
         static readonly ConcurrentDictionary<UriString, ISimpleApiClient> cache = new ConcurrentDictionary<UriString, ISimpleApiClient>();
@@ -24,7 +24,7 @@ public class SimpleApiClientFactory : ISimpleApiClientFactory
         public SimpleApiClientFactory(
             IProgram program,
             IKeychain keychain,
-            Lazy<IEnterpriseProbeTask> enterpriseProbe,
+            Lazy<IEnterpriseProbe> enterpriseProbe,
             Lazy<IWikiProbe> wikiProbe)
         {
             this.keychain = keychain;
diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj
@@ -189,11 +189,9 @@
     <Compile Include="SampleData\SampleViewModels.cs" />
     <Compile Include="Api\ApiClient.cs" />
     <Compile Include="Factories\ApiClientFactory.cs" />
-    <Compile Include="Services\EnterpriseProbe.cs" />
     <Compile Include="Services\ErrorMap.cs" />
     <Compile Include="Services\ErrorMessage.cs" />
     <Compile Include="Services\ErrorMessageTranslator.cs" />
-    <Compile Include="Services\IEnterpriseProbe.cs" />
     <Compile Include="Services\RepositoryCreationService.cs" />
     <Compile Include="Services\GistPublishService.cs" />
     <Compile Include="Services\RepositoryPublishService.cs" />
diff --git a/src/GitHub.App/Infrastructure/ExportWrappers.cs b/src/GitHub.App/Infrastructure/ExportWrappers.cs
@@ -1,7 +1,7 @@
 ﻿using System.ComponentModel.Composition;
+using GitHub.Models;
+using Octokit;
 using Octokit.Internal;
-using System;
-using System.Net.Http;
 
 namespace GitHub.Infrastructure
 {
@@ -16,4 +16,14 @@ public ExportedHttpClient() :
             base(HttpMessageHandlerFactory.CreateDefault)
         {}
     }
+
+    [Export(typeof(IEnterpriseProbe))]
+    public class ExportedEnterpriseProbe : EnterpriseProbe
+    {
+        [ImportingConstructor]
+        public ExportedEnterpriseProbe(IProgram program, IHttpClient client)
+            : base(program.ProductHeader, client)
+        {
+        }
+    }
 }
diff --git a/src/GitHub.App/Services/EnterpriseProbe.cs b/src/GitHub.App/Services/EnterpriseProbe.cs
diff --git a/src/GitHub.App/Services/IEnterpriseProbe.cs b/src/GitHub.App/Services/IEnterpriseProbe.cs
diff --git a/src/GitHub.Exports/GitHub.Exports.csproj b/src/GitHub.Exports/GitHub.Exports.csproj
@@ -252,9 +252,7 @@
     <Compile Include="Exports\ExportMetadata.cs" />
     <Compile Include="Primitives\StringEquivalent.cs" />
     <Compile Include="Primitives\UriString.cs" />
-    <Compile Include="Services\EnterpriseProbeTask.cs" />
     <Compile Include="Services\ExportFactoryProvider.cs" />
-    <Compile Include="Services\IEnterpriseProbeTask.cs" />
     <Compile Include="Services\IGitHubServiceProvider.cs" />
     <Compile Include="Services\IWikiProbe.cs" />
     <Compile Include="Services\WikiProbe.cs" />
diff --git a/src/GitHub.Exports/Services/EnterpriseProbeTask.cs b/src/GitHub.Exports/Services/EnterpriseProbeTask.cs
diff --git a/src/GitHub.Exports/Services/IEnterpriseProbeTask.cs b/src/GitHub.Exports/Services/IEnterpriseProbeTask.cs
diff --git a/test/UnitTests/GitHub.Api/SimpleApiClientFactoryTests.cs b/test/UnitTests/GitHub.Api/SimpleApiClientFactoryTests.cs
@@ -5,6 +5,7 @@
 using GitHub.Services;
 using GitHub.VisualStudio;
 using NSubstitute;
+using Octokit;
 using Xunit;
 
 public class SimpleApiClientFactoryTests
@@ -17,12 +18,12 @@ public async Task CreatesNewInstanceOfSimpleApiClient()
             const string url = "https://github.com/github/CreatesNewInstanceOfSimpleApiClient";
             var program = new Program();
             var keychain = Substitute.For<IKeychain>();
-            var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
+            var enterpriseProbe = Substitute.For<IEnterpriseProbe>();
             var wikiProbe = Substitute.For<IWikiProbe>();
             var factory = new SimpleApiClientFactory(
                 program,
                 CreateKeychain(),
-                new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
+                new Lazy<IEnterpriseProbe>(() => enterpriseProbe),
                 new Lazy<IWikiProbe>(() => wikiProbe));
 
             var client = await factory.Create(url);
@@ -40,12 +41,12 @@ public async Task RemovesClientFromCache()
         {
             const string url = "https://github.com/github/RemovesClientFromCache";
             var program = new Program();
-            var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
+            var enterpriseProbe = Substitute.For<IEnterpriseProbe>();
             var wikiProbe = Substitute.For<IWikiProbe>();
             var factory = new SimpleApiClientFactory(
                 program,
                 CreateKeychain(),
-                new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
+                new Lazy<IEnterpriseProbe>(() => enterpriseProbe),
                 new Lazy<IWikiProbe>(() => wikiProbe));
 
             var client = await factory.Create(url);
diff --git a/test/UnitTests/GitHub.Api/SimpleApiClientTests.cs b/test/UnitTests/GitHub.Api/SimpleApiClientTests.cs
@@ -6,7 +6,6 @@
 using NSubstitute;
 using Octokit;
 using Xunit;
-using EnterpriseProbeResult = GitHub.Services.EnterpriseProbeResult;
 
 public class SimpleApiClientTests
 {
@@ -28,12 +27,12 @@ public async Task RetrievesRepositoryFromWeb()
             var gitHubClient = Substitute.For<IGitHubClient>();
             var repository = new Repository(42);
             gitHubClient.Repository.Get("github", "visualstudio").Returns(Task.FromResult(repository));
-            var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
+            var enterpriseProbe = Substitute.For<IEnterpriseProbe>();
             var wikiProbe = Substitute.For<IWikiProbe>();
             var client = new SimpleApiClient(
                 "https://github.com/github/visualstudio",
                 gitHubClient,
-                new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
+                new Lazy<IEnterpriseProbe>(() => enterpriseProbe),
                 new Lazy<IWikiProbe>(() => wikiProbe));
 
             var result = await client.GetRepository();
@@ -49,12 +48,12 @@ public async Task RetrievesCachedRepositoryForSubsequentCalls()
             var repository = new Repository(42);
             gitHubClient.Repository.Get("github", "visualstudio")
                 .Returns(_ => Task.FromResult(repository), _ => { throw new Exception("Should only be called once."); });
-            var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
+            var enterpriseProbe = Substitute.For<IEnterpriseProbe>();
             var wikiProbe = Substitute.For<IWikiProbe>();
             var client = new SimpleApiClient(
                 "https://github.com/github/visualstudio",
                 gitHubClient,
-                new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
+                new Lazy<IEnterpriseProbe>(() => enterpriseProbe),
                 new Lazy<IWikiProbe>(() => wikiProbe));
             await client.GetRepository();
 
@@ -76,14 +75,14 @@ public async Task ReturnsTrueWhenWikiProbeReturnsOk(WikiProbeResult probeResult,
             var gitHubClient = Substitute.For<IGitHubClient>();
             var repository = CreateRepository(42, true);
             gitHubClient.Repository.Get("github", "visualstudio").Returns(Task.FromResult(repository));
-            var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
+            var enterpriseProbe = Substitute.For<IEnterpriseProbe>();
             var wikiProbe = Substitute.For<IWikiProbe>();
             wikiProbe.ProbeAsync(repository)
                 .Returns(_ => Task.FromResult(probeResult), _ => { throw new Exception("Only call it once"); });
             var client = new SimpleApiClient(
                 "https://github.com/github/visualstudio",
                 gitHubClient,
-                new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
+                new Lazy<IEnterpriseProbe>(() => enterpriseProbe),
                 new Lazy<IWikiProbe>(() => wikiProbe));
             await client.GetRepository();
 
@@ -98,12 +97,12 @@ public void ReturnsFalseWhenWeHaveNotRequestedRepository()
         {
             var gitHubHost = HostAddress.GitHubDotComHostAddress;
             var gitHubClient = Substitute.For<IGitHubClient>();
-            var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
+            var enterpriseProbe = Substitute.For<IEnterpriseProbe>();
             var wikiProbe = Substitute.For<IWikiProbe>();
             var client = new SimpleApiClient(
                 "https://github.com/github/visualstudio",
                 gitHubClient,
-                new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
+                new Lazy<IEnterpriseProbe>(() => enterpriseProbe),
                 new Lazy<IWikiProbe>(() => wikiProbe));
 
             var result = client.HasWiki();
@@ -124,14 +123,14 @@ public async Task ReturnsTrueWhenEnterpriseProbeReturnsOk(EnterpriseProbeResult
             var gitHubClient = Substitute.For<IGitHubClient>();
             var repository = CreateRepository(42, true);
             gitHubClient.Repository.Get("github", "visualstudio").Returns(Task.FromResult(repository));
-            var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
-            enterpriseProbe.ProbeAsync(Args.Uri)
+            var enterpriseProbe = Substitute.For<IEnterpriseProbe>();
+            enterpriseProbe.Probe(Args.Uri)
                 .Returns(_ => Task.FromResult(probeResult), _ => { throw new Exception("Only call it once"); });
             var wikiProbe = Substitute.For<IWikiProbe>();
             var client = new SimpleApiClient(
-                "https://github.com/github/visualstudio",
+                "https://github.enterprise/github/visualstudio",
                 gitHubClient,
-                new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
+                new Lazy<IEnterpriseProbe>(() => enterpriseProbe),
                 new Lazy<IWikiProbe>(() => wikiProbe));
             await client.GetRepository();
 
@@ -146,12 +145,12 @@ public void ReturnsFalseWhenWeHaveNotRequestedRepository()
         {
             var gitHubHost = HostAddress.GitHubDotComHostAddress;
             var gitHubClient = Substitute.For<IGitHubClient>();
-            var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
+            var enterpriseProbe = Substitute.For<IEnterpriseProbe>();
             var wikiProbe = Substitute.For<IWikiProbe>();
             var client = new SimpleApiClient(
                 "https://github.com/github/visualstudio",
                 gitHubClient,
-                new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
+                new Lazy<IEnterpriseProbe>(() => enterpriseProbe),
                 new Lazy<IWikiProbe>(() => wikiProbe));
 
             var result = client.IsEnterprise();
