Rename namespace from HttpClient.Cache to HttpClientCache to avoid annoyance when operating with the clr HttpClient

rmja · rmja · commit e7e77aa9b452 · 2025-06-14T17:47:59.000+02:00
diff --git a/src/HttpClient.Cache/CacheConstants.cs b/src/HttpClient.Cache/CacheConstants.cs
@@ -1,4 +1,4 @@
-namespace HttpClient.Cache;
+namespace HttpClientCache;
 
 internal static class CacheConstants
 {
diff --git a/src/HttpClient.Cache/CacheExtensions.cs b/src/HttpClient.Cache/CacheExtensions.cs
@@ -1,5 +1,5 @@
-using HttpClient.Cache;
-using HttpClient.Cache.Files;
+using HttpClientCache;
+using HttpClientCache.Files;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.Extensions.DependencyInjection;
diff --git a/src/HttpClient.Cache/CacheHandler.cs b/src/HttpClient.Cache/CacheHandler.cs
@@ -1,7 +1,7 @@
 using System.Net;
 using Microsoft.Extensions.Logging;
 
-namespace HttpClient.Cache;
+namespace HttpClientCache;
 
 /// <summary>
 /// HTTP/1.1 caching compliant <see cref="System.Net.Http.HttpClient"/> message handler.
diff --git a/src/HttpClient.Cache/CacheKeyComputer.cs b/src/HttpClient.Cache/CacheKeyComputer.cs
@@ -1,7 +1,7 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Text;
 
-namespace HttpClient.Cache;
+namespace HttpClientCache;
 
 public class CacheKeyComputer : ICacheKeyComputer
 {
diff --git a/src/HttpClient.Cache/CacheType.cs b/src/HttpClient.Cache/CacheType.cs
@@ -1,4 +1,4 @@
-namespace HttpClient.Cache;
+namespace HttpClientCache;
 
 public enum CacheType
 {
diff --git a/src/HttpClient.Cache/Files/CamelCaseStringEnumConverter.cs b/src/HttpClient.Cache/Files/CamelCaseStringEnumConverter.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace HttpClient.Cache.Files;
+namespace HttpClientCache.Files;
 
 internal class CamelCaseJsonStringEnumConverter<TEnum>()
     : JsonStringEnumConverter<TEnum>(JsonNamingPolicy.CamelCase)
diff --git a/src/HttpClient.Cache/Files/FileCache.cs b/src/HttpClient.Cache/Files/FileCache.cs
@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace HttpClient.Cache.Files;
+namespace HttpClientCache.Files;
 
 /// <summary>
 /// Provides a file-based implementation of <see cref="IHttpCache"/> for persistent HTTP response caching on disk.
diff --git a/src/HttpClient.Cache/Files/FileCacheSerializerContext.cs b/src/HttpClient.Cache/Files/FileCacheSerializerContext.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace HttpClient.Cache.Files;
+namespace HttpClientCache.Files;
 
 [JsonSerializable(typeof(Metadata))]
 [JsonSerializable(typeof(Variation))]
diff --git a/src/HttpClient.Cache/Files/FileName.cs b/src/HttpClient.Cache/Files/FileName.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Net.Http.Headers;
 
-namespace HttpClient.Cache.Files;
+namespace HttpClientCache.Files;
 
 internal readonly record struct FileName(
     string KeyHash,
diff --git a/src/HttpClient.Cache/Files/Hash.cs b/src/HttpClient.Cache/Files/Hash.cs
@@ -1,7 +1,7 @@
 ﻿using System.Security.Cryptography;
 using System.Text;
 
-namespace HttpClient.Cache.Files;
+namespace HttpClientCache.Files;
 
 internal static class Hash
 {
diff --git a/src/HttpClient.Cache/Files/Metadata.cs b/src/HttpClient.Cache/Files/Metadata.cs
@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace HttpClient.Cache.Files;
+namespace HttpClientCache.Files;
 
 public record Metadata
 {
diff --git a/src/HttpClient.Cache/Files/ResponseFilePair.cs b/src/HttpClient.Cache/Files/ResponseFilePair.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 
-namespace HttpClient.Cache.Files;
+namespace HttpClientCache.Files;
 
 internal record struct ResponseFilePair(FileInfo MetadataInfo, FileInfo ResponseInfo)
 {
diff --git a/src/HttpClient.Cache/Files/VariationFile.cs b/src/HttpClient.Cache/Files/VariationFile.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 
-namespace HttpClient.Cache.Files;
+namespace HttpClientCache.Files;
 
 internal record struct VariationFile(FileInfo Info)
 {
diff --git a/src/HttpClient.Cache/HttpClient.Cache.csproj b/src/HttpClient.Cache/HttpClient.Cache.csproj
@@ -12,6 +12,7 @@
     <RepositoryUrl>https://github.com/rmja/HttpClient.Cache.git</RepositoryUrl>
     <Version>0.0.2</Version>
     <PackageReadmeFile>README.md</PackageReadmeFile>
+    <RootNamespace>HttpClientCache</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\..\README.md" Pack="true" PackagePath="">
diff --git a/src/HttpClient.Cache/HttpResponseMessageExtensions.cs b/src/HttpClient.Cache/HttpResponseMessageExtensions.cs
@@ -1,4 +1,4 @@
-namespace HttpClient.Cache;
+namespace HttpClientCache;
 
 public static class HttpResponseMessageExtensions
 {
diff --git a/src/HttpClient.Cache/ICacheKeyComputer.cs b/src/HttpClient.Cache/ICacheKeyComputer.cs
@@ -1,4 +1,4 @@
-namespace HttpClient.Cache;
+namespace HttpClientCache;
 
 public interface ICacheKeyComputer
 {
diff --git a/src/HttpClient.Cache/IHttpCache.cs b/src/HttpClient.Cache/IHttpCache.cs
@@ -1,4 +1,4 @@
-namespace HttpClient.Cache;
+namespace HttpClientCache;
 
 /// <summary>
 /// Defines the contract for a HTTP cache that stores and retrieves HTTP response entries.
diff --git a/src/HttpClient.Cache/ResponseWithVariation.cs b/src/HttpClient.Cache/ResponseWithVariation.cs
@@ -1,4 +1,4 @@
-namespace HttpClient.Cache;
+namespace HttpClientCache;
 
 public sealed record ResponseWithVariation(HttpResponseMessage Response, Variation Variation)
     : IDisposable
diff --git a/src/HttpClient.Cache/Variation.cs b/src/HttpClient.Cache/Variation.cs
@@ -1,4 +1,4 @@
-namespace HttpClient.Cache;
+namespace HttpClientCache;
 
 /// <summary>
 /// Represents a cache variation, allowing cache entries to be differentiated
diff --git a/test/HttpClient.Cache.Tests/CacheHandlerTests.cs b/test/HttpClient.Cache.Tests/CacheHandlerTests.cs
@@ -1,13 +1,12 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Net;
 using System.Security.Claims;
-using HttpClient.Cache.Files;
-using HttpClient.Cache.Tests.Support;
+using HttpClientCache.Files;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Time.Testing;
 using Moq;
 
-namespace HttpClient.Cache.Tests;
+namespace HttpClientCache.Tests;
 
 public sealed class CacheHandlerTests : IDisposable
 {
diff --git a/test/HttpClient.Cache.Tests/File/FileCacheTests.cs b/test/HttpClient.Cache.Tests/File/FileCacheTests.cs
@@ -1,9 +1,9 @@
 using System.Net;
 using System.Text;
-using HttpClient.Cache.Files;
+using HttpClientCache.Files;
 using Microsoft.Extensions.Time.Testing;
 
-namespace HttpClient.Cache.Tests.File;
+namespace HttpClientCache.Tests.File;
 
 public sealed class FileCacheTests : IDisposable
 {
diff --git a/test/HttpClient.Cache.Tests/HttpClient.Cache.Tests.csproj b/test/HttpClient.Cache.Tests/HttpClient.Cache.Tests.csproj
@@ -4,6 +4,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
+    <RootNamespace>HttpClientCache.Tests</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.4">
@@ -25,4 +26,7 @@
   <ItemGroup>
     <Using Include="Xunit" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Support\" />
+  </ItemGroup>
 </Project>
diff --git a/test/HttpClient.Cache.Tests/HttpMessageHandlerMockExtensions.cs b/test/HttpClient.Cache.Tests/HttpMessageHandlerMockExtensions.cs
@@ -2,7 +2,7 @@
 using Moq;
 using Moq.Protected;
 
-namespace HttpClient.Cache.Tests;
+namespace HttpClientCache.Tests;
 
 public static class HttpMessageHandlerMockExtensions
 {
diff --git a/test/HttpClient.Cache.Tests/HttpResponseMessageExtensions.cs b/test/HttpClient.Cache.Tests/HttpResponseMessageExtensions.cs
@@ -1,4 +1,4 @@
-namespace HttpClient.Cache.Tests;
+namespace HttpClientCache.Tests;
 
 internal static class HttpResponseMessageExtensions
 {
diff --git a/test/HttpClient.Cache.Tests/PublicCacheHandler.cs b/test/HttpClient.Cache.Tests/PublicCacheHandler.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace HttpClient.Cache.Tests.Support;
+namespace HttpClientCache.Tests;
 
 public class PublicCacheHandler(IHttpCache cache, ILogger<CacheHandler> logger)
     : CacheHandler(cache, logger)
diff --git a/test/HttpClient.Cache.Tests/ReadmeExamplesTests.cs b/test/HttpClient.Cache.Tests/ReadmeExamplesTests.cs
@@ -1,7 +1,7 @@
-using HttpClient.Cache.Files;
+using HttpClientCache.Files;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace HttpClient.Cache.Tests;
+namespace HttpClientCache.Tests;
 
 public class ReadmeExamplesTests
 {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace HttpClient.Cache;`
	`1`	`+namespace HttpClientCache;`
`2`	`2`
`3`	`3`	`internal static class CacheConstants`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.IdentityModel.Tokens.Jwt;`
`2`	`2`	`using System.Text;`
`3`	`3`
`4`		`-namespace HttpClient.Cache;`
	`4`	`+namespace HttpClientCache;`
`5`	`5`
`6`	`6`	`public class CacheKeyComputer : ICacheKeyComputer`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Security.Cryptography;`
`2`	`2`	`using System.Text;`
`3`	`3`
`4`		`-namespace HttpClient.Cache.Files;`
	`4`	`+namespace HttpClientCache.Files;`
`5`	`5`
`6`	`6`	`internal static class Hash`
`7`	`7`	`{`