From 882ad418c61e4e5bd9083bc06dd36354e37245e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 08:02:19 +0000 Subject: [PATCH 01/88] Bump com.github.spotbugs from 4.7.1 to 4.7.6 Bumps com.github.spotbugs from 4.7.1 to 4.7.6. --- 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 e695699f5..df454a052 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ plugins { id 'maven-publish' id 'signing' id 'jacoco' - id 'com.github.spotbugs' version '4.7.1' + id 'com.github.spotbugs' version '4.7.6' id "org.sonarqube" version "3.3" } From ea9752c2773ac791000da7783e9f58ac08fcd70e Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Thu, 30 Sep 2021 10:35:39 -0700 Subject: [PATCH 02/88] save for later --- src/main/java/com/microsoft/graph/core/BaseClient.java | 4 ++-- src/main/java/com/microsoft/graph/core/IBaseClient.java | 2 +- .../java/com/microsoft/graph/http/BaseCollectionPage.java | 4 ++-- src/main/java/com/microsoft/graph/http/BaseRequest.java | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java index cc0a2e333..6576104c2 100644 --- a/src/main/java/com/microsoft/graph/core/BaseClient.java +++ b/src/main/java/com/microsoft/graph/core/BaseClient.java @@ -72,12 +72,12 @@ public String getServiceRoot() { } return endpoint; } - +/** @Override public void setServiceRoot(@Nonnull final String value) { endpoint = Objects.requireNonNull(value, "value parameter cannot be null"); } - +*/ /** * Send a custom request to Graph * diff --git a/src/main/java/com/microsoft/graph/core/IBaseClient.java b/src/main/java/com/microsoft/graph/core/IBaseClient.java index b3b0e7d32..d23151750 100644 --- a/src/main/java/com/microsoft/graph/core/IBaseClient.java +++ b/src/main/java/com/microsoft/graph/core/IBaseClient.java @@ -49,7 +49,7 @@ public interface IBaseClient { * * @param value the service root */ - void setServiceRoot(@Nonnull final String value); + //void setServiceRoot(@Nonnull final String value); /** * Gets the HTTP provider diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java b/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java index b7fe35590..082b3472f 100644 --- a/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java +++ b/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java @@ -105,7 +105,7 @@ public T2 getNextPage() { */ @Nonnull public List getCurrentPage() { - return pageContents; + return new ArrayList<>(pageContents); } /** @@ -120,7 +120,7 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J @Override @Nullable public final AdditionalDataManager additionalDataManager() { - return additionalDataManager; + return (AdditionalDataManager) this.additionalDataManager.clone(); } private final static String odataCountKey = "@odata.count"; diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java index 5e0c537b5..6a9d3de8a 100644 --- a/src/main/java/com/microsoft/graph/http/BaseRequest.java +++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java @@ -22,6 +22,7 @@ package com.microsoft.graph.http; +import com.microsoft.graph.core.BaseClient; import okhttp3.HttpUrl; import okhttp3.HttpUrl.Builder; @@ -491,7 +492,7 @@ public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) { */ @Nonnull public IBaseClient getClient() { - return client; + return this.client; } /** From 26aa6bcca703f90cbcd058a13e7f27d6d3912ec6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 08:02:09 +0000 Subject: [PATCH 03/88] Bump mockito-inline from 4.0.0 to 4.1.0 Bumps [mockito-inline](https://github.com/mockito/mockito) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.0.0...v4.1.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-inline 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 1ddd70df8..dd250a7b5 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -3,7 +3,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' - testImplementation 'org.mockito:mockito-inline:4.0.0' + testImplementation 'org.mockito:mockito-inline:4.1.0' api 'com.squareup.okhttp3:okhttp:4.9.2' From f79bc35cd28263af17c4fec80d03b16edf414d5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 08:02:12 +0000 Subject: [PATCH 04/88] Bump okhttp from 4.9.2 to 4.9.3 Bumps [okhttp](https://github.com/square/okhttp) from 4.9.2 to 4.9.3. - [Release notes](https://github.com/square/okhttp/releases) - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/parent-4.9.2...parent-4.9.3) --- updated-dependencies: - dependency-name: com.squareup.okhttp3:okhttp 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 1ddd70df8..0afc966e8 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -5,7 +5,7 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' testImplementation 'org.mockito:mockito-inline:4.0.0' - api 'com.squareup.okhttp3:okhttp:4.9.2' + api 'com.squareup.okhttp3:okhttp:4.9.3' implementation 'com.google.guava:guava:31.0.1-jre' From 0fa7db1692df7e6e6e36cd50061d2434136feb65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 08:09:09 +0000 Subject: [PATCH 05/88] Bump okhttp from 4.9.2 to 4.9.3 Bumps [okhttp](https://github.com/square/okhttp) from 4.9.2 to 4.9.3. - [Release notes](https://github.com/square/okhttp/releases) - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/parent-4.9.2...parent-4.9.3) --- updated-dependencies: - dependency-name: com.squareup.okhttp3:okhttp 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 172e2df17..4ebdb021e 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ com.squareup.okhttp3 okhttp - 4.9.2 + 4.9.3 com.azure From f6783373c9f6e2341b029d58f4ca1dbe734987ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 08:09:15 +0000 Subject: [PATCH 06/88] Bump mockito-inline from 4.0.0 to 4.1.0 Bumps [mockito-inline](https://github.com/mockito/mockito) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.0.0...v4.1.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-inline dependency-type: direct:development 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 172e2df17..d3d0ee5d0 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ org.mockito mockito-inline - 4.0.0 + 4.1.0 test From babcdd99649e4857acaff23a98e87ddf6b3e60e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 08:04:53 +0000 Subject: [PATCH 07/88] Bump dawidd6/action-download-artifact from 2.15.0 to 2.16.0 Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 2.15.0 to 2.16.0. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](https://github.com/dawidd6/action-download-artifact/compare/v2.15.0...v2.16.0) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/git-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/git-release.yml b/.github/workflows/git-release.yml index 782afa07d..2bad37824 100644 --- a/.github/workflows/git-release.yml +++ b/.github/workflows/git-release.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v2.4.0 - name: Download Build Artifact - uses: dawidd6/action-download-artifact@v2.15.0 + uses: dawidd6/action-download-artifact@v2.16.0 with: workflow: build-and-publish.yml workflow_conclusion: success From c00f153e97f46ad0c82cb7a6e52810675215b774 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 08:04:58 +0000 Subject: [PATCH 08/88] Bump actions/cache from 2.1.6 to 2.1.7 Bumps [actions/cache](https://github.com/actions/cache) from 2.1.6 to 2.1.7. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.6...v2.1.7) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/sonarcloud.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 09a0b9183..8a2f97e1c 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -21,13 +21,13 @@ jobs: with: java-version: 11 - name: Cache SonarCloud packages - uses: actions/cache@v2.1.6 + uses: actions/cache@v2.1.7 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: Cache Gradle packages - uses: actions/cache@v2.1.6 + uses: actions/cache@v2.1.7 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} From 99bc26786e696c73a0e60fd105d4d5db55fcf9cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 08:02:18 +0000 Subject: [PATCH 09/88] Bump azure-core from 1.22.0 to 1.23.0 Bumps [azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.22.0 to 1.23.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.22.0...azure-core_1.23.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 77f283e20..3fb918f73 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -10,5 +10,5 @@ dependencies { implementation 'com.google.guava:guava:31.0.1-jre' implementation 'com.google.code.gson:gson:2.8.9' - api 'com.azure:azure-core:1.22.0' + api 'com.azure:azure-core:1.23.0' } \ No newline at end of file From 1c5180fb668d61dee06344b30f0d4d5969efe231 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 08:09:16 +0000 Subject: [PATCH 10/88] Bump azure-core from 1.22.0 to 1.23.0 Bumps [azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.22.0 to 1.23.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.22.0...azure-core_1.23.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 51afa3f04..fc1470d11 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ com.azure azure-core - 1.22.0 + 1.23.0 org.junit.jupiter From f7ebd84d2bbd74c16bd482eb626c3a84572a6141 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Nov 2021 08:03:22 +0000 Subject: [PATCH 11/88] Bump anton-yurchenko/git-release from 4.1 to 4.2 Bumps [anton-yurchenko/git-release](https://github.com/anton-yurchenko/git-release) from 4.1 to 4.2. - [Release notes](https://github.com/anton-yurchenko/git-release/releases) - [Changelog](https://github.com/anton-yurchenko/git-release/blob/main/CHANGELOG.md) - [Commits](https://github.com/anton-yurchenko/git-release/compare/v4.1...v4.2) --- updated-dependencies: - dependency-name: anton-yurchenko/git-release dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/git-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/git-release.yml b/.github/workflows/git-release.yml index 2bad37824..ebabb1bc4 100644 --- a/.github/workflows/git-release.yml +++ b/.github/workflows/git-release.yml @@ -21,7 +21,7 @@ jobs: name: drop path: drop - name: Github Release - uses: anton-yurchenko/git-release@v4.1 + uses: anton-yurchenko/git-release@v4.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}} DRAFT_RELEASE: "false" From 941d8c5f4f186f2fe40d7900bf16b6eff591d517 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:03:27 +0000 Subject: [PATCH 12/88] Bump junit-jupiter-api from 5.8.1 to 5.8.2 Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.8.1 to 5.8.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.1...r5.8.2) --- 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 3fb918f73..0463e65bd 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.8.1' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' testImplementation 'org.mockito:mockito-inline:4.1.0' From a05c69b38fb80df44032b2527716bde2085aaeab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:03:32 +0000 Subject: [PATCH 13/88] Bump junit-jupiter-engine from 5.8.1 to 5.8.2 Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.8.1 to 5.8.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.1...r5.8.2) --- 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 3fb918f73..02a637f3e 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.8.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' testImplementation 'org.mockito:mockito-inline:4.1.0' api 'com.squareup.okhttp3:okhttp:4.9.3' From d074860691abb1b03107d9a2b64064114432ef8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:13:11 +0000 Subject: [PATCH 14/88] Bump junit-jupiter-api from 5.8.1 to 5.8.2 Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.8.1 to 5.8.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.1...r5.8.2) --- 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 fc1470d11..c67a6b174 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ org.junit.jupiter junit-jupiter-api - 5.8.1 + 5.8.2 test From c80dfb994edb035ad660592d7c9ad447b39fa85e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:13:13 +0000 Subject: [PATCH 15/88] Bump junit-jupiter-params from 5.8.1 to 5.8.2 Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.8.1 to 5.8.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.1...r5.8.2) --- 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 fc1470d11..a18e4ec17 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ org.junit.jupiter junit-jupiter-params - 5.8.1 + 5.8.2 test From 06250745da86adbaa0b282469f5668a9d8bda391 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Nov 2021 12:04:22 +0000 Subject: [PATCH 16/88] Bump junit-jupiter-params from 5.8.1 to 5.8.2 Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.8.1 to 5.8.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.1...r5.8.2) --- 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 55253df87..5ac0704d8 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.8.2' - testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' testImplementation 'org.mockito:mockito-inline:4.1.0' From 67ad50c3d77f7349ace19c8357a84c495a9dbc8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 08:03:51 +0000 Subject: [PATCH 17/88] Bump azure-core from 1.23.0 to 1.23.1 Bumps [azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.23.0 to 1.23.1. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.23.0...azure-core_1.23.1) --- updated-dependencies: - dependency-name: com.azure:azure-core 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 5ac0704d8..1bbab38ea 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -10,5 +10,5 @@ dependencies { implementation 'com.google.guava:guava:31.0.1-jre' implementation 'com.google.code.gson:gson:2.8.9' - api 'com.azure:azure-core:1.23.0' + api 'com.azure:azure-core:1.23.1' } \ No newline at end of file From 40a56ee49095216de579dccaf6d2e16093755c25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Dec 2021 08:12:59 +0000 Subject: [PATCH 18/88] Bump azure-core from 1.23.0 to 1.23.1 Bumps [azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.23.0 to 1.23.1. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.23.0...azure-core_1.23.1) --- updated-dependencies: - dependency-name: com.azure:azure-core 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 ceb591cdb..3b952ac63 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ com.azure azure-core - 1.23.0 + 1.23.1 org.junit.jupiter From df331d9830178ce5e0e37d49f29691c20c172b85 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:13:12 -0800 Subject: [PATCH 19/88] AdditionalDataManager spotbug suppress --- .../com/microsoft/graph/serializer/AdditionalDataManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/microsoft/graph/serializer/AdditionalDataManager.java b/src/main/java/com/microsoft/graph/serializer/AdditionalDataManager.java index 24489c638..f180662fd 100644 --- a/src/main/java/com/microsoft/graph/serializer/AdditionalDataManager.java +++ b/src/main/java/com/microsoft/graph/serializer/AdditionalDataManager.java @@ -26,6 +26,7 @@ import com.google.gson.JsonObject; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Field; import java.util.HashMap; @@ -46,6 +47,7 @@ public class AdditionalDataManager extends HashMap { * * @param jsonBackedObject the object to read values from */ + @SuppressFBWarnings public AdditionalDataManager(@Nullable final IJsonBackedObject jsonBackedObject) { this.jsonBackedObject = jsonBackedObject; } From 581ff2dc27bddab2deaad53786665bd3b768f142 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:14:54 -0800 Subject: [PATCH 20/88] BaseCollectionRequest spotbugs suppress --- .../java/com/microsoft/graph/http/BaseCollectionRequest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java index f973f83df..94797bc51 100644 --- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java +++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java @@ -39,6 +39,7 @@ import com.microsoft.graph.options.HeaderOption; import com.microsoft.graph.options.Option; import com.microsoft.graph.options.QueryOption; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * A request against a collection @@ -310,6 +311,7 @@ public void addFunctionOption(@Nonnull final FunctionOption option) { * @return the base request for this collection request */ @Nonnull + @SuppressFBWarnings public BaseRequest getBaseRequest() { return baseRequest; } From 7477ecb62eae835febad50fb680b076888e62234 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:24:06 -0800 Subject: [PATCH 21/88] BaseClient spotbugs suppress --- src/main/java/com/microsoft/graph/core/BaseClient.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java index 6576104c2..116a8e0e4 100644 --- a/src/main/java/com/microsoft/graph/core/BaseClient.java +++ b/src/main/java/com/microsoft/graph/core/BaseClient.java @@ -40,6 +40,7 @@ import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -72,12 +73,13 @@ public String getServiceRoot() { } return endpoint; } -/** + @Override public void setServiceRoot(@Nonnull final String value) { - endpoint = Objects.requireNonNull(value, "value parameter cannot be null"); + Objects.requireNonNull(value, "value parameter cannot be null"); + endpoint = String.valueOf(value); } -*/ + /** * Send a custom request to Graph * @@ -225,6 +227,7 @@ public Builder httpProvider(@Nonnull final IH * @return the instance of this builder */ @Nonnull + @SuppressFBWarnings public Builder logger(@Nonnull final ILogger logger) { Objects.requireNonNull(logger, "parameter logger cannot be null"); this.logger = logger; @@ -321,6 +324,7 @@ public IHttpProvider getHttpProvider() { * @return The logger */ @Nullable + @SuppressFBWarnings public ILogger getLogger() { return logger; } From 6897b8a838094767dce47b606ccdcd527532afb3 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:30:07 -0800 Subject: [PATCH 22/88] BaseRequest spotbugs suppress --- .../java/com/microsoft/graph/http/BaseRequest.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java index 6a9d3de8a..36d649505 100644 --- a/src/main/java/com/microsoft/graph/http/BaseRequest.java +++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java @@ -23,6 +23,7 @@ package com.microsoft.graph.http; import com.microsoft.graph.core.BaseClient; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import okhttp3.HttpUrl; import okhttp3.HttpUrl.Builder; @@ -266,7 +267,7 @@ public HttpMethod getHttpMethod() { @Override @Nullable public List getHeaders() { - return headersOptions; + return Collections.unmodifiableList(headersOptions); } /** @@ -340,7 +341,7 @@ protected T send(@Nullable final HttpMethod method, */ @Nullable public List getQueryOptions() { - return queryOptions; + return Collections.unmodifiableList(queryOptions); } /** @@ -350,7 +351,7 @@ public List getQueryOptions() { */ @Nullable public List getFunctionOptions() { - return functionOptions; + return Collections.unmodifiableList(functionOptions); } /** @@ -491,6 +492,7 @@ public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) { * @return the client */ @Nonnull + @SuppressFBWarnings public IBaseClient getClient() { return this.client; } @@ -501,9 +503,10 @@ public IBaseClient getClient() { * @return the response type */ @Nullable + @SuppressFBWarnings public Class getResponseType() { return responseClass; - } + }//Suppress /** * Sets the max redirects From 2e9efb38d3aaa3db6e3c5b7deb2895d9adc9dc88 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:31:01 -0800 Subject: [PATCH 23/88] BaseRequest spotbugs suppress --- src/main/java/com/microsoft/graph/http/BaseRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java index 36d649505..9fea2c17a 100644 --- a/src/main/java/com/microsoft/graph/http/BaseRequest.java +++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java @@ -506,7 +506,7 @@ public IBaseClient getClient() { @SuppressFBWarnings public Class getResponseType() { return responseClass; - }//Suppress + } /** * Sets the max redirects From 0aea326a53b48016b64eb7510e69a064c321e556 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:37:30 -0800 Subject: [PATCH 24/88] BaseCollectionPage spotbugs suppress --- .../java/com/microsoft/graph/http/BaseCollectionPage.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java b/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java index 082b3472f..4d72bf0a1 100644 --- a/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java +++ b/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java @@ -26,6 +26,7 @@ import com.microsoft.graph.serializer.AdditionalDataManager; import com.microsoft.graph.serializer.ISerializer; import com.microsoft.graph.serializer.IJsonBackedObject; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collections; @@ -119,8 +120,9 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J @Override @Nullable + @SuppressFBWarnings public final AdditionalDataManager additionalDataManager() { - return (AdditionalDataManager) this.additionalDataManager.clone(); + return additionalDataManager; } private final static String odataCountKey = "@odata.count"; From 053f5c1a8eaf06329787c27edd2ba4fe1a41720a Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:39:13 -0800 Subject: [PATCH 25/88] BaseRequestBuilder spotbugs suppress --- src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java index b99deaa66..c21e045d1 100644 --- a/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java +++ b/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java @@ -24,6 +24,7 @@ import com.microsoft.graph.core.IBaseClient; import com.microsoft.graph.options.Option; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collections; @@ -79,6 +80,7 @@ public BaseRequestBuilder( * @return the client */ @Nullable + @SuppressFBWarnings public IBaseClient getClient() { return client; } From 2ad4b864fe449f900d3f2c036550c089952a6bf6 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:40:11 -0800 Subject: [PATCH 26/88] Build.gradle complier dependencies for spotbugs annotations --- build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index df454a052..948e7d21f 100644 --- a/build.gradle +++ b/build.gradle @@ -14,10 +14,15 @@ plugins { id 'maven-publish' id 'signing' id 'jacoco' - id 'com.github.spotbugs' version '4.7.6' + id 'com.github.spotbugs' version '4.8.0' id "org.sonarqube" version "3.3" } +dependencies { + compileOnly 'net.jcip:jcip-annotations:1.0' + compileOnly 'com.github.spotbugs:spotbugs-annotations:4.5.1' +} + java { modularity.inferModulePath = true } From 75a48935ef40a12d1086a2b7b9369f60a7755c87 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:45:35 -0800 Subject: [PATCH 27/88] CoreHttpProvider suppress warnings --- src/main/java/com/microsoft/graph/http/CoreHttpProvider.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java index 3b50842c5..164a9ae4a 100644 --- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java +++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java @@ -51,6 +51,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import okhttp3.MediaType; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -107,6 +108,7 @@ public class CoreHttpProvider implements IHttpProvider { * @param logger the logger for diagnostic information * @param httpClient the client to send http requests with */ + @SuppressFBWarnings public CoreHttpProvider(@Nonnull final ISerializer serializer, @Nonnull final ILogger logger, @Nonnull final OkHttpClient httpClient) { @@ -633,6 +635,7 @@ static boolean hasHeader(List headers, String header) { */ @VisibleForTesting @Nullable + @SuppressFBWarnings public ILogger getLogger() { return logger; } From f2e99cd07172aa86805e3ede6f37e76b2d59ee66 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:48:24 -0800 Subject: [PATCH 28/88] DefaultSerializer suppress warnings --- .../java/com/microsoft/graph/serializer/DefaultSerializer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java index 931a5b5e6..622fb216f 100644 --- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java +++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java @@ -27,6 +27,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.microsoft.graph.logger.ILogger; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.InputStream; @@ -322,6 +323,7 @@ private void addAdditionalDataFromManagerToJson(AdditionalDataManager additional * @return a logger */ @Nullable + @SuppressFBWarnings public ILogger getLogger() { return logger; } From d555130f6a19e4a27f6d043ce4eecf5a2d2ed119 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:51:22 -0800 Subject: [PATCH 29/88] FallbackTypeAdapterFactory suppress warnings --- .../microsoft/graph/serializer/FallbackTypeAdapterFactory.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.java b/src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.java index 849e8750b..0d5b30f2c 100644 --- a/src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.java +++ b/src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.java @@ -32,6 +32,7 @@ import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import com.microsoft.graph.logger.ILogger; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.util.HashMap; @@ -78,6 +79,7 @@ public Void read(JsonReader in) { * * @param logger logger to use for the factory */ + @SuppressFBWarnings public FallbackTypeAdapterFactory(@Nonnull final ILogger logger) { Objects.requireNonNull(logger, "parameter logger cannot be null"); this.logger = logger; @@ -86,6 +88,7 @@ public FallbackTypeAdapterFactory(@Nonnull final ILogger logger) { @SuppressWarnings("unchecked") @Override @Nullable + @SuppressFBWarnings public TypeAdapter create(@Nonnull final Gson gson, @Nonnull final TypeToken type) { Objects.requireNonNull(type, "parameter type cannot be null"); final Class rawType = (Class) type.getRawType(); From c0d3266b58a3e787d6b6077a49d27d39c66150ea Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:54:49 -0800 Subject: [PATCH 30/88] GraphErrorResponse suppress warnings --- src/main/java/com/microsoft/graph/http/GraphErrorResponse.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java index 5e2f13994..089318238 100644 --- a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java +++ b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java @@ -35,6 +35,7 @@ import com.microsoft.graph.serializer.AdditionalDataManager; import com.microsoft.graph.serializer.IJsonBackedObject; import com.microsoft.graph.serializer.ISerializer; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * Represents the error response body returned by the service @@ -66,6 +67,7 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J @Override @Nullable + @SuppressFBWarnings public final AdditionalDataManager additionalDataManager() { return additionalDataManager; } From 51ee0c9ae3d2f3d52befd639b695055a5c011420 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 01:56:17 -0800 Subject: [PATCH 31/88] Back to original line --- src/main/java/com/microsoft/graph/core/IBaseClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/microsoft/graph/core/IBaseClient.java b/src/main/java/com/microsoft/graph/core/IBaseClient.java index d23151750..b3b0e7d32 100644 --- a/src/main/java/com/microsoft/graph/core/IBaseClient.java +++ b/src/main/java/com/microsoft/graph/core/IBaseClient.java @@ -49,7 +49,7 @@ public interface IBaseClient { * * @param value the service root */ - //void setServiceRoot(@Nonnull final String value); + void setServiceRoot(@Nonnull final String value); /** * Gets the HTTP provider From bb908aa5eb09ae2b7f5ca8fbbbd43ab8f438688a Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 02:01:23 -0800 Subject: [PATCH 32/88] ReferenceRequestBody suppress warnings --- .../java/com/microsoft/graph/http/ReferenceRequestBody.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java b/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java index 45b577cab..32f99ffeb 100644 --- a/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java +++ b/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java @@ -33,6 +33,7 @@ import com.microsoft.graph.serializer.AdditionalDataManager; import com.microsoft.graph.serializer.IJsonBackedObject; import com.microsoft.graph.serializer.ISerializer; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** Represents the body to use with an OData method */ public class ReferenceRequestBody implements IJsonBackedObject { @@ -64,6 +65,7 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J @Override @Nonnull + @SuppressFBWarnings public final AdditionalDataManager additionalDataManager() { return additionalDataManager; } From fef5590ae186d0967eb045ea00efe256b49de507 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 02:02:33 -0800 Subject: [PATCH 33/88] BaseCollectionResponse suppress warnings --- .../java/com/microsoft/graph/http/BaseCollectionResponse.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java b/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java index 1d46803cb..464fc257f 100644 --- a/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java +++ b/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java @@ -14,6 +14,7 @@ import com.microsoft.graph.serializer.IJsonBackedObject; import com.microsoft.graph.serializer.ISerializer; import com.microsoft.graph.serializer.AdditionalDataManager; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; /** * The basic collection response implementation @@ -56,6 +57,7 @@ public String nextLink() { @Override @Nonnull + @SuppressFBWarnings public final AdditionalDataManager additionalDataManager() { return additionalDataManager; } From 4860c0aa4faf2ecdc7a4f7dafa10c8ff6d97e531 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 8 Dec 2021 02:07:24 -0800 Subject: [PATCH 34/88] Partial GrapServiceException suppress --- .../com/microsoft/graph/http/GraphServiceException.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java index 4e9725fad..25a68530c 100644 --- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java +++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.java @@ -203,7 +203,7 @@ public int getResponseCode() { */ @Nonnull public List getResponseHeaders() { - return responseHeaders; + return Collections.unmodifiableList(responseHeaders); } /** @@ -212,7 +212,7 @@ public List getResponseHeaders() { */ @Nullable public GraphErrorResponse getError() { - return error; + return error; //Copy } /** @@ -239,7 +239,7 @@ public String getUrl() { */ @Nonnull public List getRequestHeaders() { - return requestHeaders; + return Collections.unmodifiableList(requestHeaders); } /** From 34925f87f1df11c63c85921673d71aa6571218c2 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 15 Dec 2021 07:37:58 -0500 Subject: [PATCH 35/88] - upgrades android sdk version to latest and adds missing dependabot configuration --- .github/dependabot.yml | 5 +++++ android/build.gradle | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 865793c50..be24b1a66 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,11 @@ updates: schedule: interval: daily open-pull-requests-limit: 10 +- package-ecosystem: gradle + directory: "/android" + schedule: + interval: daily + open-pull-requests-limit: 10 - package-ecosystem: maven directory: "/" schedule: diff --git a/android/build.gradle b/android/build.gradle index 1086c94d3..d4bff8775 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,9 +8,9 @@ buildscript { } dependencies { - classpath "com.gradle:gradle-enterprise-gradle-plugin:3.6" - classpath "com.android.tools.build:gradle:4.1.3" - classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0" + classpath "com.gradle:gradle-enterprise-gradle-plugin:3.7.2" + classpath "com.android.tools.build:gradle:7.0.4" + classpath "com.github.ben-manes:gradle-versions-plugin:0.39.0" } } @@ -23,13 +23,13 @@ apply plugin: "com.android.library" apply plugin: "com.github.ben-manes.versions" android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { versionCode 1 versionName "1.0" minSdkVersion 26 - targetSdkVersion 31 + targetSdkVersion 32 } buildTypes { From 5c05c08eca4a97c73122db000980a9366987ad0e Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 15 Dec 2021 07:40:06 -0500 Subject: [PATCH 36/88] - adds dependabot configuration for samples --- .github/dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index be24b1a66..96bdbee06 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,16 @@ updates: schedule: interval: daily open-pull-requests-limit: 10 +- package-ecosystem: gradle + directory: "/samples/deviceCodeSample" + schedule: + interval: daily + open-pull-requests-limit: 10 +- package-ecosystem: gradle + directory: "/samples/interactiveBrowserSample" + schedule: + interval: daily + open-pull-requests-limit: 10 - package-ecosystem: maven directory: "/" schedule: From 6d9d41bf78a35aaed132a49c17fd1fc75e0b9279 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 13:21:32 +0000 Subject: [PATCH 37/88] Bump junit from 4.12 to 4.13.2 in /samples/interactiveBrowserSample Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.2. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.2) --- updated-dependencies: - dependency-name: junit:junit 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 2b02722f4..744a75156 100644 --- a/samples/interactiveBrowserSample/build.gradle +++ b/samples/interactiveBrowserSample/build.gradle @@ -10,7 +10,7 @@ repositories { } dependencies { - testImplementation group: 'junit', name: 'junit', version: '4.12' + testImplementation group: 'junit', name: 'junit', version: '4.13.2' implementation project(':coreLibrary') implementation 'com.azure:azure-identity:1.2.5' } From 611e779b92e910f191f89ec13f9c5d40875cb976 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 13:21:39 +0000 Subject: [PATCH 38/88] Bump azure-identity from 1.2.5 to 1.4.2 in /samples/deviceCodeSample Bumps [azure-identity](https://github.com/Azure/azure-sdk-for-java) from 1.2.5 to 1.4.2. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-identity_1.2.5...azure-identity_1.4.2) --- 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 2b02722f4..f7129da5e 100644 --- a/samples/deviceCodeSample/build.gradle +++ b/samples/deviceCodeSample/build.gradle @@ -12,5 +12,5 @@ repositories { dependencies { testImplementation group: 'junit', name: 'junit', version: '4.12' implementation project(':coreLibrary') - implementation 'com.azure:azure-identity:1.2.5' + implementation 'com.azure:azure-identity:1.4.2' } From 224f28d4a7ecb42db7a84a80dc36583514e1f17f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 13:21:43 +0000 Subject: [PATCH 39/88] Bump azure-identity in /samples/interactiveBrowserSample Bumps [azure-identity](https://github.com/Azure/azure-sdk-for-java) from 1.2.5 to 1.4.2. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-identity_1.2.5...azure-identity_1.4.2) --- 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 2b02722f4..f7129da5e 100644 --- a/samples/interactiveBrowserSample/build.gradle +++ b/samples/interactiveBrowserSample/build.gradle @@ -12,5 +12,5 @@ repositories { dependencies { testImplementation group: 'junit', name: 'junit', version: '4.12' implementation project(':coreLibrary') - implementation 'com.azure:azure-identity:1.2.5' + implementation 'com.azure:azure-identity:1.4.2' } From d84212f24b25705df05b1956fbf5f4abeb857132 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 13:21:44 +0000 Subject: [PATCH 40/88] Bump junit from 4.12 to 4.13.2 in /samples/deviceCodeSample Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.2. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.2) --- updated-dependencies: - dependency-name: junit:junit 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 2b02722f4..744a75156 100644 --- a/samples/deviceCodeSample/build.gradle +++ b/samples/deviceCodeSample/build.gradle @@ -10,7 +10,7 @@ repositories { } dependencies { - testImplementation group: 'junit', name: 'junit', version: '4.12' + testImplementation group: 'junit', name: 'junit', version: '4.13.2' implementation project(':coreLibrary') implementation 'com.azure:azure-identity:1.2.5' } From 548d9bd3464db0b96b8ae70fa708f072f29016d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 08:02:59 +0000 Subject: [PATCH 41/88] Bump mockito-inline from 4.1.0 to 4.2.0 Bumps [mockito-inline](https://github.com/mockito/mockito) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-inline 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 1bbab38ea..1dc40c534 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -3,7 +3,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' - testImplementation 'org.mockito:mockito-inline:4.1.0' + testImplementation 'org.mockito:mockito-inline:4.2.0' api 'com.squareup.okhttp3:okhttp:4.9.3' From fc313caa2b383ee5385db148e76b6b6f2aaf99e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 08:11:44 +0000 Subject: [PATCH 42/88] Bump mockito-inline from 4.1.0 to 4.2.0 Bumps [mockito-inline](https://github.com/mockito/mockito) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-inline dependency-type: direct:development 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 3b952ac63..5e12131ac 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ org.mockito mockito-inline - 4.1.0 + 4.2.0 test From a5aeefaf32b066449e4a474b08a22e32239eb7ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 08:30:10 +0000 Subject: [PATCH 43/88] Bump mockito-inline from 4.1.0 to 4.2.0 in /android Bumps [mockito-inline](https://github.com/mockito/mockito) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-inline 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 1bbab38ea..1dc40c534 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -3,7 +3,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' - testImplementation 'org.mockito:mockito-inline:4.1.0' + testImplementation 'org.mockito:mockito-inline:4.2.0' api 'com.squareup.okhttp3:okhttp:4.9.3' From e451715aafb725052d73651cb059a2fe63da3586 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 08:35:08 +0000 Subject: [PATCH 44/88] Bump gradle-enterprise-gradle-plugin from 3.7.2 to 3.8 in /android Bumps gradle-enterprise-gradle-plugin from 3.7.2 to 3.8. --- updated-dependencies: - dependency-name: com.gradle:gradle-enterprise-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... 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 d4bff8775..c8d435355 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath "com.gradle:gradle-enterprise-gradle-plugin:3.7.2" + classpath "com.gradle:gradle-enterprise-gradle-plugin:3.8" classpath "com.android.tools.build:gradle:7.0.4" classpath "com.github.ben-manes:gradle-versions-plugin:0.39.0" } From 885913f5b975551e44779debd7b8948c9d3446d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Dec 2021 08:24:06 +0000 Subject: [PATCH 45/88] Bump gradle-versions-plugin from 0.39.0 to 0.40.0 in /android Bumps [gradle-versions-plugin](https://github.com/ben-manes/gradle-versions-plugin) from 0.39.0 to 0.40.0. - [Release notes](https://github.com/ben-manes/gradle-versions-plugin/releases) - [Commits](https://github.com/ben-manes/gradle-versions-plugin/compare/v0.39.0...v0.40.0) --- updated-dependencies: - dependency-name: com.github.ben-manes:gradle-versions-plugin dependency-type: direct:production update-type: version-update:semver-minor ... 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 c8d435355..9dabc6b5b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath "com.gradle:gradle-enterprise-gradle-plugin:3.8" classpath "com.android.tools.build:gradle:7.0.4" - classpath "com.github.ben-manes:gradle-versions-plugin:0.39.0" + classpath "com.github.ben-manes:gradle-versions-plugin:0.40.0" } } From 7e8cef2d9f56d8842abfa401c550b257fc47d8a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jan 2022 08:27:34 +0000 Subject: [PATCH 46/88] Bump gradle-versions-plugin from 0.40.0 to 0.41.0 in /android Bumps [gradle-versions-plugin](https://github.com/ben-manes/gradle-versions-plugin) from 0.40.0 to 0.41.0. - [Release notes](https://github.com/ben-manes/gradle-versions-plugin/releases) - [Commits](https://github.com/ben-manes/gradle-versions-plugin/compare/v0.40.0...v0.41.0) --- updated-dependencies: - dependency-name: com.github.ben-manes:gradle-versions-plugin dependency-type: direct:production update-type: version-update:semver-minor ... 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 9dabc6b5b..0def93564 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -10,7 +10,7 @@ buildscript { dependencies { classpath "com.gradle:gradle-enterprise-gradle-plugin:3.8" classpath "com.android.tools.build:gradle:7.0.4" - classpath "com.github.ben-manes:gradle-versions-plugin:0.40.0" + classpath "com.github.ben-manes:gradle-versions-plugin:0.41.0" } } From d9e73ef69b192a336a1cc67834c3441cd3a009d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jan 2022 08:02:17 +0000 Subject: [PATCH 47/88] Bump azure-core from 1.23.1 to 1.24.0 Bumps [azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.23.1 to 1.24.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.23.1...azure-core_1.24.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 1dc40c534..a9c9154ca 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -10,5 +10,5 @@ dependencies { implementation 'com.google.guava:guava:31.0.1-jre' implementation 'com.google.code.gson:gson:2.8.9' - api 'com.azure:azure-core:1.23.1' + api 'com.azure:azure-core:1.24.0' } \ No newline at end of file From cedce86180f14aa4e1844dc7064821016f88ab4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jan 2022 08:09:25 +0000 Subject: [PATCH 48/88] Bump azure-core from 1.23.1 to 1.24.0 Bumps [azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.23.1 to 1.24.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.23.1...azure-core_1.24.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 5e12131ac..d659213f7 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ com.azure azure-core - 1.23.1 + 1.24.0 org.junit.jupiter From 5c5d729988189ce610cbd91b2b791c38cc9875f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jan 2022 08:23:30 +0000 Subject: [PATCH 49/88] Bump azure-core from 1.23.1 to 1.24.0 in /android Bumps [azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.23.1 to 1.24.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.23.1...azure-core_1.24.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 1dc40c534..a9c9154ca 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -10,5 +10,5 @@ dependencies { implementation 'com.google.guava:guava:31.0.1-jre' implementation 'com.google.code.gson:gson:2.8.9' - api 'com.azure:azure-core:1.23.1' + api 'com.azure:azure-core:1.24.0' } \ No newline at end of file From 9417ef8a7d026a542a5d02e6797f324edc2c541a Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Thu, 9 Dec 2021 17:49:47 -0800 Subject: [PATCH 50/88] Update spotbugs to 5.0.3 --- build.gradle | 2 +- .../com/microsoft/graph/http/GraphErrorResponse.java | 11 +++++++++++ .../microsoft/graph/http/GraphServiceException.java | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 948e7d21f..84ba1b1e0 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ plugins { id 'maven-publish' id 'signing' id 'jacoco' - id 'com.github.spotbugs' version '4.8.0' + id 'com.github.spotbugs' version '5.0.3' id "org.sonarqube" version "3.3" } diff --git a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java index 089318238..e082bc591 100644 --- a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java +++ b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java @@ -71,4 +71,15 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J public final AdditionalDataManager additionalDataManager() { return additionalDataManager; } + + public GraphErrorResponse getCopy() + { + //makeCopy of error + //make copy of additionalData manager + //make copy of raw object + return this; + + } + + } diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java index 25a68530c..bc2c573a7 100644 --- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java +++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.java @@ -212,7 +212,7 @@ public List getResponseHeaders() { */ @Nullable public GraphErrorResponse getError() { - return error; //Copy + return error.getCopy(); //Copy the error, deserialize and copy contents TODO } /** From 86eddd520c05f83266c43e6130a7f2e8e20b5eac Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Thu, 16 Dec 2021 12:17:53 -0800 Subject: [PATCH 51/88] Compile and TestCompile dependencies --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 84ba1b1e0..ff9ee99dd 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,8 @@ plugins { dependencies { compileOnly 'net.jcip:jcip-annotations:1.0' compileOnly 'com.github.spotbugs:spotbugs-annotations:4.5.1' + testCompileOnly 'net.jcip:jcip-annotations:1.0' + testCompileOnly 'com.github.spotbugs:spotbugs-annotations:4.5.1' } java { From 6150b3f37239adbb814883a06b49b7b40e581f76 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Thu, 16 Dec 2021 12:19:38 -0800 Subject: [PATCH 52/88] DeepCopy methods, needs comments --- .../java/com/microsoft/graph/http/GraphError.java | 11 +++++++++++ .../microsoft/graph/http/GraphErrorResponse.java | 15 +++++++-------- .../com/microsoft/graph/http/GraphInnerError.java | 14 ++++++++++++++ .../graph/http/GraphServiceException.java | 2 +- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/microsoft/graph/http/GraphError.java b/src/main/java/com/microsoft/graph/http/GraphError.java index a54db2263..be9a93aa2 100644 --- a/src/main/java/com/microsoft/graph/http/GraphError.java +++ b/src/main/java/com/microsoft/graph/http/GraphError.java @@ -86,4 +86,15 @@ protected String transformErrorCodeCase(@Nonnull final String original) { Objects.requireNonNull(original, "parameter original cannot be null"); return CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, original); } + + //TODO comments + public static final GraphError graphErrorCopy(GraphError error) { + GraphError errorCopy = new GraphError(); + errorCopy.message = error.message; + errorCopy.code = error.code; + if(error.innererror!=null) { + errorCopy.innererror = GraphInnerError.graphInnerErrorCopy(error.innererror); + } + return errorCopy; + } } diff --git a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java index e082bc591..81f3c9a1b 100644 --- a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java +++ b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java @@ -72,14 +72,13 @@ public final AdditionalDataManager additionalDataManager() { return additionalDataManager; } - public GraphErrorResponse getCopy() + //TODO: Comments + public static GraphErrorResponse getErrorCopy(GraphErrorResponse response) { - //makeCopy of error - //make copy of additionalData manager - //make copy of raw object - return this; - + GraphErrorResponse copy = new GraphErrorResponse(); + copy.additionalDataManager = response.additionalDataManager(); //We are okay with keeping the dataManager intact + copy.rawObject = response.rawObject.deepCopy(); + copy.error = GraphError.graphErrorCopy(response.error); + return copy; } - - } diff --git a/src/main/java/com/microsoft/graph/http/GraphInnerError.java b/src/main/java/com/microsoft/graph/http/GraphInnerError.java index b46b1b7f6..c6354e266 100644 --- a/src/main/java/com/microsoft/graph/http/GraphInnerError.java +++ b/src/main/java/com/microsoft/graph/http/GraphInnerError.java @@ -60,4 +60,18 @@ public class GraphInnerError { @SerializedName("innererror") @Nullable public GraphInnerError innererror; + + //TODO: Comments + public static final GraphInnerError graphInnerErrorCopy(GraphInnerError InnerError) { + GraphInnerError innerErrorCopy = new GraphInnerError(); + innerErrorCopy.code = InnerError.code; + innerErrorCopy.errorType = InnerError.errorType; + innerErrorCopy.debugMessage = InnerError.debugMessage; + innerErrorCopy.stackTrace = InnerError.stackTrace; + innerErrorCopy.throwSite = InnerError.throwSite; + if (InnerError.innererror != null) { + innerErrorCopy.innererror = graphInnerErrorCopy(InnerError.innererror); + } + return innerErrorCopy; + } } diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java index bc2c573a7..b1e29c092 100644 --- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java +++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.java @@ -212,7 +212,7 @@ public List getResponseHeaders() { */ @Nullable public GraphErrorResponse getError() { - return error.getCopy(); //Copy the error, deserialize and copy contents TODO + return GraphErrorResponse.getErrorCopy(error); } /** From 350d141eefbfa0a4bc7a7bd557557b45b5953058 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Thu, 16 Dec 2021 12:20:07 -0800 Subject: [PATCH 53/88] Test Suppress Warnings --- .../java/com/microsoft/graph/content/BatchRequestTestBody.java | 2 ++ .../java/com/microsoft/graph/models/TestIJsonBackedObject.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/test/java/com/microsoft/graph/content/BatchRequestTestBody.java b/src/test/java/com/microsoft/graph/content/BatchRequestTestBody.java index 63f7d8dca..acbeaf171 100644 --- a/src/test/java/com/microsoft/graph/content/BatchRequestTestBody.java +++ b/src/test/java/com/microsoft/graph/content/BatchRequestTestBody.java @@ -8,6 +8,7 @@ import com.microsoft.graph.serializer.AdditionalDataManager; import com.microsoft.graph.serializer.IJsonBackedObject; import com.microsoft.graph.serializer.ISerializer; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; public class BatchRequestTestBody implements IJsonBackedObject { @Expose @@ -23,6 +24,7 @@ public void setRawObject(ISerializer serializer, JsonObject json) { final AdditionalDataManager manager = new AdditionalDataManager(this); @Override + @SuppressFBWarnings public AdditionalDataManager additionalDataManager() { return manager; } diff --git a/src/test/java/com/microsoft/graph/models/TestIJsonBackedObject.java b/src/test/java/com/microsoft/graph/models/TestIJsonBackedObject.java index b5a80c12c..c1824a998 100644 --- a/src/test/java/com/microsoft/graph/models/TestIJsonBackedObject.java +++ b/src/test/java/com/microsoft/graph/models/TestIJsonBackedObject.java @@ -4,6 +4,7 @@ import com.microsoft.graph.serializer.AdditionalDataManager; import com.microsoft.graph.serializer.IJsonBackedObject; import com.microsoft.graph.serializer.ISerializer; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,6 +23,7 @@ public void setRawObject(@NotNull ISerializer serializer, @NotNull JsonObject js @Nullable @Override + @SuppressFBWarnings public AdditionalDataManager additionalDataManager() { return additionalDataManager; } From fae78caa2d4393a23eaec67a45199509f682686b Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Thu, 16 Dec 2021 16:55:52 -0800 Subject: [PATCH 54/88] Comments --- src/main/java/com/microsoft/graph/http/GraphError.java | 6 +++++- .../java/com/microsoft/graph/http/GraphErrorResponse.java | 6 +++++- src/main/java/com/microsoft/graph/http/GraphInnerError.java | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/microsoft/graph/http/GraphError.java b/src/main/java/com/microsoft/graph/http/GraphError.java index be9a93aa2..92c5caa8a 100644 --- a/src/main/java/com/microsoft/graph/http/GraphError.java +++ b/src/main/java/com/microsoft/graph/http/GraphError.java @@ -87,7 +87,11 @@ protected String transformErrorCodeCase(@Nonnull final String original) { return CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, original); } - //TODO comments + /** + * Makes a deep copy of specified error + * @param error The error we wish to copy + * @return The copy of the specified error + */ public static final GraphError graphErrorCopy(GraphError error) { GraphError errorCopy = new GraphError(); errorCopy.message = error.message; diff --git a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java index 81f3c9a1b..7dd48c352 100644 --- a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java +++ b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java @@ -72,7 +72,11 @@ public final AdditionalDataManager additionalDataManager() { return additionalDataManager; } - //TODO: Comments + /** + * Make a deep copy the specified GraphErrorResponse object. + * @param response The GraphErrorResponse we want to copy + * @return The copy of the specified GraphErrorResponse + */ public static GraphErrorResponse getErrorCopy(GraphErrorResponse response) { GraphErrorResponse copy = new GraphErrorResponse(); diff --git a/src/main/java/com/microsoft/graph/http/GraphInnerError.java b/src/main/java/com/microsoft/graph/http/GraphInnerError.java index c6354e266..e36f0cdb8 100644 --- a/src/main/java/com/microsoft/graph/http/GraphInnerError.java +++ b/src/main/java/com/microsoft/graph/http/GraphInnerError.java @@ -61,7 +61,11 @@ public class GraphInnerError { @Nullable public GraphInnerError innererror; - //TODO: Comments + /** + * Make a deep copy of the specified GraphInnerError, this includes all it's subsequent InnerError's. + * @param InnerError The InnerError we want to copy. + * @return The copy of the specified InnerError + */ public static final GraphInnerError graphInnerErrorCopy(GraphInnerError InnerError) { GraphInnerError innerErrorCopy = new GraphInnerError(); innerErrorCopy.code = InnerError.code; From 6a69bdc12b2daeb7f5eafa9dfe9876ba77f456d2 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Fri, 7 Jan 2022 11:43:12 -0800 Subject: [PATCH 55/88] Adjust test, ensure deep copy in getCurrentPage() --- .../graph/http/BaseCollectionPageTests.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java index d677327a6..9cf1b7e68 100644 --- a/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java +++ b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java @@ -1,11 +1,8 @@ package com.microsoft.graph.http; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; @@ -48,13 +45,11 @@ public void testNotNull() { public void testCurrentPage() { assertEquals(3,baseCollectionPage.getCurrentPage().size()); assertEquals("Object2", baseCollectionPage.getCurrentPage().get(1)); - Boolean success = false; - try{ - baseCollectionPage.getCurrentPage().remove(1); - }catch (UnsupportedOperationException uEx){ - success = true; - } - assertTrue(success); + + //Test to ensure the returned list from getCurrentPage is a deep copy of baseCollectionPage contents. + ArrayList baseCollectionContentsCopy = (ArrayList) baseCollectionPage.getCurrentPage(); + baseCollectionContentsCopy.remove(1); + assertNotEquals(baseCollectionPage.getCurrentPage().size(), baseCollectionContentsCopy.size()); } @Test From f2a66d9fa3aafe7565985cc6e519df0c82a36980 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Fri, 7 Jan 2022 11:45:27 -0800 Subject: [PATCH 56/88] Adjust functions to conform with unmodifiable lists --- .../java/com/microsoft/graph/http/BaseCollectionRequest.java | 4 ++-- src/main/java/com/microsoft/graph/http/BaseRequest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java index 94797bc51..090a2ab89 100644 --- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java +++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java @@ -216,7 +216,7 @@ public List