Refactor

Author: SergeiPavlov

Orm/Xtensive.Orm/Orm/Rse/Column.cs

@@ -4,111 +4,84 @@
 // Created by: Elena Vakhtina
 // Created:    2008.09.09
 
-namespace Xtensive.Orm.Rse
+namespace Xtensive.Orm.Rse;
+
+/// <summary>
+/// Base class for any column of the <see cref="RecordSetHeader"/>.
+/// </summary>
+[Serializable]
+public abstract class Column(string name, ColNum index, Type type) : IEquatable<Column>
 {
   /// <summary>
-  /// Base class for any column of the <see cref="RecordSetHeader"/>.
+  /// Gets origin <see cref="Column"/> for this instance.
   /// </summary>
-  [Serializable]
-  public abstract class Column : IEquatable<Column>
-  {
-    private const string ToStringFormat = "{0} {1} ({2})";
-
-    /// <summary>
-    /// Gets origin <see cref="Column"/> for this instance.
-    /// </summary>
-    public virtual Column Origin => this;
-
-    /// <summary>
-    /// Gets the column name.
-    /// </summary>
-    public string Name { get; private set; }
-
-    /// <summary>
-    /// Gets the column index.
-    /// </summary>
-    public ColNum Index { get; }
-
-    /// <summary>
-    /// Gets the column type.
-    /// </summary>
-    public Type Type { get; private set; }
-
-    #region Equals, GetHashCode, ==, !=
+  public virtual Column Origin => this;
 
-    /// <inheritdoc/>
-    public bool Equals(Column other) =>
-      other is not null && (ReferenceEquals(this, other) || Name == other.Name);
-
-    /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is Column other && Equals(other);
+  /// <summary>
+  /// Gets the column name.
+  /// </summary>
+  public string Name { get; } = name;
 
-    /// <inheritdoc/>
-    public override int GetHashCode() => Name.GetHashCode();
+  /// <summary>
+  /// Gets the column index.
+  /// </summary>
+  public ColNum Index { get; } = index;
 
-    /// <summary>
-    /// Implements the operator ==.
-    /// </summary>
-    /// <param name="left">The left.</param>
-    /// <param name="right">The right.</param>
-    /// <returns>
-    /// The result of the operator.
-    /// </returns>
-    public static bool operator ==(Column left, Column right) => left?.Equals(right) ?? right is null;
+  /// <summary>
+  /// Gets the column type.
+  /// </summary>
+  public Type Type { get; } = type;
 
-    /// <summary>
-    /// Implements the operator !=.
-    /// </summary>
-    /// <param name="left">The left.</param>
-    /// <param name="right">The right.</param>
-    /// <returns>
-    /// The result of the operator.
-    /// </returns>
-    public static bool operator !=(Column left, Column right) => !(left == right);
+  /// <inheritdoc/>
+  public bool Equals(Column other) =>
+    other is not null && (ReferenceEquals(this, other) || Name == other.Name);
 
-    #endregion
+  /// <inheritdoc/>
+  public override bool Equals(object obj) => obj is Column other && Equals(other);
 
-    /// <inheritdoc/>
-    public override string ToString()
-    {
-      return string.Format(ToStringFormat, Type.Name, Name, Index);
-    }
+  /// <inheritdoc/>
+  public override int GetHashCode() => Name.GetHashCode();
 
-    /// <summary>
-    /// Creates clone of the column, but with another <see cref="Index"/>.
-    /// </summary>
-    /// <param name="newIndex">The new index value.</param>
-    /// <returns>Clone of the column, but with another <see cref="Index"/>.</returns>
-    public abstract Column Clone(ColNum newIndex);
+  /// <summary>
+  /// Implements the operator ==.
+  /// </summary>
+  /// <param name="left">The left.</param>
+  /// <param name="right">The right.</param>
+  /// <returns>
+  /// The result of the operator.
+  /// </returns>
+  public static bool operator ==(Column left, Column right) => left?.Equals(right) ?? right is null;
 
-    /// <summary>
-    /// Creates clone of the column, but with another <see cref="Name"/>.
-    /// </summary>
-    /// <param name="newName">The new name value.</param>
-    /// <returns>Clone of the column, but with another <see cref="Name"/>.</returns>
-    public abstract Column Clone(string newName);
+  /// <summary>
+  /// Implements the operator !=.
+  /// </summary>
+  /// <param name="left">The left.</param>
+  /// <param name="right">The right.</param>
+  /// <returns>
+  /// The result of the operator.
+  /// </returns>
+  public static bool operator !=(Column left, Column right) => !(left == right);
 
+  /// <inheritdoc/>
+  public override string ToString() => $"{Type.Name} {Name} ({Index})";
 
-    // Constructors
+  /// <summary>
+  /// Creates clone of the column, but with another <see cref="Index"/>.
+  /// </summary>
+  /// <param name="newIndex">The new index value.</param>
+  /// <returns>Clone of the column, but with another <see cref="Index"/>.</returns>
+  public abstract Column Clone(ColNum newIndex);
 
-    /// <summary>
-    /// Initializes a new instance of this class..
-    /// </summary>
-    /// <param name="name"><see cref="Name"/> property value.</param>
-    /// <param name="index"><see cref="Index"/> property value.</param>
-    /// <param name="type"><see cref="Type"/> property value.</param>
-    /// <param name="originalColumn">Original column.</param>
-    protected Column(string name, ColNum index, Type type)
-    {
-      Name = name;
-      Index = index;
-      Type = type;
-    }
-  }
+  /// <summary>
+  /// Creates clone of the column, but with another <see cref="Name"/>.
+  /// </summary>
+  /// <param name="newName">The new name value.</param>
+  /// <returns>Clone of the column, but with another <see cref="Name"/>.</returns>
+  public abstract Column Clone(string newName);
+}
 
-  public abstract class DerivedColumn(string name, ColNum index, Type type, Column origin)
-    : Column(name, index, type)
-  {
-    public override Column Origin => origin ?? this;
-  }
+public abstract class DerivedColumn(string name, ColNum index, Type type, Column origin)
+  : Column(name, index, type)
+{
+  public override Column Origin => origin ?? this;
 }