Merge branch 'master' of https://github.com/microsoftgraph/MSGraph-SDK-Code-Generator into typescript

Author: dan-silver

README.md

@@ -13,12 +13,11 @@ Currently the following target languages are supported by this writer:
 - TypeScript
 
 # Contents
-- [Prerequisites](#Prerequisites)
-- [Getting started](#Getting-started)
-- [Using Vipr with this writer](#Using-Vipr-with-this-Writer)
-- [Using generated code](#Using-generated-code)
-- [Contributing](#Contributing)
-- [License](#License)
+- [Prerequisites](#prerequisites)
+- [Getting started](#getting-started)
+- [Using Vipr with this writer](#using-vipr-with-this-writer)
+- [Contributing](#contributing)
+- [License](#license)
 
 ## Prerequisites
 - [Visual Studio SDK](https://www.microsoft.com/en-us/download/details.aspx?id=40758)
@@ -37,9 +36,9 @@ For more information on submodules read [this chapter](http://git-scm.com/book/e
 ## Using Vipr with this Writer
 
 1. Build the solution in Visual Studio.
-2. Go to the `src\T4TemplateWriter\bin\debug` folder to find all compiled components.
+2. Go to the `src\GraphODataTemplateWriter\bin\debug` folder to find all compiled components.
 3. In that folder, modify `.config\TemplateWriterSettings.json` to specify your template mapping see [Template Writer Settings](##Template-Writer-Settings) for more details.
-4. Open a command prompt as administrator in the same folder and run `Vipr.exe <path-or-url-to-metadata> --writer="GraphODataTemplateWriter"`
+4. Open a command prompt as administrator in the same folder and run `Vipr.exe <path-or-url-to-metadata> --writer="GraphODataTemplateWriter"`.  An example metadata file can be found in the root of this project.
 
 By default, output source code will be put in a folder named "output" next to the Vipr executable.
 

Templates/Android/BaseModel.template.tt

@@ -473,9 +473,15 @@
         return null;
     }
 
+    public string OdcmMethodReturnType(OdcmMethod method) {
+        return method.ReturnType is OdcmPrimitiveType
+            ? method.ReturnType.GetTypeString() : method.ReturnType.Name.ToCheckedCase();
+    }
+
     public string CollectionPageGeneric(OdcmObject c) {
         if (c is OdcmMethod) {
-            return "<" + ClassTypeName(c) + ", " + ITypeCollectionRequestBuilder(c) + ">";
+            string returnType = OdcmMethodReturnType(c as OdcmMethod);
+            return "<" + returnType + ", " + ITypeCollectionRequestBuilder(c) + ">";
         }
         return "<" + TypeName(c) + ", " + ITypeCollectionRequestBuilder(c) + ">";
     }

Templates/Android/generated/BaseMethodCollectionResponse.java.tt

@@ -13,11 +13,15 @@ import com.google.gson.annotations.*;
 <#=CreateClassDef(BaseTypeCollectionResponse(c), null, "IJsonBackedObject")#>
 
     @SerializedName("value")
-    public List<<#=ClassTypeName(c)#>> value;
+    public List<<#=OdcmMethodReturnType(c as OdcmMethod)#>> value;
 
     @SerializedName("@odata.nextLink")
     public String nextLink;
 
 <#=CreateRawJsonObject()#>
-<#=UpdateListPropertiesWithinSetRawObject(new [] { "value" })#>
+<# if ( ! ((c as OdcmMethod).ReturnType is OdcmPrimitiveType) ) { #>
+<#=    UpdateListPropertiesWithinSetRawObject(new [] { "value" })#>
+<# } else { #>
+    }
+<# } #>
 }

Templates/CSharp/Base/EntityRequest.Base.template.tt

@@ -156,7 +156,7 @@ public string GetEntityCreateAsyncMethod(OdcmClass odcmClass)
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("            this.ContentType = \"{0}\";", templateWriter.jsonContentType);
     stringBuilder.Append(Environment.NewLine);
-    stringBuilder.Append("            this.Method = \"PUT\";");
+    stringBuilder.Append("            this.Method = \"POST\";");
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("            var newEntity = await this.SendAsync<{0}>({1}ToCreate, cancellationToken).ConfigureAwait(false);", entityName, lowerCaseEntityName);
     stringBuilder.Append(Environment.NewLine);

Templates/ObjC/Base/SharedObjC.template.tt

@@ -27,11 +27,17 @@ private string GetObjCTypeIdentifier(OdcmObject o, bool getUnderlyingType=false)
     if(o is OdcmProperty)
     {
         OdcmProperty prop=(OdcmProperty)o;
+
         if(prop.IsCollection && !getUnderlyingType)
         {
             return @"NSArray";
         }
 
+        if (prop.IsComplexCollectionOpenType(model) && !getUnderlyingType)
+        {
+            return @"NSDictionary";
+        }
+
         return GetObjCTypeIdentifier(prop.Projection.Type,getUnderlyingType);
     }
     else if(o is OdcmType)
@@ -136,6 +142,17 @@ private string GetJsonToObjCExpressionConversion(string expr,OdcmProperty prop)
     type.GetNSNumberValueMethod());
 }
 
+private string GetObjCTypeIdentifierCollection(OdcmProperty prop)
+{
+    var propName =  GetObjCTypeIdentifier(prop,true);
+    if (prop.IsComplexCollectionOpenType(model))
+    {
+        propName = propName.RemoveFromEnd("Collection");
+    }
+
+    return propName;
+}
+
 private string GetHydratedPropertyFromDictionary(OdcmProperty prop)
 {
     return GetJsonToObjCExpressionConversion(String.Format(@"self.dictionary[@""{0}""]",prop.Name),prop);
@@ -198,8 +215,39 @@ private string GetHydratedIVarFromDictionary(OdcmProperty prop)
         GetJsonToObjCExpressionConversion(prop.Projection.Type.Name.ToLowerFirstChar(), prop));
     }
 
+    if(prop.IsComplexCollectionOpenType(model))
+    {
+        return String.Format(@"
+    NSMutableDictionary *{0}Result = [[NSMutableDictionary alloc] init];
+    NSDictionary *{0} = self.dictionary[@""{1}""];
+
+    if ([{0} isKindOfClass:[NSDictionary class]]){{
+        [{0} enumerateKeysAndObjectsUsingBlock:^(NSString* key, id value, BOOL* stop){{
+            [{0}Result setValue:{3} forKey:key];
+        }}];
+    }}
+
+    _{0} = {0}Result;
+        ",
+        GetObjCProperty(prop),
+        prop.Name,
+        prop.Projection.Type.Name.ToLowerFirstChar().RemoveFromEnd("Collection"),
+        GetJsonToObjCExpressionConversionOpenType(prop));
+    }
+
     return String.Format(@"_{0} = {1};",GetObjCProperty(prop),GetHydratedPropertyFromDictionary(prop));
+}
+
+private string GetJsonToObjCExpressionConversionOpenType(OdcmProperty prop)
+{
+    string objCIdentifierType = GetObjCTypeIdentifierCollection(prop);
+
+    if(model.GetComplexTypes().Any(complexType => objCIdentifierType.Equals(writer.GetPrefix() + complexType.Name.ToUpperFirstChar())))
+    {
+        return String.Format("[[{0} alloc] initWithDictionary:value]", objCIdentifierType);
+    }
 
+    return "value";
 }
 
 public string GetFunctionParameterDictionary(List<OdcmParameter> parameters)

Templates/ObjC/Models/EntityType.h.tt

@@ -18,6 +18,7 @@ if (baseEntity == null)
 {
 #>
   @property (nullable, nonatomic, setter=setODataType:, getter=oDataType) NSString *oDataType;
+  @property (nullable, nonatomic, setter=setODataEtag:, getter=oDataEtag) NSString *oDataEtag;
 <#
 }
 

Templates/ObjC/Models/EntityType.m.tt

@@ -57,6 +57,14 @@ if (entity.Base == null)
 {
     self.dictionary[@"@odata.type"] = val;
 }
+- (NSString*) oDataEtag
+{
+    return self.dictionary[@"@odata.etag"];
+}
+- (void) setODataEtag: (NSString*) val
+{
+    self.dictionary[@"@odata.etag"] = val;
+}
 <#
 }