Container serialization include PartitionKeyDefinition only if not nu…

…ll (#653) * Do not write partitionKey when the value is null * add test
Azure · Aug 8, 2019 · 50d944c · 50d944c
1 parent 834d66b
commit 50d944c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Microsoft.Azure.Cosmos/src/Resource/Settings/ContainerProperties.cs b/Microsoft.Azure.Cosmos/src/Resource/Settings/ContainerProperties.cs
@@ -380,7 +380,7 @@ internal ContainerProperties(string id, PartitionKeyDefinition partitionKeyDefin
         /// <value>
         /// <see cref="PartitionKeyDefinition"/> object.
         /// </value>
-        [JsonProperty(PropertyName = Constants.Properties.PartitionKey)]
+        [JsonProperty(PropertyName = Constants.Properties.PartitionKey, NullValueHandling = NullValueHandling.Ignore)]
         internal PartitionKeyDefinition PartitionKey { get; set; } = new PartitionKeyDefinition();
 
         /// <summary>

diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/SettingsContractTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/SettingsContractTests.cs
@@ -416,6 +416,18 @@ public async Task ContainerSettingsIndexTest()
             Assert.AreEqual(containerJsonString, containerJsonAfterConversion);
         }
 
+        [TestMethod]
+        public void ContainerSettingsNullPartitionKeyTest()
+        {
+            ContainerProperties cosmosContainerSettings = new ContainerProperties("id", "/partitionKey")
+            {
+                PartitionKey = null
+            };
+
+            string cosmosSerialized = SettingsContractTests.CosmosSerialize(cosmosContainerSettings);
+            Assert.IsFalse(cosmosSerialized.Contains("partitionKey"));
+        }
+
         [TestMethod]
         public async Task ContainerV2CompatTest()
         {