Skip to content

Commit d1263cd

Browse files
KirillKurdyukovKirillKurdyukov
committed
fix linter
1 parent c1f8cbc commit d1263cd

File tree

15 files changed

+75
-155
lines changed

15 files changed

+75
-155
lines changed

‎src/Ydb.Sdk/src/Ado/YdbCommand.cs‎

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -158,20 +158,13 @@ protected override DbTransaction? DbTransaction
158158

159159
public override bool DesignTimeVisible { get; set; }
160160

161-
protected override YdbParameter CreateDbParameter()
162-
{
163-
return new YdbParameter();
164-
}
161+
protected override YdbParameter CreateDbParameter() => new();
165162

166-
public new YdbDataReader ExecuteReader(CommandBehavior behavior = CommandBehavior.Default)
167-
{
168-
return ExecuteDbDataReader(behavior);
169-
}
163+
public new YdbDataReader ExecuteReader(CommandBehavior behavior = CommandBehavior.Default) =>
164+
ExecuteDbDataReader(behavior);
170165

171-
protected override YdbDataReader ExecuteDbDataReader(CommandBehavior behavior)
172-
{
173-
return ExecuteReaderAsync(behavior).GetAwaiter().GetResult();
174-
}
166+
protected override YdbDataReader ExecuteDbDataReader(CommandBehavior behavior) =>
167+
ExecuteReaderAsync(behavior).GetAwaiter().GetResult();
175168

176169
protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior,
177170
CancellationToken cancellationToken)
@@ -230,26 +223,18 @@ await YdbConnection.Session.ExecuteQuery(
230223
return ydbDataReader;
231224
}
232225

233-
public new async Task<YdbDataReader> ExecuteReaderAsync()
234-
{
235-
return (YdbDataReader)await ExecuteDbDataReaderAsync(CommandBehavior.Default, CancellationToken.None);
236-
}
226+
public new async Task<YdbDataReader> ExecuteReaderAsync() =>
227+
(YdbDataReader)await ExecuteDbDataReaderAsync(CommandBehavior.Default, CancellationToken.None);
237228

238-
public new Task<YdbDataReader> ExecuteReaderAsync(CancellationToken cancellationToken)
239-
{
240-
return ExecuteReaderAsync(CommandBehavior.Default, cancellationToken);
241-
}
229+
public new Task<YdbDataReader> ExecuteReaderAsync(CancellationToken cancellationToken) =>
230+
ExecuteReaderAsync(CommandBehavior.Default, cancellationToken);
242231

243232
// ReSharper disable once MemberCanBePrivate.Global
244-
public new Task<YdbDataReader> ExecuteReaderAsync(CommandBehavior behavior)
245-
{
246-
return ExecuteReaderAsync(behavior, CancellationToken.None);
247-
}
233+
public new Task<YdbDataReader> ExecuteReaderAsync(CommandBehavior behavior) =>
234+
ExecuteReaderAsync(behavior, CancellationToken.None);
248235

249236
// ReSharper disable once MemberCanBePrivate.Global
250237
public new async Task<YdbDataReader> ExecuteReaderAsync(CommandBehavior behavior,
251-
CancellationToken cancellationToken)
252-
{
253-
return (YdbDataReader)await ExecuteDbDataReaderAsync(behavior, cancellationToken);
254-
}
238+
CancellationToken cancellationToken) =>
239+
(YdbDataReader)await ExecuteDbDataReaderAsync(behavior, cancellationToken);
255240
}

‎src/Ydb.Sdk/src/Ado/YdbConnectionStringBuilder.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,8 @@ private abstract class YdbConnectionOption
241241
};
242242

243243
[DoesNotReturn]
244-
private static T UnexpectedArgumentException<T>(string key, object value)
245-
{
244+
private static T UnexpectedArgumentException<T>(string key, object value) =>
246245
throw new ArgumentException($"Expected type {typeof(T)} for key {key}, but actual {value.GetType()}");
247-
}
248246

249247
public static readonly Dictionary<string, YdbConnectionOption> KeyToOption = new();
250248

‎src/Ydb.Sdk/src/Auth/StaticCredentialsProvider.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ public StaticCredentialsProvider(string user, string? password, ILoggerFactory?
3636
_logger = loggerFactory.CreateLogger<StaticCredentialsProvider>();
3737
}
3838

