fix(samples):remove unnecessary lines from sample (#12606)

Azure · Jun 8, 2020 · 12df3e5 · 12df3e5
1 parent 5800dc1
commit 12df3e5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 14 deletions.
diff --git a/...digitaltwins/Azure.DigitalTwins.Core/samples/DigitalTwinsClientSample/ComponentSamples.cs b/...digitaltwins/Azure.DigitalTwins.Core/samples/DigitalTwinsClientSample/ComponentSamples.cs
@@ -63,7 +63,6 @@ public async Task RunSamplesAsync(DigitalTwinsClient client)
                         "Component1",
                         new ModelProperties
                         {
-                            Metadata = { },
                             // component properties
                             CustomProperties =
                             {
@@ -118,12 +117,11 @@ public async Task RunSamplesAsync(DigitalTwinsClient client)
             var customTwin = new CustomDigitalTwin
             {
                 Id = customDtId,
-                Metadata = new CustomDigitalTwinMetadata { ModelId = modelId },
+                Metadata = { ModelId = modelId },
                 Prop1 = "Prop1 val",
                 Prop2 = 987,
                 Component1 = new Component1
                 {
-                    Metadata = new Component1Metadata { },
                     ComponentProp1 = "Component prop1 val",
                     ComponentProp2 = 123,
                 }

diff --git a/...igitaltwins/Azure.DigitalTwins.Core/samples/DigitalTwinsClientSample/CustomDigitalTwin.cs b/...igitaltwins/Azure.DigitalTwins.Core/samples/DigitalTwinsClientSample/CustomDigitalTwin.cs
@@ -19,7 +19,7 @@ internal class CustomDigitalTwin
         public string ETag { get; set; }
 
         [JsonPropertyName("$metadata")]
-        public CustomDigitalTwinMetadata Metadata { get; set; }
+        public CustomDigitalTwinMetadata Metadata { get; set; } = new CustomDigitalTwinMetadata();
 
         [JsonPropertyName("Prop1")]
         public string Prop1 { get; set; }
@@ -34,7 +34,7 @@ internal class CustomDigitalTwin
     internal class Component1
     {
         [JsonPropertyName("$metadata")]
-        public Component1Metadata Metadata { get; set; }
+        public Component1Metadata Metadata { get; set; } = new Component1Metadata();
 
         [JsonPropertyName("ComponentProp1")]
         public string ComponentProp1 { get; set; }

diff --git a/sdk/digitaltwins/Azure.DigitalTwins.Core/samples/Readme.md b/sdk/digitaltwins/Azure.DigitalTwins.Core/samples/Readme.md
@@ -138,7 +138,6 @@ var basicTwin = new BasicDigitalTwin
             "Component1",
             new ModelProperties
             {
-                Metadata = { },
                 // component properties
                 CustomProperties =
                 {
@@ -164,12 +163,11 @@ You can review the [CustomDigitalTwin definition](https://github.com/Azure/azure
 var customTwin = new CustomDigitalTwin
 {
     Id = customDtId,
-    Metadata = new CustomDigitalTwinMetadata { ModelId = modelId },
+    Metadata = { ModelId = modelId },
     Prop1 = "Prop1 val",
     Prop2 = 987,
     Component1 = new Component1
     {
-        Metadata = new Component1Metadata { },
         ComponentProp1 = "Component prop1 val",
         ComponentProp2 = 123,
     }
@@ -212,12 +210,11 @@ Custom types provide the best possible experience.
 var customTwin = new CustomDigitalTwin
 {
     Id = customDtId,
-    Metadata = new CustomDigitalTwinMetadata { ModelId = modelId },
+    Metadata = { ModelId = modelId },
     Prop1 = "Prop1 val",
     Prop2 = 987,
     Component1 = new Component1
     {
-        Metadata = new Component1Metadata { },
         ComponentProp1 = "Component prop1 val",
         ComponentProp2 = 123,
     }

diff --git a/sdk/digitaltwins/Azure.DigitalTwins.Core/src/DigitalTwinsClient.cs b/sdk/digitaltwins/Azure.DigitalTwins.Core/src/DigitalTwinsClient.cs
@@ -189,12 +189,11 @@ public virtual Response<string> GetDigitalTwin(string digitalTwinId, Cancellatio
         /// var customTwin = new CustomDigitalTwin
         /// {
         ///     Id = customDtId,
-        ///     Metadata = new CustomDigitalTwinMetadata { ModelId = modelId },
+        ///     Metadata = { ModelId = modelId },
         ///     Prop1 = &quot;Prop1 val&quot;,
         ///     Prop2 = 987,
         ///     Component1 = new Component1
         ///     {
-        ///         Metadata = new Component1Metadata { },
         ///         ComponentProp1 = &quot;Component prop1 val&quot;,
         ///         ComponentProp2 = 123,
         ///     }

diff --git a/sdk/digitaltwins/Azure.DigitalTwins.Core/src/Serialization/BasicDigitalTwin.cs b/sdk/digitaltwins/Azure.DigitalTwins.Core/src/Serialization/BasicDigitalTwin.cs
@@ -33,7 +33,6 @@ namespace Azure.DigitalTwins.Core.Serialization
     ///             &quot;Component1&quot;,
     ///             new ModelProperties
     ///             {
-    ///                 Metadata = { },
     ///                 // component properties
     ///                 CustomProperties =
     ///                 {

diff --git a/sdk/digitaltwins/Azure.DigitalTwins.Core/src/Serialization/ModelProperties.cs b/sdk/digitaltwins/Azure.DigitalTwins.Core/src/Serialization/ModelProperties.cs
@@ -18,7 +18,7 @@ public class ModelProperties
         /// Information about the model a component conforms to. This field is present on every digital twin.
         /// </summary>
         [JsonPropertyName("$metadata")]
-        public ComponentMetadata Metadata { get; } = new ComponentMetadata();
+        public ComponentMetadata Metadata { get; internal set; } = new ComponentMetadata();
 
         /// <summary>
         /// Additional properties of the digital twin. This field will contain any properties of the digital twin that are not already defined by the other strong types of this class.