Merge pull request #429 from microsoftgraph/zengin/namespacesJava2

V1 release with multiple namespace support

Author: zengin

.azure-pipelines/generate-v1.0-models.yml

@@ -45,16 +45,9 @@ steps:
   inputs:
     targetType: inline
     script: |
-      
-      $repoModelsDir = "$env:Build_SourcesDirectory\msgraph-sdk-java\src\main\java\com\microsoft\graph\models\generated\"
-      $repoModelsExtensionDir = "$env:Build_SourcesDirectory\msgraph-sdk-java\src\main\java\com\microsoft\graph\models\extensions\"
-      $repoRequestExtensionDir = "$env:Build_SourcesDirectory\msgraph-sdk-java\src\main\java\com\microsoft\graph\requests\extensions\"
-      Write-Host "Path to repo model directory: $repoModelsDir"
-      Write-Host "Path to repo model extension directory: $repoModelsExtensionDir"
-      Write-Host "Path to repo request directory: $repoRequestExtensionDir"
-      Write-Host "##vso[task.setvariable variable=repoModelsDir]$repoModelsDir"
-      Write-Host "##vso[task.setvariable variable=repoModelsExtensionDir]$repoModelsExtensionDir"
-      Write-Host "##vso[task.setvariable variable=repoRequestExtensionDir]$repoRequestExtensionDir"
+      $repoDir = "$env:Build_SourcesDirectory\msgraph-sdk-java\"
+      Write-Host "Path to java repository: $repoDir"
+      Write-Host "##vso[task.setvariable variable=repoDir]$repoDir"
 
       $outputPath = Join-Path $env:Build_SourcesDirectory "output"
       Write-Host "Path to typewriter.exe output $outputPath"
@@ -68,21 +61,12 @@ steps:
       Write-Host "Branch path spec for the pull request will be $branchName"
       Write-Host "##vso[task.setvariable variable=branchName]$branchName"
 
-- task: PowerShell@2
-  displayName: 'Git: checkout dev'
-  inputs:
-    targetType: inline
-    workingDirectory: '$(Build.SourcesDirectory)/msgraph-sdk-java'
-    script: |
-      git checkout dev | Write-Host
-
 - task: PowerShell@2
   displayName: 'Git: branch from dev named with the build id: $(Build.BuildId)'
   inputs:
     targetType: inline
     workingDirectory: '$(Build.SourcesDirectory)/msgraph-sdk-java'
     script: |
-      
       Write-Host "The new branch name will be: $env:branchName"
       git checkout -B $env:branchName | Write-Host
 
@@ -100,11 +84,17 @@ steps:
   inputs:
     targetType: inline
     script: |
-      Remove-Item -Recurse $env:repoModelsDir | Write-Host
-      Remove-Item -Recurse $env:repoModelsExtensionDir | Write-Host
-      Remove-Item -Recurse $env:repoRequestExtensionDir | Write-Host
-      Write-Host "Removed the existing generated files in the repo." -ForegroundColor Green
-  enabled: false # The old GUI pipeline wasn't doing this. I recall that there was a reason
+      $mainDir = Join-Path $env:repoDir "\src\main\"
+      $extensionsAndGeneratedDirectories = Get-ChildItem $mainDir -Include extensions,generated -Recurse -Directory
+
+      # this list should be updated if a new hand-crafted extension is added to one of the extensions/ directories
+      $filesThatShouldNotBeDeleted = "UploadSession.java","DateOnly.java","TimeOfDay.java","Multipart.java","ChunkedUploadRequest.java","ChunkedUploadResult.java","CustomRequestBuilder.java"
+      foreach ($directory in $extensionsAndGeneratedDirectories)
+      {
+          Remove-Item $directory.FullName -Recurse -Force -Exclude $filesThatShouldNotBeDeleted
+      }
+      Write-Host "Removed the existing generated files in the repo's main directory: $mainDir" -ForegroundColor Green
+  enabled: true # The old GUI pipeline wasn't doing this. I recall that there was a reason
   # for this but I can't recall the reason but I think it was related to reducing number of
   # generated files.
 
@@ -123,21 +113,14 @@ steps:
     targetType: inline
     script: |
       # Path to typewriter output
