chore: move internal types to Internal folder (but do not use it as n…

…amespace provider, at least not yet)

src/MockHttp/Responses/BitRate.cs → src/MockHttp/BitRate.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using MockHttp.IO;
 
 // ReSharper disable once CheckNamespace
 namespace MockHttp;
@@ -85,7 +84,7 @@ public static BitRate OneGigabit()
     /// </summary>
     /// <param name="bitRate"></param>
     /// <returns></returns>
-    public static explicit operator int (BitRate bitRate)
+    public static explicit operator int(BitRate bitRate)
     {
         return ToInt32(bitRate);
     }
@@ -95,7 +94,7 @@ public static explicit operator int (BitRate bitRate)
     /// </summary>
     /// <param name="bitRate"></param>
     /// <returns></returns>
-    public static explicit operator BitRate (int bitRate)
+    public static explicit operator BitRate(int bitRate)
     {
         return FromInt32(bitRate);
     }

src/MockHttp/Extensions/IRespondsExtensions.cs

@@ -1,6 +1,7 @@
 using MockHttp.Language;
 using MockHttp.Language.Flow;
 using MockHttp.Language.Flow.Response;
+using MockHttp.Response;
 using MockHttp.Responses;
 
 namespace MockHttp;

src/MockHttp/Extensions/RequestMatchingExtensions.cs

@@ -5,9 +5,11 @@
 using System.Linq.Expressions;
 using System.Net.Http.Headers;
 using System.Text;
+using MockHttp.Extensions;
 using MockHttp.Http;
 using MockHttp.Matchers;
 using MockHttp.Patterns;
+using MockHttp.Request;
 using static MockHttp.Http.UriExtensions;
 
 namespace MockHttp;

src/MockHttp/Extensions/ResponseBuilderExtensions.cs

@@ -3,11 +3,12 @@
 using System.Net;
 using System.Net.Http.Headers;
 using System.Text;
+using MockHttp.Extensions;
 using MockHttp.Http;
 using MockHttp.IO;
 using MockHttp.Language.Flow.Response;
 using MockHttp.Language.Response;
-using MockHttp.Responses;
+using MockHttp.Response.Behaviors;
 
 namespace MockHttp;
 

src/MockHttp/Extensions/HttpContentExtensions.cs → src/MockHttp/Internal/Extensions/HttpContentExtensions.cs

