microsoft · May 1, 2023 · May 1, 2023 · May 1, 2023 · May 1, 2023 · May 1, 2023
diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.4.0
+        uses: dependabot/fetch-metadata@v1.5.1
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+## [0.4.4] - 2023-06-09
+
+### Added
+
+- Fix a bug where the OkHttp client would close InputStream responses before they reach the user code
+
 ## [0.4.3] - 2023-04-17
 
 ### Added

diff --git a/components/abstractions/android/build.gradle b/components/abstractions/android/build.gradle
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13"
-        classpath "com.android.tools.build:gradle:8.0.0"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13.3"
+        classpath "com.android.tools.build:gradle:8.0.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }
 }

diff --git a/components/abstractions/build.gradle b/components/abstractions/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'signing'
     id 'jacoco'
     id 'com.github.spotbugs' version '5.0.14'
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.2.0.3129"
 }
 
 java {

diff --git a/components/abstractions/gradle/dependencies.gradle b/components/abstractions/gradle/dependencies.gradle
@@ -8,9 +8,9 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'com.google.guava:guava:31.1-jre'
+    implementation 'com.google.guava:guava:32.0.0-jre'
     implementation 'org.javatuples:javatuples:1.2'
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
-    implementation 'io.opentelemetry:opentelemetry-api:1.25.0'
-    implementation 'io.opentelemetry:opentelemetry-context:1.25.0'
+    implementation 'io.opentelemetry:opentelemetry-api:1.26.0'
+    implementation 'io.opentelemetry:opentelemetry-context:1.26.0'
 }
diff --git a/components/authentication/azure/android/build.gradle b/components/authentication/azure/android/build.gradle
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13"
-        classpath "com.android.tools.build:gradle:8.0.0"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13.3"
+        classpath "com.android.tools.build:gradle:8.0.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }
 }

diff --git a/components/authentication/azure/build.gradle b/components/authentication/azure/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'signing'
     id 'jacoco'
     id 'com.github.spotbugs' version '5.0.14'
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.2.0.3129"
 }
 
 java {

diff --git a/components/authentication/azure/gradle/dependencies.gradle b/components/authentication/azure/gradle/dependencies.gradle
@@ -8,10 +8,10 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'io.opentelemetry:opentelemetry-api:1.25.0'
-    implementation 'io.opentelemetry:opentelemetry-context:1.25.0'
-    implementation 'com.google.guava:guava:31.1-jre'
-    api 'com.azure:azure-core:1.38.0'
+    implementation 'io.opentelemetry:opentelemetry-api:1.26.0'
+    implementation 'io.opentelemetry:opentelemetry-context:1.26.0'
+    implementation 'com.google.guava:guava:32.0.0-jre'
+    api 'com.azure:azure-core:1.40.0'
 
     api project(':components:abstractions')
 }
diff --git a/components/http/okHttp/android/build.gradle b/components/http/okHttp/android/build.gradle
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13"
-        classpath "com.android.tools.build:gradle:8.0.0"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13.3"
+        classpath "com.android.tools.build:gradle:8.0.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }
 }

