Merge pull request #335 from DataObjects-NET/master-remove-obsoletes

alex-kulakov · web-flow · commit baa8098add41 · 2023-08-21T20:34:29.000+05:00
Removes obsolete types / members of types.
diff --git a/ChangeLog/7.2.0-Beta-1-dev.txt b/ChangeLog/7.2.0-Beta-1-dev.txt
@@ -10,5 +10,18 @@
 [main] TemporaryTableDescriptor changed interface to IMultiRecordPersistDescriptor, fully compatible with IPersistDescriptor
 [main] SqlNode.Clone() method now returns SqlNode to take advantage of C# covariant returns and reduce casts overhead
 [main] Improved exception handling if some appered during asynchronous Session opening
+[main] Obsolete LockableExtensions.EnsureNotLocked is removed
+[main] Obsolete DomainConfiguration.DefaultVersioningPolicy is removed
+[main] Obsolete TypeInfo methods (GetImplementors(), GetInterfaces(), GetDescendants(), GetAncestors() and GetRoot()) are removed
+[main] Obsolete TypeInfoCollection FindXXX methods are removed
+[main] Obsolete PersistRequest constructor removed
+[main] Obsolete PersistRequestBuilder.CreatePersistRequest() method is removed.
+[main] Obsolete StorageDriver.Compile(ISqlCompileUnit, NodeConfigruation) method is removed
+[main] Obsolete MethodHelper.GetMethod() and .GetConstructor() methods are removed
+[main] Obsolete TypeHelper.GetConstructor() and .GetInterfaces() are removed
+[main] Obsolete SqlCompilerConfiguration.SchemaMapping and .DatabaseMapping properties and constructor are removed
+[main] Obsolete SqlNodeActualizer class is removed
+[main] Obsolete SqlCompilerContext.SqlNodeActualizer property is removed
+[main] Obsolete XtensiveSql.Dml.Extensions.IsNullReference() extension method is removed
 [postgresql] QueryInfo.MaxQueryParameterCount actualized, it is 65535 now
 [oracle] QueryInfo.MaxQueryParameterCount actualized, it is 65535 now
diff --git a/Orm/Xtensive.Orm/Core/Extensions/LockableExtensions.cs b/Orm/Xtensive.Orm/Core/Extensions/LockableExtensions.cs
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs
@@ -81,12 +81,6 @@ public class DomainConfiguration : ConfigurationBase
     /// </summary>
     public const bool DefaultEnsureConnectionIsAlive = true;
 
-    /// <summary>
-    /// Default <see cref="EntityVersioningPolicy"/> value;
-    /// </summary>
-    [Obsolete("Use VersioningConvention.DefaultVersioningPolicy")]
-    public const EntityVersioningPolicy DefaultVersioningPolicy = EntityVersioningPolicy.Default;
-
     /// <summary>
     /// Default <see cref="UpgradeMode"/> value.
     /// </summary>
diff --git a/Orm/Xtensive.Orm/Orm/Model/TypeInfo.cs b/Orm/Xtensive.Orm/Orm/Model/TypeInfo.cs
@@ -566,43 +566,6 @@ public Tuple InjectPrimaryKey(Tuple entityTuple, Tuple primaryKey)
       return primaryKeyInjector.Apply(TupleTransformType.Tuple, primaryKey, entityTuple);
     }
 
