Skip to content

Commit 49a107b

Browse files
baywetbaywet
committed
- space/tabs fix to make @zengin happy :)
1 parent 61ae79b commit 49a107b

File tree

2 files changed

+71
-71
lines changed

2 files changed

+71
-71
lines changed

‎src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,34 @@
1111

1212
public class TelemetryHandler implements Interceptor{
1313

14-
public static final String SDK_VERSION = "SdkVersion";
15-
public static final String VERSION = "v1.0.6";
16-
public static final String GRAPH_VERSION_PREFIX = "graph-java-core";
14+
public static final String SDK_VERSION = "SdkVersion";
15+
public static final String VERSION = "v1.0.6";
16+
public static final String GRAPH_VERSION_PREFIX = "graph-java-core";
1717
public static final String JAVA_VERSION_PREFIX = "java";
1818
public static final String ANDROID_VERSION_PREFIX = "android";
19-
public static final String CLIENT_REQUEST_ID = "client-request-id";
19+
public static final String CLIENT_REQUEST_ID = "client-request-id";
2020

21-
@Override
22-
public Response intercept(Chain chain) throws IOException {
23-
final Request request = chain.request();
24-
final Request.Builder telemetryAddedBuilder = request.newBuilder();
21+
@Override
22+
public Response intercept(Chain chain) throws IOException {
23+
final Request request = chain.request();
24+
final Request.Builder telemetryAddedBuilder = request.newBuilder();
2525

26-
TelemetryOptions telemetryOptions = request.tag(TelemetryOptions.class);
27-
if(telemetryOptions == null)
28-
telemetryOptions = new TelemetryOptions();
26+
TelemetryOptions telemetryOptions = request.tag(TelemetryOptions.class);
27+
if(telemetryOptions == null)
28+
telemetryOptions = new TelemetryOptions();
2929

30-
final String featureUsage = "(featureUsage=" + telemetryOptions.getFeatureUsage() + ")";
31-
final String javaVersion = System.getProperty("java.version");
32-
final String androidVersion = getAndroidAPILevel();
33-
final String sdkversion_value = GRAPH_VERSION_PREFIX + "/" + VERSION + " " + featureUsage + " " + JAVA_VERSION_PREFIX + "/" + javaVersion + " " + ANDROID_VERSION_PREFIX + "/" + androidVersion;
34-
telemetryAddedBuilder.addHeader(SDK_VERSION, sdkversion_value);
30+
final String featureUsage = "(featureUsage=" + telemetryOptions.getFeatureUsage() + ")";
31+
final String javaVersion = System.getProperty("java.version");
32+
final String androidVersion = getAndroidAPILevel();
33+
final String sdkversion_value = GRAPH_VERSION_PREFIX + "/" + VERSION + " " + featureUsage + " " + JAVA_VERSION_PREFIX + "/" + javaVersion + " " + ANDROID_VERSION_PREFIX + "/" + androidVersion;
34+
telemetryAddedBuilder.addHeader(SDK_VERSION, sdkversion_value);
3535

36-
if(request.header(CLIENT_REQUEST_ID) == null) {
37-
telemetryAddedBuilder.addHeader(CLIENT_REQUEST_ID, telemetryOptions.getClientRequestId());
38-
}
36+
if(request.header(CLIENT_REQUEST_ID) == null) {
37+
telemetryAddedBuilder.addHeader(CLIENT_REQUEST_ID, telemetryOptions.getClientRequestId());
38+
}
3939

40-
return chain.proceed(telemetryAddedBuilder.build());
41-
}
40+
return chain.proceed(telemetryAddedBuilder.build());
41+
}
4242

4343
private String androidAPILevel;
4444
private String getAndroidAPILevel() {

‎src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -13,60 +13,60 @@
1313
import okhttp3.Response;
1414

1515
public class TelemetryHandlerTest {
16-
@Test
17-
public void telemetryInitTest() {
18-
final TelemetryHandler telemetryHandler = new TelemetryHandler();
19-
assertNotNull(telemetryHandler);
20-
}
16+
@Test
17+
public void telemetryInitTest() {
18+
final TelemetryHandler telemetryHandler = new TelemetryHandler();
19+
assertNotNull(telemetryHandler);
20+
}
2121

22-
@Test
23-
public void interceptTest() throws IOException {
24-
final String expectedHeader = TelemetryHandler.GRAPH_VERSION_PREFIX +"/"
25-
+TelemetryHandler.VERSION;
26-
final OkHttpClient client = HttpClients.createDefault(new ICoreAuthenticationProvider() {
27-
@Override
28-
public Request authenticateRequest(Request request) {
29-
return request;
30-
}
31-
});
32-
final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/users/").build();
33-
final Response response = client.newCall(request).execute();
34-
assertNotNull(response);
35-
assertTrue(response.request().header(TelemetryHandler.SDK_VERSION).contains(expectedHeader));
36-
assertTrue(response.request().header(TelemetryHandler.SDK_VERSION).contains(TelemetryHandler.ANDROID_VERSION_PREFIX));
37-
assertTrue(response.request().header(TelemetryHandler.SDK_VERSION).contains(TelemetryHandler.JAVA_VERSION_PREFIX));
38-
}
22+
@Test
23+
public void interceptTest() throws IOException {
24+
final String expectedHeader = TelemetryHandler.GRAPH_VERSION_PREFIX +"/"
25+
+TelemetryHandler.VERSION;
26+
final OkHttpClient client = HttpClients.createDefault(new ICoreAuthenticationProvider() {
27+
@Override
28+
public Request authenticateRequest(Request request) {
29+
return request;
30+
}
31+
});
32+
final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/users/").build();
33+
final Response response = client.newCall(request).execute();
34+
assertNotNull(response);
35+
assertTrue(response.request().header(TelemetryHandler.SDK_VERSION).contains(expectedHeader));
36+
assertTrue(response.request().header(TelemetryHandler.SDK_VERSION).contains(TelemetryHandler.ANDROID_VERSION_PREFIX));
37+
assertTrue(response.request().header(TelemetryHandler.SDK_VERSION).contains(TelemetryHandler.JAVA_VERSION_PREFIX));
38+
}
3939

40-
@Test
41-
public void arrayInterceptorsTest() throws IOException {
40+
@Test
41+
public void arrayInterceptorsTest() throws IOException {
4242

43-
final AuthenticationHandler authenticationHandler = new AuthenticationHandler(new ICoreAuthenticationProvider() {
43+
final AuthenticationHandler authenticationHandler = new AuthenticationHandler(new ICoreAuthenticationProvider() {
4444

45-
@Override
46-
public Request authenticateRequest(Request request) {
47-
return request;
48-
}
49-
});
50-
final Interceptor[] interceptors = {new RetryHandler(), new RedirectHandler(), authenticationHandler};
51-
final OkHttpClient client = HttpClients.createFromInterceptors(interceptors);
52-
final String expectedHeader = TelemetryHandler.GRAPH_VERSION_PREFIX +"/"
53-
+TelemetryHandler.VERSION;
54-
final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/users/").build();
55-
final Response response = client.newCall(request).execute();
56-
assertNotNull(response);
57-
assertTrue(response.request().header(TelemetryHandler.SDK_VERSION).contains(expectedHeader));
58-
}
45+
@Override
46+
public Request authenticateRequest(Request request) {
47+
return request;
48+
}
49+
});
50+
final Interceptor[] interceptors = {new RetryHandler(), new RedirectHandler(), authenticationHandler};
51+
final OkHttpClient client = HttpClients.createFromInterceptors(interceptors);
52+
final String expectedHeader = TelemetryHandler.GRAPH_VERSION_PREFIX +"/"
53+
+TelemetryHandler.VERSION;
54+
final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/users/").build();
55+
final Response response = client.newCall(request).execute();
56+
assertNotNull(response);
57+
assertTrue(response.request().header(TelemetryHandler.SDK_VERSION).contains(expectedHeader));
58+
}
5959

60-
@Test
61-
public void arrayInterceptorEmptyTest() throws IOException {
62-
final Interceptor[] interceptors = null;
63-
final OkHttpClient client = HttpClients.createFromInterceptors(interceptors);
64-
final String expectedHeader = TelemetryHandler.GRAPH_VERSION_PREFIX +"/"
65-
+TelemetryHandler.VERSION;
66-
final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/users/").build();
67-
final Response response = client.newCall(request).execute();
68-
assertNotNull(response);
69-
assertTrue(response.request().header(TelemetryHandler.SDK_VERSION).contains(expectedHeader));
70-
}
60+
@Test
61+
public void arrayInterceptorEmptyTest() throws IOException {
62+
final Interceptor[] interceptors = null;
63+
final OkHttpClient client = HttpClients.createFromInterceptors(interceptors);
64+
final String expectedHeader = TelemetryHandler.GRAPH_VERSION_PREFIX +"/"
65+
+TelemetryHandler.VERSION;
66+
final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/users/").build();
67+
final Response response = client.newCall(request).execute();
68+
assertNotNull(response);
69+
assertTrue(response.request().header(TelemetryHandler.SDK_VERSION).contains(expectedHeader));
70+
}
7171

7272
}

0 commit comments

Comments
 (0)