Drop odataQueryHandler

src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj

@@ -101,10 +101,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.17.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.0.0-preview.4" />
-    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.0.0-preview.1" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.0.0-preview.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.0.0-preview.1" />
-    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.0.0-preview.5" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.0.0-preview.5" />
+    <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.0.0-preview.2" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.0.0-preview.4" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.0.0-preview.2" />
+    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.0.0-preview.6" />
   </ItemGroup>
 </Project>

src/Microsoft.Graph.Core/Requests/GraphClientFactory.cs

@@ -9,6 +9,7 @@ namespace Microsoft.Graph
     using System.Net;
     using System.Net.Http;
     using System.Net.Http.Headers;
+    using Microsoft.Kiota.Http.HttpClientLibrary;
     using Microsoft.Kiota.Http.HttpClientLibrary.Middleware;
 
     /// <summary>
@@ -110,13 +111,13 @@ public static HttpClient Create(
         /// <returns></returns>
         public static IList<DelegatingHandler> CreateDefaultHandlers(GraphClientOptions graphClientOptions = null)
         {
-            return new List<DelegatingHandler> {
-                new GraphTelemetryHandler(graphClientOptions),
-                new OdataQueryHandler(),
-                new CompressionHandler(),
-                new RetryHandler(),
-                new RedirectHandler()
-            };
+            var handlers = KiotaClientFactory.CreateDefaultHandlers();
+            handlers.Add(new GraphTelemetryHandler(graphClientOptions));// add the telemetry handler last.
+
+            // TODO remove this once https://github.com/microsoft/kiota/issues/598 is closed.
+            handlers.Insert(0, new CompressionHandler());
+
+            return handlers;
         }
 
         /// <summary>

src/Microsoft.Graph.Core/Requests/Middleware/GraphTelemetryHandler.cs

@@ -72,8 +72,10 @@ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage httpRe
             features += " runtimeEnvironment=" + RuntimeInformation.FrameworkDescription + ";";
 
             var telemetryString = $"{serviceLibraryString} {coreLibraryString} (featureUsage={Enum.Format(typeof(FeatureFlag), httpRequest.GetFeatureFlags(), "x")};{features})";
-            httpRequest.Headers.Add(CoreConstants.Headers.SdkVersionHeaderName, telemetryString);
-            httpRequest.Headers.Add(CoreConstants.Headers.ClientRequestId, Guid.NewGuid().ToString());
+            if(!httpRequest.Headers.Contains(CoreConstants.Headers.SdkVersionHeaderName))
+                httpRequest.Headers.Add(CoreConstants.Headers.SdkVersionHeaderName, telemetryString);
+            if (!httpRequest.Headers.Contains(CoreConstants.Headers.ClientRequestId))
+                httpRequest.Headers.Add(CoreConstants.Headers.ClientRequestId, Guid.NewGuid().ToString());
 
             return base.SendAsync(httpRequest, cancellationToken);
         }

tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/GraphClientFactoryTests.cs

