Skip to content

Commit 644c6c3

Browse files
bkoelmanbkoelman
authored
Merge pull request #1428 from json-api-dotnet/dependabot-nuget-jetbrains.resharper.globaltools-2023.3.2
Bump jetbrains.resharper.globaltools from 2023.3.1 to 2023.3.2; fix new warnings
2 parents e430330 + aac053f commit 644c6c3

File tree

204 files changed

+538
-1559
lines changed

Some content is hidden

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

204 files changed

+538
-1559
lines changed

‎.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"jetbrains.resharper.globaltools": {
6-
"version": "2023.3.1",
6+
"version": "2023.3.2",
77
"commands": [
88
"jb"
99
]
@@ -27,4 +27,4 @@
2727
]
2828
}
2929
}
30-
}
30+
}

‎JsonApiDotNetCore.sln.DotSettings

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
5454
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceLockStatementBraces/@EntryIndexedValue">WARNING</s:String>
5555
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceUsingStatementBraces/@EntryIndexedValue">WARNING</s:String>
5656
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
57+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EntityFramework_002EModelValidation_002EUnlimitedStringLength/@EntryIndexedValue">DO_NOT_SHOW</s:String>
5758
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
5859
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ExtractCommonPropertyPattern/@EntryIndexedValue">SUGGESTION</s:String>
5960
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IntroduceOptionalParameters_002EGlobal/@EntryIndexedValue">HINT</s:String>
@@ -95,6 +96,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
9596
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue">SUGGESTION</s:String>
9697
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseRawString/@EntryIndexedValue">SUGGESTION</s:String>
9798
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
99+
<s:Boolean x:Key="/Default/CodeInspection/Highlighting/ReplaceWithPrimaryConstructorParameter/PreserveReadonlyModifier/@EntryValue">True</s:Boolean>
98100
<s:String x:Key="/Default/CodeInspection/Highlighting/UseCollectionExpression/ConvertEmptyCollection/@EntryValue">SUGGESTION</s:String>
99101
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=JADNC_0020Full_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="JADNC Full Cleanup"&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" ArrangeNullCheckingPattern="True" /&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;OptimizeReferenceCommentsTs&gt;True&lt;/OptimizeReferenceCommentsTs&gt;&lt;PublicModifierStyleTs&gt;True&lt;/PublicModifierStyleTs&gt;&lt;ExplicitAnyTs&gt;True&lt;/ExplicitAnyTs&gt;&lt;TypeAnnotationStyleTs&gt;True&lt;/TypeAnnotationStyleTs&gt;&lt;RelativePathStyleTs&gt;True&lt;/RelativePathStyleTs&gt;&lt;AsInsteadOfCastTs&gt;True&lt;/AsInsteadOfCastTs&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSReformatInactiveBranches&gt;True&lt;/CSReformatInactiveBranches&gt;&lt;/Profile&gt;</s:String>
100102
<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">JADNC Full Cleanup</s:String>
@@ -154,6 +156,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
154156
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_DECLARATION_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
155157
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
156158
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
159+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PRIMARY_CONSTRUCTOR_PARAMETERS_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
157160
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CssFormatter/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
158161
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/HtmlFormatter/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
159162
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/INDENT_SIZE/@EntryValue">2</s:Int64>

‎WarningSeverities.DotSettings

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
7070
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
7171
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToNullCoalescingCompoundAssignment/@EntryIndexedValue">WARNING</s:String>
72+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToPrimaryConstructor/@EntryIndexedValue">WARNING</s:String>
7273
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
7374
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">WARNING</s:String>
7475
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationInPattern/@EntryIndexedValue">WARNING</s:String>
@@ -197,6 +198,7 @@
197198
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
198199
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
199200
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EWhere/@EntryIndexedValue">WARNING</s:String>
201+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithPrimaryConstructorParameter/@EntryIndexedValue">WARNING</s:String>
200202
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
201203
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
202204
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>

