Rename HttpRequestKernel to HttpKernel (#3231)

Also rename associated namespaces.
dotnet · Oct 9, 2023 · 9dc74a8 · 9dc74a8
1 parent b2d778e
commit 9dc74a8
Show file tree

Hide file tree

Showing 78 changed files with 493 additions and 479 deletions.
diff --git a/dotnet-interactive.sln b/dotnet-interactive.sln
@@ -104,9 +104,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactiv
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.CSharpProject.Tests", "src\Microsoft.DotNet.Interactive.CSharpProject.Tests\Microsoft.DotNet.Interactive.CSharpProject.Tests.csproj", "{F5A3EA0D-77C0-41DC-8506-EA6AF4A3FC70}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.HttpRequest", "src\Microsoft.DotNet.Interactive.HttpRequest\Microsoft.DotNet.Interactive.HttpRequest.csproj", "{B830CFD8-6EE0-45FA-9C29-E3F0244912C6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.Http", "src\Microsoft.DotNet.Interactive.Http\Microsoft.DotNet.Interactive.Http.csproj", "{B830CFD8-6EE0-45FA-9C29-E3F0244912C6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.HttpRequest.Tests", "src\Microsoft.DotNet.Interactive.HttpRequest.Tests\Microsoft.DotNet.Interactive.HttpRequest.Tests.csproj", "{0BFB2568-B6FB-4C1E-A002-B2DB86551A4F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.Http.Tests", "src\Microsoft.DotNet.Interactive.Http.Tests\Microsoft.DotNet.Interactive.Http.Tests.csproj", "{0BFB2568-B6FB-4C1E-A002-B2DB86551A4F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.SQLite", "src\Microsoft.DotNet.Interactive.SQLite\Microsoft.DotNet.Interactive.SQLite.csproj", "{CAB71ACA-9CDA-492D-A3DD-E5BA2C84FD64}"
 EndProject
@@ -119,9 +119,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactiv
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.HttpRequestParser", "src\Microsoft.DotNet.Interactive.HttpRequestParser\Microsoft.DotNet.Interactive.HttpRequestParser.csproj", "{DA0B3BFC-ED19-4754-A9A0-0F831DBCC9C4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Interactive.AIUtilities", "src\Microsoft.DotNet.Interactive.AIUtilities\Microsoft.DotNet.Interactive.AIUtilities.csproj", "{C874F96E-AC54-4AEF-A2E7-F6679378662A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.AIUtilities", "src\Microsoft.DotNet.Interactive.AIUtilities\Microsoft.DotNet.Interactive.AIUtilities.csproj", "{C874F96E-AC54-4AEF-A2E7-F6679378662A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Interactive.AIUtilities.Tests", "src\Microsoft.DotNet.Interactive.AIUtilities.Tests\Microsoft.DotNet.Interactive.AIUtilities.Tests.csproj", "{B711649D-0397-4B2F-A367-8101823DE481}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.AIUtilities.Tests", "src\Microsoft.DotNet.Interactive.AIUtilities.Tests\Microsoft.DotNet.Interactive.AIUtilities.Tests.csproj", "{B711649D-0397-4B2F-A367-8101823DE481}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/eng/publish/PublishVSCodeExtension.ps1 b/eng/publish/PublishVSCodeExtension.ps1
@@ -44,7 +44,6 @@ try {
                 "Microsoft.DotNet.Interactive.Formatting",
                 "Microsoft.DotNet.Interactive.FSharp",
                 "Microsoft.DotNet.Interactive.Http,",
-                "Microsoft.DotNet.Interactive.HttpRequest",
                 "Microsoft.DotNet.Interactive.Journey",
                 "Microsoft.DotNet.Interactive.Kql",
                 "Microsoft.DotNet.Interactive.Mermaid",

diff --git a/src/Microsoft.DotNet.Interactive.ApiCompatibility.Tests/ApiCompatibilityTests.cs b/src/Microsoft.DotNet.Interactive.ApiCompatibility.Tests/ApiCompatibilityTests.cs
@@ -8,7 +8,7 @@
 using Microsoft.DotNet.Interactive.Documents;
 using Microsoft.DotNet.Interactive.Formatting;
 using Microsoft.DotNet.Interactive.FSharp;
-using Microsoft.DotNet.Interactive.HttpRequest;
+using Microsoft.DotNet.Interactive.Http;
 using Microsoft.DotNet.Interactive.Journey;
 using Microsoft.DotNet.Interactive.Jupyter;
 using Microsoft.DotNet.Interactive.Kql;
@@ -134,7 +134,7 @@ public void jupyter_api_is_not_changed()
     [FactSkipLinux("Testing api contract changes, not needed on Linux too")]
     public void httpRequest_api_is_not_changed()
     {
-        var contract = ApiContract.GenerateContract<HttpRequestKernel>();
+        var contract = ApiContract.GenerateContract<HttpKernel>();
         this.Assent(contract, _configuration);
     }
 }
diff --git a/....ApiCompatibility.Tests/ApiCompatibilityTests.httpRequest_api_is_not_changed.approved.txt b/....ApiCompatibility.Tests/ApiCompatibilityTests.httpRequest_api_is_not_changed.approved.txt
@@ -1,4 +1,4 @@
-Microsoft.DotNet.Interactive.HttpRequest
+Microsoft.DotNet.Interactive.Http
   public class EmptyHttpResponse
     .ctor()
   public class HttpContent
@@ -7,18 +7,18 @@ Microsoft.DotNet.Interactive.HttpRequest
     public System.String ContentType { get;}
     public System.Collections.Generic.Dictionary<System.String,System.String[]> Headers { get;}
     public System.String Raw { get;}
+  public class HttpKernel : Microsoft.DotNet.Interactive.Kernel, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestDiagnostics>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestKernelInfo>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestValue>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestValueInfos>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.SendValue>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.SubmitCode>, System.IDisposable
+    .ctor(System.String name = null, System.Net.Http.HttpClient client = null, System.Int32 responseDelayThresholdInMilliseconds = 1000, System.Int32 contentByteLengthThreshold = 500000)
+  public class HttpKernelExtension
+    public static System.Void Load(Microsoft.DotNet.Interactive.Kernel kernel, System.Net.Http.HttpClient httpClient = null, System.Int32 responseDelayThresholdInMilliseconds = 1000, System.Int32 contentByteLengthThreshold = 500000)
+    .ctor()
   public class HttpRequest
     .ctor(System.String method, System.String version, System.Collections.Generic.Dictionary<System.String,System.String[]> headers, System.String uri = null, HttpContent content = null)
     public HttpContent Content { get;}
     public System.Collections.Generic.Dictionary<System.String,System.String[]> Headers { get;}
     public System.String Method { get;}
     public System.String Uri { get;}
     public System.String Version { get;}
-  public class HttpRequestKernel : Microsoft.DotNet.Interactive.Kernel, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestDiagnostics>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestKernelInfo>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestValue>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.RequestValueInfos>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.SendValue>, Microsoft.DotNet.Interactive.IKernelCommandHandler<Microsoft.DotNet.Interactive.Commands.SubmitCode>, System.IDisposable
-    .ctor(System.String name = null, System.Net.Http.HttpClient client = null, System.Int32 responseDelayThresholdInMilliseconds = 1000, System.Int32 contentByteLengthThreshold = 500000)
-  public class HttpRequestKernelExtension
-    public static System.Void Load(Microsoft.DotNet.Interactive.Kernel kernel, System.Net.Http.HttpClient httpClient = null, System.Int32 responseDelayThresholdInMilliseconds = 1000, System.Int32 contentByteLengthThreshold = 500000)
-    .ctor()
   public class HttpResponse : PartialHttpResponse
     .ctor(System.Int32 statusCode, System.String reasonPhrase, System.String version, System.Collections.Generic.Dictionary<System.String,System.String[]> headers, HttpRequest request = null, HttpContent content = null, System.Nullable<System.Double> elapsedMilliseconds = null)
     public HttpContent Content { get;}

diff --git a/...ractive.ApiCompatibility.Tests/Microsoft.DotNet.Interactive.ApiCompatibility.Tests.csproj b/...ractive.ApiCompatibility.Tests/Microsoft.DotNet.Interactive.ApiCompatibility.Tests.csproj
@@ -50,7 +50,7 @@
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Documents\Microsoft.DotNet.Interactive.Documents.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Formatting\Microsoft.DotNet.Interactive.Formatting.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp\Microsoft.DotNet.Interactive.FSharp.fsproj" />
-    <ProjectReference Include="..\Microsoft.DotNet.Interactive.HttpRequest\Microsoft.DotNet.Interactive.HttpRequest.csproj" />
+    <ProjectReference Include="..\Microsoft.DotNet.Interactive.Http\Microsoft.DotNet.Interactive.Http.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Journey\Microsoft.DotNet.Interactive.Journey.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Kql\Microsoft.DotNet.Interactive.Kql.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Mermaid\Microsoft.DotNet.Interactive.Mermaid.csproj" />

diff --git a/src/Microsoft.DotNet.Interactive.AspNetCore.Tests/AspNetCoreTests.cs b/src/Microsoft.DotNet.Interactive.AspNetCore.Tests/AspNetCoreTests.cs
@@ -7,7 +7,7 @@
 using Microsoft.DotNet.Interactive.Commands;
 using Microsoft.DotNet.Interactive.CSharp;
 using Microsoft.DotNet.Interactive.Events;
-using Microsoft.DotNet.Interactive.HttpRequest;
+using Microsoft.DotNet.Interactive.Http;
 using Microsoft.DotNet.Interactive.Tests.Utility;
 using Xunit;
 

diff --git a/....DotNet.Interactive.AspNetCore.Tests/Microsoft.DotNet.Interactive.AspNetCore.Tests.csproj b/....DotNet.Interactive.AspNetCore.Tests/Microsoft.DotNet.Interactive.AspNetCore.Tests.csproj
@@ -26,7 +26,7 @@
     <ProjectReference Include="..\dotnet-interactive\dotnet-interactive.csproj" />
     <ProjectReference Include="..\interface-generator\interface-generator.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.AspNetCore\Microsoft.DotNet.Interactive.AspNetCore.csproj" />
-    <ProjectReference Include="..\Microsoft.DotNet.Interactive.HttpRequest\Microsoft.DotNet.Interactive.HttpRequest.csproj" />
+    <ProjectReference Include="..\Microsoft.DotNet.Interactive.Http\Microsoft.DotNet.Interactive.Http.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Tests\Microsoft.DotNet.Interactive.Tests.csproj" />
   </ItemGroup>