EdgeHub: Fix error if client does not send product info (#1496)

* Update Product Info * Fix SerDeExtensions
Azure · Aug 6, 2019 · bb31324 · bb31324
1 parent 0ce39ee
commit bb31324
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/edge-hub/src/Microsoft.Azure.Devices.Edge.Hub.Core/ProductInfoStore.cs b/edge-hub/src/Microsoft.Azure.Devices.Edge.Hub.Core/ProductInfoStore.cs
@@ -19,7 +19,7 @@ public ProductInfoStore(IKeyValueStore<string, string> productInfoEntityStore, s
         public Task SetProductInfo(string id, string productInfo)
         {
             Preconditions.CheckNonWhiteSpace(id, nameof(id));
-            return this.productInfoEntityStore.Put(id, productInfo);
+            return !string.IsNullOrWhiteSpace(productInfo) ? this.productInfoEntityStore.Put(id, productInfo) : Task.CompletedTask;
         }
 
         public async Task<string> GetProductInfo(string id)

diff --git a/edge-hub/test/Microsoft.Azure.Devices.Edge.Hub.Core.Test/ProductInfoStoreTest.cs b/edge-hub/test/Microsoft.Azure.Devices.Edge.Hub.Core.Test/ProductInfoStoreTest.cs
@@ -58,6 +58,23 @@ public async Task SmokeTest()
             }
         }
 
+        [Fact]
+        public async Task EmptyProductInfoTest()
+        {
+            // Arrange
+            string edgeProductInfo = "IoTEdge 1.0.7";
+            var storeProvider = new StoreProvider(new InMemoryDbStoreProvider());
+            IEntityStore<string, string> store = storeProvider.GetEntityStore<string, string>("productInfo");
+            var productInfoStore = new ProductInfoStore(store, edgeProductInfo);
+
+            // Act
+            await productInfoStore.SetProductInfo("d1", string.Empty);
+            string productInfoValue = await productInfoStore.GetProductInfo("d1");
+
+            // Assert
+            Assert.Equal(string.Empty, productInfoValue);
+        }
+
         [Fact]
         public void ProductInfoCtorTest()
         {

diff --git a/edge-util/src/Microsoft.Azure.Devices.Edge.Storage/SerDeExtensions.cs b/edge-util/src/Microsoft.Azure.Devices.Edge.Storage/SerDeExtensions.cs
@@ -10,7 +10,9 @@ public static T FromJson<T>(this string json)
         {
             if (string.IsNullOrWhiteSpace(json))
             {
-                return default(T);
+                return typeof(T) == typeof(string)
+                    ? (T)(object)json
+                    : default(T);
             }
 
             return typeof(T) == typeof(string)

diff --git a/edge-util/test/Microsoft.Azure.Devices.Edge.Storage.Test/SerDeExtensionsTest.cs b/edge-util/test/Microsoft.Azure.Devices.Edge.Storage.Test/SerDeExtensionsTest.cs
@@ -47,6 +47,16 @@ public void FromJsonTest()
             Assert.Equal(str, SerDeExtensions.FromJson<string>(str));
         }
 
+        [Theory]
+        [InlineData("")]
+        [InlineData("  ")]
+        [InlineData(" some value")]
+        public void StringToJsonRoundtripTest(string input)
+        {
+            string value = SerDeExtensions.FromJson<string>(SerDeExtensions.ToJson(input));
+            Assert.Equal(input, value);
+        }
+
         [Fact]
         public void StringToBytesRoundtripTest()
         {