Reshuffle shared source files (Azure#38509)

* Move GZipUtf8JsonRequestContent to Monitor * Move GuidUtilities to ServiceBus * Make GeoRedundantFallbackPolicy internal * move ErrorResponse<T> into HttpPipelineExtensions * Move NoValueResponse<T> to Tables
yaotongms · Oct 12, 2023 · af83deb · af83deb
1 parent 44b83e0
commit af83deb
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 36 deletions.
diff --git a/eng/Directory.Build.Common.targets b/eng/Directory.Build.Common.targets
@@ -198,7 +198,6 @@
     <Compile Include="$(AzureCoreSharedSources)ClientDiagnostics.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)DiagnosticScope.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)DiagnosticScopeFactory.cs" LinkBase="Shared/Core" />
-    <Compile Include="$(AzureCoreSharedSources)ErrorResponse.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)FixedDelayWithNoJitterStrategy.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)FormUrlEncodedContent.cs" LinkBase="Shared/Core" />
     <Compile Include="$(AzureCoreSharedSources)HttpMessageSanitizer.cs" LinkBase="Shared/Core" />

diff --git a/sdk/core/Azure.Core/src/Azure.Core.csproj b/sdk/core/Azure.Core/src/Azure.Core.csproj
@@ -81,7 +81,6 @@
     <Compile Include="Shared\CancellationHelper.cs" />
     <Compile Include="Shared\OperationPoller.cs" />
     <Compile Include="Shared\TypeReferenceTypeAttribute.cs" />
-    <Compile Include="Shared\GeoRedundantFallbackPolicy.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/.../src/Shared/GeoRedundantFallbackPolicy.cs → ...rc/Internal/GeoRedundantFallbackPolicy.cs b/.../src/Shared/GeoRedundantFallbackPolicy.cs → ...rc/Internal/GeoRedundantFallbackPolicy.cs
@@ -4,11 +4,10 @@
 using System;
 using System.Diagnostics;
 using System.Threading;
-using Azure.Core.Pipeline;
 
 #nullable enable
 
-namespace Azure.Core.Shared
+namespace Azure.Core.Pipeline
 {
     /// <summary>
     /// Internal policy that can be used to support georedundant fallbacks for Azure services. The policy maintains the current healthy host
@@ -172,4 +171,4 @@ public void ResetPrimaryIfNeeded()
             }
         }
     }
-}
+}
diff --git a/sdk/core/Azure.Core/src/Shared/ErrorResponse.cs b/sdk/core/Azure.Core/src/Shared/ErrorResponse.cs
diff --git a/sdk/core/Azure.Core/src/Shared/HttpPipelineExtensions.cs b/sdk/core/Azure.Core/src/Shared/HttpPipelineExtensions.cs
@@ -90,5 +90,21 @@ private static (CancellationToken CancellationToken, ErrorOptions ErrorOptions)
 
             return (requestContext.CancellationToken, requestContext.ErrorOptions);
         }
+
+        internal class ErrorResponse<T> : Response<T>
+        {
+            private readonly Response _response;
+            private readonly RequestFailedException _exception;
+
+            public ErrorResponse(Response response, RequestFailedException exception)
+            {
+                _response = response;
+                _exception = exception;
+            }
+
+            public override T Value { get => throw _exception; }
+
+            public override Response GetRawResponse() => _response;
+        }
     }
 }
diff --git a/sdk/core/Azure.Core/tests/Azure.Core.Tests.csproj b/sdk/core/Azure.Core/tests/Azure.Core.Tests.csproj
@@ -35,11 +35,8 @@
     <Compile Include="..\src\Shared\ChangeTrackingDictionary.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\ChangeTrackingList.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\ConnectionString.cs" LinkBase="Shared" />
-    <Compile Include="..\src\Shared\ErrorResponse.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\FormUrlEncodedContent.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\ForwardsClientCallsAttribute.cs" LinkBase="Shared" />
-    <Compile Include="..\src\Shared\GuidUtilities.cs" LinkBase="Shared" />
-    <Compile Include="..\src\Shared\GZipUtf8JsonRequestContent.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\HttpPipelineExtensions.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\IUtf8JsonSerializable.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\IOperationSource.cs" LinkBase="Shared" />
@@ -48,7 +45,6 @@
     <Compile Include="..\src\Shared\LightweightPkcs8Decoder.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\NextLinkOperationImplementation.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\NoBodyResponseOfT.cs" LinkBase="Shared" />
