Merge pull request #214 from microsoftgraph/extensions-generated-merging

Merged extensions and generated

Author: deepak2016

src/main/java/com/microsoft/graph/models/extensions/ActivityHistoryItem.java

@@ -3,12 +3,142 @@
 // ------------------------------------------------------------------------------
 
 package com.microsoft.graph.models.extensions;
+import com.microsoft.graph.concurrency.*;
+import com.microsoft.graph.core.*;
+import com.microsoft.graph.http.*;
+import com.microsoft.graph.options.*;
+import com.microsoft.graph.serializer.*;
+import java.util.Arrays;
+import java.util.EnumSet;
+import com.microsoft.graph.models.generated.Status;
+import com.microsoft.graph.models.extensions.UserActivity;
+import com.microsoft.graph.models.extensions.Entity;
 
-import com.microsoft.graph.models.generated.BaseActivityHistoryItem;
+
+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 Activity History Item.
  */
-public class ActivityHistoryItem extends BaseActivityHistoryItem {
+public class ActivityHistoryItem extends Entity implements IJsonBackedObject {
+
+
+    /**
+     * The Status.
+     * Set by the server. A status code used to identify valid objects. Values: active, updated, deleted, ignored.
+     */
+    @SerializedName("status")
+    @Expose
+    public Status status;
+
+    /**
+     * The Active Duration Seconds.
+     * Optional. The duration of active user engagement. if not supplied, this is calculated from the startedDateTime and lastActiveDateTime.
+     */
+    @SerializedName("activeDurationSeconds")
+    @Expose
+    public Integer activeDurationSeconds;
+
+    /**
+     * The Created Date Time.
+     * Set by the server. DateTime in UTC when the object was created on the server.
+     */
+    @SerializedName("createdDateTime")
+    @Expose
+    public java.util.Calendar createdDateTime;
+
+    /**
+     * The Last Active Date Time.
+     * Optional. UTC DateTime when the historyItem (activity session) was last understood as active or finished - if null, historyItem status should be Ongoing.
+     */
+    @SerializedName("lastActiveDateTime")
+    @Expose
+    public java.util.Calendar lastActiveDateTime;
+
+    /**
+     * The Last Modified Date Time.
+     * Set by the server. DateTime in UTC when the object was modified on the server.
+     */
+    @SerializedName("lastModifiedDateTime")
+    @Expose
+    public java.util.Calendar lastModifiedDateTime;
+
+    /**
+     * The Expiration Date Time.
+     * Optional. UTC DateTime when the historyItem will undergo hard-delete. Can be set by the client.
+     */
+    @SerializedName("expirationDateTime")
+    @Expose
+    public java.util.Calendar expirationDateTime;
+
+    /**
+     * The Started Date Time.
+     * Required. UTC DateTime when the historyItem (activity session) was started. Required for timeline history.
+     */
+    @SerializedName("startedDateTime")
+    @Expose
+    public java.util.Calendar startedDateTime;
+
+    /**
+     * The User Timezone.
+     * Optional. The timezone in which the user's device used to generate the activity was located at activity creation time. Values supplied as Olson IDs in order to support cross-platform representation.
+     */
+    @SerializedName("userTimezone")
+    @Expose
+    public String userTimezone;
+
+    /**
+     * The Activity.
+     * Optional. NavigationProperty/Containment; navigation property to the associated activity.
+     */
+    @SerializedName("activity")
+    @Expose
+    public UserActivity activity;
+
+
+    /**
+     * 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;
 
+    }
 }

src/main/java/com/microsoft/graph/models/extensions/AdministrativeUnit.java

@@ -3,12 +3,68 @@
 // ------------------------------------------------------------------------------
 
 package com.microsoft.graph.models.extensions;
+import com.microsoft.graph.concurrency.*;
+import com.microsoft.graph.core.*;
+import com.microsoft.graph.http.*;
+import com.microsoft.graph.options.*;
+import com.microsoft.graph.serializer.*;
+import java.util.Arrays;
+import java.util.EnumSet;
+import com.microsoft.graph.models.extensions.DirectoryObject;
 
-import com.microsoft.graph.models.generated.BaseAdministrativeUnit;
+
+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 Administrative Unit.
  */
-public class AdministrativeUnit extends BaseAdministrativeUnit {
+public class AdministrativeUnit extends DirectoryObject implements IJsonBackedObject {
+
+
+
+    /**
+     * 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;
 
+    }
 }