Merge pull request #69 from ooples/develop

Did some minor code cleanup

src/Helpers/AnalystHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var analystData = JsonConvert.DeserializeObject<AnalystData>(jsonData);
 
-        return analystData != null ? (IEnumerable<T>)analystData.Finance.Results : Enumerable.Empty<T>();
+        return analystData != null ? (IEnumerable<T>)analystData.Finance.Results : [];
     }
 }

src/Helpers/AutoCompleteHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var autoComplete = JsonConvert.DeserializeObject<AutoCompleteData>(jsonData);
 
-        return autoComplete != null ? (IEnumerable<T>)autoComplete.ResultSet.Results : Enumerable.Empty<T>();
+        return autoComplete != null ? (IEnumerable<T>)autoComplete.ResultSet.Results : [];
     }
 }

src/Helpers/BalanceSheetHistoryHelper.cs

@@ -13,6 +13,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
         var balanceSheetHistory = JsonConvert.DeserializeObject<BalanceSheetHistoryData>(jsonData);
 
         return balanceSheetHistory != null ? (IEnumerable<T>)balanceSheetHistory.QuoteSummary.Results.
-            Select(x => x.BalanceSheetHistory).First().BalanceSheetStatements : Enumerable.Empty<T>();
+            Select(x => x.BalanceSheetHistory).First().BalanceSheetStatements : [];
     }
 }

src/Helpers/BalanceSheetHistoryQuarterlyHelper.cs

@@ -13,6 +13,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
         var balanceSheetHistoryQuarterlyData = JsonConvert.DeserializeObject<BalanceSheetHistoryQuarterlyData>(jsonData);
 
         return balanceSheetHistoryQuarterlyData != null ? (IEnumerable<T>)balanceSheetHistoryQuarterlyData.QuoteSummary.Results.
-            Select(x => x.BalanceSheetHistoryQuarterly).First().BalanceSheetStatements : Enumerable.Empty<T>();
+            Select(x => x.BalanceSheetHistoryQuarterly).First().BalanceSheetStatements : [];
     }
 }

src/Helpers/CalendarEventsHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var calendarEvents = JsonConvert.DeserializeObject<CalendarEventsData>(jsonData);
 
-        return calendarEvents != null ? (IEnumerable<T>)calendarEvents.QuoteSummary.Results.Select(x => x.CalendarEvents) : Enumerable.Empty<T>();
+        return calendarEvents != null ? (IEnumerable<T>)calendarEvents.QuoteSummary.Results.Select(x => x.CalendarEvents) : [];
     }
 }

src/Helpers/CashflowStatementHistoryHelper.cs

@@ -13,6 +13,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
         var balanceSheetHistory = JsonConvert.DeserializeObject<CashflowStatementHistoryData>(jsonData);
 
         return balanceSheetHistory != null ? (IEnumerable<T>)balanceSheetHistory.QuoteSummary.Results.
-            Select(x => x.CashflowStatementHistory).First().CashflowStatements : Enumerable.Empty<T>();
+            Select(x => x.CashflowStatementHistory).First().CashflowStatements : [];
     }
 }

src/Helpers/CashflowStatementHistoryQuarterlyHelper.cs

@@ -13,6 +13,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
         var cashflowStatementHistoryQuarterlyData = JsonConvert.DeserializeObject<CashflowStatementHistoryQuarterlyData>(jsonData);
 
         return cashflowStatementHistoryQuarterlyData != null ? (IEnumerable<T>)cashflowStatementHistoryQuarterlyData.QuoteSummary.Results.
-            Select(x => x.CashflowStatementHistoryQuarterly).First().CashflowStatements : Enumerable.Empty<T>();
+            Select(x => x.CashflowStatementHistoryQuarterly).First().CashflowStatements : [];
     }
 }

src/Helpers/ChartHelper.cs

@@ -10,32 +10,23 @@ internal class ChartHelper : YahooJsonBase
     /// <returns></returns>
     internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
