Fixing test and format

Author: adrian05-ms

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

@@ -178,9 +178,7 @@ Request getRedirect(
                                 && redirectOption.shouldRedirect().shouldRedirect(response);
 
                 final Request followup =
-                        shouldRedirect
-                                ? getRedirect(request, response, redirectOption)
-                                : null;
+                        shouldRedirect ? getRedirect(request, response, redirectOption) : null;
                 if (followup != null) {
                     response.close();
                     request = followup;

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

@@ -81,8 +81,6 @@ void crossHostRedirectStripsAuthHeaders() throws Exception {
                         .body(ResponseBody.create("", MediaType.parse("text/plain")))
                         .build();
 
-        // Mock chain to get client without proxy
-        Interceptor.Chain chain = mock(Interceptor.Chain.class);
 
         RedirectHandlerOption option = new RedirectHandlerOption();
         Request result = new RedirectHandler().getRedirect(original, redirect, option);
@@ -136,16 +134,14 @@ void sameHostRedirectKeepsAllHeaders() throws Exception {
                         .body(ResponseBody.create("", MediaType.parse("text/plain")))
                         .build();
 
-        // Mock chain with proxy
-        Interceptor.Chain chain = mock(Interceptor.Chain.class);
+        // Setup proxy selector
         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));
 
         RedirectHandlerOption option = new RedirectHandlerOption();
         Request result =
-                new RedirectHandler(option, proxySelector)
-                        .getRedirect(original, redirect, option);
+                new RedirectHandler(option, proxySelector).getRedirect(original, redirect, option);
 
         assertNotNull(result);
         assertEquals("trusted.example.com", result.url().host());
@@ -173,16 +169,14 @@ void crossHostRedirectWithProxyKeepsProxyAuth() throws Exception {
                         .body(ResponseBody.create("", MediaType.parse("text/plain")))
                         .build();
 
-        // Mock chain with active proxy
-        Interceptor.Chain chain = mock(Interceptor.Chain.class);
+        // Setup proxy selector with active proxy
         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));
 
         RedirectHandlerOption option = new RedirectHandlerOption();
         Request result =
-                new RedirectHandler(option, proxySelector)
-                        .getRedirect(original, redirect, option);
+                new RedirectHandler(option, proxySelector).getRedirect(original, redirect, option);
 
         assertNotNull(result);
         assertEquals("other.example.com", result.url().host());
@@ -211,16 +205,14 @@ void crossHostRedirectWithDirectProxyStripsProxyAuth() throws Exception {
                         .body(ResponseBody.create("", MediaType.parse("text/plain")))
                         .build();
 
-        // Mock chain with DIRECT proxy (no proxy)
-        Interceptor.Chain chain = mock(Interceptor.Chain.class);
+        // Setup proxy selector with DIRECT proxy (no proxy)
         ProxySelector proxySelector = mock(ProxySelector.class);
         when(proxySelector.select(any(URI.class)))
                 .thenReturn(Collections.singletonList(Proxy.NO_PROXY));
 
         RedirectHandlerOption option = new RedirectHandlerOption();
         Request result =
-                new RedirectHandler(option, proxySelector)
-                        .getRedirect(original, redirect, option);
+                new RedirectHandler(option, proxySelector).getRedirect(original, redirect, option);
 
         assertNotNull(result);
         assertEquals("other.example.com", result.url().host());
@@ -252,8 +244,6 @@ void schemeChangeStripsAuthHeaders() throws Exception {
                         .body(ResponseBody.create("", MediaType.parse("text/plain")))
                         .build();
 
-        // Mock chain without proxy
-        Interceptor.Chain chain = mock(Interceptor.Chain.class);
 
         RedirectHandlerOption option = new RedirectHandlerOption();
         Request result = new RedirectHandler().getRedirect(original, redirect, option);
@@ -284,8 +274,6 @@ void redirectWithDifferentPortRemovesAuthAndCookie() throws Exception {
                         .body(ResponseBody.create("", MediaType.parse("text/plain")))
                         .build();
 
-        // Mock chain without proxy
-        Interceptor.Chain chain = mock(Interceptor.Chain.class);
 
         RedirectHandlerOption option = new RedirectHandlerOption();
         Request result = new RedirectHandler().getRedirect(original, redirect, option);
@@ -315,8 +303,6 @@ void redirectWithSamePortKeepsAuthAndCookie() throws Exception {
                         .body(ResponseBody.create("", MediaType.parse("text/plain")))
                         .build();
 
-        // Mock chain without proxy
-        Interceptor.Chain chain = mock(Interceptor.Chain.class);
 
         RedirectHandlerOption option = new RedirectHandlerOption();
         Request result = new RedirectHandler().getRedirect(original, redirect, option);
@@ -352,9 +338,6 @@ void customScrubberIsUsed() throws Exception {
                     // Don't remove any headers
                 };
 
-        // Mock chain
-        Interceptor.Chain chain = mock(Interceptor.Chain.class);
-
         RedirectHandlerOption option = new RedirectHandlerOption(5, null, customScrubber);
         Request result = new RedirectHandler().getRedirect(original, redirect, option);
 
@@ -395,7 +378,6 @@ void customScrubberRemovesCustomHeaders() throws Exception {
                     requestBuilder.removeHeader("X-Api-Key");
                 };
 
-        Interceptor.Chain chain = mock(Interceptor.Chain.class);
 
         RedirectHandlerOption option = new RedirectHandlerOption(5, null, customScrubber);
         Request result = new RedirectHandler().getRedirect(original, redirect, option);