39-
private async Task UpdateToken()
40-
{
41-
_token = await ReceiveToken();
42-
}
39+
private async Task UpdateToken() => _token = await ReceiveToken();
4340

4441
public string GetAuthInfo()
4542
{

‎src/Ydb.Sdk/src/Client/ClientOperation.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@ public void EnsureReady()
8282
return _result.Unpack<TResult>();
8383
}
8484

85-
internal static ClientOperation FromProto(Operations.Operation operationProto)
86-
{
87-
return new ClientOperation(operationProto);
88-
}
85+
internal static ClientOperation FromProto(Operations.Operation operationProto) => new(operationProto);
8986
}
9087

9188
public class OperationException : Exception

‎src/Ydb.Sdk/src/Client/Response.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ protected ResponseBase(Status status)
1616
Status = status;
1717
}
1818

19-
public void EnsureSuccess()
20-
{
21-
Status.EnsureSuccess();
22-
}
19+
public void EnsureSuccess() => Status.EnsureSuccess();
2320
}
2421

2522
public class ClientInternalErrorResponse : ResponseBase

‎src/Ydb.Sdk/src/Services/Scheme/SchemeClient.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@ public Permissions(string subject, IReadOnlyList<string> permissionNames)
3232
public string Subject { get; }
3333
public IReadOnlyList<string> PermissionNames { get; }
3434

35-
internal static Permissions FromProto(Ydb.Scheme.Permissions permissionsProto)
36-
{
37-
return new Permissions(
38-
subject: permissionsProto.Subject,
39-
permissionNames: permissionsProto.PermissionNames);
40-
}
35+
internal static Permissions FromProto(Ydb.Scheme.Permissions permissionsProto) =>
36+
new(subject: permissionsProto.Subject, permissionNames: permissionsProto.PermissionNames);
4137
}
4238

4339
public class SchemeEntry

‎src/Ydb.Sdk/src/Services/Table/CopyTable.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ public CopyTableItem(string sourcePath, string destinationPath, bool omitIndexes
1818
OmitIndexes = omitIndexes;
1919
}
2020

21-
public Ydb.Table.CopyTableItem GetProto(TableClient tableClient)
22-
{
23-
return new Ydb.Table.CopyTableItem
21+
public Ydb.Table.CopyTableItem GetProto(TableClient tableClient) =>
22+
new()
2423
{
2524
SourcePath = tableClient.MakeTablePath(SourcePath),
2625
DestinationPath = tableClient.MakeTablePath(DestinationPath),
2726
OmitIndexes = OmitIndexes
2827
};
29-
}
3028
}
3129

3230
public class CopyTableSettings : OperationSettings

‎src/Ydb.Sdk/src/Services/Table/DescribeTable.cs‎

Lines changed: 25 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,23 @@ public enum IndexType
2323

2424
internal static class TableEnumConverter
2525
{
26-
internal static FeatureFlagStatus FromProto(this FeatureFlag.Types.Status proto)
27-
{
28-
return proto switch
26+
internal static FeatureFlagStatus FromProto(this FeatureFlag.Types.Status proto) =>
27+
proto switch
2928
{
3029
FeatureFlag.Types.Status.Unspecified => FeatureFlagStatus.Unspecified,
3130
FeatureFlag.Types.Status.Enabled => FeatureFlagStatus.Enabled,
3231
FeatureFlag.Types.Status.Disabled => FeatureFlagStatus.Disabled,
3332
_ => throw new ArgumentOutOfRangeException()
3433
};
35-
}
3634

37-
internal static FeatureFlag.Types.Status GetProto(this FeatureFlagStatus status)
38-
{
39-
return status switch
35+
internal static FeatureFlag.Types.Status GetProto(this FeatureFlagStatus status) =>
36+
status switch
4037
{
4138
FeatureFlagStatus.Unspecified => FeatureFlag.Types.Status.Unspecified,
4239
FeatureFlagStatus.Enabled => FeatureFlag.Types.Status.Enabled,
4340
FeatureFlagStatus.Disabled => FeatureFlag.Types.Status.Disabled,
4441
_ => throw new ArgumentOutOfRangeException(nameof(status), status, null)
4542
};
46-
}
4743
}
4844

