Merge pull request #775 from microsoftgraph/dev

baywet · web-flow · commit 4ce634b555b0 · 2023-03-20T09:29:18.000-04:00
2.0.17 release
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @baywet @ddyett @MichaelMainer @nikithauc @zengin @ramsessanchez @andrueastman
+* @baywet @ddyett @MichaelMainer @zengin @ramsessanchez @andrueastman
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -30,3 +30,27 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+- package-ecosystem: gradle
+  directory: "/"
+  target-branch: v3/longTermBranch
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+- package-ecosystem: gradle
+  directory: "/android"
+  target-branch: v3/longTermBranch
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  - package-ecosystem: maven
+  directory: "/"
+  target-branch: v3/longTermBranch
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+- package-ecosystem: github-actions
+  directory: "/"
+  target-branch: v3/longTermBranch
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml
@@ -0,0 +1,32 @@
+name: Auto-merge dependabot updates
+
+on:
+  pull_request:
+    branches: [ main ]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+
+  dependabot-merge:
+
+    runs-on: ubuntu-latest
+
+    if: ${{ github.actor == 'dependabot[bot]' }}
+
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.6
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Enable auto-merge for Dependabot PRs
+        # Only if version bump is not a major version change
+        if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git 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.5.4
+        uses: rickstaa/action-create-tag@v1.6.1
         with:
           tag: ${{ steps.GetVersion.outputs.tag }}
       - name: Queue Git Release
diff --git a/.github/workflows/git-release.yml b/.github/workflows/git-release.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Download Build Artifact
-        uses: dawidd6/action-download-artifact@v2.24.3
+        uses: dawidd6/action-download-artifact@v2.26.0
         with:
           workflow: build-and-publish.yml
           workflow_conclusion: success
diff --git a/.github/workflows/projectsbot.yml b/.github/workflows/projectsbot.yml
@@ -3,7 +3,8 @@
 name: Add PR to project
 on:
   issues:
-    types: [opened]
+    types:
+      - opened
 jobs:
   track_issue:
     runs-on: ubuntu-latest
@@ -24,22 +25,27 @@ jobs:
           gh api graphql -f query='
             query($org: String!, $number: Int!) {
               organization(login: $org){
-                projectNext(number: $number) {
+                projectV2(number: $number) {
                   id
                   fields(first:20) {
                     nodes {
-                      id
-                      name
-                      settings
+                      ... on ProjectV2SingleSelectField {
+                        id
+                        name
+                        options {
+                          id
+                          name
+                        }
+                      }
                     }
                   }
                 }
               }
             }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
 
-          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-          echo 'TRIAGE_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Needs Triage 🔍") |.id' project_data.json) >> $GITHUB_ENV
+          echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
+          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'TRIAGE_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Status") | .options[] | select(.name=="Needs Triage 🔍") |.id' project_data.json) >> $GITHUB_ENV
 
       - name: Add Issue to project
         env:
@@ -48,12 +54,12 @@ jobs:
         run: |
           item_id="$( gh api graphql -f query='
             mutation($project:ID!, $issue:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $project, contentId: $issue}) {
+                item {
                   id
                 }
               }
-            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
           
           echo 'ITEM_ID='$item_id >> $GITHUB_ENV
 
@@ -68,13 +74,13 @@ jobs:
               $status_field: ID!
               $status_value: String!              
             ) {
-              set_status: updateProjectNextItemField(input: {
+              set_status: updateProjectV2ItemFieldValue(input: {
                 projectId: $project
                 itemId: $item
                 fieldId: $status_field
-                value: $status_value
+                value: {singleSelectOptionId: $status_value} 
               }) {
-                projectNextItem {
+                projectV2Item {
                   id
                   }
               }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+## [2.0.17] - 2023-03-20
+
 ### Changed
 
+- Aligns default http client timeout to be 100 seconds
+- Fixes NullPointerException in GraphErrorResponse#copy
+
 ## [2.0.16] - 2023-01-30
 
 ### Changed
diff --git a/android/build.gradle b/android/build.gradle
@@ -8,9 +8,9 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.3"
-        classpath "com.android.tools.build:gradle:7.4.0"
-        classpath "com.github.ben-manes:gradle-versions-plugin:0.44.0"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.4"
+        classpath "com.android.tools.build:gradle:7.4.2"
+        classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }
 }
 
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ plugins {
     id 'signing'
     id 'jacoco'
     id 'com.github.spotbugs' version '5.0.13'
-    id "org.sonarqube" version "3.5.0.2730"
+    id "org.sonarqube" version "4.0.0.2929"
 }
 
 java {
diff --git a/gradle.properties b/gradle.properties
@@ -25,7 +25,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 2
 mavenMinorVersion    = 0
-mavenPatchVersion    = 16
+mavenPatchVersion    = 17
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -3,14 +3,14 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
-    testImplementation 'org.mockito:mockito-inline:5.1.1'
+    testImplementation 'org.mockito:mockito-inline:5.2.0'
     
     api 'com.squareup.okhttp3:okhttp:4.10.0'
 
     implementation 'com.google.guava:guava:31.1-jre'
 
     implementation 'com.google.code.gson:gson:2.10.1'
-    api 'com.azure:azure-core:1.35.0'
+    api 'com.azure:azure-core:1.37.0'
 
     api 'com.github.spotbugs:spotbugs-annotations:4.7.3'
 }
diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core</artifactId>
-            <version>1.35.0</version>
+            <version>1.37.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
-            <version>5.1.1</version>
+            <version>5.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git 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.7.3'
+    implementation 'com.azure:azure-identity:1.8.1'
 }
diff --git 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.7.3'
+    implementation 'com.azure:azure-identity:1.8.1'
 }
