@@ -168,31 +168,29 @@ private void BuildQueryPreprocessors()
168
168
{
169
169
var unordered = Domain . Services . GetAll < IQueryPreprocessor > ( ) ;
170
170
var ordered = unordered . SortTopologically ( ( first , second ) => second . IsDependentOn ( first ) ) ;
171
- if ( ordered == null )
172
- throw new InvalidOperationException ( Strings . ExCyclicDependencyInQueryPreprocessorGraphIsDetected ) ;
173
- QueryPreprocessors = ordered ;
171
+ QueryPreprocessors = ordered ?? throw new InvalidOperationException ( Strings . ExCyclicDependencyInQueryPreprocessorGraphIsDetected ) ;
174
172
}
175
173
176
174
private static ProviderOrderingDescriptor ResolveOrderingDescriptor ( CompilableProvider provider )
177
175
{
178
- bool isOrderSensitive = provider . Type == ProviderType . Skip
179
- || provider . Type == ProviderType . Take
180
- || provider . Type == ProviderType . Seek
181
- || provider . Type == ProviderType . Paging
182
- || provider . Type == ProviderType . RowNumber ;
183
- bool preservesOrder = provider . Type == ProviderType . Take
184
- || provider . Type == ProviderType . Skip
185
- || provider . Type == ProviderType . Seek
186
- || provider . Type == ProviderType . RowNumber
187
- || provider . Type == ProviderType . Paging
188
- || provider . Type == ProviderType . Distinct
189
- || provider . Type == ProviderType . Alias ;
190
- bool isOrderBreaker = provider . Type == ProviderType . Except
191
- || provider . Type == ProviderType . Intersect
192
- || provider . Type == ProviderType . Union
193
- || provider . Type == ProviderType . Concat
194
- || provider . Type == ProviderType . Existence ;
195
- bool isSorter = provider . Type == ProviderType . Sort || provider . Type == ProviderType . Index ;
176
+ var isOrderSensitive = provider . Type is ProviderType . Skip
177
+ or ProviderType . Take
178
+ or ProviderType . Seek
179
+ or ProviderType . Paging
180
+ or ProviderType . RowNumber ;
181
+ var preservesOrder = provider . Type is ProviderType . Skip
182
+ or ProviderType . Take
183
+ or ProviderType . Seek
184
+ or ProviderType . Paging
185
+ or ProviderType . RowNumber
186
+ or ProviderType . Distinct
187
+ or ProviderType . Alias ;
188
+ var isOrderBreaker = provider . Type is ProviderType . Except
189
+ or ProviderType . Intersect
190
+ or ProviderType . Union
191
+ or ProviderType . Concat
192
+ or ProviderType . Existence ;
193
+ var isSorter = provider . Type is ProviderType . Sort or ProviderType . Index ;
196
194
return new ProviderOrderingDescriptor ( isOrderSensitive , preservesOrder , isOrderBreaker , isSorter ) ;
197
195
}
198
196
0 commit comments