fix linter

KirillKurdyukov · KirillKurdyukov · commit 74c23f422097 · 2025-05-19T16:56:10.000+03:00
diff --git a/src/EFCore.Ydb/src/Query/Internal/Translators/YdbByteArrayMethodTranslator.cs b/src/EFCore.Ydb/src/Query/Internal/Translators/YdbByteArrayMethodTranslator.cs
@@ -9,13 +9,8 @@
 
 namespace EntityFrameworkCore.Ydb.Query.Internal.Translators;
 
-public class YdbByteArrayMethodTranslator : IMethodCallTranslator
+public class YdbByteArrayMethodTranslator(ISqlExpressionFactory sqlExpressionFactory) : IMethodCallTranslator
 {
-    private readonly ISqlExpressionFactory _sqlExpressionFactory;
-
-    public YdbByteArrayMethodTranslator(ISqlExpressionFactory sqlExpressionFactory)
-        => _sqlExpressionFactory = sqlExpressionFactory;
-
     private static MethodInfo Contains => typeof(Enumerable)
         .GetMethods(BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly)
         .Where(m => m.Name == nameof(Enumerable.Contains))
@@ -38,32 +33,33 @@ public YdbByteArrayMethodTranslator(ISqlExpressionFactory sqlExpressionFactory)
         IDiagnosticsLogger<DbLoggerCategory.Query> logger
     )
     {
-        if (method.IsGenericMethod
-            && method.GetGenericMethodDefinition().Equals(Contains)
-            && arguments[0].Type == typeof(byte[]))
+        if (!method.IsGenericMethod
+            || !method.GetGenericMethodDefinition().Equals(Contains)
+            || arguments[0].Type != typeof(byte[]))
         {
-            var source = arguments[0];
+            return null;
+        }
+        
+        var source = arguments[0];
 
-            var value = arguments[1] is SqlConstantExpression constantValue
-                ? _sqlExpressionFactory.Constant(new[] { (byte)constantValue.Value! }, source.TypeMapping)
-                : _sqlExpressionFactory.Function(
-                    "ToBytes",
-                    [arguments[1]],
-                    nullable: false,
-                    argumentsPropagateNullability: ArrayUtil.TrueArrays[1],
-                    typeof(string));
+        var value = arguments[1] is SqlConstantExpression constantValue
+            ? sqlExpressionFactory.Constant(new[] { (byte)constantValue.Value! }, source.TypeMapping)
+            : sqlExpressionFactory.Function(
+                "ToBytes",
+                [arguments[1]],
+                nullable: false,
+                argumentsPropagateNullability: ArrayUtil.TrueArrays[1],
+                typeof(string));
 
-            return _sqlExpressionFactory.IsNotNull(
-                _sqlExpressionFactory.Function(
-                    "FIND",
-                    [source, value],
-                    nullable: true,
-                    argumentsPropagateNullability: ArrayUtil.FalseArrays[2],
-                    typeof(int)
-                )
-            );
-        }
+        return sqlExpressionFactory.IsNotNull(
+            sqlExpressionFactory.Function(
+                "FIND",
+                [source, value],
+                nullable: true,
+                argumentsPropagateNullability: ArrayUtil.FalseArrays[2],
+                typeof(int)
+            )
+        );
 