@@ -1,6 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace MockHttp;
+namespace MockHttp.Extensions;
 
 internal static class HttpContentExtensions
 {

src/MockHttp/Extensions/HttpRequestMatcherExtensions.cs → src/MockHttp/Internal/Extensions/HttpRequestMatcherExtensions.cs

@@ -1,7 +1,7 @@
 using MockHttp.Matchers;
 using MockHttp.Responses;
 
-namespace MockHttp;
+namespace MockHttp.Extensions;
 
 internal static class HttpRequestMatcherExtensions
 {

src/MockHttp/Extensions/ListExtensions.cs → src/MockHttp/Internal/Extensions/ListExtensions.cs

@@ -1,4 +1,4 @@
-namespace MockHttp;
+namespace MockHttp.Extensions;
 
 internal static class ListExtensions
 {

src/MockHttp/Extensions/NameValueCollectionExtensions.cs → src/MockHttp/Internal/Extensions/NameValueCollectionExtensions.cs

@@ -1,6 +1,6 @@
 using System.Collections.Specialized;
 
-namespace MockHttp;
+namespace MockHttp.Extensions;
 
 internal static class NameValueCollectionExtensions
 {

src/MockHttp/Extensions/ReadOnlyListExtensions.cs → src/MockHttp/Internal/Extensions/ReadOnlyListExtensions.cs

@@ -1,4 +1,4 @@
-namespace MockHttp;
+namespace MockHttp.Extensions;
 
 internal static class ReadOnlyListExtensions
 {

src/MockHttp/Responses/EmptyContent.cs → src/MockHttp/Internal/Http/EmptyContent.cs

@@ -1,7 +1,7 @@
 #pragma warning disable S4136
 using System.Net;
 
-namespace MockHttp.Responses;
+namespace MockHttp.Http;
 
 internal class EmptyContent : HttpContent
 {

src/MockHttp/AnyRequestMatching.cs → src/MockHttp/Internal/Request/AnyRequestMatching.cs

@@ -1,6 +1,6 @@
 using MockHttp.Matchers;
 
-namespace MockHttp;
+namespace MockHttp.Request;
 
 /// <summary>
 /// A builder to configure request matchers, accepting all matchers.

src/MockHttp/InvertRequestMatching.cs → src/MockHttp/Internal/Request/InvertRequestMatching.cs

@@ -1,6 +1,6 @@
 using MockHttp.Matchers;
 
-namespace MockHttp;
+namespace MockHttp.Request;
 
 internal sealed class InvertRequestMatching : RequestMatching
 {

src/MockHttp/Responses/HttpContentBehavior.cs → src/MockHttp/Internal/Response/Behaviors/HttpContentBehavior.cs

@@ -1,4 +1,6 @@
-namespace MockHttp.Responses;
+using MockHttp.Responses;
+
+namespace MockHttp.Response.Behaviors;
 
 internal sealed class HttpContentBehavior
     : IResponseBehavior

src/MockHttp/Responses/HttpHeaderBehavior.cs → src/MockHttp/Internal/Response/Behaviors/HttpHeaderBehavior.cs

@@ -1,6 +1,7 @@
 using MockHttp.Http;
+using MockHttp.Responses;
 
-namespace MockHttp.Responses;
+namespace MockHttp.Response.Behaviors;
 
 internal sealed class HttpHeaderBehavior
     : IResponseBehavior

src/MockHttp/Responses/NetworkLatencyBehavior.cs → src/MockHttp/Internal/Response/Behaviors/NetworkLatencyBehavior.cs

@@ -1,6 +1,8 @@
-namespace MockHttp.Responses;
+using MockHttp.Responses;
 
-internal class NetworkLatencyBehavior
+namespace MockHttp.Response.Behaviors;
+
+internal sealed class NetworkLatencyBehavior
     : IResponseBehavior
 {
     private readonly NetworkLatency _networkLatency;

src/MockHttp/Responses/StatusCodeBehavior.cs → src/MockHttp/Internal/Response/Behaviors/StatusCodeBehavior.cs

@@ -1,6 +1,7 @@
 using System.Net;
+using MockHttp.Responses;
 
-namespace MockHttp.Responses;
+namespace MockHttp.Response.Behaviors;
 
 internal sealed class StatusCodeBehavior
     : IResponseBehavior

src/MockHttp/Responses/TimeoutBehavior.cs → src/MockHttp/Internal/Response/Behaviors/TimeoutBehavior.cs

@@ -1,7 +1,8 @@
 using System.Runtime.InteropServices;
+using MockHttp.Responses;
 using MockHttp.Threading;
 
-namespace MockHttp.Responses;
+namespace MockHttp.Response.Behaviors;
 
 internal sealed class TimeoutBehavior
     : IResponseBehavior

src/MockHttp/Responses/TransferRateBehavior.cs → src/MockHttp/Internal/Response/Behaviors/TransferRateBehavior.cs

@@ -1,7 +1,8 @@
 using System.Net;
 using MockHttp.IO;
+using MockHttp.Responses;
 
-namespace MockHttp.Responses;
+namespace MockHttp.Response.Behaviors;
 
 internal sealed class TransferRateBehavior : IResponseBehavior
 {

src/MockHttp/Responses/ExceptionStrategy.cs → src/MockHttp/Internal/Response/ExceptionStrategy.cs

@@ -1,4 +1,6 @@
-namespace MockHttp.Responses;
+using MockHttp.Responses;
+
+namespace MockHttp.Response;
 
 internal sealed class ExceptionStrategy : IResponseStrategy
 {

src/MockHttp/Responses/ResponseFuncStrategy.cs → src/MockHttp/Internal/Response/ResponseFuncStrategy.cs

@@ -1,4 +1,6 @@
-namespace MockHttp.Responses;
+using MockHttp.Responses;
+
+namespace MockHttp.Response;
 
 internal sealed class ResponseFuncStrategy : IResponseStrategy
 {

src/MockHttp/Language/Flow/Response/EnsureHttpContentBehavior.cs

@@ -1,4 +1,5 @@
-using MockHttp.Responses;
+using MockHttp.Http;
+using MockHttp.Responses;
 
 namespace MockHttp.Language.Flow.Response;
 

src/MockHttp/Language/Flow/Response/ResponseBuilder.cs

@@ -1,7 +1,9 @@
 using System.Collections.ObjectModel;
 using System.Net;
 using System.Net.Http.Headers;
+using MockHttp.Extensions;
 using MockHttp.Http;
+using MockHttp.Response.Behaviors;
 using MockHttp.Responses;
 
 namespace MockHttp.Language.Flow.Response;

src/MockHttp/Language/Flow/SetupPhrase.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using MockHttp.Response;
 using MockHttp.Responses;
 
 namespace MockHttp.Language.Flow;

src/MockHttp/Matchers/AnyMatcher.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using MockHttp.Extensions;
 using MockHttp.Responses;
 
 namespace MockHttp.Matchers;

src/MockHttp/Matchers/PartialContentMatcher.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using MockHttp.Extensions;
 
 namespace MockHttp.Matchers;
 

src/MockHttp/MockHttp.csproj.DotSettings

@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=extensions/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=extensions/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=internal/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/MockHttp/MockHttpHandler.cs

@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 using System.Net;
 using System.Text;
+using MockHttp.Extensions;
 using MockHttp.Language;
 using MockHttp.Language.Flow;
 using MockHttp.Matchers;

src/MockHttp/RequestMatching.cs

@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using MockHttp.Matchers;
+using MockHttp.Request;
 
 namespace MockHttp;
 

test/MockHttp.Tests/Responses/BitRateTests.cs → test/MockHttp.Tests/BitRateTests.cs

@@ -1,6 +1,6 @@
 using static MockHttp.BitRate;
 
-namespace MockHttp.Responses;
+namespace MockHttp;
 
 public sealed class BitRateTests
 {

test/MockHttp.Tests/Extensions/IRespondsExtensionsTests.cs

@@ -5,7 +5,7 @@
 using MockHttp.Language.Flow;
 using MockHttp.Responses;
 
-namespace MockHttp.Extensions;
+namespace MockHttp;
 
 public class IRespondsExtensionsTests
 {

test/MockHttp.Tests/Extensions/RequestMatchingExtensionsTests.cs

@@ -1,15 +1,15 @@
-using System;
-using System.Collections.Specialized;
+using System.Collections.Specialized;
 using System.Linq.Expressions;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Xml;
+using MockHttp.Extensions;
 using MockHttp.Http;
 using MockHttp.Matchers;
 using MockHttp.Responses;
 using static MockHttp.Http.UriExtensions;
 
-namespace MockHttp.Extensions;
+namespace MockHttp;
 
 public abstract class RequestMatchingExtensionsTests
 {

test/MockHttp.Tests/RateLimitedStreamTests.cs → test/MockHttp.Tests/IO/RateLimitedStreamTests.cs

@@ -1,8 +1,7 @@
 using System.Diagnostics;
-using MockHttp.IO;
 using Xunit.Abstractions;
 
-namespace MockHttp;
+namespace MockHttp.IO;
 
 public sealed class RateLimitedStreamTests : IDisposable
 {

test/MockHttp.Tests/Responses/EmptyContentTests.cs → test/MockHttp.Tests/Internal/Http/EmptyContentTests.cs

@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace MockHttp.Responses;
+namespace MockHttp.Http;
 
 public class EmptyContentTests
 {

test/MockHttp.Tests/HttpCallTests.cs → test/MockHttp.Tests/Internal/HttpCallTests.cs

@@ -1,4 +1,5 @@
-using MockHttp.Responses;
+using MockHttp.Response;
+using MockHttp.Responses;
 
 namespace MockHttp;
 

test/MockHttp.Tests/AnyRequestMatchingTests.cs → test/MockHttp.Tests/Internal/Request/AnyRequestMatchingTests.cs

@@ -1,6 +1,6 @@
 using MockHttp.Matchers;
 
-namespace MockHttp;
+namespace MockHttp.Request;
 
 public class AnyRequestMatchingTests
 {

test/MockHttp.Tests/InvertRequestMatchingTests.cs → test/MockHttp.Tests/Internal/Request/InvertRequestMatchingTests.cs

@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace MockHttp;
+namespace MockHttp.Request;
 
 public sealed class InvertRequestMatchingTests : IDisposable
 {

test/MockHttp.Tests/Responses/TimeoutBehaviorTests.cs → test/MockHttp.Tests/Internal/Response/Behaviors/TimeoutBehaviorTests.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics;
+using MockHttp.Responses;
 
-namespace MockHttp.Responses;
+namespace MockHttp.Response.Behaviors;
 
 public class TimeoutBehaviorTests
 {

test/MockHttp.Tests/Responses/ExceptionStrategyTests.cs → test/MockHttp.Tests/Internal/Response/ExceptionStrategyTests.cs

@@ -1,4 +1,6 @@
-namespace MockHttp.Responses;
+using MockHttp.Responses;
+
+namespace MockHttp.Response;
 
 public class ExceptionStrategyTests
 {

test/MockHttp.Tests/Responses/ResponseFuncStrategyTests.cs → test/MockHttp.Tests/Internal/Response/ResponseFuncStrategyTests.cs

@@ -1,4 +1,6 @@
-namespace MockHttp.Responses;
+using MockHttp.Responses;
+
+namespace MockHttp.Response;
 
 public class ResponseFuncStrategyTests
 {

test/MockHttp.Tests/Matchers/RequestUriMatcherTests.cs

@@ -2,6 +2,7 @@
 
 namespace MockHttp.Matchers;
 
+[Obsolete($"Replaced with {nameof(UriMatcher)}. Will be removed in next major release.")]
 public class RequestUriMatcherTests
 {
     [Theory]

test/MockHttp.Tests/MockHttp.Tests.csproj.DotSettings

@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=extensions/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=internal/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

test/MockHttp.Tests/RequestMatchingTests.cs

@@ -1,4 +1,5 @@
 using MockHttp.Matchers;
+using MockHttp.Request;
 
 namespace MockHttp;