From 23a4cce990af3a8f51573e490511dcd510572fc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 08:55:49 +0000 Subject: [PATCH 01/21] chore(deps): bump rickstaa/action-create-tag from 1.6.4 to 1.6.6 Bumps [rickstaa/action-create-tag](https://github.com/rickstaa/action-create-tag) from 1.6.4 to 1.6.6. - [Release notes](https://github.com/rickstaa/action-create-tag/releases) - [Commits](https://github.com/rickstaa/action-create-tag/compare/v1.6.4...v1.6.6) --- updated-dependencies: - dependency-name: rickstaa/action-create-tag dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 5d4361f9c..dbf50d8a0 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -105,7 +105,7 @@ jobs: run: .\scripts\getLatestVersion.ps1 shell: pwsh - name: Create tag - uses: rickstaa/action-create-tag@v1.6.4 + uses: rickstaa/action-create-tag@v1.6.6 with: tag: ${{ steps.GetVersion.outputs.tag }} - name: Queue Git Release From 45df7410928f64ac6696bc8ad1d153213bd93271 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 08:11:46 +0000 Subject: [PATCH 02/21] chore(deps): bump com.azure:azure-core from 1.44.1 to 1.45.0 Bumps [com.azure:azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.44.1 to 1.45.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.44.1...azure-core_1.45.0) --- updated-dependencies: - dependency-name: com.azure:azure-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 59f07acda..58843541e 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ com.azure azure-core - 1.44.1 + 1.45.0 org.junit.jupiter From 99a6c914357f0f0e6bcc52160cf27c0968e889cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 08:25:19 +0000 Subject: [PATCH 03/21] chore(deps): bump org.junit.jupiter:junit-jupiter-params in /android Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index e30e65e23..ee8763a01 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -1,7 +1,7 @@ dependencies { // Use JUnit test framework testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0' - testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0' testImplementation 'org.mockito:mockito-inline:5.2.0' From fa93ebbcfff93e20c08966efee581d2791061848 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 08:45:10 +0000 Subject: [PATCH 04/21] chore(deps): bump org.junit.jupiter:junit-jupiter-params Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index e30e65e23..ee8763a01 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -1,7 +1,7 @@ dependencies { // Use JUnit test framework testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0' - testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0' testImplementation 'org.mockito:mockito-inline:5.2.0' From 78343be33a62e402ab19310fa042727f65e1c620 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:37:11 +0000 Subject: [PATCH 05/21] chore(deps): bump com.azure:azure-core from 1.44.1 to 1.45.0 Bumps [com.azure:azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.44.1 to 1.45.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.44.1...azure-core_1.45.0) --- updated-dependencies: - dependency-name: com.azure:azure-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ee8763a01..ad84df087 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -10,7 +10,7 @@ dependencies { implementation 'com.google.guava:guava:32.1.3-jre' implementation 'com.google.code.gson:gson:2.10.1' - api 'com.azure:azure-core:1.44.1' + api 'com.azure:azure-core:1.45.0' api 'com.github.spotbugs:spotbugs-annotations:4.8.0' } \ No newline at end of file From c00bcc07b144fa297f1784b016f051936d0c4f3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:37:34 +0000 Subject: [PATCH 06/21] chore(deps): bump com.azure:azure-core from 1.44.1 to 1.45.0 in /android Bumps [com.azure:azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.44.1 to 1.45.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.44.1...azure-core_1.45.0) --- updated-dependencies: - dependency-name: com.azure:azure-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ee8763a01..ad84df087 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -10,7 +10,7 @@ dependencies { implementation 'com.google.guava:guava:32.1.3-jre' implementation 'com.google.code.gson:gson:2.10.1' - api 'com.azure:azure-core:1.44.1' + api 'com.azure:azure-core:1.45.0' api 'com.github.spotbugs:spotbugs-annotations:4.8.0' } \ No newline at end of file From b6a128d5b5fe1dc51a08b437b096fef17c7897ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:52:29 +0000 Subject: [PATCH 07/21] chore(deps-dev): bump org.junit.jupiter:junit-jupiter-params Bumps [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 58843541e..d3b31e5c8 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ org.junit.jupiter junit-jupiter-params - 5.10.0 + 5.10.1 test From 250e72214004c44defd82c685bdf987124813eaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:56:20 +0000 Subject: [PATCH 08/21] chore(deps-dev): bump org.junit.jupiter:junit-jupiter-api Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3b31e5c8..5f38c5dd6 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ org.junit.jupiter junit-jupiter-api - 5.10.0 + 5.10.1 test From 1e7393dbcb7c862f321450fad0d73f94998a8b1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:59:18 +0000 Subject: [PATCH 09/21] chore(deps): bump org.junit.jupiter:junit-jupiter-api in /android Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ad84df087..44fc6a46c 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -1,6 +1,6 @@ dependencies { // Use JUnit test framework - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0' testImplementation 'org.mockito:mockito-inline:5.2.0' From ee6e24bccf4023c3ac43a89557009cbd582528cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 10:02:41 +0000 Subject: [PATCH 10/21] chore(deps): bump org.junit.jupiter:junit-jupiter-engine Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.0 to 5.10.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 44fc6a46c..68789b674 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { // Use JUnit test framework testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.1' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1' testImplementation 'org.mockito:mockito-inline:5.2.0' api 'com.squareup.okhttp3:okhttp:4.12.0' From 3f44241ca39344f6291ce0d76fc7664c33caaf11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 08:06:10 +0000 Subject: [PATCH 11/21] chore(deps): bump com.github.spotbugs Bumps com.github.spotbugs from 5.2.1 to 5.2.3. --- updated-dependencies: - dependency-name: com.github.spotbugs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 608fda594..de29f9202 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'maven-publish' id 'signing' id 'jacoco' - id 'com.github.spotbugs' version '5.2.1' + id 'com.github.spotbugs' version '5.2.3' id "org.sonarqube" version "4.4.1.3373" } From 8d53414bbd58a4650b309425868d6f7a1075ffab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 08:12:20 +0000 Subject: [PATCH 12/21] chore(deps): bump com.github.spotbugs:spotbugs-annotations Bumps [com.github.spotbugs:spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.8.0...4.8.1) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 68789b674..ed256e9e5 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -12,5 +12,5 @@ dependencies { implementation 'com.google.code.gson:gson:2.10.1' api 'com.azure:azure-core:1.45.0' - api 'com.github.spotbugs:spotbugs-annotations:4.8.0' + api 'com.github.spotbugs:spotbugs-annotations:4.8.1' } \ No newline at end of file From cc4368a5cd4c7fb8ff179ced255246a420efc973 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 08:22:09 +0000 Subject: [PATCH 13/21] chore(deps): bump com.github.spotbugs:spotbugs-annotations Bumps [com.github.spotbugs:spotbugs-annotations](https://github.com/spotbugs/spotbugs) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.8.0...4.8.1) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5f38c5dd6..1cb75d8a2 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ com.github.spotbugs spotbugs-annotations - 4.8.0 + 4.8.1 From 4b6560803e5f800219107edf4c766f7c84cf5a6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 08:47:00 +0000 Subject: [PATCH 14/21] chore(deps): bump com.android.tools.build:gradle in /android Bumps com.android.tools.build:gradle from 8.1.2 to 8.1.3. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index cbd451570..4793db785 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath "com.gradle:gradle-enterprise-gradle-plugin:3.15.1" - classpath "com.android.tools.build:gradle:8.1.2" + classpath "com.android.tools.build:gradle:8.1.3" classpath "com.github.ben-manes:gradle-versions-plugin:0.49.0" } } From 42f6353b2e28c22b4cf47de4cc12b4e2ba216c52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 09:08:01 +0000 Subject: [PATCH 15/21] chore(deps): bump com.azure:azure-identity in /samples/deviceCodeSample Bumps [com.azure:azure-identity](https://github.com/Azure/azure-sdk-for-java) from 1.10.4 to 1.11.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-identity_1.10.4...azure-core_1.11.0) --- updated-dependencies: - dependency-name: com.azure:azure-identity dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- samples/deviceCodeSample/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/deviceCodeSample/build.gradle b/samples/deviceCodeSample/build.gradle index 9271f2dbb..5d56bb63b 100644 --- a/samples/deviceCodeSample/build.gradle +++ b/samples/deviceCodeSample/build.gradle @@ -12,5 +12,5 @@ repositories { dependencies { testImplementation group: 'junit', name: 'junit', version: '4.13.2' implementation project(':coreLibrary') - implementation 'com.azure:azure-identity:1.10.4' + implementation 'com.azure:azure-identity:1.11.0' } From 17f5cebdc50783d777bb2ecd8002cc9b1ca26284 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 09:17:36 +0000 Subject: [PATCH 16/21] chore(deps): bump com.azure:azure-identity Bumps [com.azure:azure-identity](https://github.com/Azure/azure-sdk-for-java) from 1.10.4 to 1.11.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-identity_1.10.4...azure-core_1.11.0) --- updated-dependencies: - dependency-name: com.azure:azure-identity dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- samples/interactiveBrowserSample/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/interactiveBrowserSample/build.gradle b/samples/interactiveBrowserSample/build.gradle index 9271f2dbb..5d56bb63b 100644 --- a/samples/interactiveBrowserSample/build.gradle +++ b/samples/interactiveBrowserSample/build.gradle @@ -12,5 +12,5 @@ repositories { dependencies { testImplementation group: 'junit', name: 'junit', version: '4.13.2' implementation project(':coreLibrary') - implementation 'com.azure:azure-identity:1.10.4' + implementation 'com.azure:azure-identity:1.11.0' } From 6ede0820604fc5914a7ca286785e286a887a3d06 Mon Sep 17 00:00:00 2001 From: Cees Bos Date: Wed, 25 Oct 2023 11:07:41 +0200 Subject: [PATCH 17/21] Use parent Call.Factory of OkHttpClient to be able to use OpenTelemetry --- .../java/com/microsoft/graph/core/BaseClient.java | 12 ++++++------ .../com/microsoft/graph/http/CoreHttpProvider.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java index cbdbac4e7..d6952b6ff 100644 --- a/src/main/java/com/microsoft/graph/core/BaseClient.java +++ b/src/main/java/com/microsoft/graph/core/BaseClient.java @@ -41,6 +41,7 @@ import javax.annotation.Nonnull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import okhttp3.Call; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -137,7 +138,7 @@ public static Builder builder() { * @return builder to start configuring the client */ @Nonnull - public static Builder builder(@Nonnull final Class nativeClientClass, @Nonnull final Class nativeRequestClass) { + public static Builder builder(@Nonnull final Class nativeClientClass, @Nonnull final Class nativeRequestClass) { return new Builder<>(); } @@ -146,7 +147,7 @@ public static Builder * @param type of the native http library client * @param type of a request for the native http client */ - public static class Builder { + public static class Builder { private ISerializer serializer; private IHttpProvider httpProvider; private ILogger logger; @@ -174,10 +175,9 @@ private ISerializer getSerializer() { return serializer; } } - @SuppressWarnings("unchecked") - private httpClientType getHttpClient() { + private Call.Factory getHttpClient() { if(httpClient == null) { - return (httpClientType)HttpClients.createDefault(getAuthenticationProvider()); + return HttpClients.createDefault(getAuthenticationProvider()); } else { return httpClient; } @@ -185,7 +185,7 @@ private httpClientType getHttpClient() { @SuppressWarnings("unchecked") private IHttpProvider getHttpProvider() { if(httpProvider == null) { - return (IHttpProvider)new CoreHttpProvider(getSerializer(), getLogger(), (OkHttpClient)getHttpClient()); + return (IHttpProvider)new CoreHttpProvider(getSerializer(), getLogger(), getHttpClient()); } else { return httpProvider; } diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java index 7dea22c18..31f357643 100644 --- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java +++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java @@ -98,9 +98,9 @@ public class CoreHttpProvider implements IHttpProvider { private final ILogger logger; /** - * The OkHttpClient that handles all requests + * The OkHttpClient(Call.Factory) that handles all requests */ - private OkHttpClient corehttpClient; + private Call.Factory corehttpClient; /** * Creates the CoreHttpProvider @@ -112,7 +112,7 @@ public class CoreHttpProvider implements IHttpProvider { @SuppressFBWarnings public CoreHttpProvider(@Nonnull final ISerializer serializer, @Nonnull final ILogger logger, - @Nonnull final OkHttpClient httpClient) { + @Nonnull final Call.Factory httpClient) { Objects.requireNonNull(logger, "parameter logger cannot be null"); Objects.requireNonNull(serializer, "parameter serializer cannot be null"); Objects.requireNonNull(httpClient, "parameter httpClient cannot be null"); From 8221a4a1391847e71b3a31501a858f310d192b0b Mon Sep 17 00:00:00 2001 From: Cees Bos Date: Wed, 25 Oct 2023 20:32:50 +0200 Subject: [PATCH 18/21] Remove usage of generics --- .../java/com/microsoft/graph/core/BaseClient.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java index d6952b6ff..27382a382 100644 --- a/src/main/java/com/microsoft/graph/core/BaseClient.java +++ b/src/main/java/com/microsoft/graph/core/BaseClient.java @@ -138,7 +138,7 @@ public static Builder builder() { * @return builder to start configuring the client */ @Nonnull - public static Builder builder(@Nonnull final Class nativeClientClass, @Nonnull final Class nativeRequestClass) { + public static Builder builder(@Nonnull final Class nativeClientClass, @Nonnull final Class nativeRequestClass) { return new Builder<>(); } @@ -147,7 +147,7 @@ public static Builder type of the native http library client * @param type of a request for the native http client */ - public static class Builder { + public static class Builder { private ISerializer serializer; private IHttpProvider httpProvider; private ILogger logger; @@ -175,9 +175,10 @@ private ISerializer getSerializer() { return serializer; } } - private Call.Factory getHttpClient() { + @SuppressWarnings("unchecked") + private httpClientType getHttpClient() { if(httpClient == null) { - return HttpClients.createDefault(getAuthenticationProvider()); + return (httpClientType)HttpClients.createDefault(getAuthenticationProvider()); } else { return httpClient; } @@ -185,7 +186,7 @@ private Call.Factory getHttpClient() { @SuppressWarnings("unchecked") private IHttpProvider getHttpProvider() { if(httpProvider == null) { - return (IHttpProvider)new CoreHttpProvider(getSerializer(), getLogger(), getHttpClient()); + return (IHttpProvider)new CoreHttpProvider(getSerializer(), getLogger(), (Call.Factory) getHttpClient()); } else { return httpProvider; } From 7da66034e57bd0454d1014a3fca4e630b3c96f4d Mon Sep 17 00:00:00 2001 From: Cees Bos Date: Wed, 25 Oct 2023 21:47:17 +0200 Subject: [PATCH 19/21] Update changelog and add info how to use OpenTelemetry with GraphServiceClient --- CHANGELOG.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27061f84c..2de0f1e60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -### Added +### Changed + +- Changed CoreHttpProvider dependency from OkHttpClient to Call.Factory (parent interface implemented by OkHttpClient). This make usage of OpenTelemetry tracing possible. + https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/okhttp/okhttp-3.0/library/README.md + +```java + private Call.Factory createTracedClient(OpenTelemetry openTelemetry, @Nonnull final IAuthenticationProvider auth) { + return OkHttpTelemetry.builder(openTelemetry).build().newCallFactory(createClient(auth)); + } + + private OkHttpClient createClient(@Nonnull final IAuthenticationProvider auth) { + return HttpClients.createDefault(auth); + } + + // then create the GraphServiceClient + IAuthenticationProvider authenticationProvider = ...; + GraphServiceClient + .builder(Call.Factory.class, Request.class) + .httpClient(createTracedClient(openTelemetry, authenticationProvider)) + .authenticationProvider(authenticationProvider) + .buildClient(); +``` + ## [2.0.20] - 2023-10-23 From 69294af05c82ccdbc0152dee3c6d69bb3d89fea3 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 8 Nov 2023 08:31:20 -0500 Subject: [PATCH 20/21] - bumps patch version --- CHANGELOG.md | 7 ++++++- gradle.properties | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2de0f1e60..b040e5bcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +### Changed + +## [2.0.21] - 2023-11-08 + ### Changed - Changed CoreHttpProvider dependency from OkHttpClient to Call.Factory (parent interface implemented by OkHttpClient). This make usage of OpenTelemetry tracing possible. @@ -30,7 +36,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 .buildClient(); ``` - ## [2.0.20] - 2023-10-23 ### Changed diff --git a/gradle.properties b/gradle.properties index c270067b9..11030eaf9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,7 +25,7 @@ mavenGroupId = com.microsoft.graph mavenArtifactId = microsoft-graph-core mavenMajorVersion = 2 mavenMinorVersion = 0 -mavenPatchVersion = 20 +mavenPatchVersion = 21 mavenArtifactSuffix = #These values are used to run functional tests From 1dfcdb3fec019cf5f342ba097ac2176d133c8c64 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 8 Nov 2023 08:38:22 -0500 Subject: [PATCH 21/21] - adds a check secret step for the sonarcloud workflow to avoid failures on PRs --- .github/workflows/sonarcloud.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index c7b367340..02a328912 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -8,8 +8,24 @@ on: - feature/v2 pull_request: types: [opened, synchronize, reopened] + +env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + jobs: + checksecret: + name: check if SONAR_TOKEN is set in github secrets + runs-on: ubuntu-latest + outputs: + is_SONAR_TOKEN_set: ${{ steps.checksecret_job.outputs.is_SONAR_TOKEN_set }} + steps: + - name: Check whether unity activation requests should be done + id: checksecret_job + run: | + echo "is_SONAR_TOKEN_set=${{ env.SONAR_TOKEN != '' }}" >> $GITHUB_OUTPUT build: + needs: [checksecret] + if: needs.checksecret.outputs.is_SONAR_TOKEN_set == 'true' name: Build runs-on: ubuntu-latest steps: @@ -37,5 +53,4 @@ jobs: - name: Build and analyze env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: ./gradlew build sonarqube --info