Skip to content

Commit c59e0a4

Browse files
fix linters + added primary constructors
1 parent 9486cd8 commit c59e0a4

File tree

43 files changed

+263
-386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+263
-386
lines changed

src/EfCore.Ydb.FunctionalTests/TestUtilities/YdbNorthwindTestStoreFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace EfCore.Ydb.FunctionalTests.TestUtilities;
44

55
public class YdbNorthwindTestStoreFactory : YdbTestStoreFactory
66
{
7-
public const string DatabaseName = "Northwind";
7+
private const string DatabaseName = "Northwind";
88

99
public new static YdbNorthwindTestStoreFactory Instance { get; } = new();
1010

src/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestStoreFactory.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ public class YdbTestStoreFactory : RelationalTestStoreFactory
88
{
99
public static YdbTestStoreFactory Instance { get; } = new();
1010

11-
private string? _scriptPath = null;
12-
private string? _additionalSql = null;
13-
private string? _connectionStringOptions = null;
11+
private readonly string? _scriptPath = null;
12+
private readonly string? _additionalSql = null;
13+
private readonly string? _connectionStringOptions = null;
1414
private readonly string? _connectionString;
15-
private bool _useConnectionString = false;
15+
private readonly bool _useConnectionString = false;
1616

1717
public YdbTestStoreFactory(
1818
string? connectionString = null,

src/EfCore.Ydb/src/Abstractions/YdbStringAttribute.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@
33
namespace EfCore.Ydb.Abstractions;
44

55
[AttributeUsage(AttributeTargets.Property)]
6-
public class YdbStringAttribute: Attribute
7-
{
8-
}
6+
public class YdbStringAttribute : Attribute;

src/EfCore.Ydb/src/Diagnostics/Internal/YdbCommandInterceptor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace EfCore.Ydb.Diagnostics.Internal;
55

6-
// TODO: Temporary for debugging
6+
// Temporary for debugging
77
public class YdbCommandInterceptor : DbCommandInterceptor
88
{
99
public override InterceptionResult<DbDataReader> ReaderExecuting(

src/EfCore.Ydb/src/Infrastructure/EntityFrameworkYdbServicesBuilder.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@
55

66
namespace EfCore.Ydb.Infrastructure;
77

8-
public class EntityFrameworkYdbServicesBuilder : EntityFrameworkRelationalServicesBuilder
8+
public class EntityFrameworkYdbServicesBuilder(IServiceCollection serviceCollection)
9+
: EntityFrameworkRelationalServicesBuilder(serviceCollection)
910
{
1011
private static readonly IDictionary<Type, ServiceCharacteristics> YdbServices
1112
= new Dictionary<Type, ServiceCharacteristics>
1213
{
1314
// TODO: Add items if required
1415
};
1516

16-
public EntityFrameworkYdbServicesBuilder(IServiceCollection serviceCollection) : base(serviceCollection)
17-
{
18-
}
19-
2017
protected override ServiceCharacteristics GetServiceCharacteristics(Type serviceType)
2118
{
2219
var contains = YdbServices.TryGetValue(serviceType, out var characteristics);

src/EfCore.Ydb/src/Infrastructure/YdbDbContextOptionsBuilder.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,5 @@
44

55
namespace EfCore.Ydb.Infrastructure;
66

7-
public class YdbDbContextOptionsBuilder
8-
: RelationalDbContextOptionsBuilder<YdbDbContextOptionsBuilder, YdbOptionsExtension>
9-
{
10-
public YdbDbContextOptionsBuilder(DbContextOptionsBuilder optionsBuilder) : base(optionsBuilder)
11-
{
12-
}
13-
}
7+
public class YdbDbContextOptionsBuilder(DbContextOptionsBuilder optionsBuilder)
8+
: RelationalDbContextOptionsBuilder<YdbDbContextOptionsBuilder, YdbOptionsExtension>(optionsBuilder);

src/EfCore.Ydb/src/Metadata/Conventions/YdbConventionSetBuilder.cs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@
33

44
namespace EfCore.Ydb.Metadata.Conventions;
55

6-
public class YdbConventionSetBuilder
7-
: RelationalConventionSetBuilder
6+
// ReSharper disable once ClassNeverInstantiated.Global
7+
public class YdbConventionSetBuilder(
8+
ProviderConventionSetBuilderDependencies dependencies,
9+
RelationalConventionSetBuilderDependencies relationalDependencies
10+
) : RelationalConventionSetBuilder(dependencies, relationalDependencies)
811
{
9-
public YdbConventionSetBuilder(
10-
ProviderConventionSetBuilderDependencies dependencies,
11-
RelationalConventionSetBuilderDependencies relationalDependencies
12-
) : base(dependencies, relationalDependencies)
13-
{
14-
}
15-
1612
public override ConventionSet CreateConventionSet()
1713
{
1814
var coreConventions = base.CreateConventionSet();

src/EfCore.Ydb/src/Metadata/Conventions/YdbStringAttributeConvention.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@
77

88
namespace EfCore.Ydb.Metadata.Conventions;
99

10-
public class YdbStringAttributeConvention
11-
: PropertyAttributeConventionBase<YdbStringAttribute>
10+
public class YdbStringAttributeConvention(ProviderConventionSetBuilderDependencies dependencies)
11+
: PropertyAttributeConventionBase<YdbStringAttribute>(dependencies)
1212
{
13-
public YdbStringAttributeConvention(ProviderConventionSetBuilderDependencies dependencies) : base(dependencies)
14-
{
15-
}
16-
1713
protected override void ProcessPropertyAdded(
1814
IConventionPropertyBuilder propertyBuilder,
1915
YdbStringAttribute attribute,

src/EfCore.Ydb/src/Metadata/Internal/YdbAnnotationNames.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace EfCore.Ydb.Metadata.Internal;
22

33
public static class YdbAnnotationNames
44
{
5-
public const string Prefix = "Ydb";
5+
private const string Prefix = "Ydb";
66

77
public const string Serial = Prefix + "Serial";
88
}

src/EfCore.Ydb/src/Metadata/Internal/YdbAnnotationProvider.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55

66
namespace EfCore.Ydb.Metadata.Internal;
77

8-
public class YdbAnnotationProvider : RelationalAnnotationProvider
8+
public class YdbAnnotationProvider(RelationalAnnotationProviderDependencies dependencies)
9+
: RelationalAnnotationProvider(dependencies)
910
{
10-
public YdbAnnotationProvider(RelationalAnnotationProviderDependencies dependencies) : base(dependencies)
11-
{
12-
}
13-
1411
public override IEnumerable<IAnnotation> For(IColumn column, bool designTime)
1512
{
1613
if (!designTime)

0 commit comments

Comments
 (0)