- further fix on the nullability

- spacing issue fixed on @Property

Author: unpluggedk

Templates/ObjC/Base/SharedObjC.template.tt

@@ -241,13 +241,20 @@ private string GetStaticBaseObject()
 
 private string GeneratePropertyDeclarationLine(OdcmProperty prop)
 {
-    if(prop.IsNullable==true) 
+    if(prop.IsCollection || prop.IsComplex())
     {
-        return "@property (nullable, nonatomic, setter=" + GetObjCPropertySetter(prop) + ":, getter=" + GetObjCPropertyGetter(prop) + ") " + GetObjCTypeForVarDeclaration(prop) + " " + GetObjCProperty(prop) + ";";
+        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 (nonnull, nonatomic, setter=" + GetObjCPropertySetter(prop) + ":, getter=" + GetObjCPropertyGetter(prop) + ") " + GetObjCTypeForVarDeclaration(prop) + " " + GetObjCProperty(prop) + ";";
+        return "@property (nonatomic, setter=" + GetObjCPropertySetter(prop) + ":, getter=" + GetObjCPropertyGetter(prop) + ") " + GetObjCTypeForVarDeclaration(prop) + " " + GetObjCProperty(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;
 <#
 }