Merge pull request #31 from microsoftgraph/dev

Dev to master
microsoftgraph · Sep 27, 2019 · 04d36d4 · 04d36d4
2 parents 2409e2d + c542645
commit 04d36d4
Show file tree

Hide file tree

Showing 47 changed files with 17,227 additions and 7,323 deletions.
diff --git a/GeneratedModels/MSGraphCalendar.h b/GeneratedModels/MSGraphCalendar.h
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 
 
-@class MSGraphEmailAddress, MSGraphEvent, MSGraphSingleValueLegacyExtendedProperty, MSGraphMultiValueLegacyExtendedProperty; 
+@class MSGraphEmailAddress, MSGraphSingleValueLegacyExtendedProperty, MSGraphMultiValueLegacyExtendedProperty, MSGraphEvent; 
 #import "MSGraphCalendarColor.h"
 
 
@@ -16,9 +16,9 @@
     @property (nonatomic, setter=setCanViewPrivateItems:, getter=canViewPrivateItems) BOOL canViewPrivateItems;
     @property (nonatomic, setter=setCanEdit:, getter=canEdit) BOOL canEdit;
     @property (nullable, nonatomic, setter=setOwner:, getter=owner) MSGraphEmailAddress* owner;
-    @property (nullable, nonatomic, setter=setEvents:, getter=events) NSArray* events;
-    @property (nullable, nonatomic, setter=setCalendarView:, getter=calendarView) NSArray* calendarView;
     @property (nullable, nonatomic, setter=setSingleValueExtendedProperties:, getter=singleValueExtendedProperties) NSArray* singleValueExtendedProperties;
     @property (nullable, nonatomic, setter=setMultiValueExtendedProperties:, getter=multiValueExtendedProperties) NSArray* multiValueExtendedProperties;
+    @property (nullable, nonatomic, setter=setEvents:, getter=events) NSArray* events;
+    @property (nullable, nonatomic, setter=setCalendarView:, getter=calendarView) NSArray* calendarView;
 
 @end
diff --git a/GeneratedModels/MSGraphCalendar.m b/GeneratedModels/MSGraphCalendar.m
@@ -21,10 +21,10 @@ @interface MSGraphCalendar()
     BOOL _canViewPrivateItems;
     BOOL _canEdit;
     MSGraphEmailAddress* _owner;
-    NSArray* _events;
-    NSArray* _calendarView;
     NSArray* _singleValueExtendedProperties;
     NSArray* _multiValueExtendedProperties;
+    NSArray* _events;
+    NSArray* _calendarView;
 }
 @end
 
@@ -129,104 +129,104 @@ - (void) setOwner: (MSGraphEmailAddress*) val
     self.dictionary[@"owner"] = val;
 }
 