-    <Compile Include="..\src\Shared\NoValueResponseOfT.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\OperationFinalStateVia.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\Optional.cs" LinkBase="Shared" />
     <Compile Include="..\src\Shared\Page.cs" LinkBase="Shared" />

diff --git a/sdk/monitor/Azure.Monitor.Ingestion/src/Azure.Monitor.Ingestion.csproj b/sdk/monitor/Azure.Monitor.Ingestion/src/Azure.Monitor.Ingestion.csproj
@@ -16,7 +16,6 @@
     <Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />
     <Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared" />
     <Compile Include="$(AzureCoreSharedSources)AzureKeyCredentialPolicy.cs" LinkBase="Shared" />
-    <Compile Include="$(AzureCoreSharedSources)GZipUtf8JsonRequestContent.cs" LinkBase="Shared" />
     <Compile Include="$(AzureCoreSharedSources)SyncAsyncEventHandlerExtensions.cs" LinkBase="Shared" />
   </ItemGroup>
   <ItemGroup>

diff --git a/.../src/Shared/GZipUtf8JsonRequestContent.cs → ...gestion/src/GZipUtf8JsonRequestContent.cs b/.../src/Shared/GZipUtf8JsonRequestContent.cs → ...gestion/src/GZipUtf8JsonRequestContent.cs
diff --git a/.../tests/GZipUtf8JsonRequestContentTests.cs → .../tests/GZipUtf8JsonRequestContentTests.cs b/.../tests/GZipUtf8JsonRequestContentTests.cs → .../tests/GZipUtf8JsonRequestContentTests.cs
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Azure.Messaging.ServiceBus.csproj b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Azure.Messaging.ServiceBus.csproj
@@ -42,7 +42,6 @@
     <Compile Include="$(AzureCoreSharedSources)ValueStopwatch.cs" LinkBase="SharedSource\Azure.Core" />
     <Compile Include="$(AzureCoreSharedSources)PageResponseEnumerator.cs" LinkBase="SharedSource\Azure.Core" />
     <Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="SharedSource\Azure.Core" />
-    <Compile Include="$(AzureCoreSharedSources)GuidUtilities.cs" LinkBase="SharedSource\Azure.Core" />
     <Compile Include="$(AzureCoreSharedSources)MessagingClientDiagnostics.cs" LinkBase="SharedSource\Azure.Core" />
     <Compile Include="$(AzureCoreSharedSources)MessagingDiagnosticOperation.cs" LinkBase="SharedSource\Azure.Core" />
     <Compile Include="$(AzureCoreAmqpSharedSources)AmqpAnnotatedMessageConverter.cs" LinkBase="SharedSource\Azure.Core.Amqp" />

diff --git a/...re/Azure.Core/src/Shared/GuidUtilities.cs → ...Messaging.ServiceBus/src/GuidUtilities.cs b/...re/Azure.Core/src/Shared/GuidUtilities.cs → ...Messaging.ServiceBus/src/GuidUtilities.cs
diff --git a/...re/Azure.Core/tests/GuidUtilitiesTests.cs → ...rviceBus/tests/Core/GuidUtilitiesTests.cs b/...re/Azure.Core/tests/GuidUtilitiesTests.cs → ...rviceBus/tests/Core/GuidUtilitiesTests.cs
@@ -5,7 +5,7 @@
 using Azure.Core.Shared;
 using NUnit.Framework;
 
-namespace Azure.Core.Tests;
+namespace Azure.Messaging.ServiceBus.Tests;
 
 public class GuidUtilitiesTests
 {

diff --git a/sdk/tables/Azure.Data.Tables/src/Azure.Data.Tables.csproj b/sdk/tables/Azure.Data.Tables/src/Azure.Data.Tables.csproj
@@ -17,7 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(AzureCoreSharedSources)NoValueResponseOfT.cs" LinkBase="Shared" />
     <Compile Include="$(AzureCoreSharedSources)ForwardsClientCallsAttribute.cs" LinkBase="Shared" />
   </ItemGroup>
   <ItemGroup>

diff --git a/...ure.Core/src/Shared/NoValueResponseOfT.cs → ...ure.Data.Tables/src/NoValueResponseOfT.cs b/...ure.Core/src/Shared/NoValueResponseOfT.cs → ...ure.Data.Tables/src/NoValueResponseOfT.cs
diff --git a/...ure.Core/tests/NoValueResponseOfTTests.cs → ...a.Tables/tests/NoValueResponseOfTTests.cs b/...ure.Core/tests/NoValueResponseOfTTests.cs → ...a.Tables/tests/NoValueResponseOfTTests.cs