4945
public class PartitionStats
@@ -157,9 +153,8 @@ public Ydb.Table.ValueSinceUnixEpochModeSettings GetProto()
157153
};
158154
}
159155

160-
private static Ydb.Table.ValueSinceUnixEpochModeSettings.Types.Unit GetProtoUnit(Unit unit)
161-
{
162-
return unit switch
156+
private static Ydb.Table.ValueSinceUnixEpochModeSettings.Types.Unit GetProtoUnit(Unit unit) =>
157+
unit switch
163158
{
164159
Unit.Unspecified => Ydb.Table.ValueSinceUnixEpochModeSettings.Types.Unit.Unspecified,
165160
Unit.Seconds => Ydb.Table.ValueSinceUnixEpochModeSettings.Types.Unit.Seconds,
@@ -168,7 +163,6 @@ private static Ydb.Table.ValueSinceUnixEpochModeSettings.Types.Unit GetProtoUnit
168163
Unit.Nanoseconds => Ydb.Table.ValueSinceUnixEpochModeSettings.Types.Unit.Nanoseconds,
169164
_ => throw new ArgumentOutOfRangeException(nameof(unit), unit, null)
170165
};
171-
}
172166
}
173167

174168
public class TtlSettingsMode
@@ -304,10 +298,7 @@ public StoragePool(Ydb.Table.StoragePool? proto)
304298
Media = proto?.Media;
305299
}
306300

307-
public Ydb.Table.StoragePool GetProto()
308-
{
309-
return new Ydb.Table.StoragePool { Media = Media };
310-
}
301+
public Ydb.Table.StoragePool GetProto() => new() { Media = Media };
311302
}
312303

313304
public class StorageSettings
@@ -376,18 +367,15 @@ public PartitioningSettings(Ydb.Table.PartitioningSettings proto)
376367
MaxPartitionsCount = proto.MaxPartitionsCount;
377368
}
378369

379-
public Ydb.Table.PartitioningSettings GetProto()
370+
public Ydb.Table.PartitioningSettings GetProto() => new()
380371
{
381-
return new Ydb.Table.PartitioningSettings
382-
{
383-
PartitionBy = { PartitionBy },
384-
PartitioningBySize = PartitioningBySize.GetProto(),
385-
PartitionSizeMb = PartitionSizeMb,
386-
PartitioningByLoad = PartitioningByLoad.GetProto(),
387-
MinPartitionsCount = MinPartitionsCount,
388-
MaxPartitionsCount = MaxPartitionsCount
389-
};
390-
}
372+
PartitionBy = { PartitionBy },
373+
PartitioningBySize = PartitioningBySize.GetProto(),
374+
PartitionSizeMb = PartitionSizeMb,
375+
PartitioningByLoad = PartitioningByLoad.GetProto(),
376+
MinPartitionsCount = MinPartitionsCount,
377+
MaxPartitionsCount = MaxPartitionsCount
378+
};
391379
}
392380

393381
public class ReadReplicasSettings
@@ -402,7 +390,6 @@ public enum SettingsType
402390
public SettingsType Type { get; }
403391
public ulong Settings { get; }
404392

405-
406393
public ReadReplicasSettings(SettingsType type, ulong settings)
407394
{
408395
Type = type;
@@ -435,18 +422,15 @@ public ReadReplicasSettings(Ydb.Table.ReadReplicasSettings? proto)
435422
}
436423
}
437424

438-
public Ydb.Table.ReadReplicasSettings GetProto()
425+
public Ydb.Table.ReadReplicasSettings GetProto() => Type switch
439426
{
440-
return Type switch
441-
{
442-
SettingsType.None => new Ydb.Table.ReadReplicasSettings(),
443-
SettingsType.PerAzReadReplicasCount => new Ydb.Table.ReadReplicasSettings
444-
{ PerAzReadReplicasCount = Settings },
445-
SettingsType.AnyAzReadReplicasCount => new Ydb.Table.ReadReplicasSettings
446-
{ AnyAzReadReplicasCount = Settings },
447-
_ => throw new ArgumentOutOfRangeException()
448-
};
449-
}
427+
SettingsType.None => new Ydb.Table.ReadReplicasSettings(),
428+
SettingsType.PerAzReadReplicasCount => new Ydb.Table.ReadReplicasSettings
429+
{ PerAzReadReplicasCount = Settings },
430+
SettingsType.AnyAzReadReplicasCount => new Ydb.Table.ReadReplicasSettings
431+
{ AnyAzReadReplicasCount = Settings },
432+
_ => throw new ArgumentOutOfRangeException()
433+
};
450434
}
451435

