Fix GetOrCreateObject Update Copyright date range (#88)

* Fix GetOrCreateObject Update Copyright date range

GetOrCreateObject did not add any data to the database
Copyright updated form 2019 to 2021 to 2019 to 2022
Update formatting
Use auto Null parameter check where possible i.e. key!!

* Clean up code

Use more expression bodies where possible

Author: ChrisPulman

src/ReactiveMarbles.CacheData.SystemTextJson/SystemJsonSerializer.cs

@@ -1,11 +1,8 @@
-// Copyright (c) 2019-2021 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System;
 using System.Text.Json;
-using System.Text.Json.Serialization;
-
 using ReactiveMarbles.CacheDatabase.Core;
 
 namespace ReactiveMarbles.CacheDatabase.SystemTextJson

src/ReactiveMarbles.CacheDatabase.Benchmarks/Program.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 

src/ReactiveMarbles.CacheDatabase.Benchmarks/Utility.cs

@@ -1,15 +1,11 @@
-// Copyright (c) 2019-2021 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Reactive.Disposables;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace ReactiveMarbles.CacheDatabase.Benchmarks
 {

src/ReactiveMarbles.CacheDatabase.Core/CoreRegistrations.cs

@@ -1,11 +1,8 @@
-// Copyright (c) 2019-2021 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System;
-using System.Collections.Generic;
 using System.Reactive.Concurrency;
-using System.Text;
 
 namespace ReactiveMarbles.CacheDatabase.Core
 {

src/ReactiveMarbles.CacheDatabase.Core/HttpExtensions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 

src/ReactiveMarbles.CacheDatabase.Core/HttpService.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
@@ -48,15 +48,8 @@ public HttpService()
         /// <param name="fetchAlways">Force a web request to always be issued, skipping the cache.</param>
         /// <param name="absoluteExpiration">An optional expiration date.</param>
         /// <returns>The data downloaded from the URL.</returns>
-        public IObservable<byte[]> DownloadUrl(IBlobCache blobCache, string url, HttpMethod? method = default, IEnumerable<KeyValuePair<string, string>>? headers = null, bool fetchAlways = false, DateTimeOffset? absoluteExpiration = null)
-        {
-            if (blobCache is null)
-            {
-                throw new ArgumentNullException(nameof(blobCache));
-            }
-
-            return blobCache.DownloadUrl(url, url, method, headers, fetchAlways, absoluteExpiration);
-        }
+        public IObservable<byte[]> DownloadUrl(IBlobCache blobCache!!, string url, HttpMethod? method = default, IEnumerable<KeyValuePair<string, string>>? headers = null, bool fetchAlways = false, DateTimeOffset? absoluteExpiration = null) =>
+            blobCache.DownloadUrl(url, url, method, headers, fetchAlways, absoluteExpiration);
 
         /// <summary>
         /// Download data from an HTTP URL and insert the result into the
@@ -71,20 +64,9 @@ public IObservable<byte[]> DownloadUrl(IBlobCache blobCache, string url, HttpMet
         /// <param name="fetchAlways">Force a web request to always be issued, skipping the cache.</param>
         /// <param name="absoluteExpiration">An optional expiration date.</param>
         /// <returns>The data downloaded from the URL.</returns>
-        public IObservable<byte[]> DownloadUrl(IBlobCache blobCache, Uri url, HttpMethod? method = default, IEnumerable<KeyValuePair<string, string>>? headers = null, bool fetchAlways = false, DateTimeOffset? absoluteExpiration = null)
-        {
-            if (blobCache is null)
-            {
-                throw new ArgumentNullException(nameof(blobCache));
-            }
-
-            if (url is null)
-            {
-                throw new ArgumentNullException(nameof(url));
-            }
-
-            return blobCache.DownloadUrl(url.ToString(), url, method, headers, fetchAlways, absoluteExpiration);
-        }
+        public IObservable<byte[]> DownloadUrl(IBlobCache blobCache!!, Uri url, HttpMethod? method = default, IEnumerable<KeyValuePair<string, string>>? headers = null, bool fetchAlways = false, DateTimeOffset? absoluteExpiration = null) => url is null
+                ? throw new ArgumentNullException(nameof(url))
+                : blobCache.DownloadUrl(url.ToString(), url, method, headers, fetchAlways, absoluteExpiration);
 
         /// <summary>
         /// Download data from an HTTP URL and insert the result into the
@@ -186,9 +168,7 @@ protected virtual IObservable<HttpResponseMessage> MakeWebRequest(
             int retries = 3,
             TimeSpan? timeout = null)
         {
-            IObservable<HttpResponseMessage> request;
-
-            request = Observable.Defer(() =>
+            var request = Observable.Defer(() =>
             {
                 var httpRequest = CreateWebRequest(uri, method, headers);
 

src/ReactiveMarbles.CacheDatabase.Core/IBlobCache.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 

src/ReactiveMarbles.CacheDatabase.Core/IHttpService.cs

@@ -1,11 +1,10 @@
-// Copyright (c) 2019-2021 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
-using System.Text;
 
 namespace ReactiveMarbles.CacheDatabase.Core
 {

src/ReactiveMarbles.CacheDatabase.Core/ISecureBlobCache.cs

@@ -1,11 +1,7 @@
-// Copyright (c) 2019-2021 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace ReactiveMarbles.CacheDatabase.Core
 {
     /// <summary>

src/ReactiveMarbles.CacheDatabase.Core/ISerializer.cs

@@ -1,11 +1,7 @@
-// Copyright (c) 2019-2021 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace ReactiveMarbles.CacheDatabase.Core
 {
     /// <summary>