-    /// <summary>
-    /// Gets the direct implementors of this instance.
-    /// </summary>
-    /// <param name="recursive">if set to <see langword="true"/> then both direct and non-direct implementors will be returned.</param>
-    [Obsolete("Use DirectImplementors/AllImplementors properties instead")]
-    public IEnumerable<TypeInfo> GetImplementors(bool recursive = false) => recursive ? AllImplementors : DirectImplementors;
-
-    /// <summary>
-    /// Gets the persistent interfaces this instance implements.
-    /// </summary>
-    /// <param name="recursive">if set to <see langword="true"/> then both direct and non-direct implemented interfaces will be returned.</param>
-    [Obsolete("Use DirectInterfaces/AllInterfaces properties instead")]
-    public IEnumerable<TypeInfo> GetInterfaces(bool recursive = false) => recursive ? AllInterfaces : DirectInterfaces;
-
-    /// <summary>
-    /// Gets descendants of this instance.
-    /// </summary>
-    /// <param name="recursive">if set to <see langword="true"/> then both direct and nested descendants will be returned.</param>
-    /// <returns></returns>
-    [Obsolete("Use DirectDescendants/AllDescendants properties instead")]
-    public IEnumerable<TypeInfo> GetDescendants(bool recursive) => recursive ? AllDescendants : DirectDescendants;
-
-    /// <summary>
-    /// Gets the ancestors recursively. Root-to-inheritor order.
-    /// </summary>
-    /// <returns>The ancestor</returns>
-    [Obsolete("Use Ancestors property instead")]
-    public IReadOnlyList<TypeInfo> GetAncestors() => Ancestors.ToList();
-
-    /// <summary>
-    /// Gets the root of the hierarchy.
-    /// </summary>
-    /// <returns>The hierarchy root.</returns>
-    [Obsolete("Use Root property instead")]
-    [CanBeNull]
-    public TypeInfo GetRoot() => Root;
-
     public IEnumerable<AssociationInfo> GetTargetAssociations()
     {
       if (targetAssociations == null) {
diff --git a/Orm/Xtensive.Orm/Orm/Model/TypeInfoCollection.cs b/Orm/Xtensive.Orm/Orm/Model/TypeInfoCollection.cs
@@ -167,90 +167,6 @@ public TypeInfo Find(string fullName)
       return fullNameTable.TryGetValue(fullName, out result) ? result : null;
     }
 
-
-    /// <summary>
-    /// Finds the ancestor of the specified <paramref name="item"/>.
-    /// </summary>
-    /// <param name="item">The type to search ancestor for.</param>
-    /// <returns><see cref="TypeInfo"/> instance that is ancestor of specified <paramref name="item"/> or 
-    /// <see langword="null"/> if the ancestor is not found in this collection.</returns>
-    /// <exception cref="ArgumentNullException">When <paramref name="item"/> is <see langword="null"/>.</exception>
-    [Obsolete("Use TypeInfo.Ancestor")]
-    public TypeInfo FindAncestor(TypeInfo item) => item.Ancestor;
-
-    /// <summary>
-    /// Finds the set of direct descendants of the specified <paramref name="item"/>.
-    /// </summary>
-    /// <param name="item">The type to search descendants for.</param>
-    /// <returns><see cref="IEnumerable{T}"/> of <see cref="TypeInfo"/> instance that are descendants of specified <paramref name="item"/>.</returns>
-    /// <exception cref="ArgumentNullException">When <paramref name="item"/> is <see langword="null"/>.</exception>
-    [Obsolete("Use TypeInfo.DirectDescendants")]
-    public IEnumerable<TypeInfo> FindDescendants(TypeInfo item) => item.DirectDescendants;
-
-    /// <summary>
-    /// Finds the set of descendants of the specified <paramref name="item"/>.
-    /// </summary>
-    /// <param name="item">The type to search descendants for.</param>
-    /// <param name="recursive">if set to <see langword="true"/> then both direct and nested descendants will be returned.</param>
-    /// <returns>
-    ///   <see cref="IEnumerable{T}"/> of <see cref="TypeInfo"/> instance that are descendants of specified <paramref name="item"/>.
-    /// </returns>
-    /// <exception cref="ArgumentNullException">When <paramref name="item"/> is <see langword="null"/>.</exception>
-    [Obsolete("Use TypeInfo.DirectDescendants/.AllDescendants")]
-    public IEnumerable<TypeInfo> FindDescendants(TypeInfo item, bool recursive) =>
-      recursive ? item.AllDescendants : item.DirectDescendants;
-
-    /// <summary>
-    /// Find the <see cref="IList{T}"/> of interfaces that specified <paramref name="item"/> implements.
-    /// </summary>
-    /// <param name="item">The type to search interfaces for.</param>
-    /// <returns><see cref="IEnumerable{T}"/> of <see cref="TypeInfo"/> instance that are implemented by specified <paramref name="item"/>.</returns>
-    /// <exception cref="ArgumentNullException">When <paramref name="item"/> is <see langword="null"/>.</exception>
-    [Obsolete("Use TypeInfo.DirectInterfaces")]
-    public IEnumerable<TypeInfo> FindInterfaces(TypeInfo item) => item.DirectInterfaces;
-
-    /// <summary>
-    /// Find the <see cref="IList{T}"/> of interfaces that specified <paramref name="item"/> implements.
-    /// </summary>
-    /// <param name="item">The type to search interfaces for.</param>
-    /// <param name="recursive">if set to <see langword="true"/> then both direct and non-direct implemented interfaces will be returned.</param>
-    /// <returns><see cref="IEnumerable{T}"/> of <see cref="TypeInfo"/> instance that are implemented by specified <paramref name="item"/>.</returns>
-    /// <exception cref="ArgumentNullException">When <paramref name="item"/> is <see langword="null"/>.</exception>
-    [Obsolete("Use TypeInfo.DirectInterfaces/.AllInterfaces ")]
-    public IEnumerable<TypeInfo> FindInterfaces(TypeInfo item, bool recursive) =>
-      recursive ? item.AllInterfaces : item.DirectInterfaces;
-
-    /// <summary>
-    /// Finds the set of direct implementors of the specified <paramref name="item"/>.
-    /// </summary>
-    /// <param name="item">The type to search implementors for.</param>
-    /// <returns><see cref="IEnumerable{T}"/> of <see cref="TypeInfo"/> instance that are implementors of specified <paramref name="item"/>.</returns>
-    /// <exception cref="ArgumentNullException">When <paramref name="item"/> is <see langword="null"/>.</exception>
-    [Obsolete("Use TypeInfo.DirectImplementors")]
-    public IEnumerable<TypeInfo> FindImplementors(TypeInfo item) => item.DirectImplementors;
-
-    /// <summary>
-    /// Finds the set of implementors of the specified <paramref name="item"/>.
-    /// </summary>
-    /// <param name="item">The type to search implementors for.</param>
-    /// <param name="recursive">if set to <see langword="true"/> then both direct and nested implementors will be returned.</param>
-    /// <returns>
-    ///   <see cref="IEnumerable{T}"/> of <see cref="TypeInfo"/> instance that are implementors of specified <paramref name="item"/>.
-    /// </returns>
-    /// <exception cref="ArgumentNullException">When <paramref name="item"/> is <see langword="null"/>.</exception>
-    [Obsolete("Use TypeInfo.DirectImplementors/.AllImplementors ")]
-    public IEnumerable<TypeInfo> FindImplementors(TypeInfo item, bool recursive) =>
-      recursive ? item.AllImplementors : item.DirectImplementors;
-
-    /// <summary>
-    /// Finds the root of the specified <paramref name="item"/>.
-    /// </summary>
-    /// <param name="item">The type to search root for.</param>
-    /// <returns><see cref="TypeInfo"/> instance that is root of specified <paramref name="item"/>.</returns>
-    /// <exception cref="ArgumentNullException">When <paramref name="item"/> is <see langword="null"/>.</exception>
-    [Obsolete("Use TypeInfo.Root")]
-    public TypeInfo FindRoot(TypeInfo item) => item.Root;
-
     /// <summary>
     /// Finds the ancestor of the specified <paramref name="type"/>.
     /// </summary>
diff --git a/Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequest.cs b/Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequest.cs
@@ -56,21 +56,5 @@ public PersistRequest(
       CompileUnit = compileUnit;
       ParameterBindings = ParameterBinding.NormalizeBindings(parameterBindings);
     }
-
-    [Obsolete]
-    public PersistRequest(
-      StorageDriver driver, SqlStatement statement, IEnumerable<PersistParameterBinding> parameterBindings, NodeConfiguration nodeConfiguration)
-    {
-      ArgumentValidator.EnsureArgumentNotNull(driver, "driver");
-      ArgumentValidator.EnsureArgumentNotNull(statement, "statement");
-
-      var compileUnit = statement as ISqlCompileUnit
-        ?? throw new ArgumentException("Statement is not ISqlCompileUnit");
-
-      this.driver = driver;
-      Statement = statement;
-      CompileUnit = compileUnit;
-      ParameterBindings = ParameterBinding.NormalizeBindings(parameterBindings);
-    }
   }
 }
