NR simplify code by using new C# features

jbe2277 · Nov 22, 2023 · db4e058 · db4e058
1 parent 18a0976
commit db4e058
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 74 deletions.
diff --git a/src/NewsReader/NewsReader.Domain.Test/FeedItemTest.cs b/src/NewsReader/NewsReader.Domain.Test/FeedItemTest.cs
@@ -13,33 +13,33 @@ public void ApplyValuesFromTest()
     {
         AssertHelper.ExpectedException<ArgumentNullException>(() => new FeedItem(null!, DateTimeOffset.Now, "test", "test"));
 
-        var itemA1 = new FeedItem(new Uri("http://www.test.com/rss/feed"), new DateTimeOffset(2020, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), "name", "desc");
-        Assert.AreEqual(new DateTimeOffset(2020, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), itemA1.Date);
+        var itemA1 = new FeedItem(new("http://www.test.com/rss/feed"), new(2020, 5, 5, 12, 0, 0, new(1, 0, 0)), "name", "desc");
+        Assert.AreEqual(new DateTimeOffset(2020, 5, 5, 12, 0, 0, new(1, 0, 0)), itemA1.Date);
         Assert.AreEqual("name", itemA1.Name);
         Assert.AreEqual("desc", itemA1.Description);
         Assert.IsFalse(itemA1.MarkAsRead);
 
-        var itemA2 = new FeedItem(new Uri("http://www.test.com/rss/feed"), new DateTimeOffset(2022, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), "name2", "desc2");
+        var itemA2 = new FeedItem(new("http://www.test.com/rss/feed"), new(2022, 5, 5, 12, 0, 0, new(1, 0, 0)), "name2", "desc2");
         itemA2.MarkAsRead = true;
         itemA1.ApplyValuesFrom(itemA2);
-        Assert.AreEqual(new DateTimeOffset(2022, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), itemA1.Date);
+        Assert.AreEqual(new DateTimeOffset(2022, 5, 5, 12, 0, 0, new(1, 0, 0)), itemA1.Date);
         Assert.AreEqual("name2", itemA1.Name);
         Assert.AreEqual("desc2", itemA1.Description);
         Assert.IsTrue(itemA1.MarkAsRead);
 
-        var itemB1 = new FeedItem(new Uri("http://www.test.com/rss/feed2"), new DateTimeOffset(2020, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), "name", "desc");
+        var itemB1 = new FeedItem(new("http://www.test.com/rss/feed2"), new(2020, 5, 5, 12, 0, 0, new(1, 0, 0)), "name", "desc");
         AssertHelper.ExpectedException<InvalidOperationException>(() => itemA1.ApplyValuesFrom(itemB1));
     }
 
     [TestMethod]
     public void CloneTest()
     {
-        var item = new FeedItem(new Uri("http://www.test.com/rss/feed"), new DateTimeOffset(2020, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), "name", "desc");
+        var item = new FeedItem(new("http://www.test.com/rss/feed"), new(2020, 5, 5, 12, 0, 0, new(1, 0, 0)), "name", "desc");
         item.MarkAsRead = true;
         var clone = item.Clone();
 
         Assert.AreNotSame(item, clone);
-        Assert.AreEqual(new DateTimeOffset(2020, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), clone.Date);
+        Assert.AreEqual(new DateTimeOffset(2020, 5, 5, 12, 0, 0, new(1, 0, 0)), clone.Date);
         Assert.AreEqual("name", clone.Name);
         Assert.AreEqual("desc", clone.Description);
         Assert.IsTrue(clone.MarkAsRead);
@@ -48,7 +48,7 @@ public void CloneTest()
     [TestMethod]
     public void SupportNull()
     {
-        var item = new FeedItem(new Uri("http://www.test.com/rss/feed"), new DateTimeOffset(2020, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), "name", "desc");
+        var item = new FeedItem(new("http://www.test.com/rss/feed"), new(2020, 5, 5, 12, 0, 0, new(1, 0, 0)), "name", "desc");
         item.Name = null;
         item.Description = null;
         Assert.IsNull(item.Name);

diff --git a/src/NewsReader/NewsReader.Domain.Test/FeedManagerTest.cs b/src/NewsReader/NewsReader.Domain.Test/FeedManagerTest.cs
@@ -14,7 +14,7 @@ public void SetDataManager()
         var feedManagerA = new FeedManager();
         Assert.AreSame(feedManagerA, feedManagerA.Feeds.Single().DataManager);
 
-        var feedA1 = new Feed(new Uri("http://www.test.com/rss/feed"));
+        var feedA1 = new Feed(new("http://www.test.com/rss/feed"));
         Assert.IsNull(feedA1.DataManager);
 
         feedManagerA.Feeds.Add(feedA1);
@@ -44,11 +44,11 @@ public void MergeTest()
     {
         var feedManagerA = new FeedManager();
         feedManagerA.Feeds.Remove(feedManagerA.Feeds.Single());
-        var feedA1 = new Feed(new Uri("http://www.test.com/rss/feedA1"));
-        var feedA2 = new Feed(new Uri("http://www.test.com/rss/feedA2"));
+        var feedA1 = new Feed(new("http://www.test.com/rss/feedA1"));
+        var feedA2 = new Feed(new("http://www.test.com/rss/feedA2"));
         feedManagerA.Feeds.Add(feedA1);
         feedManagerA.Feeds.Add(feedA2);
-        var item = new FeedItem(new Uri("http://www.test.com/rss/feed"), new DateTimeOffset(2120, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), "name", "desc");
+        var item = new FeedItem(new("http://www.test.com/rss/feed"), new(2120, 5, 5, 12, 0, 0, new(1, 0, 0)), "name", "desc");
         feedA2.UpdateItems(new[] { item });
         Assert.IsFalse(feedManagerA.Feeds.Last().Items.Single().MarkAsRead);
 
@@ -58,8 +58,8 @@ public void MergeTest()
             MaxItemsLimit = 43
         };
         feedManagerB.Feeds.Remove(feedManagerB.Feeds.Single());
-        var feedB1 = new Feed(new Uri("http://www.test.com/rss/feedB1"));
-        var feedB2 = new Feed(new Uri("http://www.test.com/rss/feedA2"));
+        var feedB1 = new Feed(new("http://www.test.com/rss/feedB1"));
+        var feedB2 = new Feed(new("http://www.test.com/rss/feedA2"));
         feedManagerB.Feeds.Add(feedB1);
         feedManagerB.Feeds.Add(feedB2);
         feedB2.UpdateItems(new[] { item }, cloneItemsBeforeInsert: true);
@@ -76,7 +76,7 @@ public void MergeTest()
         // Just remove one element => this way the Merge does not create new instances
         var feedManagerC = new FeedManager();
         feedManagerC.Feeds.Remove(feedManagerC.Feeds.Single());
-        var feedC2 = new Feed(new Uri("http://www.test.com/rss/feedA2"));
+        var feedC2 = new Feed(new("http://www.test.com/rss/feedA2"));
         feedManagerC.Feeds.Add(feedC2);
         feedC2.UpdateItems(new[] { item }, cloneItemsBeforeInsert: true);
         feedC2.Items.Single().MarkAsRead = false;
@@ -92,12 +92,12 @@ public void MergeTest()
     [TestMethod]
     public void FeedEqualityComparerTest()
     {
-        Assert.IsTrue(FeedEqualityComparer.Default.Equals(new Feed(new Uri("http://microsoft.com")), new Feed(new Uri("http://microsoft.com"))));
-        Assert.IsFalse(FeedEqualityComparer.Default.Equals(new Feed(new Uri("http://microsoft.com")), new Feed(new Uri("http://google.com"))));
-        Assert.IsFalse(FeedEqualityComparer.Default.Equals(new Feed(new Uri("http://microsoft.com")), new Feed(null!)));
-        Assert.IsFalse(FeedEqualityComparer.Default.Equals(new Feed(null!), new Feed(new Uri("http://microsoft.com"))));
-        Assert.IsFalse(FeedEqualityComparer.Default.Equals(new Feed(new Uri("http://microsoft.com")), null!));
-        Assert.IsFalse(FeedEqualityComparer.Default.Equals(null!, new Feed(new Uri("http://microsoft.com"))));
+        Assert.IsTrue(FeedEqualityComparer.Default.Equals(new Feed(new("http://microsoft.com")), new Feed(new("http://microsoft.com"))));
+        Assert.IsFalse(FeedEqualityComparer.Default.Equals(new Feed(new("http://microsoft.com")), new Feed(new("http://google.com"))));
+        Assert.IsFalse(FeedEqualityComparer.Default.Equals(new Feed(new("http://microsoft.com")), new Feed(null!)));
+        Assert.IsFalse(FeedEqualityComparer.Default.Equals(new Feed(null!), new Feed(new("http://microsoft.com"))));
+        Assert.IsFalse(FeedEqualityComparer.Default.Equals(new Feed(new("http://microsoft.com")), null!));
+        Assert.IsFalse(FeedEqualityComparer.Default.Equals(null!, new Feed(new("http://microsoft.com"))));
         Assert.IsTrue(FeedEqualityComparer.Default.Equals(new Feed(null!), new Feed(null!)));
         Assert.IsTrue(FeedEqualityComparer.Default.Equals(null!, null!));
 

diff --git a/src/NewsReader/NewsReader.Domain.Test/FeedTest.cs b/src/NewsReader/NewsReader.Domain.Test/FeedTest.cs
@@ -16,8 +16,8 @@ public class FeedTest : DomainTest
 
     private static void IsLoadingCoreTest(bool useSerializer)
     {
-        var feed1 = new Feed(new Uri("http://www.test.com/rss/feed"));
-        var feed2 = new Feed(new Uri("http://www.test.com/rss/feed"));
+        var feed1 = new Feed(new("http://www.test.com/rss/feed"));
+        var feed2 = new Feed(new("http://www.test.com/rss/feed"));
         feed1 = !useSerializer ? feed1 : SerializerHelper.Clone(feed1);
         feed2 = !useSerializer ? feed2 : SerializerHelper.Clone(feed2);
 
@@ -39,7 +39,7 @@ private static void IsLoadingCoreTest(bool useSerializer)
         Assert.IsFalse(feed2.IsLoading);
         feed2.StartLoading();
         Assert.IsTrue(feed2.IsLoading);
-        feed2.UpdateItems(new FeedItem[0]);
+        feed2.UpdateItems([]);
         Assert.IsFalse(feed2.IsLoading);
     }
 
@@ -57,20 +57,20 @@ private static void IsLoadingCoreTest(bool useSerializer)
 
     private static void UpdateItemsCoreTest(bool cloneItemsBeforeInsert, bool useSerializer)
     {
-        var feed = new Feed(new Uri("http://www.test.com/rss/feed"));
-        feed.UpdateItems(new[] {
-            new FeedItem(new Uri("http://www.test.com/rss/feed/1"), new DateTimeOffset(2020, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), "name1", "desc"),
-            new FeedItem(new Uri("http://www.test.com/rss/feed/2"), new DateTimeOffset(2020, 5, 7, 12, 0, 0, new TimeSpan(1, 0, 0)), "name2", "desc"),
-        });
+        var feed = new Feed(new("http://www.test.com/rss/feed"));
+        feed.UpdateItems([
+            new FeedItem(new("http://www.test.com/rss/feed/1"), new(2020, 5, 5, 12, 0, 0, new(1, 0, 0)), "name1", "desc"),
+            new FeedItem(new("http://www.test.com/rss/feed/2"), new(2020, 5, 7, 12, 0, 0, new(1, 0, 0)), "name2", "desc"),
+        ]);
         feed = !useSerializer ? feed : SerializerHelper.Clone(feed);
 
         Assert.AreEqual(2, feed.Items.Count);
         Assert.IsTrue(new[] { "name2", "name1" }.SequenceEqual(feed.Items.Select(x => x.Name)));
 
         var newItems = new[]
         {
-            new FeedItem(new Uri("http://www.test.com/rss/feed/2"), new DateTimeOffset(2020, 5, 7, 12, 0, 0, new TimeSpan(1, 0, 0)), "name2b", "desc"),
-            new FeedItem(new Uri("http://www.test.com/rss/feed/3"), new DateTimeOffset(2020, 5, 6, 12, 0, 0, new TimeSpan(1, 0, 0)), "name3", "desc"),
+            new FeedItem(new("http://www.test.com/rss/feed/2"), new(2020, 5, 7, 12, 0, 0, new(1, 0, 0)), "name2b", "desc"),
+            new FeedItem(new("http://www.test.com/rss/feed/3"), new(2020, 5, 6, 12, 0, 0, new(1, 0, 0)), "name3", "desc"),
         };
         feed.UpdateItems(newItems, cloneItemsBeforeInsert: cloneItemsBeforeInsert);
 
@@ -94,13 +94,13 @@ private static void UpdateItemsCoreTest(bool cloneItemsBeforeInsert, bool useSer
 
     private static void UnreadItemsCountCoreTest(bool useSerializer)
     {
-        var feed = new Feed(new Uri("http://www.test.com/rss/feed"));
+        var feed = new Feed(new("http://www.test.com/rss/feed"));
         var feedManager = new FeedManager() { MaxItemsLimit = null, ItemLifetime = null };
         feedManager.Feeds.Add(feed);
-        feed.UpdateItems(new[] {
-            new FeedItem(new Uri("http://www.test.com/rss/feed/1"), new DateTimeOffset(2020, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), "name1", "desc"),
-            new FeedItem(new Uri("http://www.test.com/rss/feed/2"), new DateTimeOffset(2020, 5, 5, 12, 0, 0, new TimeSpan(1, 0, 0)), "name2", "desc"),
-        });
+        feed.UpdateItems([
+            new FeedItem(new("http://www.test.com/rss/feed/1"), new(2020, 5, 5, 12, 0, 0, new(1, 0, 0)), "name1", "desc"),
+            new FeedItem(new("http://www.test.com/rss/feed/2"), new(2020, 5, 5, 12, 0, 0, new(1, 0, 0)), "name2", "desc"),
+        ]);
         feed = !useSerializer ? feed : SerializerHelper.Clone(feed);
 
         Assert.AreEqual(2, feed.UnreadItemsCount);
@@ -111,9 +111,7 @@ private static void UnreadItemsCountCoreTest(bool useSerializer)
 
         AssertHelper.PropertyChangedEvent(feed, x => x.UnreadItemsCount, () =>
         {
-            feed.UpdateItems(new[] {
-                new FeedItem(new Uri("http://www.test.com/rss/feed/3"), new DateTimeOffset(2020, 5, 5, 12, 0, 3, new TimeSpan(1, 0, 0)), "name3", "desc"),
-            });
+            feed.UpdateItems([new FeedItem(new("http://www.test.com/rss/feed/3"), new(2020, 5, 5, 12, 0, 3, new(1, 0, 0)), "name3", "desc")]);
         });
 
         Assert.AreEqual(2, feed.UnreadItemsCount);
@@ -131,7 +129,7 @@ private static void UnreadItemsCountCoreTest(bool useSerializer)
 
     private static void TrimItemsListWithMaxItemsLimitTest(bool useSerializer)
     {
-        var feed = new Feed(new Uri("http://www.test.com/rss/feed"));
+        var feed = new Feed(new("http://www.test.com/rss/feed"));
         feed = !useSerializer ? feed : SerializerHelper.Clone(feed);
 
         var feedManager = new FeedManager();
@@ -165,7 +163,7 @@ private static void TrimItemsListWithMaxItemsLimitTest(bool useSerializer)
 
     private static void TrimItemsListWithItemLifetimeTest(bool useSerializer)
     {
-        var feed = new Feed(new Uri("http://www.test.com/rss/feed"));
+        var feed = new Feed(new("http://www.test.com/rss/feed"));
         feed = !useSerializer ? feed : SerializerHelper.Clone(feed);
 
         var feedManager = new FeedManager();
@@ -193,10 +191,10 @@ private static void TrimItemsListWithItemLifetimeTest(bool useSerializer)
 
     private static void UpdateFeedItems(Feed feed)
     {
-        feed.UpdateItems(new[] {
-            new FeedItem(new Uri("http://www.test.com/rss/feed/1"), DateTimeOffset.Now - TimeSpan.FromDays(10), "name1", "desc"),
-            new FeedItem(new Uri("http://www.test.com/rss/feed/2"), DateTimeOffset.Now - TimeSpan.FromDays(5), "name2", "desc"),
-            new FeedItem(new Uri("http://www.test.com/rss/feed/3"), DateTimeOffset.Now - TimeSpan.FromDays(1), "name3", "desc"),
-        });
+        feed.UpdateItems([
+            new FeedItem(new("http://www.test.com/rss/feed/1"), DateTimeOffset.Now - TimeSpan.FromDays(10), "name1", "desc"),
+            new FeedItem(new("http://www.test.com/rss/feed/2"), DateTimeOffset.Now - TimeSpan.FromDays(5), "name2", "desc"),
+            new FeedItem(new("http://www.test.com/rss/feed/3"), DateTimeOffset.Now - TimeSpan.FromDays(1), "name3", "desc"),
+        ]);
     }
 }
diff --git a/src/NewsReader/NewsReader.Domain/Feed.cs b/src/NewsReader/NewsReader.Domain/Feed.cs
@@ -21,7 +21,7 @@ public Feed(Uri uri)
     {
         // Note: Serializer does not call the constructor.
         this.uri = uri;
-        items = new();
+        items = [];
         Initialize();
     }
 

diff --git a/src/NewsReader/NewsReader.Domain/FeedManager.cs b/src/NewsReader/NewsReader.Domain/FeedManager.cs
@@ -12,7 +12,7 @@ public class FeedManager : Model, IDataManager
     public FeedManager()
     {
         // Note: Serializer does not call the constructor.
-        feeds = new() { new Feed(new Uri("https://devblogs.microsoft.com/dotnet/category/maui/feed/")) };
+        feeds = [new Feed(new Uri("https://devblogs.microsoft.com/dotnet/category/maui/feed/"))];
         ItemLifetime = TimeSpan.FromDays(365);
         MaxItemsLimit = 250;
         Initialize();

diff --git a/src/NewsReader/NewsReader.Domain/Foundation/ObservableGroupedListView.cs b/src/NewsReader/NewsReader.Domain/Foundation/ObservableGroupedListView.cs
@@ -80,15 +80,8 @@ private IReadOnlyList<ObservableGroupingView<TKey, TElement>> CreateGroupingList
     private void OriginalCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e) => UpdateInnerList();
 
 
-    private sealed class InnerListKeyComparer : IEqualityComparer<ObservableGroupingView<TKey, TElement>>
+    private sealed class InnerListKeyComparer(IEqualityComparer<TKey> keyComparer) : IEqualityComparer<ObservableGroupingView<TKey, TElement>>
     {
-        private readonly IEqualityComparer<TKey> keyComparer;
-
-        public InnerListKeyComparer(IEqualityComparer<TKey> keyComparer)
-        {
-            this.keyComparer = keyComparer;
-        }
-
         public bool Equals(ObservableGroupingView<TKey, TElement>? x, ObservableGroupingView<TKey, TElement>? y)
         {
             if (x != null && y != null) return keyComparer.Equals(x.Key, y.Key);

diff --git a/src/NewsReader/NewsReader.Domain/Foundation/ObservableGroupingView.cs b/src/NewsReader/NewsReader.Domain/Foundation/ObservableGroupingView.cs
@@ -1,13 +1,8 @@
 namespace Waf.NewsReader.Domain.Foundation;
 
-public class ObservableGroupingView<TKey, TElement> : ObservableListViewBase<TElement>, IGrouping<TKey, TElement>
+public class ObservableGroupingView<TKey, TElement>(TKey key, IEnumerable<TElement> originalList) : ObservableListViewBase<TElement>(originalList), IGrouping<TKey, TElement>
 {
-    public ObservableGroupingView(TKey key, IEnumerable<TElement> originalList) : base(originalList)
-    {
-        Key = key;
-    }
-
-    public TKey Key { get; }
+    public TKey Key { get; } = key;
 
     internal new List<TElement> InnerList => base.InnerList;
 

diff --git a/src/NewsReader/NewsReader.Domain/GlobalSuppressions.cs b/src/NewsReader/NewsReader.Domain/GlobalSuppressions.cs
diff --git a/src/NewsReader/NewsReader.Presentation/Services/AppInfoService.cs b/src/NewsReader/NewsReader.Presentation/Services/AppInfoService.cs
@@ -4,13 +4,7 @@ namespace Waf.NewsReader.Presentation.Services;
 
 public class AppInfoService : IAppInfoService
 {
-    public AppInfoService()
-    {
-        AppName = AppInfo.Name;
-        VersionString = AppInfo.VersionString;
-    }
+    public string AppName { get; } = AppInfo.Name;
 
-    public string AppName { get; }
-
-    public string VersionString { get; }
+    public string VersionString { get; } = AppInfo.VersionString;
 }
diff --git a/src/NewsReader/NewsReader.Presentation/Views/FeedItemView.xaml.cs b/src/NewsReader/NewsReader.Presentation/Views/FeedItemView.xaml.cs
@@ -12,7 +12,7 @@ public partial class FeedItemView : IFeedItemView
     public FeedItemView()
     {
         InitializeComponent();
-        cancellationTokenSource = new CancellationTokenSource();
+        cancellationTokenSource = new();
     }
 
     protected override void OnBindingContextChanged()
@@ -24,7 +24,7 @@ protected override void OnBindingContextChanged()
     protected override void OnAppearing()
     {
         base.OnAppearing();
-        cancellationTokenSource = new CancellationTokenSource();
+        cancellationTokenSource = new();
         webView.Source = viewModel.FeedItem?.Uri;
     }
 
@@ -47,7 +47,7 @@ protected override bool OnBackButtonPressed()
 
     private async void WebViewNavigating(object sender, WebNavigatingEventArgs e)
     {
-        webViewNavigated = new TaskCompletionSource<object?>();
+        webViewNavigated = new();
         activityIndicator.IsVisible = true;
         activityIndicator.IsRunning = true;
         var delayTask = Task.Delay(TimeSpan.FromSeconds(5), cancellationTokenSource.Token);