Resolved conflicts

Author: peombwa

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

@@ -93,7 +93,7 @@ public static HttpClient Create(string version = "v1.0", string nationalCloud =
                 pipeline = CreatePipeline(CreateDefaultHandlers(), DefaultHttpHandler());
             } else
             {
-                pipeline = CreatePipeline(handlers,DefaultHttpHandler());
+                pipeline = CreatePipeline(handlers, DefaultHttpHandler());
             }
 
             HttpClient client = new HttpClient(pipeline);

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

@@ -79,7 +79,24 @@ public HttpProvider(IAuthenticationProvider authenticationProvider, HttpMessageH
                 new AuthenticationHandler(authenticationProvider)
             };
 
-            this.httpClient = GraphClientFactory.CreateClient(this.httpMessageHandler, handlers);
+            GraphClientFactory.DefaultHttpHandler = () => httpMessageHandler;
+            this.httpClient = GraphClientFactory.Create("v1.0", GraphClientFactory.Global_Cloud, handlers);
+        }
+
+        /// <summary>
+        /// Gets or sets the cache control header for requests;
+        /// </summary>
+        public CacheControlHeaderValue CacheControlHeader
+        {
+            get
+            {
+                return this.httpClient.DefaultRequestHeaders.CacheControl;
+            }
+
+            set
+            {
+                this.httpClient.DefaultRequestHeaders.CacheControl = value;
+            }
         }
 
         /// <summary>

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

@@ -21,15 +21,15 @@ public class GraphClientFactoryTests
     {
         private DelegatingHandler[] handlers = new DelegatingHandler[3];
         private MockRedirectHandler testHttpMessageHandler;
-
+        private MockAuthenticationProvider authenticationProvider = new MockAuthenticationProvider();
 
         [TestInitialize]
         public void Setup()
         {
             this.testHttpMessageHandler = new MockRedirectHandler();
             handlers[0] = new RetryHandler();
             handlers[1] = new RedirectHandler();
-            handlers[2] = new AuthenticationHandler();
+            handlers[2] = new AuthenticationHandler(authenticationProvider.Object);
         }
 
         [TestCleanup]

tests/Microsoft.Graph.Core.Test/Requests/HttpProviderTests.cs

@@ -43,9 +43,8 @@ public void HttpProvider_CustomCacheHeaderAndTimeout()
         {
             var timeout = TimeSpan.FromSeconds(200);
             var cacheHeader = new CacheControlHeaderValue();
-            using (var defaultHttpProvider = new HttpProvider(authProvider.Object, null))
+            using (var defaultHttpProvider = new HttpProvider(null) { CacheControlHeader = cacheHeader, OverallTimeout = timeout })
             {
-                GraphClientFactory.Configure(defaultHttpProvider.httpClient, timeout, null, cacheHeader);
                 Assert.IsFalse(defaultHttpProvider.httpClient.DefaultRequestHeaders.CacheControl.NoCache, "NoCache true.");
                 Assert.IsFalse(defaultHttpProvider.httpClient.DefaultRequestHeaders.CacheControl.NoStore, "NoStore true.");
 
@@ -111,7 +110,7 @@ public async Task OverallTimeout_RequestAlreadySent()
 
             try
             {
-                GraphClientFactory.Configure(this.httpProvider.httpClient, new TimeSpan(0, 0, 30), null, null);
+                this.httpProvider.OverallTimeout = new TimeSpan(0, 0, 30);
             }
             catch (ServiceException serviceException)
             {

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

@@ -20,14 +20,15 @@ public class GraphClientFactoryTests : IDisposable
     {
         private MockRedirectHandler testHttpMessageHandler;
         private DelegatingHandler[] handlers;
+        private MockAuthenticationProvider authenticationProvider = new MockAuthenticationProvider();
 
         public GraphClientFactoryTests()
         {
             this.testHttpMessageHandler = new MockRedirectHandler();
             handlers = handlers = new DelegatingHandler[3];
             handlers[0] = new RetryHandler();
             handlers[1] = new RedirectHandler();
-            handlers[2] = new AuthenticationHandler();
+            handlers[2] = new AuthenticationHandler(authenticationProvider.Object);
 
         }
 

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

@@ -41,10 +41,8 @@ public void HttpProvider_CustomCacheHeaderAndTimeout()
         {
             var timeout = TimeSpan.FromSeconds(200);
             var cacheHeader = new CacheControlHeaderValue();
-            using (var defaultHttpProvider = new HttpProvider(authProvider.Object, null))
+            using (var defaultHttpProvider = new HttpProvider(null) { CacheControlHeader = cacheHeader, OverallTimeout = timeout })
             {
-                GraphClientFactory.Configure(defaultHttpProvider.httpClient, timeout, null, cacheHeader);
-
                 Assert.False(defaultHttpProvider.httpClient.DefaultRequestHeaders.CacheControl.NoCache);
                 Assert.False(defaultHttpProvider.httpClient.DefaultRequestHeaders.CacheControl.NoStore);
 
@@ -103,21 +101,20 @@ public async Task OverallTimeout_RequestAlreadySent()
             {
                 this.testHttpMessageHandler.AddResponseMapping(httpRequestMessage.RequestUri.ToString(), httpResponseMessage);
                 var returnedResponseMessage = await this.httpProvider.SendAsync(httpRequestMessage);
-            }
 
-            try
-            {
-                Assert.Throws<ServiceException>( () => GraphClientFactory.Configure(this.httpProvider.httpClient, new TimeSpan(0, 0,30), null, null));
-            }
-            catch (ServiceException serviceException)
-            {
-                Assert.True(serviceException.IsMatch(ErrorConstants.Codes.NotAllowed));
-                Assert.Equal(
-                    ErrorConstants.Messages.OverallTimeoutCannotBeSet,
-                    serviceException.Error.Message);
-                Assert.IsType(typeof(InvalidOperationException), serviceException.InnerException);
-
-                throw;
+                try
+                {
+                    Assert.Throws<ServiceException>(() => this.httpProvider.OverallTimeout = new TimeSpan(0, 0, 30));
+                }
+                catch (ServiceException serviceException)
+                {
+                    Assert.True(serviceException.IsMatch(ErrorConstants.Codes.NotAllowed));
+                    Assert.Equal(
+                        ErrorConstants.Messages.OverallTimeoutCannotBeSet,
+                        serviceException.Error.Message);
+                    Assert.IsType(typeof(InvalidOperationException), serviceException.InnerException);
+                    throw;
+                }
             }
         }