-      $modelsDirectory = Join-Path $env:outputPath "\com\microsoft\graph\models\generated\*"
-      $modelsExtensionsDirectory = Join-Path $env:outputPath "\com\microsoft\graph\models\extensions\*"
-      $requestsExtensionsDirectory = Join-Path $env:outputPath "\com\microsoft\graph\requests\extensions\*"
+      $comDirectory = Join-Path $env:outputPath "\com\"
 
-      # models\generated - excluding Base* should not be necessary as those files shouldn't be generated. 
-      Copy-Item $modelsDirectory -Destination $env:repoModelsDir -Exclude Base*
-      Write-Host "Copied the generated models\generated files into the repo. Excluded Base* files." -ForegroundColor Green
+      # Path to the destination directory
+      $comDestinationDirectory = Join-Path $env:repoDir "\src\main\java\"
 
-      # models\extensions
-      Copy-Item $modelsExtensionsDirectory -Destination $env:repoModelsExtensionDir
-      Write-Host "Copied the generated models\extensions files into the repo." -ForegroundColor Green
-      
-      # requests\extensions
-      Copy-Item $requestsExtensionsDirectory -Destination $env:repoRequestExtensionDir
-      Write-Host "Copied the generated requests\extensions files into the repo." -ForegroundColor Green
+      # copies com/ directory to java SDK repo, by following all the recursive paths
+      Copy-Item $comDirectory -Destination $comDestinationDirectory -Recurse -Force
+      Write-Host "Copied the generated com\ files into the repo. From: $comDirectory to: $comDestinationDirectory" -ForegroundColor Green
 
 - task: PowerShell@2
   displayName: 'Git: stage and commit generated files'

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,4 +16,6 @@ Fixes #
 
 <!-- Optional. Provide related links. This might be other pull requests, code files, StackOverflow posts. Delete this section if it is not used. -->
 ### Other links
+
+<!-- Is this PR adding a new hand crafted extension class? If so, please update $filesThatShouldNotBeDeleted variable in .azure-pipelines/generate-v1.0-models.yml file, so that it doesn't get deleted by auto generation pipeline.-->
 -

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

@@ -0,0 +1,169 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.callrecords.models.extensions;
+import com.microsoft.graph.concurrency.*;
+import com.microsoft.graph.core.*;
+import com.microsoft.graph.http.*;
+import com.microsoft.graph.serializer.*;
+import java.util.Arrays;
+import java.util.EnumSet;
+import com.microsoft.graph.callrecords.models.generated.CallType;
+import com.microsoft.graph.callrecords.models.generated.Modality;
+import com.microsoft.graph.models.extensions.IdentitySet;
+import com.microsoft.graph.callrecords.models.extensions.Session;
+import com.microsoft.graph.models.extensions.Entity;
+import com.microsoft.graph.callrecords.requests.extensions.SessionCollectionResponse;
+import com.microsoft.graph.callrecords.requests.extensions.SessionCollectionPage;
+
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
+import com.google.gson.annotations.*;
+import java.util.HashMap;
+import java.util.Map;
+
+// **NOTE** This file was generated by a tool and any changes will be overwritten.
+
+/**
+ * The class for the Call Record.
+ */
+public class CallRecord extends Entity implements IJsonBackedObject {
+
+
+    /**
+     * 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.
+     */
+    @SerializedName("version")
+    @Expose
+    public Long version;
+
+    /**
+     * The Type.
+     * Indicates the type of the call. Possible values are: unknown, groupCall, peerToPeer, unknownFutureValue.
+     */
+    @SerializedName("type")
+    @Expose
+    public CallType type;
+
+    /**
+     * The Modalities.
+     * List of all the modalities used in the call. Possible values are: unknown, audio, video, videoBasedScreenSharing, data, screenSharing, unknownFutureValue.
+     */
+    @SerializedName("modalities")
+    @Expose
+    public java.util.List<Modality> modalities;
+
+    /**
+     * 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'
+     */
+    @SerializedName("lastModifiedDateTime")
+    @Expose
+    public java.util.Calendar lastModifiedDateTime;
+
+    /**
+     * 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'
+     */
+    @SerializedName("startDateTime")
+    @Expose
+    public java.util.Calendar startDateTime;
+
+    /**
+     * 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'
+     */
+    @SerializedName("endDateTime")
+    @Expose
+    public java.util.Calendar endDateTime;
+
+    /**
+     * The Organizer.
+     * The organizing party's identity.
+     */
+    @SerializedName("organizer")
+    @Expose
+    public IdentitySet organizer;
+
+    /**
+     * The Participants.
+     * List of distinct identities involved in the call.
+     */
+    @SerializedName("participants")
+    @Expose
+    public java.util.List<IdentitySet> participants;
+
+    /**
+     * The Join Web Url.
+     * Meeting URL associated to the call. May not be available for a peerToPeer call record type.
+     */
+    @SerializedName("joinWebUrl")
+    @Expose
+    public String joinWebUrl;
+
+    /**
+     * The Sessions.
+     * 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.
+     */
+    public SessionCollectionPage sessions;
+
+
+    /**
+     * The raw representation of this class
+     */
+    private JsonObject rawObject;
+
+    /**
+     * The serializer
+     */
+    private ISerializer serializer;
+
+    /**
+     * Gets the raw representation of this class
+     *
+     * @return the raw representation of this class
+     */
+    public JsonObject getRawObject() {
+        return rawObject;
+    }
+
+    /**
+     * Gets serializer
+     *
+     * @return the serializer
+     */
+    protected ISerializer getSerializer() {
+        return serializer;
+    }
+
+    /**
+     * Sets the raw JSON object
+     *
+     * @param serializer the serializer
+     * @param json the JSON object to set this object to
+     */
+    public void setRawObject(final ISerializer serializer, final JsonObject json) {
+        this.serializer = serializer;
+        rawObject = json;
+
+
+        if (json.has("sessions")) {
+            final SessionCollectionResponse response = new SessionCollectionResponse();
+            if (json.has("sessions@odata.nextLink")) {
+                response.nextLink = json.get("sessions@odata.nextLink").getAsString();
+            }
+
+            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("sessions").toString(), JsonObject[].class);
+            final Session[] array = new Session[sourceArray.length];
+            for (int i = 0; i < sourceArray.length; i++) {
+                array[i] = serializer.deserializeObject(sourceArray[i].toString(), Session.class);
+                array[i].setRawObject(serializer, sourceArray[i]);
+            }
+            response.value = Arrays.asList(array);
+            sessions = new SessionCollectionPage(response, null);
+        }
+    }
+}

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