-- (NSArray*) events
+- (NSArray*) singleValueExtendedProperties
 {
-    if(!_events){
+    if(!_singleValueExtendedProperties){
 
-    NSMutableArray *eventsResult = [NSMutableArray array];
-    NSArray *events = self.dictionary[@"events"];
+    NSMutableArray *singleValueExtendedPropertiesResult = [NSMutableArray array];
+    NSArray *singleValueExtendedProperties = self.dictionary[@"singleValueExtendedProperties"];
 
-    if ([events isKindOfClass:[NSArray class]]){
-        for (id tempEvent in events){
-            [eventsResult addObject:tempEvent];
+    if ([singleValueExtendedProperties isKindOfClass:[NSArray class]]){
+        for (id tempSingleValueLegacyExtendedProperty in singleValueExtendedProperties){
+            [singleValueExtendedPropertiesResult addObject:tempSingleValueLegacyExtendedProperty];
         }
     }
 
-    _events = eventsResult;
+    _singleValueExtendedProperties = singleValueExtendedPropertiesResult;
 
     }
-    return _events;
+    return _singleValueExtendedProperties;
 }
 
-- (void) setEvents: (NSArray*) val
+- (void) setSingleValueExtendedProperties: (NSArray*) val
 {
-    _events = val;
-    self.dictionary[@"events"] = val;
+    _singleValueExtendedProperties = val;
+    self.dictionary[@"singleValueExtendedProperties"] = val;
 }
 
-- (NSArray*) calendarView
+- (NSArray*) multiValueExtendedProperties
 {
-    if(!_calendarView){
+    if(!_multiValueExtendedProperties){
 
-    NSMutableArray *calendarViewResult = [NSMutableArray array];
-    NSArray *calendarView = self.dictionary[@"calendarView"];
+    NSMutableArray *multiValueExtendedPropertiesResult = [NSMutableArray array];
+    NSArray *multiValueExtendedProperties = self.dictionary[@"multiValueExtendedProperties"];
 
-    if ([calendarView isKindOfClass:[NSArray class]]){
-        for (id tempEvent in calendarView){
-            [calendarViewResult addObject:tempEvent];
+    if ([multiValueExtendedProperties isKindOfClass:[NSArray class]]){
+        for (id tempMultiValueLegacyExtendedProperty in multiValueExtendedProperties){
+            [multiValueExtendedPropertiesResult addObject:tempMultiValueLegacyExtendedProperty];
         }
     }
 
-    _calendarView = calendarViewResult;
+    _multiValueExtendedProperties = multiValueExtendedPropertiesResult;
 
     }
-    return _calendarView;
+    return _multiValueExtendedProperties;
 }
 
-- (void) setCalendarView: (NSArray*) val
+- (void) setMultiValueExtendedProperties: (NSArray*) val
 {
-    _calendarView = val;
-    self.dictionary[@"calendarView"] = val;
+    _multiValueExtendedProperties = val;
+    self.dictionary[@"multiValueExtendedProperties"] = val;
 }
 
-- (NSArray*) singleValueExtendedProperties
+- (NSArray*) events
 {
-    if(!_singleValueExtendedProperties){
+    if(!_events){
 
-    NSMutableArray *singleValueExtendedPropertiesResult = [NSMutableArray array];
-    NSArray *singleValueExtendedProperties = self.dictionary[@"singleValueExtendedProperties"];
+    NSMutableArray *eventsResult = [NSMutableArray array];
+    NSArray *events = self.dictionary[@"events"];
 
-    if ([singleValueExtendedProperties isKindOfClass:[NSArray class]]){
-        for (id tempSingleValueLegacyExtendedProperty in singleValueExtendedProperties){
-            [singleValueExtendedPropertiesResult addObject:tempSingleValueLegacyExtendedProperty];
+    if ([events isKindOfClass:[NSArray class]]){
+        for (id tempEvent in events){
+            [eventsResult addObject:tempEvent];
         }
     }
 
-    _singleValueExtendedProperties = singleValueExtendedPropertiesResult;
+    _events = eventsResult;
 
     }
-    return _singleValueExtendedProperties;
+    return _events;
 }
 
-- (void) setSingleValueExtendedProperties: (NSArray*) val
+- (void) setEvents: (NSArray*) val
 {
-    _singleValueExtendedProperties = val;
-    self.dictionary[@"singleValueExtendedProperties"] = val;
+    _events = val;
+    self.dictionary[@"events"] = val;
 }
 
-- (NSArray*) multiValueExtendedProperties
+- (NSArray*) calendarView
 {
-    if(!_multiValueExtendedProperties){
+    if(!_calendarView){
 
-    NSMutableArray *multiValueExtendedPropertiesResult = [NSMutableArray array];
-    NSArray *multiValueExtendedProperties = self.dictionary[@"multiValueExtendedProperties"];
+    NSMutableArray *calendarViewResult = [NSMutableArray array];
+    NSArray *calendarView = self.dictionary[@"calendarView"];
 
-    if ([multiValueExtendedProperties isKindOfClass:[NSArray class]]){
-        for (id tempMultiValueLegacyExtendedProperty in multiValueExtendedProperties){
-            [multiValueExtendedPropertiesResult addObject:tempMultiValueLegacyExtendedProperty];
+    if ([calendarView isKindOfClass:[NSArray class]]){
+        for (id tempEvent in calendarView){
+            [calendarViewResult addObject:tempEvent];
         }
     }
 
-    _multiValueExtendedProperties = multiValueExtendedPropertiesResult;
+    _calendarView = calendarViewResult;
 
     }
-    return _multiValueExtendedProperties;
+    return _calendarView;
 }
 
-- (void) setMultiValueExtendedProperties: (NSArray*) val
+- (void) setCalendarView: (NSArray*) val
 {
-    _multiValueExtendedProperties = val;
-    self.dictionary[@"multiValueExtendedProperties"] = val;
+    _calendarView = val;
+    self.dictionary[@"calendarView"] = val;
 }