diff --git a/Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequestBuilder.cs b/Orm/Xtensive.Orm/Orm/Providers/Requests/PersistRequestBuilder.cs
@@ -192,14 +192,6 @@ private SqlExpression BuildVersionFilter(PersistRequestBuilderContext context, S
       return result;
     }
 
-    [Obsolete("Use constructor directly")]
-    protected PersistRequest CreatePersistRequest(SqlStatement query, IEnumerable<PersistParameterBinding> bindings, NodeConfiguration nodeConfiguration)
-    {
-      return Handlers.Domain.Configuration.ShareStorageSchemaOverNodes
-        ? new PersistRequest(driver, query, bindings, nodeConfiguration)
-        : new PersistRequest(driver, query, bindings);
-    }
-
     private bool AddFakeVersionColumnUpdate(PersistRequestBuilderContext context, SqlUpdate update, SqlTableRef filteredTable)
     {
       foreach (var column in context.Type.GetVersionColumns()) {
diff --git a/Orm/Xtensive.Orm/Orm/Providers/StorageDriver.cs b/Orm/Xtensive.Orm/Orm/Providers/StorageDriver.cs
@@ -88,16 +88,6 @@ public SqlCompilationResult Compile(ISqlCompileUnit statement)
       return underlyingDriver.Compile(statement, options);
     }
 
-    [Obsolete]
-    public SqlCompilationResult Compile(ISqlCompileUnit statement, NodeConfiguration nodeConfiguration)
-    {
-      var options = new SqlCompilerConfiguration {
-        DatabaseQualifiedObjects = configuration.IsMultidatabase,
-        CommentLocation = configuration.TagsLocation.ToCommentLocation()
-      };
-      return underlyingDriver.Compile(statement, options);
-    }
-
     public DbDataReaderAccessor GetDataReaderAccessor(in TupleDescriptor descriptor)
     {
       return new DbDataReaderAccessor(descriptor, descriptor.Select(GetTypeMapping));
diff --git a/Orm/Xtensive.Orm/Reflection/MethodHelper.cs b/Orm/Xtensive.Orm/Reflection/MethodHelper.cs
@@ -93,23 +93,6 @@ public static MethodInfo GetMethodEx(this Type type, string name, BindingFlags b
       return lastMatch;
     }
 
-    /// <summary>
-    /// Gets generic method by names \ types of its arguments.
-    /// </summary>
-    /// <param name="type">Type to search the method in.</param>
-    /// <param name="name">Method name.</param>
-    /// <param name="bindingFlags">Binding attributes.</param>
-    /// <param name="genericArgumentNames">Generic arguments of the method.</param>
-    /// <param name="parameterTypes">Either strings or <see cref="Type"/>s of parameters (mixing is allowed).</param>
-    /// <returns>Found method, if match was found;
-    /// otherwise, <see langword="null"/>.</returns>
-    [DebuggerStepThrough]
-    [Obsolete("Use MethodHelper.GetMethodEx() instead")]
-    [CanBeNull]
-    public static MethodInfo GetMethod(this Type type,
-        string name, BindingFlags bindingFlags, string[] genericArgumentNames, object[] parameterTypes) =>
-      GetMethodEx(type, name, bindingFlags, genericArgumentNames, parameterTypes);
-
     /// <summary>
     /// Gets constructor by names \ types of its parameters.
     /// </summary>
@@ -147,11 +130,6 @@ public static ConstructorInfo GetConstructorEx(this Type type, BindingFlags bind
       return lastMatch;
     }
 
-    [Obsolete("Use MethodHelper.GetConstructorEx() instead")]
-    [CanBeNull]
-    public static ConstructorInfo GetConstructor(this Type type, BindingFlags bindingFlags, object[] parameterTypes) =>
-      GetConstructorEx(type, bindingFlags, parameterTypes);
-
     /// <summary>
     /// Gets the types of method parameters.
     /// </summary>
diff --git a/Orm/Xtensive.Orm/Reflection/TypeHelper.cs b/Orm/Xtensive.Orm/Reflection/TypeHelper.cs
@@ -630,20 +630,6 @@ public static object Activate(this Type type, Type[] genericArguments, params ob
       }
     }
 
-    /// <summary>
-    /// Gets the public constructor of type <paramref name="type"/>
-    /// accepting specified <paramref name="arguments"/>.
-    /// </summary>
-    /// <param name="type">The type to get the constructor for.</param>
-    /// <param name="arguments">The arguments.</param>
-    /// <returns>
-    /// Appropriate constructor, if a single match is found;
-    /// otherwise, <see langword="null"/>.
-    /// </returns>
-    [Obsolete, CanBeNull]
-    public static ConstructorInfo GetConstructor(this Type type, object[] arguments) =>
-      GetSingleConstructorOrDefault(type, arguments.Select(a => a?.GetType()).ToArray());
-
     /// <summary>
     /// Gets the public constructor of type <paramref name="type"/>
     /// accepting specified <paramref name="argumentTypes"/>.
@@ -725,15 +711,6 @@ public static InterfaceMapping GetInterfaceMapFast(this Type type, Type targetIn
     public static IReadOnlyList<Type> GetInterfacesUnordered(Type type) =>
       UnorderedInterfaces.GetOrAdd(type, static t => t.GetInterfaces());
 
-    /// <summary>
-    /// Gets the interfaces of the specified type.
-    /// Interfaces will be ordered from the very base ones to ancestors.
-    /// </summary>
-    /// <param name="type">The type to get the interfaces of.</param>
-    [Obsolete("Use GetInterfacesOrderByInheritance instead")]
-    public static Type[] GetInterfaces(this Type type) =>
-      OrderedInterfaces.GetOrAdd(type, t => t.GetInterfaces().OrderByInheritance().ToArray());
-
     /// <summary>
     /// Gets the interfaces of the specified type.
     /// Interfaces will be ordered from the very base ones to ancestors.
diff --git a/Orm/Xtensive.Orm/Sql/Compiler/SqlCompilerConfiguration.cs b/Orm/Xtensive.Orm/Sql/Compiler/SqlCompilerConfiguration.cs
@@ -35,18 +35,6 @@ public sealed class SqlCompilerConfiguration
     /// </summary>
     public SqlCommentLocation CommentLocation { get; set; } = SqlCommentLocation.Nowhere;
 
-    /// <summary>
-    /// Gets database mapping.
-    /// </summary>
-    [Obsolete("No longer in use. Moved to SqlPostCompilerConfiguration.")]
-    public IReadOnlyDictionary<string, string> SchemaMapping { get; private set; }
-
-    /// <summary>
-    /// Gets database mapping.
-    /// </summary>
-    [Obsolete("No longer in use. Moved to SqlPostCompilerConfiguration.")]
-    public IReadOnlyDictionary<string, string> DatabaseMapping { get; private set; }
-
     /// <summary>
     /// Clones this instance.
     /// </summary>
@@ -58,22 +46,5 @@ public SqlCompilerConfiguration Clone()
         DatabaseQualifiedObjects = DatabaseQualifiedObjects,
       };
     }