-        return null;
     }
 }
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesYdbTest.cs
@@ -1,9 +1,8 @@
-using EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 using Microsoft.EntityFrameworkCore.BulkUpdates;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit.Abstractions;
 
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 // TODO: Await Norhhwind
 internal class NorthwindBulkUpdatesYdbTest(
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbFixture.cs
@@ -1,4 +1,4 @@
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 internal class TpcFiltersInheritanceBulkUpdatesYdbFixture : TpcInheritanceBulkUpdatesYdbFixture
 {
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesYdbTest.cs
@@ -3,7 +3,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 #pragma warning disable xUnit1000
 internal class TpcFiltersInheritanceBulkUpdatesYdbTest(
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbFixture.cs
@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.BulkUpdates;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 internal class TpcInheritanceBulkUpdatesYdbFixture : TPCInheritanceBulkUpdatesFixture
 {
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesYdbTest.cs
@@ -3,7 +3,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 #pragma warning disable xUnit1000
 internal class TpcInheritanceBulkUpdatesYdbTest(
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbFixture.cs
@@ -1,4 +1,4 @@
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 internal class TphFiltersInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesYdbFixture
 {
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesYdbTest.cs
@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.BulkUpdates;
 using Xunit.Abstractions;
 
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 // TODO: following error
 // Error: Primary key is required for ydb tables.
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbFixture.cs
@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.BulkUpdates;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 internal class TPHInheritanceBulkUpdatesYdbFixture : TPHInheritanceBulkUpdatesFixture
 {
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesYdbTest.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore.BulkUpdates;
 using Xunit.Abstractions;
 
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 // TODO: Primary key required for ydb tables
 internal class TPHInheritanceBulkUpdatesYdbTest(
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbFixture.cs
@@ -1,4 +1,4 @@
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 internal class TPTFiltersInheritanceBulkUpdatesYdbFixture : TPTInheritanceBulkUpdatesYdbFixture
 {
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesYdbTest.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore.BulkUpdates;
 using Xunit.Abstractions;
 
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 // TODO: Refactor later
 #pragma warning disable xUnit1000
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbFixture.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbFixture.cs
@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.BulkUpdates;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 internal class TPTInheritanceBulkUpdatesYdbFixture : TPTInheritanceBulkUpdatesFixture
 {
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesYdbTest.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore.BulkUpdates;
 using Xunit.Abstractions;
 
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;
 
 // TODO: Key columns are not specified :c
 internal class TPTInheritanceBulkUpdatesYdbTest(
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/LazyLoadProxyYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/LazyLoadProxyYdbTest.cs
@@ -18,10 +18,8 @@ public LazyLoadProxyYdbTest(LoadYdbFixture fixture) : base(fixture)
 
     [ConditionalTheory(Skip = "TODO: InvalidOperationException")]
     [InlineData(EntityState.Unchanged)]
-    public override void Lazy_load_one_to_one_reference_with_recursive_property(EntityState state)
-    {
+    public override void Lazy_load_one_to_one_reference_with_recursive_property(EntityState state) =>
         base.Lazy_load_one_to_one_reference_with_recursive_property(state);
-    }
 
     [ConditionalFact(Skip = "TODO: InvalidOperationException")]
     public override void Top_level_projection_track_entities_before_passing_to_client_method() =>
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/ModelBuilding/YdbModelBuilderGenericTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/ModelBuilding/YdbModelBuilderGenericTest.cs
@@ -9,10 +9,7 @@ public class YdbModelBuilderGenericTest : YdbModelBuilderTestBase
     public class YdbGenericNonRelationship(YdbModelBuilderFixture fixture) : YdbNonRelationship(fixture)
     {
         [ConditionalFact(Skip = "TODO: Not ready yet")]
-        public override void Element_types_can_have_precision_and_scale()
-        {
-            base.Element_types_can_have_precision_and_scale();
-        }
+        public override void Element_types_can_have_precision_and_scale() => base.Element_types_can_have_precision_and_scale();
 
         [ConditionalFact(Skip = "TODO: Not ready yet")]
         public override void Element_types_have_default_precision_and_scale() =>
diff --git a/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Update/UpdatesYdbTest.cs b/src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Update/UpdatesYdbTest.cs
@@ -4,7 +4,7 @@
 using Microsoft.EntityFrameworkCore.Update;
 using Xunit;
 
-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.Update;
+namespace EntityFrameworkCore.Ydb.FunctionalTests.Update;
 
 // Tests:
 // Ignore_before_save_property_is_still_generated_graph,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;`
	`1`	`+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;`
`2`	`2`
`3`	`3`	`internal class TpcFiltersInheritanceBulkUpdatesYdbFixture : TpcInheritanceBulkUpdatesYdbFixture`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using Microsoft.EntityFrameworkCore.BulkUpdates;`
`3`	`3`	`using Microsoft.EntityFrameworkCore.TestUtilities;`
`4`	`4`
`5`		`-namespace EntityFrameworkCore.Ydb.FunctionalTests.AllTests.BulkUpdates;`
	`5`	`+namespace EntityFrameworkCore.Ydb.FunctionalTests.BulkUpdates;`
`6`	`6`
`7`	`7`	`internal class TpcInheritanceBulkUpdatesYdbFixture : TPCInheritanceBulkUpdatesFixture`
`8`	`8`	`{`