@@ -0,0 +1,87 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.callrecords.models.extensions;
+import com.microsoft.graph.concurrency.*;
+import com.microsoft.graph.core.*;
+import com.microsoft.graph.http.*;
+import com.microsoft.graph.serializer.*;
+import java.util.Arrays;
+import java.util.EnumSet;
+import com.microsoft.graph.callrecords.models.generated.ClientPlatform;
+import com.microsoft.graph.callrecords.models.generated.ProductFamily;
+import com.microsoft.graph.callrecords.models.extensions.UserAgent;
+
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
+import com.google.gson.annotations.*;
+import java.util.HashMap;
+import java.util.Map;
+
+// **NOTE** This file was generated by a tool and any changes will be overwritten.
+
+/**
+ * The class for the Client User Agent.
+ */
+public class ClientUserAgent extends UserAgent implements IJsonBackedObject {
+
+
+    /**
+     * The Platform.
+     * Identifies the platform used by this endpoint. Possible values are: unknown, windows, macOS, iOS, android, web, ipPhone, roomSystem, surfaceHub, holoLens, unknownFutureValue.
+     */
+    @SerializedName("platform")
+    @Expose
+    public ClientPlatform platform;
+
+    /**
+     * The Product Family.
+     * Identifies the family of application software used by this endpoint. Possible values are: unknown, teams, skypeForBusiness, lync, unknownFutureValue.
+     */
+    @SerializedName("productFamily")
+    @Expose
+    public ProductFamily productFamily;
+
+
+    /**
+     * The raw representation of this class
+     */
+    private JsonObject rawObject;
+
+    /**
+     * The serializer
+     */
+    private ISerializer serializer;
+
+    /**
+     * Gets the raw representation of this class
+     *
+     * @return the raw representation of this class
+     */
+    public JsonObject getRawObject() {
+        return rawObject;
+    }
+
+    /**
+     * Gets serializer
+     *
+     * @return the serializer
+     */
+    protected ISerializer getSerializer() {
+        return serializer;
+    }
+
+    /**
+     * Sets the raw JSON object
+     *
+     * @param serializer the serializer
+     * @param json the JSON object to set this object to
+     */
+    public void setRawObject(final ISerializer serializer, final JsonObject json) {
+        this.serializer = serializer;
+        rawObject = json;
+
+    }
+}