Move HTTP related types to http namespace, and policy types to… (#6939)

Azure · Jul 16, 2019 · f31e18d · f31e18d
1 parent 9dea72e
commit f31e18d
Show file tree

Hide file tree

Showing 60 changed files with 316 additions and 327 deletions.
diff --git a/...configuration/Azure.ApplicationModel.Configuration/samples/Sample7_ConfiguringPipeline.cs b/...configuration/Azure.ApplicationModel.Configuration/samples/Sample7_ConfiguringPipeline.cs
@@ -3,7 +3,6 @@
 // license information.
 
 using Azure.Core.Pipeline;
-using Azure.Core.Pipeline.Policies;
 using NUnit.Framework;
 using System;
 using System.Net.Http;

diff --git a/...configuration/Azure.ApplicationModel.Configuration/src/ConfigurationClientModelFactory.cs b/...configuration/Azure.ApplicationModel.Configuration/src/ConfigurationClientModelFactory.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using Azure.Core.Http;
 
 namespace Azure.ApplicationModel.Configuration
 {

diff --git a/sdk/appconfiguration/Azure.ApplicationModel.Configuration/src/ConfigurationClient_private.cs b/sdk/appconfiguration/Azure.ApplicationModel.Configuration/src/ConfigurationClient_private.cs
@@ -11,6 +11,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
+using Azure.Core.Http;
 using Azure.Core.Pipeline;
 
 namespace Azure.ApplicationModel.Configuration

diff --git a/sdk/appconfiguration/Azure.ApplicationModel.Configuration/src/ConfigurationSetting.cs b/sdk/appconfiguration/Azure.ApplicationModel.Configuration/src/ConfigurationSetting.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using Azure.Core;
+using Azure.Core.Http;
 
 namespace Azure.ApplicationModel.Configuration
 {

diff --git a/sdk/appconfiguration/Azure.ApplicationModel.Configuration/src/ConfigurationSettingParser.cs b/sdk/appconfiguration/Azure.ApplicationModel.Configuration/src/ConfigurationSettingParser.cs
@@ -9,6 +9,7 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure.Core.Http;
 
 namespace Azure.ApplicationModel.Configuration
 {

diff --git a/sdk/appconfiguration/Azure.ApplicationModel.Configuration/tests/ConfigurationMockTests.cs b/sdk/appconfiguration/Azure.ApplicationModel.Configuration/tests/ConfigurationMockTests.cs
@@ -10,6 +10,7 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure.Core.Http;
 using NUnit.Framework;
 
 namespace Azure.ApplicationModel.Configuration.Tests

diff --git a/sdk/appconfiguration/Azure.ApplicationModel.Configuration/tests/ConfigurationSettingTests.cs b/sdk/appconfiguration/Azure.ApplicationModel.Configuration/tests/ConfigurationSettingTests.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using Azure.Core;
+using Azure.Core.Http;
 
 namespace Azure.ApplicationModel.Configuration.Tests
 {

diff --git a/sdk/core/Azure.Core/src/ETag.cs → sdk/core/Azure.Core/src/Http/ETag.cs b/sdk/core/Azure.Core/src/ETag.cs → sdk/core/Azure.Core/src/Http/ETag.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Azure
+namespace Azure.Core.Http
 {
     public readonly struct ETag : IEquatable<ETag>
     {

diff --git a/....Core/src/Pipeline/HttpClientTransport.cs → ...zure.Core/src/Http/HttpClientTransport.cs b/....Core/src/Pipeline/HttpClientTransport.cs → ...zure.Core/src/Http/HttpClientTransport.cs
diff --git a/sdk/core/Azure.Core/src/Http/HttpHeader.cs b/sdk/core/Azure.Core/src/Http/HttpHeader.cs
@@ -2,9 +2,8 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Runtime.InteropServices;
 
-namespace Azure.Core.Pipeline
+namespace Azure.Core.Http
 {
     public readonly struct HttpHeader : IEquatable<HttpHeader>
     {

diff --git a/.../Azure.Core/src/HttpPipelineUriBuilder.cs → ...e.Core/src/Http/HttpPipelineUriBuilder.cs b/.../Azure.Core/src/HttpPipelineUriBuilder.cs → ...e.Core/src/Http/HttpPipelineUriBuilder.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Text;
 
-namespace Azure.Core
+namespace Azure.Core.Http
 {
     public class RequestUriBuilder
     {

diff --git a/sdk/core/Azure.Core/src/Http/HttpRange.cs b/sdk/core/Azure.Core/src/Http/HttpRange.cs
@@ -4,7 +4,6 @@
 using System;
 using System.ComponentModel;
 using System.Globalization;
-using Azure.Core.Pipeline;
 
 namespace Azure.Core.Http
 {

diff --git a/sdk/core/Azure.Core/src/RequestHeaders.cs → ...ore/Azure.Core/src/Http/RequestHeaders.cs b/sdk/core/Azure.Core/src/RequestHeaders.cs → ...ore/Azure.Core/src/Http/RequestHeaders.cs
@@ -3,7 +3,6 @@
 
 using System.Collections;
 using System.Collections.Generic;
-using Azure.Core.Pipeline;
 
 namespace Azure.Core.Http
 {

diff --git a/sdk/core/Azure.Core/src/ResponseHeaders.cs → ...re/Azure.Core/src/Http/ResponseHeaders.cs b/sdk/core/Azure.Core/src/ResponseHeaders.cs → ...re/Azure.Core/src/Http/ResponseHeaders.cs
@@ -5,9 +5,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using Azure.Core.Pipeline;
 
-namespace Azure
+namespace Azure.Core.Http
 {
     public readonly struct ResponseHeaders: IEnumerable<HttpHeader>
     {

diff --git a/sdk/core/Azure.Core/src/OperationOfT.cs b/sdk/core/Azure.Core/src/OperationOfT.cs
@@ -57,7 +57,7 @@ protected set
         public abstract bool HasValue { get; }
 
         /// <summary>
-        /// Polling interval used by WaitCompletionAsync method. 
+        /// Polling interval used by WaitCompletionAsync method.
         /// </summary>
         /// <remarks>
         /// The interval can change based on information returned from the server.

diff --git a/...licies/BearerTokenAuthenticationPolicy.cs → ...peline/BearerTokenAuthenticationPolicy.cs b/...licies/BearerTokenAuthenticationPolicy.cs → ...peline/BearerTokenAuthenticationPolicy.cs
@@ -5,15 +5,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Azure.Core.Http;
 
-namespace Azure.Core.Pipeline.Policies
+namespace Azure.Core.Pipeline
 {
     public class BearerTokenAuthenticationPolicy: HttpPipelinePolicy
     {
         private readonly TokenCredential _credential;
 
         private readonly string[] _scopes;
-        
+
         private string _headerValue;
 
         private DateTimeOffset _refreshOn;

diff --git a/...Pipeline/Policies/BufferResponsePolicy.cs → ...Core/src/Pipeline/BufferResponsePolicy.cs b/...Pipeline/Policies/BufferResponsePolicy.cs → ...Core/src/Pipeline/BufferResponsePolicy.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Azure.Core.Pipeline.Policies
+namespace Azure.Core.Pipeline
 {
     internal class BufferResponsePolicy: HttpPipelinePolicy
     {

diff --git a/...ipeline/Policies/ClientRequestIdPolicy.cs → ...ore/src/Pipeline/ClientRequestIdPolicy.cs b/...ipeline/Policies/ClientRequestIdPolicy.cs → ...ore/src/Pipeline/ClientRequestIdPolicy.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Core.Pipeline.Policies
+namespace Azure.Core.Pipeline
 {
     internal class ClientRequestIdPolicy : SynchronousHttpPipelinePolicy
     {

diff --git a/sdk/core/Azure.Core/src/Pipeline/HttpPipelineBuilder.cs b/sdk/core/Azure.Core/src/Pipeline/HttpPipelineBuilder.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Azure.Core.Pipeline.Policies;
 
 namespace Azure.Core.Pipeline
 {

diff --git a/...re/src/Pipeline/Policies/LoggingPolicy.cs → .../Azure.Core/src/Pipeline/LoggingPolicy.cs b/...re/src/Pipeline/Policies/LoggingPolicy.cs → .../Azure.Core/src/Pipeline/LoggingPolicy.cs
@@ -8,8 +8,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core.Diagnostics;
+using Azure.Core.Http;
 
-namespace Azure.Core.Pipeline.Policies
+namespace Azure.Core.Pipeline
 {
     internal class LoggingPolicy : HttpPipelinePolicy
     {

diff --git a/sdk/core/Azure.Core/src/RetriableStream.cs → ...zure.Core/src/Pipeline/RetriableStream.cs b/sdk/core/Azure.Core/src/RetriableStream.cs → ...zure.Core/src/Pipeline/RetriableStream.cs
@@ -8,9 +8,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core.Pipeline;
-using Azure.Core.Pipeline.Policies;
 
-namespace Azure.Core
+namespace Azure.Core.Pipeline
 {
     public static class RetriableStream
     {

diff --git a/sdk/core/Azure.Core/src/Pipeline/RetryOptions.cs b/sdk/core/Azure.Core/src/Pipeline/RetryOptions.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using Azure.Core.Pipeline.Policies;
 
 namespace Azure.Core.Pipeline
 {

diff --git a/...Core/src/Pipeline/Policies/RetryPolicy.cs → ...re/Azure.Core/src/Pipeline/RetryPolicy.cs b/...Core/src/Pipeline/Policies/RetryPolicy.cs → ...re/Azure.Core/src/Pipeline/RetryPolicy.cs
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using Azure.Core.Diagnostics;
 
-namespace Azure.Core.Pipeline.Policies
+namespace Azure.Core.Pipeline
 {
     internal class RetryPolicy : HttpPipelinePolicy
     {

diff --git a/...e/src/Pipeline/Policies/TaskExtensions.cs → ...Azure.Core/src/Pipeline/TaskExtensions.cs b/...e/src/Pipeline/Policies/TaskExtensions.cs → ...Azure.Core/src/Pipeline/TaskExtensions.cs
@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
 
-namespace Azure.Core.Pipeline.Policies
+namespace Azure.Core.Pipeline
 {
     internal static class TaskExtensions
     {

diff --git a/.../src/Pipeline/Policies/TelemetryPolicy.cs → ...zure.Core/src/Pipeline/TelemetryPolicy.cs b/.../src/Pipeline/Policies/TelemetryPolicy.cs → ...zure.Core/src/Pipeline/TelemetryPolicy.cs
@@ -2,10 +2,11 @@
 // Licensed under the MIT License.
 
 using System.Runtime.InteropServices;
+using Azure.Core.Http;
 
-namespace Azure.Core.Pipeline.Policies
+namespace Azure.Core.Pipeline
 {
-    public class TelemetryPolicy : SynchronousHttpPipelinePolicy
+    internal class TelemetryPolicy : SynchronousHttpPipelinePolicy
     {
         private readonly string _header;
 

diff --git a/sdk/core/Azure.Core/src/Response.cs b/sdk/core/Azure.Core/src/Response.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Azure.Core.Http;
 using Azure.Core.Pipeline;
 
 namespace Azure

diff --git a/sdk/core/Azure.Core/src/ResponseExceptionExtensions.cs b/sdk/core/Azure.Core/src/ResponseExceptionExtensions.cs
@@ -1,13 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using Azure.Core.Pipeline;
-using Azure.Core.Pipeline.Policies;
 
 namespace Azure.Core
 {

diff --git a/sdk/core/Azure.Core/tests/BearerTokenAuthenticationPolicyTests.cs b/sdk/core/Azure.Core/tests/BearerTokenAuthenticationPolicyTests.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Azure.Core.Pipeline.Policies;
+using Azure.Core.Pipeline;
 using Azure.Core.Testing;
 using Moq;
 using NUnit.Framework;

diff --git a/sdk/core/Azure.Core/tests/BufferResponsePolicyTests.cs b/sdk/core/Azure.Core/tests/BufferResponsePolicyTests.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Azure.Core.Pipeline.Policies;
+using Azure.Core.Pipeline;
 using Azure.Core.Testing;
 using NUnit.Framework;
 

diff --git a/sdk/core/Azure.Core/tests/ClientRequestIdPolicyTests.cs b/sdk/core/Azure.Core/tests/ClientRequestIdPolicyTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Threading.Tasks;
-using Azure.Core.Pipeline.Policies;
+using Azure.Core.Pipeline;
 using Azure.Core.Testing;
 using NUnit.Framework;
 

diff --git a/sdk/core/Azure.Core/tests/ETagTests.cs b/sdk/core/Azure.Core/tests/ETagTests.cs
@@ -1,10 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NUnit;
+using Azure.Core.Http;
 using NUnit.Framework;
 
 namespace Azure.Core.Tests

diff --git a/sdk/core/Azure.Core/tests/EventSourceTests.cs b/sdk/core/Azure.Core/tests/EventSourceTests.cs
@@ -11,7 +11,6 @@
 using Azure.Core.Diagnostics;
 using Azure.Core.Http;
 using Azure.Core.Pipeline;
-using Azure.Core.Pipeline.Policies;
 using Azure.Core.Testing;
 using NUnit.Framework;
 

diff --git a/sdk/core/Azure.Core/tests/ExponentialPolicyTest.cs b/sdk/core/Azure.Core/tests/ExponentialPolicyTest.cs
@@ -2,10 +2,9 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Threading;
 using System.Threading.Tasks;
+using Azure.Core.Http;
 using Azure.Core.Pipeline;
-using Azure.Core.Pipeline.Policies;
 using Azure.Core.Testing;
 using NUnit.Framework;
 

diff --git a/sdk/core/Azure.Core/tests/FailedResponseExceptionTests.cs b/sdk/core/Azure.Core/tests/FailedResponseExceptionTests.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
+using Azure.Core.Http;
 using Azure.Core.Pipeline;
 using Azure.Core.Testing;
 using NUnit.Framework;

diff --git a/sdk/core/Azure.Core/tests/FixedRetryPolicyTests.cs b/sdk/core/Azure.Core/tests/FixedRetryPolicyTests.cs
@@ -2,10 +2,9 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Threading;
 using System.Threading.Tasks;
+using Azure.Core.Http;
 using Azure.Core.Pipeline;
-using Azure.Core.Pipeline.Policies;
 using Azure.Core.Testing;
 using NUnit.Framework;
 

diff --git a/sdk/core/Azure.Core/tests/HeadersTests.cs b/sdk/core/Azure.Core/tests/HeadersTests.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Text;
 using System.Text.RegularExpressions;
+using Azure.Core.Http;
 using Azure.Core.Pipeline;
 using Azure.Core.Testing;
 using NUnit.Framework;

diff --git a/sdk/core/Azure.Core/tests/PipelineTests.cs b/sdk/core/Azure.Core/tests/PipelineTests.cs
@@ -2,11 +2,9 @@
 // Licensed under the MIT License.
 
 using Azure.Core.Pipeline;
-using Azure.Core.Pipeline.Policies;
 using Azure.Core.Testing;
 using NUnit.Framework;
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/sdk/core/Azure.Core/tests/RequestUriBuilderTest.cs b/sdk/core/Azure.Core/tests/RequestUriBuilderTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using Azure.Core.Http;
 using NUnit.Framework;
 
 namespace Azure.Core.Tests

diff --git a/sdk/core/Azure.Core/tests/RetryPolicyTestBase.cs b/sdk/core/Azure.Core/tests/RetryPolicyTestBase.cs
@@ -9,8 +9,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core.Diagnostics;
+using Azure.Core.Http;
 using Azure.Core.Pipeline;
-using Azure.Core.Pipeline.Policies;
 using Azure.Core.Testing;
 using NUnit.Framework;
 

diff --git a/sdk/core/Azure.Core/tests/TelemetryPolicyTests.cs b/sdk/core/Azure.Core/tests/TelemetryPolicyTests.cs
@@ -2,11 +2,9 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Azure.Core.Pipeline;
-using Azure.Core.Pipeline.Policies;
 using Azure.Core.Testing;
 using NUnit.Framework;
 

diff --git a/sdk/core/Azure.Core/tests/TestFramework/MockResponse.cs b/sdk/core/Azure.Core/tests/TestFramework/MockResponse.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using Azure.Core.Http;
 using Azure.Core.Pipeline;
 
 namespace Azure.Core.Testing

diff --git a/sdk/identity/Azure.Identity/src/AadIdentityClient.cs b/sdk/identity/Azure.Identity/src/AadIdentityClient.cs
@@ -3,7 +3,6 @@
 
 using Azure.Core;
 using Azure.Core.Pipeline;
-using Azure.Core.Pipeline.Policies;
 using System;
 using System.Buffers;
 using System.Collections.Generic;