new method GetJsonValueEx

csharp-leaf · Jul 13, 2018 · b420fd7 · b420fd7
1 parent 32f00c1
commit b420fd7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/Leaf.Core.Tests/Extensions/String/StringExtensionsTests.cs b/Leaf.Core.Tests/Extensions/String/StringExtensionsTests.cs
@@ -50,6 +50,26 @@ public void GetJsonValueTest()
             Assert.AreEqual("true", json.GetJsonValue("boolean"));
             Assert.AreEqual("hello", json.GetJsonValue("string"));
             Assert.AreEqual("world", json.GetJsonValue("endString", "\"}"));
+            Assert.AreEqual("world", json.GetJsonValue("endString", "\""));
+
+            Assert.IsNull(json.GetJsonValue("notFoundKey", "\"}"));
+            Assert.IsNull(json.GetJsonValue("notFoundKey", "\""));
+        }
+
+        [TestMethod]
+        public void GetJsonValueExTest()
+        {
+            const string json = "{\"boolean\":true,\"string\":\"hello\",\"endString\":\"world\"}";
+
+            Assert.AreEqual("true", json.GetJsonValueEx("boolean"));
+            Assert.AreEqual("hello", json.GetJsonValueEx("string"));
+            Assert.AreEqual("world", json.GetJsonValueEx("endString", "\"}"));
+            Assert.AreEqual("world", json.GetJsonValueEx("endString", "\""));
+
+            Assert.ThrowsException<StringBetweenException>(() => {
+                json.GetJsonValueEx("notFoundKey", "\"}");
+                json.GetJsonValueEx("notFoundKey", "\"");
+            });
         }
 
         [TestMethod]

diff --git a/Leaf.Core/Extensions/String/StringExtensions.cs b/Leaf.Core/Extensions/String/StringExtensions.cs
@@ -71,7 +71,20 @@ public static string ToUpperFirst(this string s, bool useToLower = true)
         /// <returns>Вернет значение JSON ключа</returns>
         public static string GetJsonValue(this string json, string key, string endsWith = ",\"")
         {
-            return json.Between($"\"{key}\":", endsWith)?.Trim('"', '\r', '\n', '\t');
+            return endsWith != "\"" 
+                ? json.Between($"\"{key}\":", endsWith)?.Trim('"', '\r', '\n', '\t') 
+                : json.Between($"\"{key}\":\"", "\"");
+        }
+
+        /// <inheritdoc cref="GetJsonValue(string, string, string)"/>
+        /// <summary>
+        /// Получает из JSON значение нужного ключа и бросает исключение <exception cref="StringBetweenException" /> если ключ не был найден.
+        /// </summary>
+        /// <exception cref="StringBetweenException">Бросает если значение ключа не было найдено</exception>
+        public static string GetJsonValueEx(this string json, string key, string ending = ",\"")
+        {
+            return GetJsonValue(json, key, ending)
+                ?? throw new StringBetweenException($"Не найдено значение JSON ключа \"{key}\". Ответ: {json}");
         }
 
         /// <summary>