452436
public class DescribeTableSettings : OperationSettings
@@ -518,9 +502,8 @@ public ResultData(Entry self, IReadOnlyList<ColumnMeta> columns, IReadOnlyList<s
518502
ReadReplicasSettings = readReplicasSettings;
519503
}
520504

521-
internal static ResultData FromProto(DescribeTableResult resultProto)
522-
{
523-
return new ResultData(
505+
internal static ResultData FromProto(DescribeTableResult resultProto) =>
506+
new(
524507
self: resultProto.Self,
525508
columns: resultProto.Columns.Select(proto => new ColumnMeta(proto)).ToList(),
526509
primaryKey: resultProto.PrimaryKey.ToList(),
@@ -536,7 +519,6 @@ internal static ResultData FromProto(DescribeTableResult resultProto)
536519
keyBloomFilter: resultProto.KeyBloomFilter.FromProto(),
537520
readReplicasSettings: new ReadReplicasSettings(resultProto.ReadReplicasSettings)
538521
);
539-
}
540522
}
541523
}
542524

‎src/Ydb.Sdk/src/Services/Table/ExecuteScanQuery.cs‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,15 @@ internal ExecuteScanQueryPart(Status status, ResultData? result = null)
1818

1919
public class ResultData
2020
{
21-
internal ResultData(Value.ResultSet? resultSetPart)
21+
private ResultData(Value.ResultSet? resultSetPart)
2222
{
2323
ResultSetPart = resultSetPart;
2424
}
2525

2626
public Value.ResultSet? ResultSetPart { get; }
2727

28-
internal static ResultData FromProto(ExecuteScanQueryPartialResult resultProto)
29-
{
30-
return new ResultData(resultProto.ResultSet?.FromProto());
31-
}
28+
internal static ResultData FromProto(ExecuteScanQueryPartialResult resultProto) =>
29+
new(resultProto.ResultSet?.FromProto());
3230
}
3331
}
3432

@@ -39,10 +37,7 @@ internal ExecuteScanQueryStream(ServerStream<ExecuteScanQueryPartialResponse> it
3937
{
4038
}
4139

42-
protected override ExecuteScanQueryPart MakeResponse(Status status)
43-
{
44-
return new ExecuteScanQueryPart(status);
45-
}
40+
protected override ExecuteScanQueryPart MakeResponse(Status status) => new(status);
4641

4742
protected override ExecuteScanQueryPart MakeResponse(ExecuteScanQueryPartialResponse protoResponse)
4843
{
@@ -86,8 +81,6 @@ public async ValueTask<ExecuteScanQueryStream> ExecuteScanQuery(
8681

8782
public ValueTask<ExecuteScanQueryStream> ExecuteScanQuery(
8883
string query,
89-
ExecuteScanQuerySettings? settings = null)
90-
{
91-
return ExecuteScanQuery(query, new Dictionary<string, YdbValue>(), settings);
92-
}
84+
ExecuteScanQuerySettings? settings = null) =>
85+
ExecuteScanQuery(query, new Dictionary<string, YdbValue>(), settings);
9386
}

‎src/Ydb.Sdk/src/Services/Table/KeepAlive.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ private ResultData(SessionStatus sessionStatus)
3131

3232
public SessionStatus SessionStatus { get; }
3333

34-
internal static ResultData FromProto(KeepAliveResult resultProto)
35-
{
36-
return new ResultData(
34+
internal static ResultData FromProto(KeepAliveResult resultProto) =>
35+
new(
3736
sessionStatus: SessionStatusFromProto(resultProto.SessionStatus)
3837
);
39-
}
4038
}
4139

4240
private static SessionStatus SessionStatusFromProto(KeepAliveResult.Types.SessionStatus proto)

0 commit comments

Comments
 (0)