-
-    public SqlCompilerConfiguration()
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-      SchemaMapping = null;
-      DatabaseMapping = null;
-#pragma warning restore CS0618 // Type or member is obsolete
-    }
-
-    [Obsolete]
-    public SqlCompilerConfiguration([NotNull] IDictionary<string, string> databaseMapping, [NotNull] IDictionary<string, string> schemaMapping)
-    {
-      ArgumentValidator.EnsureArgumentNotNull(databaseMapping, "databaseMapping");
-      ArgumentValidator.EnsureArgumentNotNull(schemaMapping, "schemaMapping");
-      DatabaseMapping = new ReadOnlyDictionary<string, string>(databaseMapping);
-      SchemaMapping = new ReadOnlyDictionary<string, string>(schemaMapping);
-    }
   }
 }
diff --git a/Orm/Xtensive.Orm/Sql/Compiler/SqlCompilerContext.cs b/Orm/Xtensive.Orm/Sql/Compiler/SqlCompilerContext.cs
@@ -24,9 +24,6 @@ public class SqlCompilerContext
 
     public SqlCompilerNamingOptions NamingOptions { get; private set; }
 
-    [Obsolete("No longer in use")]
-    public SqlNodeActualizer SqlNodeActualizer { get; private set; }
-
     public SqlNode[] GetTraversalPath() =>
       traversalPath ??= traversalStack.ToArray();
 