‎benchmarks/Program.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ internal static class Program
99
{
1010
private static void Main(string[] args)
1111
{
12-
var switcher = new BenchmarkSwitcher(new[]
13-
{
12+
var switcher = new BenchmarkSwitcher([
1413
typeof(ResourceDeserializationBenchmarks),
1514
typeof(OperationsDeserializationBenchmarks),
1615
typeof(ResourceSerializationBenchmarks),
1716
typeof(OperationsSerializationBenchmarks),
1817
typeof(QueryStringParserBenchmarks)
19-
});
18+
]);
2019

2120
switcher.Run(args);
2221
}

‎cleanupcode.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ if ($revision) {
2828

2929
if ($baseCommitHash -eq $headCommitHash) {
3030
Write-Output "Running code cleanup on staged/unstaged files."
31-
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false-- jb --verbosity=WARN -f staged,modified
31+
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN -f staged,modified
3232
VerifySuccessExitCode
3333
}
3434
else {
3535
Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash, including staged/unstaged files."
36-
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false-- jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash
36+
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash
3737
VerifySuccessExitCode
3838
}
3939
}

‎src/Examples/DapperExample/Controllers/OperationsController.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
namespace DapperExample.Controllers;
88

9-
public sealed class OperationsController : JsonApiOperationsController
10-
{
11-
public OperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor,
12-
IJsonApiRequest request, ITargetedFields targetedFields)
13-
: base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
14-
{
15-
}
16-
}
9+
public sealed class OperationsController(
10+
IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor, IJsonApiRequest request,
11+
ITargetedFields targetedFields) : JsonApiOperationsController(options, resourceGraph, loggerFactory, processor, request, targetedFields);

‎src/Examples/DapperExample/Data/RotatingList.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,11 @@ public static RotatingList<T> Create<T>(int count, Func<int, T> createElement)
1616
}
1717
}
1818

