Skip to content

Commit 3f16ee9

Browse files
committed
Fix style violations
1 parent c6bf8a6 commit 3f16ee9

3 files changed

Lines changed: 17 additions & 19 deletions

File tree

components/http/okHttp/src/main/java/com/microsoft/kiota/http/KiotaClientFactory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ private KiotaClientFactory() {}
5858
Objects.requireNonNull(interceptors, "parameter interceptors cannot be null");
5959
final OkHttpClient.Builder builder =
6060
new OkHttpClient.Builder()
61-
.followRedirects(false) // Redirects handled by .middleware.RedirectHandler rather than okhttp
61+
.followRedirects(
62+
false) // Redirects handled by .middleware.RedirectHandler rather
63+
// than okhttp
6264
.connectTimeout(Duration.ofSeconds(100))
6365
.readTimeout(Duration.ofSeconds(100))
6466
.callTimeout(

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,9 @@ Request getRedirect(final Request request, final Response userResponse)
173173
request,
174174
"RedirectHandler_Intercept - redirect " + requestsCount,
175175
span);
176-
if(redirectSpan != null) {
177-
redirectSpan.setAttribute("com.microsoft.kiota.handler.redirect.count", requestsCount);
176+
if (redirectSpan != null) {
177+
redirectSpan.setAttribute(
178+
"com.microsoft.kiota.handler.redirect.count", requestsCount);
178179
redirectSpan.setAttribute("http.status_code", response.code());
179180
redirectSpan.end();
180181
}

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

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
11
package com.microsoft.kiota.http.middleware;
22

3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
35
import com.microsoft.kiota.http.KiotaClientFactory;
46
import com.microsoft.kiota.http.middleware.options.RedirectHandlerOption;
7+
58
import okhttp3.*;
69
import okhttp3.mockwebserver.MockResponse;
710
import okhttp3.mockwebserver.MockWebServer;
8-
import org.junit.jupiter.api.Test;
9-
10-
import static org.junit.jupiter.api.Assertions.assertEquals;
1111

12+
import org.junit.jupiter.api.Test;
1213

1314
@SuppressWarnings("resource")
1415
public class RedirectHandlerTests {
1516

1617
@Test
1718
void redirectsAreFollowedByDefault() throws Exception {
1819
var server = new MockWebServer();
19-
server.enqueue(new MockResponse()
20-
.setResponseCode(301)
21-
.setHeader("Location", server.url("/bar"))
22-
);
23-
server.enqueue(new MockResponse()
24-
.setResponseCode(201)
25-
);
20+
server.enqueue(
21+
new MockResponse().setResponseCode(301).setHeader("Location", server.url("/bar")));
22+
server.enqueue(new MockResponse().setResponseCode(201));
2623

27-
var interceptors = new Interceptor[] { new RedirectHandler() };
24+
var interceptors = new Interceptor[] {new RedirectHandler()};
2825

2926
final OkHttpClient client = KiotaClientFactory.create(interceptors).build();
3027
final Request request = new Request.Builder().url(server.url("/foo")).build();
@@ -42,14 +39,12 @@ void redirectsAreFollowedByDefault() throws Exception {
4239
@Test
4340
void redirectsCanBeDisabled() throws Exception {
4441
var server = new MockWebServer();
45-
server.enqueue(new MockResponse()
46-
.setResponseCode(301)
47-
.setHeader("Location", server.url("/bar"))
48-
);
42+
server.enqueue(
43+
new MockResponse().setResponseCode(301).setHeader("Location", server.url("/bar")));
4944

5045
var ignoreRedirectsOption = new RedirectHandlerOption(0, response -> false);
5146
var redirectHandler = new RedirectHandler(ignoreRedirectsOption);
52-
var interceptors = new Interceptor[] { redirectHandler };
47+
var interceptors = new Interceptor[] {redirectHandler};
5348

5449
final OkHttpClient client = KiotaClientFactory.create(interceptors).build();
5550
final Request request = new Request.Builder().url(server.url("/foo")).build();

0 commit comments

Comments
 (0)