-        var chartNodes = JsonNode.Parse(jsonData)!;
-        var root = chartNodes["chart"]!["result"]![0];
-        var dates = root!["timestamp"]?.AsArray().Select(x => x!.GetValue<long>().FromUnixTimeStamp());
-        var indicatorRoot = root["indicators"]!["quote"]![0];
+        var root = JsonConvert.DeserializeObject<ChartRoot>(jsonData)?.Chart.Result.FirstOrDefault();
+        var result = new ChartInfo
+        {
+            DateList = new List<DateTime>(root != null ? root.Timestamp.Select(x => x.FromUnixTimeStamp()) : []),
+            CloseList = new List<double>(root != null ? root.Indicators.Quote.SelectMany(x => x.Close.Select(y => y.GetValueOrDefault())) : []),
+            OpenList = new List<double>(root != null ? root.Indicators.Quote.SelectMany(x => x.Open.Select(y => y.GetValueOrDefault())) : []),
+            HighList = new List<double>(root != null ? root.Indicators.Quote.SelectMany(x => x.High.Select(y => y.GetValueOrDefault())) : []),
+            VolumeList = new List<double>(root != null ? root.Indicators.Quote.SelectMany(x => x.Volume.Select(y => y.GetValueOrDefault())) : []),
+            LowList = new List<double>(root != null ? root.Indicators.Quote.SelectMany(x => x.Low.Select(y => y.GetValueOrDefault())) : [])
+        };
 
-        if (dates == null  || indicatorRoot == null || indicatorRoot.AsArray().Count == 0)
+        if (result.DateList.Count == 0 || result.CloseList.Count == 0 || result.OpenList.Count == 0 || result.HighList.Count == 0 || 
+            result.VolumeList.Count == 0 || result.LowList.Count == 0)
         {
             throw new InvalidOperationException("Requested Information Not Available On Yahoo Finance");
         }
 
-        var closePrices = indicatorRoot!["close"]!.AsArray().Select(x => x != null ? Math.Round(x.GetValue<double>(), 4) : 0);
-        var openPrices = indicatorRoot!["open"]!.AsArray().Select(x => x != null ? Math.Round(x.GetValue<double>(), 4) : 0);
-        var lowPrices = indicatorRoot!["low"]!.AsArray().Select(x => x != null ? Math.Round(x.GetValue<double>(), 4) : 0);
-        var highPrices = indicatorRoot!["high"]!.AsArray().Select(x => x != null ? Math.Round(x.GetValue<double>(), 4) : 0);
-        var volumes = indicatorRoot!["volume"]!.AsArray().Select(x => x != null ? x.GetValue<double>() : 0);
-
-        var result = new ChartData
-        {
-            DateList = new List<DateTime>(dates),
-            CloseList = new List<double>(closePrices),
-            OpenList = new List<double>(openPrices),
-            HighList = new List<double>(highPrices),
-            VolumeList = new List<double>(volumes),
-            LowList = new List<double>(lowPrices)
-        };
-
         return new[] { result }.Cast<T>();
     }
 }

src/Helpers/EarningsHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var earnings = JsonConvert.DeserializeObject<EarningsData>(jsonData);
 
-        return earnings != null ? (IEnumerable<T>)earnings.QuoteSummary.Results.Select(x => x.Earnings) : Enumerable.Empty<T>();
+        return earnings != null ? (IEnumerable<T>)earnings.QuoteSummary.Results.Select(x => x.Earnings) : [];
     }
 }

src/Helpers/EarningsHistoryHelper.cs

@@ -11,7 +11,8 @@ internal class EarningsHistoryHelper : YahooJsonBase
     internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var earningsHistory = JsonConvert.DeserializeObject<EarningsHistoryData>(jsonData);
+        var result = earningsHistory != null ? (IEnumerable<T>?)earningsHistory.QuoteSummary.Results.Select(x => x.EarningsHistory).FirstOrDefault()?.History : [];
 
-        return earningsHistory != null ? (IEnumerable<T>)earningsHistory.QuoteSummary.Results.Select(x => x.EarningsHistory).First().History : Enumerable.Empty<T>();
+        return result ?? [];
     }
 }

src/Helpers/EarningsTrendHelper.cs

@@ -13,6 +13,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
         var earningsTrend = JsonConvert.DeserializeObject<EarningsTrendData>(jsonData);
 
         return earningsTrend != null ? (IEnumerable<T>)earningsTrend.QuoteSummary.Results.
-            Select(x => x.EarningsTrend).First().Trends : Enumerable.Empty<T>();
+            Select(x => x.EarningsTrend).First().Trends : [];
     }
 }

