Commit 7a59c74

authored

Minor tweaks to improve code readability (#1723)

1 parent 6321a1a commit 7a59c74Copy full SHA for 7a59c74

File tree

+21

-3

lines changed

src/JsonApiDotNetCore/Configuration
- TypeLocator.cs
test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys
- CarCompositeKeyAwareRepository.cs

+21

-3

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,16 @@ internal sealed class TypeLocator`
`82`	`82`	`$"instead of {interfaceTypeArguments.Length}.", nameof(interfaceTypeArguments));`
`83`	`83`	`}`
`84`	`84`
`85`		`- return assembly.GetTypes().Select(type => GetContainerRegistrationFromType(type, unboundInterface, interfaceTypeArguments))`
	`85`	`+ // @formatter:wrap_chained_method_calls chop_always`
	`86`	`+ // @formatter:wrap_before_first_method_call true`
	`87`	`+`
	`88`	`+ return assembly`
	`89`	`+ .GetTypes()`
	`90`	`+ .Select(type => GetContainerRegistrationFromType(type, unboundInterface, interfaceTypeArguments))`
`86`	`91`	`.FirstOrDefault(result => result != null);`
	`92`	`+`
	`93`	`+ // @formatter:wrap_before_first_method_call restore`
	`94`	`+ // @formatter:wrap_chained_method_calls restore`
`87`	`95`	`}`
`88`	`96`
`89`	`97`	`private static (Type implementationType, Type serviceInterface)? GetContainerRegistrationFromType(Type nextType, Type unboundInterface,`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,21 @@ private void RecursiveRewriteFilterInLayer(QueryLayer queryLayer)`
`39`	`39`
`40`	`40`	`if (queryLayer.Selection is { IsEmpty: false })`
`41`	`41`	`{`
`42`		`- foreach (QueryLayer? nextLayer in queryLayer.Selection.GetResourceTypes().Select(queryLayer.Selection.GetOrCreateSelectors)`
`43`		`- .SelectMany(selectors => selectors.Select(selector => selector.Value).Where(layer => layer != null)))`
	`42`	`+ // @formatter:wrap_chained_method_calls chop_always`
	`43`	`+ // @formatter:keep_existing_linebreaks true`
	`44`	`+`
	`45`	`+ foreach (QueryLayer? nextLayer in queryLayer.Selection`
	`46`	`+ .GetResourceTypes()`
	`47`	`+ .Select(queryLayer.Selection.GetOrCreateSelectors)`
	`48`	`+ .SelectMany(selectors => selectors`
	`49`	`+ .Select(selector => selector.Value)`
	`50`	`+ .Where(layer => layer != null)))`
`44`	`51`	`{`
`45`	`52`	`RecursiveRewriteFilterInLayer(nextLayer!);`
`46`	`53`	`}`
	`54`	`+`
	`55`	`+ // @formatter:keep_existing_linebreaks restore`
	`56`	`+ // @formatter:wrap_chained_method_calls restore`
`47`	`57`	`}`
`48`	`58`	`}`
`49`	`59`	`}`

Comments

(0)