Merge pull request #1538 from microsoft/fix/java-21-build

Fix Java 21 Build issues
microsoft · Aug 22, 2024 · d8ba2b6 · d8ba2b6
2 parents 6b5fde9 + 843db9c
commit d8ba2b6
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 42 deletions.
diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: gradle
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3.2.1

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup JDK
       uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'temurin'
         cache: gradle
     - name: Detect secrets

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -23,9 +23,9 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
-          cache: gradle   
+          cache: gradle
       - name: Cache SonarCloud packages
         uses: actions/cache@v4
         with:

diff --git a/components/abstractions/gradle/dependencies.gradle b/components/abstractions/gradle/dependencies.gradle
@@ -2,7 +2,7 @@ dependencies {
     // Use JUnit Jupiter API for testing.
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.0'
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation 'org.mockito:mockito-core:5.12.0'
 
     // Use JUnit Jupiter Engine for testing.
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'

diff --git a/components/authentication/azure/gradle/dependencies.gradle b/components/authentication/azure/gradle/dependencies.gradle
@@ -2,7 +2,7 @@ dependencies {
     // Use JUnit Jupiter API for testing.
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.0'
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation 'org.mockito:mockito-core:5.12.0'
 
 
     // Use JUnit Jupiter Engine for testing.

diff --git a/components/bundle/gradle/dependencies.gradle b/components/bundle/gradle/dependencies.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     // Use JUnit Jupiter Engine for testing.
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation 'org.mockito:mockito-core:5.12.0'
 
     implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
 

diff --git a/components/http/okHttp/gradle/dependencies.gradle b/components/http/okHttp/gradle/dependencies.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     // Use JUnit Jupiter Engine for testing.
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation 'org.mockito:mockito-core:5.12.0'
     testImplementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
 
 

diff --git a/...on/json/src/test/java/com/microsoft/kiota/serialization/JsonSerializationWriterTests.java b/...on/json/src/test/java/com/microsoft/kiota/serialization/JsonSerializationWriterTests.java
@@ -53,15 +53,17 @@ void writesSampleObjectValueWithPrimitivesInAdditionalData() throws IOException
                 .getAdditionalData()
                 .put("aliases", aliases); // place a collection in the additional data
 
-        var jsonSerializer = new JsonSerializationWriter();
-        jsonSerializer.writeObjectValue("", testEntity);
-        var contentStream = jsonSerializer.getSerializedContent();
-        var serializedJsonString = new String(Compatibility.readAllBytes(contentStream), "UTF-8");
-        // Assert
-        var expectedString =
-                "{\"aliases\":[\"alias1\",\"alias2\"],\"nickName\":\"Peter"
-                    + " Pan\",\"hasDependents\":true,\"accountBalance\":330.7,\"reportsCount\":4,\"averageScore\":78.142}";
-        assertEquals(expectedString, serializedJsonString);
+        try (final var jsonSerializer = new JsonSerializationWriter()) {
+            jsonSerializer.writeObjectValue("", testEntity);
+            var contentStream = jsonSerializer.getSerializedContent();
+            var serializedJsonString =
+                    new String(Compatibility.readAllBytes(contentStream), "UTF-8");
+            // Assert
+            var expectedString =
+                    "{\"aliases\":[\"alias1\",\"alias2\"],\"nickName\":\"Peter"
+                        + " Pan\",\"hasDependents\":true,\"accountBalance\":330.7,\"reportsCount\":4,\"averageScore\":78.142}";
+            assertEquals(expectedString, serializedJsonString);
+        }
     }
 
     @Test
@@ -79,14 +81,16 @@ void writesSampleObjectValueWithParsableInAdditionalData() throws IOException {
                 .getAdditionalData()
                 .put("manager", managerAdditionalData); // place a parsable in the addtionaldata
 
-        var jsonSerializer = new JsonSerializationWriter();
-        jsonSerializer.writeObjectValue("", testEntity);
-        var contentStream = jsonSerializer.getSerializedContent();
-        var serializedJsonString = new String(Compatibility.readAllBytes(contentStream), "UTF-8");
-        // Assert
-        var expectedString =
-                "{\"id\":\"test_id\",\"phones\":[\"123456789\"],\"manager\":{\"id\":\"manager_id\",\"myEnum\":\"VALUE1\"}}";
-        assertEquals(expectedString, serializedJsonString);
+        try (final var jsonSerializer = new JsonSerializationWriter()) {
+            jsonSerializer.writeObjectValue("", testEntity);
+            var contentStream = jsonSerializer.getSerializedContent();
+            var serializedJsonString =
+                    new String(Compatibility.readAllBytes(contentStream), "UTF-8");
+            // Assert
+            var expectedString =
+                    "{\"id\":\"test_id\",\"phones\":[\"123456789\"],\"manager\":{\"id\":\"manager_id\",\"myEnum\":\"VALUE1\"}}";
+            assertEquals(expectedString, serializedJsonString);
+        }
     }
 
     @Test
@@ -182,21 +186,23 @@ void writesSampleObjectValueWithUntypedProperties() throws IOException {
                                     }
                                 }));
 
