Merge branch 'dev' into feature/java-16

Author: baywet

.github/workflows/api-level-lint.yml

@@ -14,8 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: 16
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2

.github/workflows/type-summary.yml

@@ -11,8 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: 'adopt'
         java-version: 16
     - name: Add execution right to the script
       run: chmod +x gradlew
@@ -28,7 +29,7 @@ jobs:
         echo "CURRENT_BRANCH=${branchName}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
       shell: pwsh
     - name: push
-      uses: github-actions-x/commit@v2.7
+      uses: github-actions-x/commit@v2.8
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         push-branch: ${{ env.CURRENT_BRANCH }}

README.md

@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph:3.0.0'
+    implementation 'com.microsoft.graph:microsoft-graph:3.2.0'
     // Uncomment the line below if you are building an android application
     //implementation 'com.google.guava:guava:29.0-android'
 }
@@ -33,7 +33,7 @@ Add the dependency in `dependencies` in pom.xml
 <dependency>
   <groupId>com.microsoft.graph</groupId>
   <artifactId>microsoft-graph</artifactId>
-  <version>3.0.0</version>
+  <version>3.2.0</version>
 </dependency>
 ```
 
@@ -126,3 +126,5 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
 ## 9. Third-party notices
 
 [Third-party notices](THIRD%20PARTY%20NOTICES)
+
+

gradle.properties

@@ -26,7 +26,7 @@ org.gradle.caching=true
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph
 mavenMajorVersion = 3
-mavenMinorVersion = 0
+mavenMinorVersion = 2
 mavenPatchVersion = 0
 mavenArtifactSuffix = 
 
@@ -44,3 +44,5 @@ mavenCentralPublishingEnabled=false
 
 
 
+
+

gradle/dependencies.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    implementation 'com.google.guava:guava:30.1-jre'
+    implementation 'com.google.guava:guava:30.1.1-jre'
 
     // Use JUnit test framework
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'

pom.xml

@@ -1,36 +1,53 @@
 <project>
-	<!-- 
-		This package file is a place holder to enable the dependency graph https://github.com/microsoftgraph/msgraph-sdk-java/network/dependencies
-		as the dependency graph is not compatible with gradle https://docs.github.com/en/free-pro-team@latest/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems
-		build.gradle is the source of truth
-	-->
-	<modelVersion>4.0.0</modelVersion>
-   
-	<groupId>com.microsoft.graph</groupId>
-	<artifactId>microsoft-graph</artifactId>
-	<version>3.0.0</version>
-	<packaging>pom</packaging>
+    <!--
+        This package file is a place holder to enable the dependency graph https://github.com/microsoftgraph/msgraph-sdk-java/network/dependencies
+        as the dependency graph is not compatible with gradle https://docs.github.com/en/free-pro-team@latest/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems
+        build.gradle is the source of truth
+    -->
+    <modelVersion>4.0.0</modelVersion>
 
-	<dependencies>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>30.1-jre</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.8.6</version>
-		</dependency>
-		<dependency>
-			<groupId>com.squareup.okhttp3</groupId>
-			<artifactId>gson</artifactId>
-			<version>4.9.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.microsoft.graph</groupId>
-			<artifactId>microsoft-graph-core</artifactId>
-			<version>2.0.0</version>
-		</dependency>
-	</dependencies>
+    <groupId>com.microsoft.graph</groupId>
+    <artifactId>microsoft-graph</artifactId>
+    <version>3.1.0</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>30.1-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.9.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.graph</groupId>
+            <artifactId>microsoft-graph-core</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.5.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.8.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

src/main/java/com/microsoft/graph/callrecords/models/CallRecord.java

@@ -33,10 +33,10 @@ public class CallRecord extends Entity implements IJsonBackedObject {
 
     /**
      * The End Date Time.
-     * UTC time when the last user left the call. The DateTimeOffset type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 would look like this: '2014-01-01T00:00:00Z'
+     * UTC time when the last user left the call. The DateTimeOffset type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z
      */
     @SerializedName(value = "endDateTime", alternate = {"EndDateTime"})
-    @Expose
+    @Expose
 	@Nullable
     public java.time.OffsetDateTime endDateTime;
 
@@ -45,16 +45,16 @@ public class CallRecord extends Entity implements IJsonBackedObject {
      * Meeting URL associated to the call. May not be available for a peerToPeer call record type.
      */
     @SerializedName(value = "joinWebUrl", alternate = {"JoinWebUrl"})
-    @Expose
+    @Expose
 	@Nullable
     public String joinWebUrl;
 
     /**
      * The Last Modified Date Time.
-     * UTC time when the call record was created. The DatetimeOffset type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 would look like this: '2014-01-01T00:00:00Z'
+     * UTC time when the call record was created. The DatetimeOffset type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z
      */
     @SerializedName(value = "lastModifiedDateTime", alternate = {"LastModifiedDateTime"})
-    @Expose
+    @Expose
 	@Nullable
     public java.time.OffsetDateTime lastModifiedDateTime;
 
@@ -63,7 +63,7 @@ public class CallRecord extends Entity implements IJsonBackedObject {
      * List of all the modalities used in the call. Possible values are: unknown, audio, video, videoBasedScreenSharing, data, screenSharing, unknownFutureValue.
      */
     @SerializedName(value = "modalities", alternate = {"Modalities"})
-    @Expose
+    @Expose
 	@Nullable
     public java.util.List<Modality> modalities;
 
@@ -72,7 +72,7 @@ public class CallRecord extends Entity implements IJsonBackedObject {
      * The organizing party's identity.
      */
     @SerializedName(value = "organizer", alternate = {"Organizer"})
-    @Expose
+    @Expose
 	@Nullable
     public IdentitySet organizer;
 
@@ -81,16 +81,16 @@ public class CallRecord extends Entity implements IJsonBackedObject {
      * List of distinct identities involved in the call.
      */
     @SerializedName(value = "participants", alternate = {"Participants"})
-    @Expose
+    @Expose
 	@Nullable
     public java.util.List<IdentitySet> participants;
 
     /**
      * The Start Date Time.
-     * UTC time when the first user joined the call. The DatetimeOffset type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 would look like this: '2014-01-01T00:00:00Z'
+     * UTC time when the first user joined the call. The DatetimeOffset type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z.
      */
     @SerializedName(value = "startDateTime", alternate = {"StartDateTime"})
-    @Expose
+    @Expose
 	@Nullable
     public java.time.OffsetDateTime startDateTime;
 
@@ -99,16 +99,16 @@ public class CallRecord extends Entity implements IJsonBackedObject {
      * Indicates the type of the call. Possible values are: unknown, groupCall, peerToPeer, unknownFutureValue.
      */
     @SerializedName(value = "type", alternate = {"Type"})
-    @Expose
+    @Expose
 	@Nullable
     public CallType type;
 
     /**
      * The Version.
-     * Monotonically increasing version of the call record. Higher version call records with the same ID includes additional data compared to the lower version.
+     * Monotonically increasing version of the call record. Higher version call records with the same id includes additional data compared to the lower version.
      */
     @SerializedName(value = "version", alternate = {"Version"})
-    @Expose
+    @Expose
 	@Nullable
     public Long version;
 
@@ -117,7 +117,7 @@ public class CallRecord extends Entity implements IJsonBackedObject {
      * List of sessions involved in the call. Peer-to-peer calls typically only have one session, whereas group calls typically have at least one session per participant. Read-only. Nullable.
      */
     @SerializedName(value = "sessions", alternate = {"Sessions"})
-    @Expose
+    @Expose
 	@Nullable
     public SessionCollectionPage sessions;
 

src/main/java/com/microsoft/graph/callrecords/models/ClientUserAgent.java

@@ -32,7 +32,7 @@ public class ClientUserAgent extends UserAgent implements IJsonBackedObject {
      * Identifies the platform used by this endpoint. Possible values are: unknown, windows, macOS, iOS, android, web, ipPhone, roomSystem, surfaceHub, holoLens, unknownFutureValue.
      */
     @SerializedName(value = "platform", alternate = {"Platform"})
-    @Expose
+    @Expose
 	@Nullable
     public ClientPlatform platform;
 
@@ -41,7 +41,7 @@ public class ClientUserAgent extends UserAgent implements IJsonBackedObject {
      * Identifies the family of application software used by this endpoint. Possible values are: unknown, teams, skypeForBusiness, lync, unknownFutureValue.
      */
     @SerializedName(value = "productFamily", alternate = {"ProductFamily"})
-    @Expose
+    @Expose
 	@Nullable
     public ProductFamily productFamily;