@@ -147,9 +144,6 @@ internal SqlCompilerContext(SqlCompilerConfiguration configuration)
       TableNameProvider = new SqlTableNameProvider(this);
       ParameterNameProvider = new SqlParameterNameProvider(configuration);
       Output = new ContainerNode();
-#pragma warning disable CS0618, CS0612 // Type or member is obsolete
-      SqlNodeActualizer = new SqlNodeActualizer(configuration.DatabaseMapping, configuration.SchemaMapping);
-#pragma warning restore CS0618, CS0612 // Type or member is obsolete
     }
   }
 }
diff --git a/Orm/Xtensive.Orm/Sql/Compiler/SqlNodeActualizer.cs b/Orm/Xtensive.Orm/Sql/Compiler/SqlNodeActualizer.cs
diff --git a/Orm/Xtensive.Orm/Sql/Dml/Extensions.cs b/Orm/Xtensive.Orm/Sql/Dml/Extensions.cs

Original file line number	Diff line number	Diff line change
`@@ -192,14 +192,6 @@ private SqlExpression BuildVersionFilter(PersistRequestBuilderContext context, S`
`192`	`192`	`return result;`
`193`	`193`	`}`
`194`	`194`
`195`		`- [Obsolete("Use constructor directly")]`
`196`		`- protected PersistRequest CreatePersistRequest(SqlStatement query, IEnumerable<PersistParameterBinding> bindings, NodeConfiguration nodeConfiguration)`
`197`		`- {`
`198`		`- return Handlers.Domain.Configuration.ShareStorageSchemaOverNodes`
`199`		`- ? new PersistRequest(driver, query, bindings, nodeConfiguration)`
`200`		`- : new PersistRequest(driver, query, bindings);`
`201`		`- }`
`202`		`-`
`203`	`195`	`private bool AddFakeVersionColumnUpdate(PersistRequestBuilderContext context, SqlUpdate update, SqlTableRef filteredTable)`
`204`	`196`	`{`
`205`	`197`	`foreach (var column in context.Type.GetVersionColumns()) {`