HOTFIX - (ADF) suppress exceptions during deserialization

src/ResourceManagement/DataFactory/DataFactory.Tests/UnitTests/LinkedServiceTests.cs

@@ -261,6 +261,26 @@ public void ValidateLinkedServiceWithDictionaryPropertyThrowsForMissingRequiredP
                 Assert.Throws<InvalidOperationException>(() => this.TestLinkedServiceValidation(json));
             Assert.Contains("is required", ex.Message);
         }
+
+        [Theory]
+        [InlineData(@"{
+    name: ""MyLinkedService"",
+    properties: 
+    {
+        type: ""AzureSqlDatabase"", 
+        typeProperties: {
+            connectionString: null
+        }
+    }
+}")]
+        [Trait(TraitName.TestType, TestType.Unit)]
+        [Trait(TraitName.Function, TestType.Conversion)]
+
+        public void CanConvertLinkedServiceWithNullTypePropertyValuesTest(string json)
+        {
+            JsonSampleInfo sample = new JsonSampleInfo("LinkedServiceWithNullTypePropertyValues", json, null);
+            this.TestLinkedServiceJson(sample);
+        }
 #endif 
 
         #endregion Tests

src/ResourceManagement/DataFactory/DataFactory.Tests/UnitTests/PipelineTests.cs

@@ -179,6 +179,38 @@ public void UnknownCopySourceDoesNotThrowExceptionTest(string json)
             Assert.Null(((CopyActivity)pipeline.Properties.Activities[0].TypeProperties).Source);
         }
 
+        [Theory]
+        [InlineData(@"{
+    name: ""MyPipelineName"",
+    properties: 
+    {
+        activities:
+        [
+            {
+                type: ""Copy"",
+                name: ""TestActivity"",
+                description: ""Test activity description"", 
+                typeProperties:
+                {
+                    source: null,
+                    sink: null
+                },
+                inputs: [ { name: ""InputSqlDA"" } ],
+                outputs: [ { name: ""OutputBlobDA"" } ],
+                linkedServiceName: ""MyLinkedServiceName""
+            }
+        ]
+    }
+}")]
+        [Trait(TraitName.TestType, TestType.Unit)]
+        [Trait(TraitName.Function, TestType.Conversion)]
+
+        public void CanConvertPipelineWithNullTypePropertyValuesTest(string json)
+        {
+            JsonSampleInfo sample = new JsonSampleInfo("PipelineWithNullTypePropertyValues", json, null);
+            this.TestPipelineJson(sample);
+        }
+
         [Theory, InlineData(PipelineJsonSamples.HDInsightPipeline)]
         [Trait(TraitName.TestType, TestType.Unit)]
         [Trait(TraitName.Function, TestType.Conversion)]

src/ResourceManagement/DataFactory/DataFactory.Tests/UnitTests/TableTests.cs

@@ -106,6 +106,31 @@ public void TableUnregisteredTypeTest(string unregisteredTypeJson)
             Assert.IsType<GenericDataset>(table.Properties.TypeProperties);
         }
 
+        [Theory]
+        [InlineData(@"{
+    name: ""MyTable"",
+    properties: 
+    {
+        type: ""AzureBlob"", 
+        linkedServiceName: ""MyBlobLinkedService"",
+        typeProperties: {
+            connectionString: null
+        }, 
+        availability: { 
+            frequency: ""Day"", 
+            interval: 1
+        }
+    }
+}")]
+        [Trait(TraitName.TestType, TestType.Unit)]
+        [Trait(TraitName.Function, TestType.Conversion)]
+
+        public void CanConvertTableWithNullTypePropertyValuesTest(string json)
+        {
+            JsonSampleInfo sample = new JsonSampleInfo("TableWithNullTypePropertyValues", json, null);
+            this.TestTableJson(sample);
+        }
+
         private void TestTableJson(JsonSampleInfo info)
         {
             string json = info.Json;

src/ResourceManagement/DataFactory/DataFactoryManagement/Customizations/Conversion/GenericRegisteredTypeConverter.cs

@@ -108,7 +108,7 @@ public bool TryGetRegisteredType(string typeName, out Type type)
             }
         }
 
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        protected override object ReadJsonWrapper(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
             JObject obj = JObject.Load(reader);
 

src/ResourceManagement/DataFactory/DataFactoryManagement/Customizations/Conversion/PolymorphicTypeConverter.cs

@@ -42,6 +42,23 @@ static PolymorphicTypeConverter()
             ReservedTypesList = new Lazy<Dictionary<string, Type>>(GetReservedTypes);
         }
 
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            try
+            {
+                return this.ReadJsonWrapper(reader, objectType, existingValue, serializer);
+            }
+            catch (Exception)
+            {
+                // Suppress any exception during deserialization; 
+                // we should assume that the service sends back valid JSON, 
+                // so return null if there is any problem deserializing.
+                return null;
+            }
+        }
+
+        protected abstract object ReadJsonWrapper(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer);
+
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
             JObject obj = JObject.FromObject(

src/ResourceManagement/DataFactory/DataFactoryManagement/Customizations/Conversion/TypePropertiesConverter.cs

@@ -28,7 +28,7 @@ internal class TypePropertiesConverter : PolymorphicTypeConverter<TypeProperties
         private readonly CamelCasePropertyNamesContractResolver camelCaseResolver =
             new CamelCasePropertyNamesContractResolver();
 
-        public override object ReadJson(
+        protected override object ReadJsonWrapper(
             JsonReader reader,
             Type objectType,
             object existingValue,

src/ResourceManagement/DataFactory/DataFactoryManagement/Microsoft.Azure.Management.DataFactories.nuget.proj

@@ -5,7 +5,7 @@
     Microsoft.Azure.Management.DataFactories
     -->
     <SdkNuGetPackage Include="Microsoft.Azure.Management.DataFactories">
-      <PackageVersion>2.0.0</PackageVersion>
+      <PackageVersion>2.0.1</PackageVersion>
       <Folder>$(MSBuildThisFileDirectory)</Folder>
     </SdkNuGetPackage>
   </ItemGroup>

src/ResourceManagement/DataFactory/DataFactoryManagement/Properties/AssemblyInfo.cs

@@ -21,7 +21,7 @@
 [assembly: AssemblyDescription("Provides Microsoft Azure Data Factory management operations.")]
 
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.1.0")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]