Testing changes

Author: adrian05-ms

components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/RedirectHandler.java

@@ -29,24 +29,37 @@
  */
 public class RedirectHandler implements Interceptor {
     @Nonnull private final RedirectHandlerOption mRedirectOption;
+    @Nullable private final java.net.ProxySelector mProxySelector;
 
     /**
      * Initialize using default redirect options, default IShouldRedirect and max redirect value
      */
     public RedirectHandler() {
-        this(null);
+        this(null, null);
     }
 
     /**
      * Initialize using custom redirect options.
      * @param redirectOption pass instance of redirect options to be used
      */
     public RedirectHandler(@Nullable final RedirectHandlerOption redirectOption) {
+        this(redirectOption, null);
+    }
+
+    /**
+     * Initialize using custom redirect options and proxy selector.
+     * @param redirectOption pass instance of redirect options to be used
+     * @param proxySelector The ProxySelector to use for determining proxy configuration, or null to use the system default
+     */
+    public RedirectHandler(
+            @Nullable final RedirectHandlerOption redirectOption,
+            @Nullable final java.net.ProxySelector proxySelector) {
         if (redirectOption == null) {
             this.mRedirectOption = new RedirectHandlerOption();
         } else {
             this.mRedirectOption = redirectOption;
         }
+        this.mProxySelector = proxySelector != null ? proxySelector : java.net.ProxySelector.getDefault();
     }
 
     boolean isRedirected(
@@ -111,8 +124,7 @@ Request getRedirect(
 
         // Scrub sensitive headers before following the redirect
         java.util.function.Function<HttpUrl, java.net.Proxy> proxyResolver =
-                RedirectHandlerOption.getProxyResolver(
-                        chain.call().client().proxySelector());
+                RedirectHandlerOption.getProxyResolver(mProxySelector);
         redirectOption.scrubSensitiveHeaders().scrubHeaders(
                 requestBuilder, requestUrl, locationUrl, proxyResolver);
 

components/http/okHttp/src/test/java/com/microsoft/kiota/http/middleware/RedirectHandlerTests.java

@@ -84,10 +84,6 @@ void crossHostRedirectStripsAuthHeaders() throws Exception {
 
         // Mock chain to get client without proxy
         Interceptor.Chain chain = mock(Interceptor.Chain.class);
-        Call call = mock(Call.class);
-        OkHttpClient client = new OkHttpClient.Builder().build();
-        when(chain.call()).thenReturn(call);
-        when(call.client()).thenReturn(client);
 
         RedirectHandlerOption option = new RedirectHandlerOption();
         Request result = new RedirectHandler().getRedirect(original, redirect, option, chain);
@@ -143,17 +139,12 @@ void sameHostRedirectKeepsAllHeaders() throws Exception {
 
         // Mock chain with proxy
         Interceptor.Chain chain = mock(Interceptor.Chain.class);
-        Call call = mock(Call.class);
         ProxySelector proxySelector = mock(ProxySelector.class);
         Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("proxy.example.com", 8080));
         when(proxySelector.select(any(URI.class))).thenReturn(Collections.singletonList(proxy));
 
-        OkHttpClient client = new OkHttpClient.Builder().proxySelector(proxySelector).build();
-        when(chain.call()).thenReturn(call);
-        when(call.client()).thenReturn(client);
-
         RedirectHandlerOption option = new RedirectHandlerOption();
-        Request result = new RedirectHandler().getRedirect(original, redirect, option, chain);
+        Request result = new RedirectHandler(option, proxySelector).getRedirect(original, redirect, option, chain);
 
         assertNotNull(result);
         assertEquals("trusted.example.com", result.url().host());
@@ -183,17 +174,12 @@ void crossHostRedirectWithProxyKeepsProxyAuth() throws Exception {
 
         // Mock chain with active proxy
         Interceptor.Chain chain = mock(Interceptor.Chain.class);
-        Call call = mock(Call.class);
         ProxySelector proxySelector = mock(ProxySelector.class);
         Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("proxy.example.com", 8080));
         when(proxySelector.select(any(URI.class))).thenReturn(Collections.singletonList(proxy));
 
-        OkHttpClient client = new OkHttpClient.Builder().proxySelector(proxySelector).build();
-        when(chain.call()).thenReturn(call);
-        when(call.client()).thenReturn(client);
-
         RedirectHandlerOption option = new RedirectHandlerOption();
-        Request result = new RedirectHandler().getRedirect(original, redirect, option, chain);
+        Request result = new RedirectHandler(option, proxySelector).getRedirect(original, redirect, option, chain);
 
         assertNotNull(result);
         assertEquals("other.example.com", result.url().host());
@@ -224,17 +210,12 @@ void crossHostRedirectWithDirectProxyStripsProxyAuth() throws Exception {
 
         // Mock chain with DIRECT proxy (no proxy)
         Interceptor.Chain chain = mock(Interceptor.Chain.class);
-        Call call = mock(Call.class);
         ProxySelector proxySelector = mock(ProxySelector.class);
         when(proxySelector.select(any(URI.class)))
                 .thenReturn(Collections.singletonList(Proxy.NO_PROXY));
 
-        OkHttpClient client = new OkHttpClient.Builder().proxySelector(proxySelector).build();
-        when(chain.call()).thenReturn(call);
-        when(call.client()).thenReturn(client);
-
         RedirectHandlerOption option = new RedirectHandlerOption();
-        Request result = new RedirectHandler().getRedirect(original, redirect, option, chain);
+        Request result = new RedirectHandler(option, proxySelector).getRedirect(original, redirect, option, chain);
 
         assertNotNull(result);
         assertEquals("other.example.com", result.url().host());
@@ -268,10 +249,6 @@ void schemeChangeStripsAuthHeaders() throws Exception {
 
         // Mock chain without proxy
         Interceptor.Chain chain = mock(Interceptor.Chain.class);
-        Call call = mock(Call.class);
-        OkHttpClient client = new OkHttpClient.Builder().build();
-        when(chain.call()).thenReturn(call);
-        when(call.client()).thenReturn(client);
 
         RedirectHandlerOption option = new RedirectHandlerOption();
         Request result = new RedirectHandler().getRedirect(original, redirect, option, chain);
@@ -310,10 +287,6 @@ void customScrubberIsUsed() throws Exception {
 
         // Mock chain
         Interceptor.Chain chain = mock(Interceptor.Chain.class);
-        Call call = mock(Call.class);
-        OkHttpClient client = new OkHttpClient.Builder().build();
-        when(chain.call()).thenReturn(call);
-        when(call.client()).thenReturn(client);
 
         RedirectHandlerOption option = new RedirectHandlerOption(5, null, customScrubber);
         Request result = new RedirectHandler().getRedirect(original, redirect, option, chain);