Merge branch 'master' into typescript

Author: root

Templates/ObjC/Base/SharedObjC.template.tt

@@ -105,6 +105,13 @@ private string GetJsonToObjCExpressionConversion(string expr,OdcmProperty prop)
             expr);
     }
 
+    if(GetObjCTypeIdentifier(prop,true)=="MSTimeOfDay")
+    {
+        return String.Format(@"[{0} ms_timeFromString: {1}]",
+            GetObjCTypeIdentifier(prop,true),
+            expr);
+    }
+
     if(prop.IsEnum())
     {
         return String.Format(

Templates/ObjC/Models/Models.h.tt

@@ -3,6 +3,7 @@
 <#@ include file="SharedObjC.template.tt"#>
 
 #import "MSDate.h"
+#import "MSTimeOfDay.h"
 <#		
 var enums = model.GetEnumTypes();
 foreach(var e in enums)

Templates/ObjC/Requests/ODataEntities.h.tt

@@ -93,22 +93,6 @@ foreach(var et in entityTypes)
 
 foreach(var complexType in model.GetComplexTypes())
 {
-    foreach(var prop in complexType.GetProperties().Where(prop => prop.IsCollection && !(prop.Projection.Type is OdcmPrimitiveType) && !prop.IsEnum() && !prop.LongDescriptionContains("ignorableCollection")))
-    {
-        var baseName = writer.GetPrefix() + prop.Class.Name.ToUpperFirstChar() + prop.Name.ToUpperFirstChar();
-        if(!prop.IsReference())
-        {
-            classes.Add("#import \"" + baseName + "CollectionRequestBuilder.h\"");
-            classes.Add("#import \"" + baseName + "CollectionRequest.h\"");
-        }
-        else
-        {
-            classes.Add("#import \"" + baseName + "CollectionWithReferencesRequestBuilder.h\"");
-            classes.Add("#import \"" + baseName + "CollectionWithReferencesRequest.h\"");
-            classes.Add("#import \"" + baseName + "CollectionReferenceRequestBuilder.h\"");
-            classes.Add("#import \"" + baseName + "CollectionReferenceRequest.h\"");
-        }
-    }
     foreach(var streamProperty in complexType.GetProperties(typeName:"Stream"))
     {
         classes.Add("#import \"" + writer.GetPrefix() + streamProperty.Class.Name.ToUpperFirstChar() + streamProperty.Name.ToUpperFirstChar() + "Request.h\"");

src/GraphODataTemplateWriter/CodeHelpers/ObjC/TypeHelperObjC.cs

@@ -108,12 +108,18 @@ public static string GetTypeString(this OdcmType type)
                     return "NSDate";
                 case "Date":
                     return "MSDate";
+                case "TimeOfDay":
+                    return "MSTimeOfDay";
                 case "Binary":
                     return "NSString";
                 case "Boolean":
                     return "BOOL";
                 case "Stream":
                     return "NSStream";
+                case "Duration":
+                    return "Duration";
+                case "NSDictionary":
+                    return "NSDictionary";
                 default:
                     return Prefix + type.Name.ToUpperFirstChar();
             }
@@ -128,7 +134,7 @@ public static bool IsComplex(this OdcmType type)
         {
             string t = GetTypeString(type);
             return
-                !(t.Contains("int") || t == "BOOL" || t == "Byte" || t == "CGFloat");
+                !(t == "int32_t" || t == "int64_t" || t == "int16_t" || t == "BOOL" || t == "Byte" || t == "CGFloat");
         }
 
         public static bool IsComplex(this OdcmProperty property)