@@ -68,12 +68,12 @@ public void Should_CreatePipeline_Without_CompressionHandler()
         [Fact]
         public void Should_CreatePipeline_Without_HttpMessageHandlerInput()
         {
-            using GraphTelemetryHandler telemetryHandler = (GraphTelemetryHandler)GraphClientFactory.CreatePipeline(handlers);
-            using OdataQueryHandler odataQueryHandler = (OdataQueryHandler)telemetryHandler.InnerHandler;
-            using CompressionHandler compressionHandler = (CompressionHandler)odataQueryHandler.InnerHandler;
+            using CompressionHandler compressionHandler = (CompressionHandler)GraphClientFactory.CreatePipeline(handlers, new MockRedirectHandler());
             using RetryHandler retryHandler = (RetryHandler)compressionHandler.InnerHandler;
             using RedirectHandler redirectHandler = (RedirectHandler)retryHandler.InnerHandler;
-            using HttpMessageHandler innerMost = redirectHandler.InnerHandler;
+            using ParametersNameDecodingHandler odataQueryHandler = (ParametersNameDecodingHandler)redirectHandler.InnerHandler;
+            using GraphTelemetryHandler telemetryHandler = (GraphTelemetryHandler)odataQueryHandler.InnerHandler;
+            using MockRedirectHandler innerMost = (MockRedirectHandler)telemetryHandler.InnerHandler;
 
             Assert.NotNull(telemetryHandler);
             Assert.NotNull(odataQueryHandler);
@@ -82,7 +82,7 @@ public void Should_CreatePipeline_Without_HttpMessageHandlerInput()
             Assert.NotNull(redirectHandler);
             Assert.NotNull(innerMost);
             Assert.IsType<GraphTelemetryHandler>(telemetryHandler);
-            Assert.IsType<OdataQueryHandler>(odataQueryHandler);
+            Assert.IsType<ParametersNameDecodingHandler>(odataQueryHandler);
             Assert.IsType<CompressionHandler>(compressionHandler);
             Assert.IsType<RetryHandler>(retryHandler);
             Assert.IsType<RedirectHandler>(redirectHandler);
@@ -93,12 +93,12 @@ public void Should_CreatePipeline_Without_HttpMessageHandlerInput()
         [Fact]
         public void CreatePipelineWithHttpMessageHandlerInput()
         {
-            using GraphTelemetryHandler telemetryHandler = (GraphTelemetryHandler)GraphClientFactory.CreatePipeline(handlers, new MockRedirectHandler());
-            using OdataQueryHandler odataQueryHandler = (OdataQueryHandler)telemetryHandler.InnerHandler;
-            using CompressionHandler compressionHandler = (CompressionHandler)odataQueryHandler.InnerHandler;
+            using CompressionHandler compressionHandler = (CompressionHandler)GraphClientFactory.CreatePipeline(handlers, new MockRedirectHandler());
             using RetryHandler retryHandler = (RetryHandler)compressionHandler.InnerHandler;
             using RedirectHandler redirectHandler = (RedirectHandler)retryHandler.InnerHandler;
-            using MockRedirectHandler innerMost = (MockRedirectHandler)redirectHandler.InnerHandler;
+            using ParametersNameDecodingHandler odataQueryHandler = (ParametersNameDecodingHandler)redirectHandler.InnerHandler;
+            using GraphTelemetryHandler telemetryHandler = (GraphTelemetryHandler)odataQueryHandler.InnerHandler;
+            using MockRedirectHandler innerMost = (MockRedirectHandler)telemetryHandler.InnerHandler;
 
             Assert.NotNull(telemetryHandler);
             Assert.NotNull(odataQueryHandler);
@@ -107,7 +107,7 @@ public void CreatePipelineWithHttpMessageHandlerInput()
             Assert.NotNull(redirectHandler);
             Assert.NotNull(innerMost);
             Assert.IsType<GraphTelemetryHandler>(telemetryHandler);
-            Assert.IsType<OdataQueryHandler>(odataQueryHandler);
+            Assert.IsType<ParametersNameDecodingHandler>(odataQueryHandler);
             Assert.IsType<CompressionHandler>(compressionHandler);
             Assert.IsType<RetryHandler>(retryHandler);
             Assert.IsType<RedirectHandler>(redirectHandler);

tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/Middleware/TelemetryHandlerTests.cs

@@ -96,4 +96,17 @@ public async Task TelemetryHandlerShouldSetTelemetryHeaderWithCustomConfiguratio
             Assert.Contains($" runtimeEnvironment={RuntimeInformation.FrameworkDescription};", telemetryHeaderString);
         }
     }
+
+    internal class FakeSuccessHandler : DelegatingHandler
+    {
+        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            var response = new HttpResponseMessage
+            {
+                StatusCode = System.Net.HttpStatusCode.OK,
+                RequestMessage = request
+            };
+            return Task.FromResult(response);
+        }
+    }
 }