src/Helpers/EsgScoresHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var esgScores = JsonConvert.DeserializeObject<EsgScoresData>(jsonData);
 
-        return esgScores != null ? (IEnumerable<T>)esgScores.QuoteSummary.Results.Select(x => x.EsgScores) : Enumerable.Empty<T>();
+        return esgScores != null ? (IEnumerable<T>)esgScores.QuoteSummary.Results.Select(x => x.EsgScores) : [];
     }
 }

src/Helpers/FinancialDataHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var financialData = JsonConvert.DeserializeObject<FinancialDataRoot>(jsonData);
 
-        return financialData != null ? (IEnumerable<T>)financialData.QuoteSummary.Results.Select(x => x.FinancialData) : Enumerable.Empty<T>();
+        return financialData != null ? (IEnumerable<T>)financialData.QuoteSummary.Results.Select(x => x.FinancialData) : [];
     }
 }

src/Helpers/FundOwnershipHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var fundOwnership = JsonConvert.DeserializeObject<FundOwnershipData>(jsonData);
 
-        return fundOwnership != null ? (IEnumerable<T>)fundOwnership.QuoteSummary.Results.Select(x => x.FundOwnership).First().OwnershipList : Enumerable.Empty<T>();
+        return fundOwnership != null ? (IEnumerable<T>)fundOwnership.QuoteSummary.Results.Select(x => x.FundOwnership).First().OwnershipList : [];
     }
 }

src/Helpers/FundProfileHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var fundProfile = JsonConvert.DeserializeObject<FundProfileData>(jsonData);
 
-        return fundProfile != null ? (IEnumerable<T>)fundProfile.QuoteSummary.Results.Select(x => x.FundProfile) : Enumerable.Empty<T>();
+        return fundProfile != null ? (IEnumerable<T>)fundProfile.QuoteSummary.Results.Select(x => x.FundProfile) : [];
     }
 }

src/Helpers/IncomeStatementHistoryHelper.cs

@@ -13,6 +13,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
         var incomeStatementHistory = JsonConvert.DeserializeObject<IncomeStatementHistoryData>(jsonData);
 
         return incomeStatementHistory != null ? (IEnumerable<T>)incomeStatementHistory.QuoteSummary.Results.
-            Select(x => x.IncomeStatementHistory).First().IncomeStatementHistoryInfo : Enumerable.Empty<T>();
+            Select(x => x.IncomeStatementHistory).First().IncomeStatementHistoryInfo : [];
     }
 }

src/Helpers/IncomeStatementHistoryQuarterlyHelper.cs

@@ -13,6 +13,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
         var incomeStatementHistoryQuarterly = JsonConvert.DeserializeObject<IncomeStatementHistoryQuarterlyData>(jsonData);
 
         return incomeStatementHistoryQuarterly != null ? (IEnumerable<T>)incomeStatementHistoryQuarterly.QuoteSummary.Results.
-            Select(x => x.IncomeStatementHistoryQuarterly).First().IncomeStatementHistory : Enumerable.Empty<T>();
+            Select(x => x.IncomeStatementHistoryQuarterly).First().IncomeStatementHistory : [];
     }
 }

src/Helpers/IndexTrendHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var indexTrend = JsonConvert.DeserializeObject<IndexTrendData>(jsonData);
 
-        return indexTrend != null ? (IEnumerable<T>)indexTrend.QuoteSummary.Results.Select(x => x.IndexTrend) : Enumerable.Empty<T>();
+        return indexTrend != null ? (IEnumerable<T>)indexTrend.QuoteSummary.Results.Select(x => x.IndexTrend) : [];
     }
 }

src/Helpers/InsiderHolderHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var insiderHolderData = JsonConvert.DeserializeObject<InsiderHolderData>(jsonData);
 
-        return insiderHolderData != null ? (IEnumerable<T>)insiderHolderData.QuoteSummary.Results.Select(x => x.InsiderHolders).First().Holders : Enumerable.Empty<T>();
+        return insiderHolderData != null ? (IEnumerable<T>)insiderHolderData.QuoteSummary.Results.Select(x => x.InsiderHolders).First().Holders : [];
     }
 }

src/Helpers/InsiderTransactionHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var insiderTransactionData = JsonConvert.DeserializeObject<InsiderTransactionData>(jsonData);
 
