[Core.Serialization] Modernize code

Author: Kryptos-FR

sources/buildengine/Stride.Core.BuildEngine.Common/FileVersionStorage.cs

@@ -115,8 +115,10 @@ protected override List<KeyValuePair<FileVersionKey, ObjectId>> ReadEntries(Syst
 
         protected override void WriteEntry(Stream localStream, KeyValuePair<FileVersionKey, ObjectId> value)
         {
+            ArgumentNullException.ThrowIfNull(localStream);
+
             var key = value.Key;
-            var line = string.Format("{0}\t{1}\t{2}\t{3}\n", key.Path, key.LastModifiedDate.Ticks, key.FileSize, value.Value);
+            var line = $"{key.Path}\t{key.LastModifiedDate.Ticks}\t{key.FileSize}\t{value.Value}\n";
             var bytes = Encoding.UTF8.GetBytes(line);
             localStream.Write(bytes, 0, bytes.Length);
         }

sources/core/Stride.Core.Serialization/Assets/AssetId.cs

@@ -1,128 +1,124 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using Stride.Core;
+
 using Stride.Core.Serialization;
-using Stride.Core.Storage;
 
-namespace Stride.Core.Assets
+namespace Stride.Core.Assets;
+
+[DataContract(nameof(AssetId))]
+[DataSerializer(typeof(Serializer))]
+public readonly struct AssetId : IComparable<AssetId>, IEquatable<AssetId>
 {
-    [DataContract("AssetId")]
-    [DataSerializer(typeof(AssetId.Serializer))]
-    public struct AssetId : IComparable<AssetId>, IEquatable<AssetId>
+    private readonly Guid guid;
+
+    public static readonly AssetId Empty = new();
+
+    public AssetId(Guid guid)
     {
-        private readonly Guid guid;
+        this.guid = guid;
+    }
 
-        public static readonly AssetId Empty = new AssetId();
+    public AssetId(string guid)
+    {
+        this.guid = new Guid(guid);
+    }
 
-        public AssetId(Guid guid)
-        {
-            this.guid = guid;
-        }
+    public static explicit operator AssetId(Guid guid)
+    {
+        return new AssetId(guid);
+    }
 
-        public AssetId(string guid)
-        {
-            this.guid = new Guid(guid);
-        }
+    public static explicit operator Guid(AssetId id)
+    {
+        return id.guid;
+    }
 
-        public static explicit operator AssetId(Guid guid)
-        {
-            return new AssetId(guid);
-        }
+    public static AssetId New()
+    {
+        return new AssetId(Guid.NewGuid());
+    }
 
-        public static explicit operator Guid(AssetId id)
-        {
-            return id.guid;
-        }
+    /// <summary>
+    /// Implements the ==.
+    /// </summary>
+    /// <param name="left">The left.</param>
+    /// <param name="right">The right.</param>
+    /// <returns>The result of the operator.</returns>
+    public static bool operator ==(AssetId left, AssetId right)
+    {
+        return left.Equals(right);
+    }
 
-        public static AssetId New()
-        {
-            return new AssetId(Guid.NewGuid());
-        }
+    /// <summary>
+    /// Implements the !=.
+    /// </summary>
+    /// <param name="left">The left.</param>
+    /// <param name="right">The right.</param>
+    /// <returns>The result of the operator.</returns>
+    public static bool operator !=(AssetId left, AssetId right)
+    {
+        return !left.Equals(right);
+    }
 
-        /// <summary>
-        /// Implements the ==.
-        /// </summary>
-        /// <param name="left">The left.</param>
-        /// <param name="right">The right.</param>
-        /// <returns>The result of the operator.</returns>
-        public static bool operator ==(AssetId left, AssetId right)
-        {
-            return left.Equals(right);
-        }
+    /// <inheritdoc/>
+    public bool Equals(AssetId other)
+    {
+        return guid == other.guid;
+    }
 
-        /// <summary>
-        /// Implements the !=.
-        /// </summary>
-        /// <param name="left">The left.</param>
-        /// <param name="right">The right.</param>
-        /// <returns>The result of the operator.</returns>
-        public static bool operator !=(AssetId left, AssetId right)
-        {
-            return !left.Equals(right);
-        }
+    /// <inheritdoc/>
+    public override bool Equals(object? obj)
+    {
+        return obj is AssetId id && Equals(id);
+    }
 
-        /// <inheritdoc/>
-        public bool Equals(AssetId other)
-        {
-            return guid == other.guid;
-        }
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        return guid.GetHashCode();
+    }
 
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            return obj is AssetId id && Equals(id);
-        }
+    /// <inheritdoc/>
+    public int CompareTo(AssetId other)
+    {
+        return guid.CompareTo(other.guid);
+    }
 
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return guid.GetHashCode();
-        }
+    public static bool TryParse(string input, out AssetId result)
+    {
+        var success = Guid.TryParse(input, out var guid);
+        result = new AssetId(guid);
+        return success;
+    }
 
-        /// <inheritdoc/>
-        public int CompareTo(AssetId other)
-        {
-            return guid.CompareTo(other.guid);
-        }
+    public static AssetId Parse(string input)
+    {
+        return new AssetId(Guid.Parse(input));
+    }
 
-        public static bool TryParse(string input, out AssetId result)
-        {
-            Guid guid;
-            var success = Guid.TryParse(input, out guid);
-            result = new AssetId(guid);
-            return success;
-        }
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return guid.ToString();
+    }
 
-        public static AssetId Parse(string input)
-        {
-            return new AssetId(Guid.Parse(input));
-        }
+    internal class Serializer : DataSerializer<AssetId>
+    {
+        private DataSerializer<Guid>? guidSerialier;
 
-        /// <inheritdoc/>
-        public override string ToString()
+        public override void Initialize(SerializerSelector serializerSelector)
         {
-            return guid.ToString();
+            base.Initialize(serializerSelector);
+
+            guidSerialier = serializerSelector.GetSerializer<Guid>();
         }
 
-        internal class Serializer : DataSerializer<AssetId>
+        public override void Serialize(ref AssetId obj, ArchiveMode mode, SerializationStream stream)
         {
-            private DataSerializer<Guid> guidSerialier;
-
-            public override void Initialize(SerializerSelector serializerSelector)
-            {
-                base.Initialize(serializerSelector);
-
-                guidSerialier = serializerSelector.GetSerializer<Guid>();
-            }
-
-            public override void Serialize(ref AssetId obj, ArchiveMode mode, SerializationStream stream)
-            {
-                var guid = obj.guid;
-                guidSerialier.Serialize(ref guid, mode, stream);
-                if (mode == ArchiveMode.Deserialize)
-                    obj = new AssetId(guid);
-            }
+            var guid = obj.guid;
+            guidSerialier?.Serialize(ref guid, mode, stream);
+            if (mode == ArchiveMode.Deserialize)
+                obj = new AssetId(guid);
         }
     }
 }