fix build issues

Author: Ndiritu

spotBugsExcludeFilter.xml

@@ -64,6 +64,7 @@ xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubu
 			<Class name="com.microsoft.graph.core.content.BatchResponseContent" />
 			<Class name="com.microsoft.graph.core.requests.ResponseBodyHandler" />
 			<Class name="com.microsoft.graph.core.requests.upload.UploadResponseHandler" />
+			<Class name="com.microsoft.graph.core.requests.middleware.GraphTelemetryHandlerTest" />
 		</Or>
 	</Match>
 	<Match>
@@ -111,4 +112,4 @@ xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubu
 		<Bug pattern="DCN_NULLPOINTER_EXCEPTION" />
 		<Class name="com.microsoft.graph.core.content.BatchResponseContentTest" />
 	</Match>
-</FindBugsFilter>
+</FindBugsFilter>

src/main/java/com/microsoft/graph/core/requests/GraphClientFactory.java

@@ -62,6 +62,12 @@ public static OkHttpClient.Builder create(@Nonnull BaseBearerTokenAuthentication
         return create(authenticationProvider, new RequestOption[0]);
     }
 
+    /**
+     * OkHttpClient Builder for Graph with specified AuthenticationProvider and RequestOptions to override default graph interceptors
+     * @param authenticationProvider the AuthenticationProvider to use for requests.
+     * @param requestOptions custom request options to override default graph interceptors
+     * @return an OkHttpClient Builder instance.
+     */
     @Nonnull
     public static OkHttpClient.Builder create(@Nonnull BaseBearerTokenAuthenticationProvider authenticationProvider, @Nonnull RequestOption[] requestOptions) {
         final GraphClientOption graphClientOption = new GraphClientOption();
@@ -81,9 +87,9 @@ public static OkHttpClient.Builder create(@Nonnull BaseBearerTokenAuthentication
      */
     @Nonnull
     public static OkHttpClient.Builder create(@Nonnull GraphClientOption graphClientOption, @Nonnull Interceptor... interceptors) {
-        var builder = KiotaClientFactory.create(interceptors);
-        var customInterceptors = builder.interceptors();
-        var telemetryHandlerExists = customInterceptors.stream().anyMatch(x -> x instanceof GraphTelemetryHandler);
+        final OkHttpClient.Builder builder = KiotaClientFactory.create(interceptors);
+        final List<Interceptor> customInterceptors = builder.interceptors();
+        final boolean telemetryHandlerExists = customInterceptors.stream().anyMatch(x -> x instanceof GraphTelemetryHandler);
         if (!telemetryHandlerExists) {
             customInterceptors.add(new GraphTelemetryHandler(graphClientOption));
         }
@@ -112,6 +118,12 @@ public static OkHttpClient.Builder create(@Nullable GraphClientOption graphClien
         return create(graphClientOption, new RequestOption[0]);
     }
 
+    /**
+     * The OkHttpClient Builder with optional GraphClientOption and RequestOptions to override default graph interceptors
+     * @param graphClientOption the GraphClientOption for use in requests.
+     * @param requestOptions custom request options to override default graph interceptors
+     * @return an OkHttpClient Builder instance.
+     */
     @Nonnull
     public static OkHttpClient.Builder create(@Nullable GraphClientOption graphClientOption, @Nonnull RequestOption[] requestOptions) {
         GraphClientOption options = graphClientOption != null ? graphClientOption : new GraphClientOption();
@@ -129,6 +141,12 @@ public static Interceptor[] createDefaultGraphInterceptors(@Nonnull GraphClientO
         return createDefaultGraphInterceptors(graphClientOption, new RequestOption[0]);
     }
 
+    /**
+     * Creates the default Interceptors for use with Graph configured with the provided RequestOptions.
+     * @param graphClientOption the GraphClientOption used to create the GraphTelemetryHandler with.
+     * @param requestOptions custom request options to override default graph interceptors
+     * @return an array of interceptors.
+     */
     @Nonnull
     public static Interceptor[] createDefaultGraphInterceptors(@Nonnull GraphClientOption graphClientOption, @Nonnull RequestOption[] requestOptions) {
         Objects.requireNonNull(requestOptions, "parameter requestOptions cannot be null");
@@ -142,9 +160,7 @@ public static Interceptor[] createDefaultGraphInterceptors(@Nonnull GraphClientO
         }
 
         List<Interceptor> handlers = new ArrayList<>();
-        handlers.add(urlReplaceHandlerOption == null ?
-            new UrlReplaceHandler(new UrlReplaceHandlerOption(CoreConstants.ReplacementConstants.getDefaultReplacementPairs())) :
-            new UrlReplaceHandler(urlReplaceHandlerOption));
+        handlers.add(new UrlReplaceHandler(urlReplaceHandlerOption));
         handlers.add(new GraphTelemetryHandler(graphClientOption));
         handlers.addAll(Arrays.asList(KiotaClientFactory.createDefaultInterceptors(requestOptions)));
         addDefaultFeatureUsages(graphClientOption);

src/test/java/com/microsoft/graph/core/requests/GraphClientFactoryTest.java

@@ -16,8 +16,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import com.azure.core.http.policy.RetryOptions;
-import com.microsoft.graph.core.CoreConstants;
 import com.microsoft.graph.core.authentication.AzureIdentityAccessTokenProvider;
 import com.microsoft.graph.core.authentication.AzureIdentityAuthenticationProvider;
 import com.microsoft.graph.core.requests.middleware.GraphTelemetryHandler;
@@ -89,7 +87,7 @@ void testCreateWithCustomInterceptorsOverwritesDefaults() throws IOException {
             new RedirectHandler()};
         final OkHttpClient client = GraphClientFactory.create(interceptors).build();
         final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/users/").build();
-        final Response response = client.newCall(request).execute();
+        client.newCall(request).execute();
 
         for (Interceptor clientInterceptor : client.interceptors()) {
             if (clientInterceptor instanceof RetryHandler) {

src/test/java/com/microsoft/graph/core/requests/middleware/GraphTelemetryHandlerTest.java

@@ -6,13 +6,11 @@
 import com.microsoft.kiota.http.middleware.RedirectHandler;
 import com.microsoft.kiota.http.middleware.RetryHandler;
 
-import com.microsoft.kiota.http.middleware.options.RetryHandlerOption;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.Assertions;
+
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -33,6 +31,8 @@ void telemetryHandlerDefaultTests() throws IOException {
         final Response response = client.newCall(request).execute();
 
         assertNotNull(response);
+        assertNotNull(response.request());
+        assertNotNull(response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME));
         assertTrue(response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME).contains(expectedCore));
         assertTrue(!response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME).contains(
             CoreConstants.Headers.ANDROID_VERSION_PREFIX)); // Android version is not going to be present on unit tests running on java platform
@@ -51,6 +51,8 @@ void arrayInterceptorsTest() throws IOException {
         final Response response = client.newCall(request).execute();
 
         assertNotNull(response);
+        assertNotNull(response.request());
+        assertNotNull(response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME));
         assertTrue(response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME).contains(expectedCore));
         assertTrue(
             response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME).contains(defaultSDKVersion));
@@ -66,6 +68,8 @@ void arrayInterceptorEmptyTest() throws IOException {
         final Response response = client.newCall(request).execute();
 
         assertNotNull(response);
+        assertNotNull(response.request());
+        assertNotNull(response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME));
         assertTrue(response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME).contains(expectedCore));
         assertTrue(
             response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME).contains(defaultSDKVersion));
@@ -93,6 +97,9 @@ void testClientOptions() throws IOException {
         final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/users/").build();
         final Response response = client.newCall(request).execute();
 
+        assertNotNull(response);
+        assertNotNull(response.request());
+        assertNotNull(response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME));
         assertTrue(response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME).contains(expectedCoreVer));
         assertTrue(
             response.request().header(CoreConstants.Headers.SDK_VERSION_HEADER_NAME).contains(expectedClientEndpoint));