-        return insiderTransactionData != null ? (IEnumerable<T>)insiderTransactionData.QuoteSummary.Results.Select(x => x.InsiderTransactions).First().Transactions : Enumerable.Empty<T>();
+        return insiderTransactionData != null ? (IEnumerable<T>)insiderTransactionData.QuoteSummary.Results.Select(x => x.InsiderTransactions).First().Transactions : [];
     }
 }

src/Helpers/InstitutionHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var institutionData = JsonConvert.DeserializeObject<InstitutionData>(jsonData);
 
-        return institutionData != null ? (IEnumerable<T>)institutionData.Finance.Results : Enumerable.Empty<T>();
+        return institutionData != null ? (IEnumerable<T>)institutionData.Finance.Results : [];
     }
 }

src/Helpers/InstitutionOwnershipHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var institutionOwnership = JsonConvert.DeserializeObject<InstitutionOwnershipData>(jsonData);
 
-        return institutionOwnership != null ? (IEnumerable<T>)institutionOwnership.QuoteSummary.Results.Select(x => x.InstitutionOwnership).First().OwnershipList : Enumerable.Empty<T>();
+        return institutionOwnership != null ? (IEnumerable<T>)institutionOwnership.QuoteSummary.Results.Select(x => x.InstitutionOwnership).First().OwnershipList : [];
     }
 }

src/Helpers/KeyStatisticsHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var keyStatisticData = JsonConvert.DeserializeObject<KeyStatisticData>(jsonData);
 
-        return keyStatisticData != null ? (IEnumerable<T>)keyStatisticData.QuoteSummary.Results.Select(x => x.DefaultKeyStatistics) : Enumerable.Empty<T>();
+        return keyStatisticData != null ? (IEnumerable<T>)keyStatisticData.QuoteSummary.Results.Select(x => x.DefaultKeyStatistics) : [];
     }
 }

src/Helpers/MajorDirectHoldersHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var majorDirectHolders = JsonConvert.DeserializeObject<MajorDirectHoldersData>(jsonData);
 
-        return majorDirectHolders != null ? (IEnumerable<T>)majorDirectHolders.QuoteSummary.Results.Select(x => x.MajorDirectHolders).First().Holders : Enumerable.Empty<T>();
+        return majorDirectHolders != null ? (IEnumerable<T>)majorDirectHolders.QuoteSummary.Results.Select(x => x.MajorDirectHolders).First().Holders : [];
     }
 }

src/Helpers/MajorHoldersBreakdownHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var majorHoldersBreakdown = JsonConvert.DeserializeObject<MajorHoldersBreakdownData>(jsonData);
 
-        return majorHoldersBreakdown != null ? (IEnumerable<T>)majorHoldersBreakdown.QuoteSummary.Results.Select(x => x.MajorHoldersBreakdown) : Enumerable.Empty<T>();
+        return majorHoldersBreakdown != null ? (IEnumerable<T>)majorHoldersBreakdown.QuoteSummary.Results.Select(x => x.MajorHoldersBreakdown) : [];
     }
 }

src/Helpers/MarketSummaryHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var marketSummary = JsonConvert.DeserializeObject<MarketSummaryData>(jsonData);
 
-        return marketSummary != null ? (IEnumerable<T>)marketSummary.MarketSummaryResponse.Results : Enumerable.Empty<T>();
+        return marketSummary != null ? (IEnumerable<T>)marketSummary.MarketSummaryResponse.Results : [];
     }
 }

src/Helpers/NetSharePurchaseActivityHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var netSharePurchaseActivity = JsonConvert.DeserializeObject<NetSharePurchaseActivityData>(jsonData);
 
-        return netSharePurchaseActivity != null ? (IEnumerable<T>)netSharePurchaseActivity.QuoteSummary.Results.Select(x => x.NetSharePurchaseActivity) : Enumerable.Empty<T>();
+        return netSharePurchaseActivity != null ? (IEnumerable<T>)netSharePurchaseActivity.QuoteSummary.Results.Select(x => x.NetSharePurchaseActivity) : [];
     }
 }

src/Helpers/PriceHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var priceInfo = JsonConvert.DeserializeObject<PriceData>(jsonData);
 
-        return priceInfo != null ? (IEnumerable<T>)priceInfo.QuoteSummary.Results.Select(x => x.Price) : Enumerable.Empty<T>();
+        return priceInfo != null ? (IEnumerable<T>)priceInfo.QuoteSummary.Results.Select(x => x.Price) : [];
     }
 }

