Generated v1.0 models and request builders using Typewriter (#311) - …

gradle.properties

@@ -26,7 +26,7 @@ mavenBintraySnapshotUrl = http://oss.jfrog.org/artifactory/oss-snapshot-local
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph
 mavenMajorVersion    = 1
-mavenMinorVersion    = 6
+mavenMinorVersion    = 7
 mavenPatchVersion    = 0
 mavenArtifactSuffix = 
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven

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

@@ -0,0 +1,78 @@
+// ------------------------------------------------------------------------------
+// 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.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.MediaConfig;
+
+
+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 App Hosted Media Config.
+ */
+public class AppHostedMediaConfig extends MediaConfig implements IJsonBackedObject {
+
+
+    /**
+     * The Blob.
+     * 
+     */
+    @SerializedName("blob")
+    @Expose
+    public String blob;
+
+
+    /**
+     * 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/AudioConferencing.java

@@ -0,0 +1,111 @@
+// ------------------------------------------------------------------------------
+// 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.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.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 Audio Conferencing.
+ */
+public class AudioConferencing implements IJsonBackedObject {
+
+    @SerializedName("@odata.type")
+    @Expose
+    public String oDataType;
+
+    private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
+
+    @Override
+    public final AdditionalDataManager additionalDataManager() {
+        return additionalDataManager;
+    }
+
+    /**
+     * The Conference Id.
+     * 
+     */
+    @SerializedName("conferenceId")
+    @Expose
+    public String conferenceId;
+
+    /**
+     * The Toll Number.
+     * 
+     */
+    @SerializedName("tollNumber")
+    @Expose
+    public String tollNumber;
+
+    /**
+     * The Toll Free Number.
+     * 
+     */
+    @SerializedName("tollFreeNumber")
+    @Expose
+    public String tollFreeNumber;
+
+    /**
+     * The Dialin Url.
+     * 
+     */
+    @SerializedName("dialinUrl")
+    @Expose
+    public String dialinUrl;
+
+
+    /**
+     * 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/Calendar.java

@@ -12,16 +12,16 @@
 import java.util.EnumSet;
 import com.microsoft.graph.models.generated.CalendarColor;
 import com.microsoft.graph.models.extensions.EmailAddress;
-import com.microsoft.graph.models.extensions.Event;
 import com.microsoft.graph.models.extensions.SingleValueLegacyExtendedProperty;
 import com.microsoft.graph.models.extensions.MultiValueLegacyExtendedProperty;
+import com.microsoft.graph.models.extensions.Event;
 import com.microsoft.graph.models.extensions.Entity;
-import com.microsoft.graph.requests.extensions.EventCollectionResponse;
-import com.microsoft.graph.requests.extensions.EventCollectionPage;
 import com.microsoft.graph.requests.extensions.SingleValueLegacyExtendedPropertyCollectionResponse;
 import com.microsoft.graph.requests.extensions.SingleValueLegacyExtendedPropertyCollectionPage;
 import com.microsoft.graph.requests.extensions.MultiValueLegacyExtendedPropertyCollectionResponse;
 import com.microsoft.graph.requests.extensions.MultiValueLegacyExtendedPropertyCollectionPage;
+import com.microsoft.graph.requests.extensions.EventCollectionResponse;
+import com.microsoft.graph.requests.extensions.EventCollectionPage;
 
 
 import com.google.gson.JsonObject;
@@ -94,18 +94,6 @@ public class Calendar extends Entity implements IJsonBackedObject {
     @Expose
     public EmailAddress owner;
 
-    /**
-     * The Events.
-     * The events in the calendar. Navigation property. Read-only.
-     */
-    public EventCollectionPage events;
-
-    /**
-     * The Calendar View.
-     * The calendar view for the calendar. Navigation property. Read-only.
-     */
-    public EventCollectionPage calendarView;
-
     /**
      * The Single Value Extended Properties.
      * The collection of single-value extended properties defined for the calendar. Read-only. Nullable.
@@ -118,6 +106,18 @@ public class Calendar extends Entity implements IJsonBackedObject {
      */
     public MultiValueLegacyExtendedPropertyCollectionPage multiValueExtendedProperties;
 
+    /**
+     * The Events.
+     * The events in the calendar. Navigation property. Read-only.
+     */
+    public EventCollectionPage events;
+
+    /**
+     * The Calendar View.
+     * The calendar view for the calendar. Navigation property. Read-only.
+     */
+    public EventCollectionPage calendarView;
+
 
     /**
      * The raw representation of this class
@@ -158,38 +158,6 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
         rawObject = json;
 
 
-        if (json.has("events")) {
-            final EventCollectionResponse response = new EventCollectionResponse();
-            if (json.has("[email protected]")) {
-                response.nextLink = json.get("[email protected]").getAsString();
-            }
-
-            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("events").toString(), JsonObject[].class);
-            final Event[] array = new Event[sourceArray.length];
-            for (int i = 0; i < sourceArray.length; i++) {
-                array[i] = serializer.deserializeObject(sourceArray[i].toString(), Event.class);
-                array[i].setRawObject(serializer, sourceArray[i]);
-            }
-            response.value = Arrays.asList(array);
-            events = new EventCollectionPage(response, null);
-        }
-
-        if (json.has("calendarView")) {
-            final EventCollectionResponse response = new EventCollectionResponse();
-            if (json.has("[email protected]")) {
-                response.nextLink = json.get("[email protected]").getAsString();
-            }
-
-            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("calendarView").toString(), JsonObject[].class);
-            final Event[] array = new Event[sourceArray.length];
-            for (int i = 0; i < sourceArray.length; i++) {
-                array[i] = serializer.deserializeObject(sourceArray[i].toString(), Event.class);
-                array[i].setRawObject(serializer, sourceArray[i]);
-            }
-            response.value = Arrays.asList(array);
-            calendarView = new EventCollectionPage(response, null);
-        }
-
         if (json.has("singleValueExtendedProperties")) {
             final SingleValueLegacyExtendedPropertyCollectionResponse response = new SingleValueLegacyExtendedPropertyCollectionResponse();
             if (json.has("[email protected]")) {
@@ -221,5 +189,37 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
             response.value = Arrays.asList(array);
             multiValueExtendedProperties = new MultiValueLegacyExtendedPropertyCollectionPage(response, null);
         }
+
+        if (json.has("events")) {
+            final EventCollectionResponse response = new EventCollectionResponse();
+            if (json.has("[email protected]")) {
+                response.nextLink = json.get("[email protected]").getAsString();
+            }
+
+            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("events").toString(), JsonObject[].class);
+            final Event[] array = new Event[sourceArray.length];
+            for (int i = 0; i < sourceArray.length; i++) {
+                array[i] = serializer.deserializeObject(sourceArray[i].toString(), Event.class);
+                array[i].setRawObject(serializer, sourceArray[i]);
+            }
+            response.value = Arrays.asList(array);
+            events = new EventCollectionPage(response, null);
+        }
+
+        if (json.has("calendarView")) {
+            final EventCollectionResponse response = new EventCollectionResponse();
+            if (json.has("[email protected]")) {
+                response.nextLink = json.get("[email protected]").getAsString();
+            }
+
+            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("calendarView").toString(), JsonObject[].class);
+            final Event[] array = new Event[sourceArray.length];
+            for (int i = 0; i < sourceArray.length; i++) {
+                array[i] = serializer.deserializeObject(sourceArray[i].toString(), Event.class);
+                array[i].setRawObject(serializer, sourceArray[i]);
+            }
+            response.value = Arrays.asList(array);
+            calendarView = new EventCollectionPage(response, null);
+        }
     }
 }