-        var jsonSerializer = new JsonSerializationWriter();
-        jsonSerializer.writeObjectValue("", untypedTestEntity);
-        var contentStream = jsonSerializer.getSerializedContent();
-        var serializedJsonString = new String(Compatibility.readAllBytes(contentStream), "UTF-8");
-
-        // Assert
-        var expectedString =
-                "{\"id\":\"1\","
-                    + "\"location\":{\"hasReception\":true,\"address\":{\"state\":\"Washington\",\"city\":\"Redmond\",\"street\":\"NE"
-                    + " 36th St\",\"postalCode\":\"98052\"},\"displayName\":\"Microsoft Building"
-                    + " 92\",\"floorCount\":50,\"contact\":null,\"coordinates\":{\"latitude\":47.641942,\"longitude\":-122.127222}},"
-                    + "\"keywords\":["
-                    + "{\"wssId\":345345345,\"label\":\"Keyword1\",\"termGuid\":\"10e9cc83-b5a4-4c8d-8dab-4ada1252dd70\",\"created\":\"2023-07-26T10:41:26Z\"},"
-                    + "{\"wssId\":345345345,\"label\":\"Keyword2\",\"termGuid\":\"2cae6c6a-9bb8-4a78-afff-81b88e735fef\",\"created\":\"2023-07-26T10:51:26Z\"}],"
-                    + "\"extra\":{\"createdDateTime\":\"2024-01-15T00:00:00+00:00\"}}";
-        assertEquals(expectedString, serializedJsonString);
+        try (final var jsonSerializer = new JsonSerializationWriter()) {
+            jsonSerializer.writeObjectValue("", untypedTestEntity);
+            var contentStream = jsonSerializer.getSerializedContent();
+            var serializedJsonString =
+                    new String(Compatibility.readAllBytes(contentStream), "UTF-8");
+
+            // Assert
+            var expectedString =
+                    "{\"id\":\"1\","
+                        + "\"location\":{\"hasReception\":true,\"coordinates\":{\"latitude\":47.641942,\"longitude\":-122.127222},"
+                        + "\"address\":{\"state\":\"Washington\",\"city\":\"Redmond\",\"street\":\"NE"
+                        + " 36th St\",\"postalCode\":\"98052\"},\"displayName\":\"Microsoft"
+                        + " Building 92\",\"floorCount\":50,\"contact\":null},\"keywords\":["
+                        + "{\"wssId\":345345345,\"label\":\"Keyword1\",\"termGuid\":\"10e9cc83-b5a4-4c8d-8dab-4ada1252dd70\",\"created\":\"2023-07-26T10:41:26Z\"},"
+                        + "{\"wssId\":345345345,\"label\":\"Keyword2\",\"termGuid\":\"2cae6c6a-9bb8-4a78-afff-81b88e735fef\",\"created\":\"2023-07-26T10:51:26Z\"}],"
+                        + "\"extra\":{\"createdDateTime\":\"2024-01-15T00:00:00+00:00\"}}";
+            assertEquals(expectedString, serializedJsonString);
+        }
     }
 }
diff --git a/components/serialization/multipart/gradle/dependencies.gradle b/components/serialization/multipart/gradle/dependencies.gradle
@@ -1,7 +1,7 @@
 dependencies {
     // Use JUnit Jupiter API for testing.
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation 'org.mockito:mockito-core:5.12.0'
 
     // Use JUnit Jupiter Engine for testing.
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'