19-
internal sealed class RotatingList<T>
19+
internal sealed class RotatingList<T>(IList<T> elements)
2020
{
2121
private int _index = -1;
2222

23-
public IList<T> Elements { get; }
24-
25-
public RotatingList(IList<T> elements)
26-
{
27-
Elements = elements;
28-
}
23+
public IList<T> Elements { get; } = elements;
2924

3025
public T GetNext()
3126
{

‎src/Examples/DapperExample/Repositories/ResultSetMapper.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,9 @@ public IReadOnlyCollection<TResource> GetResources()
166166
return _primaryResourcesInOrder.DistinctBy(resource => resource.Id).ToList();
167167
}
168168

169-
private sealed class IncludeElementWalker
169+
private sealed class IncludeElementWalker(IncludeExpression include)
170170
{
171-
private readonly IncludeExpression _include;
172-
173-
public IncludeElementWalker(IncludeExpression include)
174-
{
175-
_include = include;
176-
}
171+
private readonly IncludeExpression _include = include;
177172

178173
public IEnumerable<IncludeElementExpression> BreadthFirstEnumerate()
179174
{

‎src/Examples/DapperExample/TranslationToSql/Builders/DeleteOneToOneStatementBuilder.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66

77
namespace DapperExample.TranslationToSql.Builders;
88

9-
internal sealed class DeleteOneToOneStatementBuilder : StatementBuilder
9+
internal sealed class DeleteOneToOneStatementBuilder(IDataModelService dataModelService) : StatementBuilder(dataModelService)
1010
{
11-
public DeleteOneToOneStatementBuilder(IDataModelService dataModelService)
12-
: base(dataModelService)
13-
{
14-
}
15-
1611
public DeleteNode Build(ResourceType resourceType, string whereColumnName, object? whereValue)
1712
{
1813
ArgumentGuard.NotNull(resourceType);

‎src/Examples/DapperExample/TranslationToSql/Builders/DeleteResourceStatementBuilder.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66

77
namespace DapperExample.TranslationToSql.Builders;
88

9-
internal sealed class DeleteResourceStatementBuilder : StatementBuilder
9+
internal sealed class DeleteResourceStatementBuilder(IDataModelService dataModelService) : StatementBuilder(dataModelService)
1010
{
11-
public DeleteResourceStatementBuilder(IDataModelService dataModelService)
12-
: base(dataModelService)
13-
{
14-
}
15-
1611
public DeleteNode Build(ResourceType resourceType, params object[] idValues)
1712
{
1813
ArgumentGuard.NotNull(resourceType);

‎src/Examples/DapperExample/TranslationToSql/Builders/InsertStatementBuilder.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66

77
namespace DapperExample.TranslationToSql.Builders;
88

9-
internal sealed class InsertStatementBuilder : StatementBuilder
9+
internal sealed class InsertStatementBuilder(IDataModelService dataModelService) : StatementBuilder(dataModelService)
1010
{
11-
public InsertStatementBuilder(IDataModelService dataModelService)
12-
: base(dataModelService)
13-
{
14-
}
15-
1611
public InsertNode Build(ResourceType resourceType, IReadOnlyDictionary<string, object?> columnsToSet)
1712
{
1813
ArgumentGuard.NotNull(resourceType);

‎src/Examples/DapperExample/TranslationToSql/Builders/SqlQueryBuilder.cs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace DapperExample.TranslationToSql.Builders;
88
/// <summary>
99
/// Converts <see cref="SqlTreeNode" />s into SQL text.
1010
/// </summary>
11-
internal sealed class SqlQueryBuilder : SqlTreeNodeVisitor<StringBuilder, object?>
11+
internal sealed class SqlQueryBuilder(DatabaseProvider databaseProvider) : SqlTreeNodeVisitor<StringBuilder, object?>
1212
{
1313
private static readonly char[] SpecialCharactersInLikeDefault =
1414
[
@@ -26,7 +26,7 @@ internal sealed class SqlQueryBuilder : SqlTreeNodeVisitor<StringBuilder, object
2626
']'
2727
];
2828

29-
private readonly DatabaseProvider _databaseProvider;
29+
private readonly DatabaseProvider _databaseProvider = databaseProvider;
3030
private readonly Dictionary<string, ParameterNode> _parametersByName = [];
3131
private int _indentDepth;
3232

@@ -35,11 +35,6 @@ internal sealed class SqlQueryBuilder : SqlTreeNodeVisitor<StringBuilder, object
3535

3636
public IDictionary<string, object?> Parameters => _parametersByName.Values.ToDictionary(parameter => parameter.Name, parameter => parameter.Value);
3737

38-
public SqlQueryBuilder(DatabaseProvider databaseProvider)
39-
{
40-
_databaseProvider = databaseProvider;
41-
}
42-
4338
public string GetCommand(SqlTreeNode node)
4439
{
4540
ArgumentGuard.NotNull(node);
@@ -488,14 +483,9 @@ private IDisposable Indent()
488483
return new RevertIndentOnDispose(this);
489484
}
490485

491-
private sealed class RevertIndentOnDispose : IDisposable
486+
private sealed class RevertIndentOnDispose(SqlQueryBuilder owner) : IDisposable
492487
{
493-
private readonly SqlQueryBuilder _owner;
494-
495-
public RevertIndentOnDispose(SqlQueryBuilder owner)
496-
{
497-
_owner = owner;
498-
}
488+
private readonly SqlQueryBuilder _owner = owner;
499489

500490
public void Dispose()
501491
{

‎src/Examples/DapperExample/TranslationToSql/Builders/UpdateClearOneToOneStatementBuilder.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66

77
namespace DapperExample.TranslationToSql.Builders;
88

9-
internal sealed class UpdateClearOneToOneStatementBuilder : StatementBuilder
9+
internal sealed class UpdateClearOneToOneStatementBuilder(IDataModelService dataModelService) : StatementBuilder(dataModelService)
1010
{
11-
public UpdateClearOneToOneStatementBuilder(IDataModelService dataModelService)
12-
: base(dataModelService)
13-
{
14-
}
15-
1611
public UpdateNode Build(ResourceType resourceType, string setColumnName, string whereColumnName, object? whereValue)
1712
{
1813
ArgumentGuard.NotNull(resourceType);

‎src/Examples/DapperExample/TranslationToSql/Builders/UpdateResourceStatementBuilder.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66

77
namespace DapperExample.TranslationToSql.Builders;
88

9-
internal sealed class UpdateResourceStatementBuilder : StatementBuilder
9+
internal sealed class UpdateResourceStatementBuilder(IDataModelService dataModelService) : StatementBuilder(dataModelService)
1010
{
11-
public UpdateResourceStatementBuilder(IDataModelService dataModelService)
12-
: base(dataModelService)
13-
{
14-
}
15-
1611
public UpdateNode Build(ResourceType resourceType, IReadOnlyDictionary<string, object?> columnsToUpdate, params object[] idValues)
1712
{
1813
ArgumentGuard.NotNull(resourceType);

‎src/Examples/DapperExample/TranslationToSql/DataModel/FromEntitiesDataModelService.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace DapperExample.TranslationToSql.DataModel;
1212
/// <summary>
1313
/// Derives foreign keys and connection strings from an existing Entity Framework Core model.
1414
/// </summary>
15-
public sealed class FromEntitiesDataModelService : BaseDataModelService
15+
public sealed class FromEntitiesDataModelService(IResourceGraph resourceGraph) : BaseDataModelService(resourceGraph)
1616
{
1717
private readonly Dictionary<RelationshipAttribute, RelationshipForeignKey> _foreignKeysByRelationship = [];
1818
private readonly Dictionary<AttrAttribute, bool> _columnNullabilityPerAttribute = [];
@@ -21,11 +21,6 @@ public sealed class FromEntitiesDataModelService : BaseDataModelService
2121

2222
public override DatabaseProvider DatabaseProvider => AssertHasDatabaseProvider();
2323

24-
public FromEntitiesDataModelService(IResourceGraph resourceGraph)
25-
: base(resourceGraph)
26-
{
27-
}
28-
2924
public void Initialize(DbContext dbContext)
3025
{
3126
_connectionString = dbContext.Database.GetConnectionString();

‎src/Examples/DapperExample/TranslationToSql/Generators/ParameterGenerator.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,5 @@ public void Reset()
2020
_nameGenerator.Reset();
2121
}
2222

23-
private sealed class ParameterNameGenerator : UniqueNameGenerator
24-
{
25-
public ParameterNameGenerator()
26-
: base("@p")
27-
{
28-
}
29-
}
23+
private sealed class ParameterNameGenerator() : UniqueNameGenerator("@p");
3024
}

‎src/Examples/DapperExample/TranslationToSql/Generators/TableAliasGenerator.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,4 @@ namespace DapperExample.TranslationToSql.Generators;
33
/// <summary>
44
/// Generates a SQL table alias with a unique name.
55
/// </summary>
6-
internal sealed class TableAliasGenerator : UniqueNameGenerator
7-
{
8-
public TableAliasGenerator()
9-
: base("t")
10-
{
11-
}
12-
}
6+
internal sealed class TableAliasGenerator() : UniqueNameGenerator("t");

‎src/Examples/DapperExample/TranslationToSql/Transformations/StaleColumnReferenceRewriter.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -290,14 +290,9 @@ private IReadOnlyList<T> VisitList<T>(IEnumerable<T> nodes, ColumnVisitMode mode
290290
return nodes.Select(element => TypedVisit(element, mode)).ToList();
291291
}
292292

293-
private sealed class PopStackOnDispose<T> : IDisposable
293+
private sealed class PopStackOnDispose<T>(Stack<T> stack) : IDisposable
294294
{
295-
private readonly Stack<T> _stack;
296-
297-
public PopStackOnDispose(Stack<T> stack)
298-
{
299-
_stack = stack;
300-
}
295+
private readonly Stack<T> _stack = stack;
301296

302297
public void Dispose()
303298
{

‎src/Examples/DapperExample/TranslationToSql/TreeNodes/ColumnInSelectNode.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,13 @@ namespace DapperExample.TranslationToSql.TreeNodes;
1010
/// SELECT t2.Id AS Id0 FROM (SELECT t1.Id FROM Users AS t1) AS t2
1111
/// ]]></code>.
1212
/// </summary>
13-
internal sealed class ColumnInSelectNode : ColumnNode
13+
internal sealed class ColumnInSelectNode(ColumnSelectorNode selector, string? tableAlias) : ColumnNode(GetColumnName(selector), selector.Column.Type,
14+
tableAlias)
1415
{
15-
public ColumnSelectorNode Selector { get; }
16+
public ColumnSelectorNode Selector { get; } = selector;
1617

1718
public bool IsVirtual => Selector.Alias != null || Selector.Column is ColumnInSelectNode { IsVirtual: true };
1819

19-
public ColumnInSelectNode(ColumnSelectorNode selector, string? tableAlias)
20-
: base(GetColumnName(selector), selector.Column.Type, tableAlias)
21-
{
22-
Selector = selector;
23-
}
24-
2520
private static string GetColumnName(ColumnSelectorNode selector)
2621
{
2722
ArgumentGuard.NotNull(selector);

0 commit comments

Comments
 (0)