Merge pull request #8 from kiranisaac/master

use ConvertTo-Json instead of Newtonsoft

Author: kiranisaac

src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs

@@ -412,7 +412,7 @@ public Variable CreateVariable(Variable variable)
                     Name = variable.Name,
                     Properties = new AutomationManagement.Models.EncryptedVariableCreateProperties()
                     {
-                        Value = JsonConvert.SerializeObject(variable.Value),
+                        Value = PowerShellJsonConverter.Serialize(variable.Value),
                         Description = variable.Description
                     }
                 };
@@ -430,7 +430,7 @@ public Variable CreateVariable(Variable variable)
                     Name = variable.Name,
                     Properties = new AutomationManagement.Models.VariableCreateProperties()
                     {
-                        Value = JsonConvert.SerializeObject(variable.Value),
+                        Value = PowerShellJsonConverter.Serialize(variable.Value),
                         Description = variable.Description
                     }
                 };
@@ -497,7 +497,7 @@ public Variable UpdateVariable(Variable variable, VariableUpdateFields updateFie
                 {
                     updateParams.Properties = new AutomationManagement.Models.EncryptedVariableUpdateProperties()
                     {
-                        Value = JsonConvert.SerializeObject(variable.Value)
+                        Value = PowerShellJsonConverter.Serialize(variable.Value)
                     };
                 }
 
@@ -521,7 +521,7 @@ public Variable UpdateVariable(Variable variable, VariableUpdateFields updateFie
                 {
                     updateParams.Properties = new AutomationManagement.Models.VariableUpdateProperties()
                     {
-                        Value = JsonConvert.SerializeObject(variable.Value)
+                        Value = PowerShellJsonConverter.Serialize(variable.Value)
                     };
                 }
 
@@ -1226,8 +1226,7 @@ public Connection UpdateConnectionFieldValue(string automationAccountName, strin
             if (connectionModel.Properties.FieldDefinitionValues.ContainsKey(connectionFieldName))
             {
                 connectionModel.Properties.FieldDefinitionValues[connectionFieldName] =
-                    JsonConvert.SerializeObject(value,
-                        new JsonSerializerSettings() {DateFormatHandling = DateFormatHandling.MicrosoftDateFormat});
+                    PowerShellJsonConverter.Serialize(value);
             }
             else
             {
@@ -1534,7 +1533,7 @@ private IDictionary<string, string> ProcessRunbookParameters(string automationAc
                     object paramValue = parameters[runbookParameter.Key];
                     try
                     {
-                        filteredParameters.Add(runbookParameter.Key, JsonConvert.SerializeObject(paramValue, new JsonSerializerSettings() { DateFormatHandling = DateFormatHandling.MicrosoftDateFormat }));
+                        filteredParameters.Add(runbookParameter.Key, PowerShellJsonConverter.Serialize(paramValue));
                     }
                     catch (JsonSerializationException)
                     {

src/ServiceManagement/Automation/Commands.Automation/Common/Constants.cs

@@ -44,5 +44,16 @@ public class AutomationAccountState
 
             public const string Suspended = "Suspended";
         }
+
+        public const string PsCommandConvertToJson = "ConvertTo-Json";
+
+        public const string PsCommandConvertFromJson = "ConvertFrom-Json";
+
+        public const string PsCommandParamInputObject = "InputObject";
+
+        public const string PsCommandParamDepth = "Depth";
+
+        public const int PsCommandValueDepth = 10;
+
     }
 }

src/ServiceManagement/Automation/Commands.Automation/Common/PowershellJsonConverter.cs

@@ -1,4 +1,18 @@
-using Microsoft.Azure.Commands.Automation.Properties;
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.Automation.Properties;
 using System;
 using System.Collections;
 using System.Collections.ObjectModel;
@@ -9,12 +23,27 @@
 
 namespace Microsoft.Azure.Commands.Automation.Common
 {
-    public static class PowershellJsonConverter
+    public static class PowerShellJsonConverter
     {
-        private const string PsCommandConvertToJson = "ConvertTo-Json";
-        private const string PsCommandConvertFromJson = "ConvertFrom-Json";
-        private const string PsCommandParamInputObject = "InputObject";
-        private const string PsCommandParamDepth = "Depth";
+        public static string Serialize(object inputObject)
+        {
+            if (inputObject == null)
+            {
+                return null;
+            }
+
+            Hashtable parameters = new Hashtable();
+            parameters.Add(Constants.PsCommandParamInputObject, inputObject);
+            parameters.Add(Constants.PsCommandParamDepth, Constants.PsCommandValueDepth);
+            var result = PowerShellJsonConverter.InvokeScript(Constants.PsCommandConvertToJson, parameters);
+            
+            if (result.Count != 1)
+            {
+                return null;
+            }
+
+            return result[0].ToString();
+        }
 
         public static PSObject Deserialize(string json)
         {
@@ -24,8 +53,8 @@ public static PSObject Deserialize(string json)
             }
 
             Hashtable parameters = new Hashtable();
-            parameters.Add(PsCommandParamInputObject, json);
-            var result = PowershellJsonConverter.InvokeScript(PsCommandConvertFromJson, parameters);
+            parameters.Add(Constants.PsCommandParamInputObject, json);
+            var result = PowerShellJsonConverter.InvokeScript(Constants.PsCommandConvertFromJson, parameters);
             if (result.Count != 1)
             {
                 return null;

src/ServiceManagement/Automation/Commands.Automation/Model/Variable.cs

@@ -46,7 +46,7 @@ public Variable(AutomationManagement.Models.Variable variable, string automation
             }
             else
             {
-                this.Value = PowershellJsonConverter.Deserialize(variable.Properties.Value);
+                this.Value = PowerShellJsonConverter.Deserialize(variable.Properties.Value);
             }
 
             this.Description = variable.Properties.Description;