Generated v1.0 models and request builders using Typewriter

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);
+        }
     }
 }

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

@@ -12,17 +12,17 @@
 import java.util.EnumSet;
 import com.microsoft.graph.models.extensions.EmailAddress;
 import com.microsoft.graph.models.extensions.PhysicalAddress;
-import com.microsoft.graph.models.extensions.Extension;
 import com.microsoft.graph.models.extensions.SingleValueLegacyExtendedProperty;
 import com.microsoft.graph.models.extensions.MultiValueLegacyExtendedProperty;
 import com.microsoft.graph.models.extensions.ProfilePhoto;
+import com.microsoft.graph.models.extensions.Extension;
 import com.microsoft.graph.models.extensions.OutlookItem;
-import com.microsoft.graph.requests.extensions.ExtensionCollectionResponse;
-import com.microsoft.graph.requests.extensions.ExtensionCollectionPage;
 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.ExtensionCollectionResponse;
+import com.microsoft.graph.requests.extensions.ExtensionCollectionPage;
 
 
 import com.google.gson.JsonObject;
@@ -303,12 +303,6 @@ public class Contact extends OutlookItem implements IJsonBackedObject {
     @Expose
     public java.util.List<String> children;
 
-    /**
-     * The Extensions.
-     * The collection of open extensions defined for the contact. Read-only. Nullable.
-     */
-    public ExtensionCollectionPage extensions;
-
     /**
      * The Single Value Extended Properties.
      * The collection of single-value extended properties defined for the contact. Read-only. Nullable.
@@ -329,6 +323,12 @@ public class Contact extends OutlookItem implements IJsonBackedObject {
     @Expose
     public ProfilePhoto photo;
 
+    /**
+     * The Extensions.
+     * The collection of open extensions defined for the contact. Read-only. Nullable.
+     */
+    public ExtensionCollectionPage extensions;
+
 
     /**
      * The raw representation of this class
@@ -369,22 +369,6 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
         rawObject = json;
 
 
-        if (json.has("extensions")) {
-            final ExtensionCollectionResponse response = new ExtensionCollectionResponse();
-            if (json.has("[email protected]")) {
-                response.nextLink = json.get("[email protected]").getAsString();
-            }
-
-            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("extensions").toString(), JsonObject[].class);
-            final Extension[] array = new Extension[sourceArray.length];
-            for (int i = 0; i < sourceArray.length; i++) {
-                array[i] = serializer.deserializeObject(sourceArray[i].toString(), Extension.class);
-                array[i].setRawObject(serializer, sourceArray[i]);
-            }
-            response.value = Arrays.asList(array);
-            extensions = new ExtensionCollectionPage(response, null);
-        }
-
         if (json.has("singleValueExtendedProperties")) {
             final SingleValueLegacyExtendedPropertyCollectionResponse response = new SingleValueLegacyExtendedPropertyCollectionResponse();
             if (json.has("[email protected]")) {
@@ -416,5 +400,21 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
             response.value = Arrays.asList(array);
             multiValueExtendedProperties = new MultiValueLegacyExtendedPropertyCollectionPage(response, null);
         }
+
+        if (json.has("extensions")) {
+            final ExtensionCollectionResponse response = new ExtensionCollectionResponse();
+            if (json.has("[email protected]")) {
+                response.nextLink = json.get("[email protected]").getAsString();
+            }
+
+            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("extensions").toString(), JsonObject[].class);
+            final Extension[] array = new Extension[sourceArray.length];
+            for (int i = 0; i < sourceArray.length; i++) {
+                array[i] = serializer.deserializeObject(sourceArray[i].toString(), Extension.class);
+                array[i].setRawObject(serializer, sourceArray[i]);
+            }
+            response.value = Arrays.asList(array);
+            extensions = new ExtensionCollectionPage(response, null);
+        }
     }
 }

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

@@ -10,19 +10,19 @@
 import com.microsoft.graph.serializer.*;
 import java.util.Arrays;
 import java.util.EnumSet;
-import com.microsoft.graph.models.extensions.Contact;
-import com.microsoft.graph.models.extensions.ContactFolder;
 import com.microsoft.graph.models.extensions.SingleValueLegacyExtendedProperty;
 import com.microsoft.graph.models.extensions.MultiValueLegacyExtendedProperty;
+import com.microsoft.graph.models.extensions.Contact;
+import com.microsoft.graph.models.extensions.ContactFolder;
 import com.microsoft.graph.models.extensions.Entity;
-import com.microsoft.graph.requests.extensions.ContactCollectionResponse;
-import com.microsoft.graph.requests.extensions.ContactCollectionPage;
-import com.microsoft.graph.requests.extensions.ContactFolderCollectionResponse;
-import com.microsoft.graph.requests.extensions.ContactFolderCollectionPage;
 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.ContactCollectionResponse;
+import com.microsoft.graph.requests.extensions.ContactCollectionPage;
+import com.microsoft.graph.requests.extensions.ContactFolderCollectionResponse;
+import com.microsoft.graph.requests.extensions.ContactFolderCollectionPage;
 
 
 import com.google.gson.JsonObject;
@@ -55,18 +55,6 @@ public class ContactFolder extends Entity implements IJsonBackedObject {
     @Expose
     public String displayName;
 
-    /**
-     * The Contacts.
-     * The contacts in the folder. Navigation property. Read-only. Nullable.
-     */
-    public ContactCollectionPage contacts;
-
-    /**
-     * The Child Folders.
-     * The collection of child folders in the folder. Navigation property. Read-only. Nullable.
-     */
-    public ContactFolderCollectionPage childFolders;
-
     /**
      * The Single Value Extended Properties.
      * The collection of single-value extended properties defined for the contactFolder. Read-only. Nullable.
@@ -79,6 +67,18 @@ public class ContactFolder extends Entity implements IJsonBackedObject {
      */
     public MultiValueLegacyExtendedPropertyCollectionPage multiValueExtendedProperties;
 
+    /**
+     * The Contacts.
+     * The contacts in the folder. Navigation property. Read-only. Nullable.
+     */
+    public ContactCollectionPage contacts;
+
+    /**
+     * The Child Folders.
+     * The collection of child folders in the folder. Navigation property. Read-only. Nullable.
+     */
+    public ContactFolderCollectionPage childFolders;
+
 
     /**
      * The raw representation of this class
@@ -119,38 +119,6 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
         rawObject = json;
 
 
-        if (json.has("contacts")) {
-            final ContactCollectionResponse response = new ContactCollectionResponse();
-            if (json.has("[email protected]")) {
-                response.nextLink = json.get("[email protected]").getAsString();
-            }
-
-            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("contacts").toString(), JsonObject[].class);
-            final Contact[] array = new Contact[sourceArray.length];
-            for (int i = 0; i < sourceArray.length; i++) {
-                array[i] = serializer.deserializeObject(sourceArray[i].toString(), Contact.class);
-                array[i].setRawObject(serializer, sourceArray[i]);
-            }
-            response.value = Arrays.asList(array);
-            contacts = new ContactCollectionPage(response, null);
-        }
-
-        if (json.has("childFolders")) {
-            final ContactFolderCollectionResponse response = new ContactFolderCollectionResponse();
-            if (json.has("[email protected]")) {
-                response.nextLink = json.get("[email protected]").getAsString();
-            }
-
-            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("childFolders").toString(), JsonObject[].class);
-            final ContactFolder[] array = new ContactFolder[sourceArray.length];
-            for (int i = 0; i < sourceArray.length; i++) {
-                array[i] = serializer.deserializeObject(sourceArray[i].toString(), ContactFolder.class);
-                array[i].setRawObject(serializer, sourceArray[i]);
-            }
-            response.value = Arrays.asList(array);
-            childFolders = new ContactFolderCollectionPage(response, null);
-        }
-
         if (json.has("singleValueExtendedProperties")) {
             final SingleValueLegacyExtendedPropertyCollectionResponse response = new SingleValueLegacyExtendedPropertyCollectionResponse();
             if (json.has("[email protected]")) {
@@ -182,5 +150,37 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
             response.value = Arrays.asList(array);
             multiValueExtendedProperties = new MultiValueLegacyExtendedPropertyCollectionPage(response, null);
         }
+
+        if (json.has("contacts")) {
+            final ContactCollectionResponse response = new ContactCollectionResponse();
+            if (json.has("[email protected]")) {
+                response.nextLink = json.get("[email protected]").getAsString();
+            }
+
+            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("contacts").toString(), JsonObject[].class);
+            final Contact[] array = new Contact[sourceArray.length];
+            for (int i = 0; i < sourceArray.length; i++) {
+                array[i] = serializer.deserializeObject(sourceArray[i].toString(), Contact.class);
+                array[i].setRawObject(serializer, sourceArray[i]);
+            }
+            response.value = Arrays.asList(array);
+            contacts = new ContactCollectionPage(response, null);
+        }
+
+        if (json.has("childFolders")) {
+            final ContactFolderCollectionResponse response = new ContactFolderCollectionResponse();
+            if (json.has("[email protected]")) {
+                response.nextLink = json.get("[email protected]").getAsString();
+            }
+
+            final JsonObject[] sourceArray = serializer.deserializeObject(json.get("childFolders").toString(), JsonObject[].class);
+            final ContactFolder[] array = new ContactFolder[sourceArray.length];
+            for (int i = 0; i < sourceArray.length; i++) {
+                array[i] = serializer.deserializeObject(sourceArray[i].toString(), ContactFolder.class);
+                array[i].setRawObject(serializer, sourceArray[i]);
+            }
+            response.value = Arrays.asList(array);
+            childFolders = new ContactFolderCollectionPage(response, null);
+        }
     }
 }