Merge pull request #33 from microsoftgraph/unpluggedk/ios-annotations

For iOS: merging annotations and nullability bugs

Author: shiftylogic

Templates/ObjC/Base/SharedObjC.template.tt

@@ -241,7 +241,21 @@ private string GetStaticBaseObject()
 
 private string GeneratePropertyDeclarationLine(OdcmProperty prop)
 {
-    return "@property (nonatomic, setter=" + GetObjCPropertySetter(prop) + ":, getter=" + GetObjCPropertyGetter(prop) + ") " + GetObjCTypeForVarDeclaration(prop) + " " + GetObjCProperty(prop) + ";";
+    if(prop.IsCollection || prop.IsComplex())
+    {
+        if(prop.IsNullable==true) 
+        {
+            return "@property (nullable, nonatomic, setter=" + GetObjCPropertySetter(prop) + ":, getter=" + GetObjCPropertyGetter(prop) + ") " + GetObjCTypeForVarDeclaration(prop) + " " + GetObjCProperty(prop) + ";";
+        }
+        else
+        {
+            return "@property (nonnull, nonatomic, setter=" + GetObjCPropertySetter(prop) + ":, getter=" + GetObjCPropertyGetter(prop) + ") " + GetObjCTypeForVarDeclaration(prop) + " " + GetObjCProperty(prop) + ";";
+        }
+    }
+    else
+    {
+        return "@property (nonatomic, setter=" + GetObjCPropertySetter(prop) + ":, getter=" + GetObjCPropertyGetter(prop) + ") " + GetObjCTypeForVarDeclaration(prop) + " " + GetObjCProperty(prop) + ";";
+    }
 }
 
 private void PropertyGetterImplementation(OdcmProperty prop)
@@ -252,6 +266,17 @@ private void PropertyGetterImplementation(OdcmProperty prop)
 <#+
     if(IsObjCTypeSameAsJsonType(prop.Projection.Type))
     {
+#>
+<#+
+    if(prop.IsNullable==true) 
+    {
+#>
+    if([[NSNull null] isEqual:self.dictionary[@"<#=prop.Name#>"]])
+    {
+        return nil;
+    }   
+<#+
+}
 #>
     return self.dictionary[@"<#=prop.Name#>"];
 <#+
@@ -280,6 +305,7 @@ private void PropertyGetterImplementation(OdcmProperty prop)
     }
 #>
 }
+
 <#+
 }
 
@@ -304,6 +330,7 @@ private void PropertySetterImplementation(OdcmProperty prop)
     }
 #>
 }
+
 <#+
 }
 #>

Templates/ObjC/Models/ComplexType.h.tt

@@ -15,9 +15,9 @@ var baseEntity = entity.Base;
 <#
 foreach(var prop in entity.Properties.Where(prop => GetObjCTypeIdentifier(prop)!="NSStream" ))
 {
-	#>
-	<#=GeneratePropertyDeclarationLine(prop)#>
-	<#
+#>
+<#=GeneratePropertyDeclarationLine(prop)#>
+<#
 }
 
 #>

Templates/ObjC/Models/EntityType.h.tt

@@ -17,7 +17,7 @@ IEnumerable<string> extraClasses = null;
 if (baseEntity == null)
 {
 #>
-  @property (nonatomic, setter=setODataType:, getter=oDataType) NSString *oDataType;
+  @property (nullable, nonatomic, setter=setODataType:, getter=oDataType) NSString *oDataType;
 <#
 }
 

Templates/ObjC/Requests/EntityRequestBuilder.h.tt

@@ -193,7 +193,8 @@ foreach(var prop in entity.Properties.Where( prop => prop.Projection.Type is Odc
 
 <#
 }
-foreach(var func in entity.Methods)
+
+foreach(var func in entity.MethodsAndOverloads())
 {
     var methodName = func.Name.Substring(func.Name.IndexOf('.') + 1).ToLowerFirstChar();
     var requestBuilderName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + methodName.ToUpperFirstChar() + "RequestBuilder";
@@ -204,8 +205,6 @@ foreach(var func in entity.Methods)
 #>
 - (<#=requestBuilderName#> *)<#=methodName#>;
 
-
-
 <#
 
 }

Templates/ObjC/Requests/EntityRequestBuilder.m.tt

@@ -115,7 +115,7 @@ foreach(var prop in entity.Properties.Where( prop => prop.Projection.Type is Odc
 
 }
 
-foreach(var func in entity.Methods)
+foreach(var func in entity.MethodsAndOverloads())
 {
     var methodName = func.Name.Substring(func.Name.IndexOf('.') + 1).ToLowerFirstChar();
     var requestBuilderName = writer.GetPrefix() + entity.Name.ToUpperFirstChar() + methodName.ToUpperFirstChar() + "RequestBuilder";