Merge pull request #80 from microsoftgraph/caitbal/working

Replace DataMember with JsonProperty

Author: Caitlin Bales (MSFT)

Templates/CSharp/Model/MethodRequestBody.cs.tt

@@ -13,10 +13,13 @@ var requestBody = entityName + method.Name.Substring(method.Name.IndexOf('.') +
 // and violate the spec.
 System.Diagnostics.Debug.Assert(!method.Overloads.Any(), "Overload actions are not allowed in OData services");
 
+var attributeStringBuilder = new StringBuilder();
+attributeStringBuilder.Append("[JsonObject(MemberSerialization = MemberSerialization.OptIn)]");
 #>
 
 namespace <#=method.Namespace.GetNamespaceName()#>
 {
+    using Newtonsoft.Json;
     using System;
     using System.Collections.Generic;
     using System.IO;
@@ -25,7 +28,7 @@ namespace <#=method.Namespace.GetNamespaceName()#>
     /// <summary>
     /// The type <#=requestBody#>.
     /// </summary>
-    [DataContract]
+    <#=attributeStringBuilder.ToString()#>
     public partial class <#=requestBody#>
     {
     <#
@@ -43,12 +46,13 @@ namespace <#=method.Namespace.GetNamespaceName()#>
         }
 
         var paramName = param.Name.ToCheckedCase().GetSanitizedPropertyName();
+		var attributeDefinition = string.Format("[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = \"{0}\", Required = Required.Default)]", param.Name);
     #>
 
         /// <summary>
         /// Gets or sets <#=paramName#>.
         /// </summary>
-        [DataMember(Name = "<#=param.Name#>", EmitDefaultValue = false, IsRequired = false)]
+        <#=attributeDefinition#>
         public <#=paramTypeString#> <#=paramName#> { get; set; }
     <#
     }

Templates/CSharp/Requests/EntityCollectionResponse.cs.tt

@@ -19,13 +19,19 @@ namespace <#=prop.Class.AsOdcmClass().Namespace.GetNamespaceName()#>
     /// <summary>
     /// The type <#=collectionResponse#>.
     /// </summary>
-    [DataContract]
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+<# 
+// We only want to add the derived type converter to the classes at the top of the inheritance hierarchy
+if (prop.Class.Derived != null && prop.Class.Base == null)
+{ #>
+    [JsonConverter(typeof(DerivedTypeConverter))]
+<# } #>
     public class <#=collectionResponse#>
     {
         /// <summary>
         /// Gets or sets the <see cref="I<#=collectionPage#>"/> value.
         /// </summary>
-        [DataMember(Name = "value", EmitDefaultValue = false, IsRequired = false)]
+		[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName ="value", Required = Required.Default)]
         public I<#=collectionPage#> Value { get; set; }
 
         /// <summary>

Templates/CSharp/Requests/EntityCollectionWithReferencesResponse.cs.tt

@@ -19,13 +19,19 @@ namespace <#=prop.Class.AsOdcmClass().Namespace.GetNamespaceName()#>
     /// <summary>
     /// The type <#=collectionResponse#>.
     /// </summary>
-    [DataContract]
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+<# 
+// We only want to add the derived type converter to the classes at the top of the inheritance hierarchy
+if (prop.Class.Derived != null && prop.Class.Base == null)
+{ #>
+    [JsonConverter(typeof(DerivedTypeConverter))]
+<# } #>
     public class <#=collectionResponse#>
     {
         /// <summary>
         /// Gets or sets the <see cref="I<#=collectionPage#>"/> value.
         /// </summary>
-        [DataMember(Name = "value", EmitDefaultValue = false, IsRequired = false)]
+		[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName ="value", Required = Required.Default)]
         public I<#=collectionPage#> Value { get; set; }
 
         /// <summary>

Templates/CSharp/Requests/MethodCollectionResponse.cs.tt

@@ -22,13 +22,13 @@ namespace <#=method.Namespace.GetNamespaceName()#>
     /// <summary>
     /// The type <#=collectionResponse#>.
     /// </summary>
-    [DataContract]
+    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
     public class <#=collectionResponse#>
     {
         /// <summary>
         /// Gets or sets the <see cref="I<#=collectionPage#>"/> value.
         /// </summary>
-        [DataMember(Name = "value", EmitDefaultValue = false, IsRequired = false)]
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName ="value", Required = Required.Default)]
         public I<#=collectionPage#> Value { get; set; }
         <#
         if (isSpecialCollection)
@@ -44,7 +44,7 @@ namespace <#=method.Namespace.GetNamespaceName()#>
         /// <summary>
         /// Gets or sets the <#=propertyName#>.
         /// </summary>
-        [DataMember(Name = "<#=property.Name#>", EmitDefaultValue = false, IsRequired = false)]
+		[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName ="<#=property.Name#>", Required = Required.Default)]
         public <#=propertyType#> <#=propertyName#> { get; set; }
         <#
                 }