src/Helpers/QuoteTypeHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var quoteType = JsonConvert.DeserializeObject<QuoteTypeData>(jsonData);
 
-        return quoteType != null ? (IEnumerable<T>)quoteType.QuoteSummary.Results.Select(x => x.QuoteType) : Enumerable.Empty<T>();
+        return quoteType != null ? (IEnumerable<T>)quoteType.QuoteSummary.Results.Select(x => x.QuoteType) : [];
     }
 }

src/Helpers/RealTimeQuoteHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var realTimeQuoteData = JsonConvert.DeserializeObject<RealTimeQuoteData>(jsonData);
 
-        return realTimeQuoteData != null ? (IEnumerable<T>)realTimeQuoteData.QuoteResponse.Results : Enumerable.Empty<T>();
+        return realTimeQuoteData != null ? (IEnumerable<T>)realTimeQuoteData.QuoteResponse.Results : [];
     }
 }

src/Helpers/RecommendationHelper.cs

@@ -18,6 +18,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
             throw new InvalidOperationException("Requested Information Not Available On Yahoo Finance");
         }
 
-        return rawRecommendData != null ? (IEnumerable<T>)rawRecommendData.Finance.Results.First().RecommendedSymbols : Enumerable.Empty<T>();
+        return rawRecommendData != null ? (IEnumerable<T>)rawRecommendData.Finance.Results.First().RecommendedSymbols : [];
     }
 }

src/Helpers/RecommendationTrendHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var recommendationTrend = JsonConvert.DeserializeObject<RecommendationTrendData>(jsonData);
 
-        return recommendationTrend != null ? (IEnumerable<T>)recommendationTrend.QuoteSummary.Results.Select(x => x.RecommendationTrend).First().Trend : Enumerable.Empty<T>();
+        return recommendationTrend != null ? (IEnumerable<T>)recommendationTrend.QuoteSummary.Results.Select(x => x.RecommendationTrend).First().Trend : [];
     }
 }

src/Helpers/ScreenerHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var screener = JsonConvert.DeserializeObject<ScreenerData>(jsonData);
 
-        return screener != null ? (IEnumerable<T>)screener.Finance.Results : Enumerable.Empty<T>();
+        return screener != null ? (IEnumerable<T>)screener.Finance.Results : [];
     }
 }

src/Helpers/SecFilingsHelper.cs

@@ -9,6 +9,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var secFilings = JsonConvert.DeserializeObject<SecFilingsData>(jsonData);
 
-        return secFilings != null ? (IEnumerable<T>)secFilings.QuoteSummary.Results.Select(x => x.SecFilings).First().Filings : Enumerable.Empty<T>();
+        return secFilings != null ? (IEnumerable<T>)secFilings.QuoteSummary.Results.Select(x => x.SecFilings).First().Filings : [];
     }
 }

src/Helpers/SectorTrendHelper.cs

@@ -12,6 +12,6 @@ internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
         var sectorTrend = JsonConvert.DeserializeObject<SectorTrendData>(jsonData);
 
-        return sectorTrend != null ? (IEnumerable<T>)sectorTrend.QuoteSummary.Results.Select(x => x.SectorTrend) : Enumerable.Empty<T>();
+        return sectorTrend != null ? (IEnumerable<T>)sectorTrend.QuoteSummary.Results.Select(x => x.SectorTrend) : [];
     }
 }

src/Helpers/SparkChartHelper.cs

@@ -10,9 +10,9 @@ internal class SparkChartHelper : YahooJsonBase
     /// <returns></returns>
     internal override IEnumerable<T> ParseYahooJsonData<T>(string jsonData)
     {
-        var rootObjects = JsonDocument.Parse(jsonData).RootElement.EnumerateObject();
-        var sparkChartData = rootObjects.Select(x => JsonConvert.DeserializeObject<SparkInfo>(x.Value.ToString()));
+        var root = JObject.Parse(jsonData).Children().FirstOrDefault();
+        var result = root?.FirstOrDefault()?.ToObject<SparkInfo>();
 
-        return sparkChartData != null ? (IEnumerable<T>)sparkChartData : Enumerable.Empty<T>();
+        return new[] { result }.Cast<T>();
     }
 }