diff --git a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java
@@ -80,8 +80,8 @@ public final AdditionalDataManager additionalDataManager() {
     public GraphErrorResponse copy() {
         GraphErrorResponse responseCopy = new GraphErrorResponse();
         responseCopy.additionalDataManager = this.additionalDataManager;
-        responseCopy.rawObject = this.rawObject.deepCopy();
-        responseCopy.error = this.error.copy();
+        responseCopy.rawObject = this.rawObject == null ? null : this.rawObject.deepCopy();
+        responseCopy.error = this.error == null ? null : this.error.copy();
         return responseCopy;
     }
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
@@ -7,6 +7,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.time.Duration;
 import java.util.Objects;
 
 /**
@@ -28,7 +29,10 @@ public static Builder custom() {
         return new OkHttpClient.Builder()
                     .addInterceptor(new TelemetryHandler())
                     .followRedirects(false)
-                    .followSslRedirects(false);
+                    .followSslRedirects(false)
+                    .connectTimeout(Duration.ofSeconds(100))
+                    .readTimeout(Duration.ofSeconds(100))
+                    .callTimeout(Duration.ofSeconds(100));
     }
 
     /**
diff --git a/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java b/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.Mockito.mock;
 
 import org.junit.jupiter.api.Test;
@@ -59,4 +60,18 @@ public void testGraphErrorResponseCopy() {
 
         assertEquals(errorResponse.rawObject, errorResponseCopy.rawObject);
     }
+
+    @Test
+    void testGraphErrorResponseCopy2() {
+        GraphErrorResponse errorResponse = new GraphErrorResponse();;
+
+        //Copy the errorResponse and its subsequent innerErrors
+        GraphErrorResponse errorResponseCopy = errorResponse.copy();
+
+        //Ensure default null values are copied without issue.
+        assertNull(errorResponseCopy.error);
+        assertNull(errorResponseCopy.rawObject);
+
+        assertEquals(errorResponse.rawObject, errorResponseCopy.rawObject);
+    }
 }
diff --git a/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java b/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
@@ -1,5 +1,6 @@
 package com.microsoft.graph.httpcore;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
@@ -16,6 +17,9 @@ public class HttpClientsTest {
     public void testHttpClientCreation() {
         OkHttpClient httpclient = HttpClients.createDefault(mock(IAuthenticationProvider.class));
         assertTrue(httpclient != null);
+        assertEquals(100000,httpclient.readTimeoutMillis());
+        assertEquals(100000,httpclient.connectTimeoutMillis());
+        assertEquals(100000,httpclient.callTimeoutMillis());
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @baywet @ddyett @MichaelMainer @nikithauc @zengin @ramsessanchez @andrueastman`
	`1`	`+* @baywet @ddyett @MichaelMainer @zengin @ramsessanchez @andrueastman`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.3"`
`12`		`- classpath "com.android.tools.build:gradle:7.4.0"`
`13`		`- classpath "com.github.ben-manes:gradle-versions-plugin:0.44.0"`
	`11`	`+ classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.4"`
	`12`	`+ classpath "com.android.tools.build:gradle:7.4.2"`
	`13`	`+ classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ plugins {`
`15`	`15`	`id 'signing'`
`16`	`16`	`id 'jacoco'`
`17`	`17`	`id 'com.github.spotbugs' version '5.0.13'`
`18`		`- id "org.sonarqube" version "3.5.0.2730"`
	`18`	`+ id "org.sonarqube" version "4.0.0.2929"`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`java {`