diff --git a/components/http/okHttp/build.gradle b/components/http/okHttp/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'signing'
     id 'jacoco'
     id 'com.github.spotbugs' version '5.0.14'
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.2.0.3129"
 }
 
 java {

diff --git a/components/http/okHttp/gradle/dependencies.gradle b/components/http/okHttp/gradle/dependencies.gradle
@@ -9,10 +9,10 @@ dependencies {
 
 
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'io.opentelemetry:opentelemetry-api:1.25.0'
-    implementation 'io.opentelemetry:opentelemetry-context:1.25.0'
-    implementation 'io.opentelemetry:opentelemetry-semconv:1.25.0-alpha'
-    implementation 'com.google.guava:guava:31.1-jre'
+    implementation 'io.opentelemetry:opentelemetry-api:1.26.0'
+    implementation 'io.opentelemetry:opentelemetry-context:1.26.0'
+    implementation 'io.opentelemetry:opentelemetry-semconv:1.26.0-alpha'
+    implementation 'com.google.guava:guava:32.0.0-jre'
     api 'com.squareup.okhttp3:okhttp:4.11.0'
 
     api project(':components:abstractions')

diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java
@@ -325,9 +325,9 @@ public <ModelType> CompletableFuture<ModelType> sendPrimitiveAsync(@Nonnull fina
                             return CompletableFuture.completedFuture(null);
                         } else {
                             if(targetClass == InputStream.class) {
+                                closeResponse = false;
                                 final ResponseBody body = response.body();
                                 if(body == null) {
-                                    closeResponse = false;
                                     return CompletableFuture.completedFuture(null);
                                 }
                                 final InputStream rawInputStream = body.byteStream();

diff --git a/components/http/okHttp/src/test/java/com/microsoft/kiota/http/OkHttpRequestAdapterTest.java b/components/http/okHttp/src/test/java/com/microsoft/kiota/http/OkHttpRequestAdapterTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import okio.Okio;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -13,6 +14,9 @@
 import com.microsoft.kiota.serialization.ParseNodeFactory;
 import com.microsoft.kiota.HttpMethod;
 import com.microsoft.kiota.RequestInformation;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.io.InputStream;
@@ -62,20 +66,30 @@ public Request test() throws Exception {
 	public void SendStreamReturnsUsableStream(int statusCode) throws Exception {
 		final var authenticationProviderMock = mock(AuthenticationProvider.class);
 		when(authenticationProviderMock.authenticateRequest(any(RequestInformation.class), any(Map.class))).thenReturn(CompletableFuture.completedFuture(null));
+		final var text = "my-demo-text";
+		final var bufferedSource = Okio.buffer(Okio.source(new ByteArrayInputStream(text.getBytes("UTF-8"))));
 		final var client = getMockClient(new Response.Builder()
 													.code(statusCode)
 													.message("OK")
 													.protocol(Protocol.HTTP_1_1)
 													.request(new Request.Builder().url("http://localhost").build())
-													.body(ResponseBody.create("".getBytes("UTF-8"), MediaType.parse("application/json")))
+													.body(ResponseBody.create(bufferedSource, MediaType.parse("application/binary"), text.getBytes("UTF-8").length))
 													.build());
 		final var requestAdapter = new OkHttpRequestAdapter(authenticationProviderMock, null, null, client);
 		final var requestInformation = new RequestInformation() {{
 			setUri(new URI("https://localhost"));
 			httpMethod = HttpMethod.GET;
 		}};
-		final var response = requestAdapter.sendPrimitiveAsync(requestInformation, InputStream.class, null).get();
-		assertNotNull(response);
+		InputStream response = null;
+		try {
+			response = requestAdapter.sendPrimitiveAsync(requestInformation, InputStream.class, null).get();
+			assertNotNull(response);
+			assertEquals(text, new String(response.readAllBytes(), StandardCharsets.UTF_8));
+		} finally {
+			if (response != null) {
+				response.close();	
+			}
+		}
 	}
 	@ParameterizedTest
 	@ValueSource(ints = {200, 201, 202, 203, 204})

diff --git a/components/serialization/form/android/build.gradle b/components/serialization/form/android/build.gradle
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13"
-        classpath "com.android.tools.build:gradle:8.0.0"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13.3"
+        classpath "com.android.tools.build:gradle:8.0.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }
 }

diff --git a/components/serialization/form/build.gradle b/components/serialization/form/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'signing'
     id 'jacoco'
     id 'com.github.spotbugs' version '5.0.14'
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.2.0.3129"
 }
 
 java {

diff --git a/components/serialization/form/gradle/dependencies.gradle b/components/serialization/form/gradle/dependencies.gradle
@@ -6,7 +6,7 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'com.google.guava:guava:31.1-jre'
+    implementation 'com.google.guava:guava:32.0.0-jre'
 
     api project(':components:abstractions')
 }
diff --git a/components/serialization/json/android/build.gradle b/components/serialization/json/android/build.gradle
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13"
-        classpath "com.android.tools.build:gradle:8.0.0"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13.3"
+        classpath "com.android.tools.build:gradle:8.0.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }
 }

diff --git a/components/serialization/json/build.gradle b/components/serialization/json/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'signing'
     id 'jacoco'
     id 'com.github.spotbugs' version '5.0.14'
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.2.0.3129"
 }
 
 java {

diff --git a/components/serialization/json/gradle/dependencies.gradle b/components/serialization/json/gradle/dependencies.gradle
@@ -6,7 +6,7 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'com.google.guava:guava:31.1-jre'
+    implementation 'com.google.guava:guava:32.0.0-jre'
     api 'com.google.code.gson:gson:2.10.1'
 
     api project(':components:abstractions')

diff --git a/components/serialization/text/android/build.gradle b/components/serialization/text/android/build.gradle
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13"
-        classpath "com.android.tools.build:gradle:8.0.0"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.13.3"
+        classpath "com.android.tools.build:gradle:8.0.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }
 }

diff --git a/components/serialization/text/build.gradle b/components/serialization/text/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'signing'
     id 'jacoco'
     id 'com.github.spotbugs' version '5.0.14'
-    id "org.sonarqube" version "4.0.0.2929"
+    id "org.sonarqube" version "4.2.0.3129"
 }
 
 java {

diff --git a/components/serialization/text/gradle/dependencies.gradle b/components/serialization/text/gradle/dependencies.gradle
@@ -6,7 +6,7 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'com.google.guava:guava:31.1-jre' 
+    implementation 'com.google.guava:guava:32.0.0-jre' 
 
     api project(':components:abstractions')
 }
diff --git a/gradle.properties b/gradle.properties
@@ -26,7 +26,7 @@ org.gradle.caching=true
 mavenGroupId         = com.microsoft.kiota
 mavenMajorVersion = 0
 mavenMinorVersion = 4
-mavenPatchVersion = 3
+mavenPatchVersion = 4
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests