Skip to content

Commit 2585b13

Browse files
committed
feat: Add remaining nullable markers
1 parent de8e1d1 commit 2585b13

File tree

7 files changed

+20
-11
lines changed

7 files changed

+20
-11
lines changed

src/Examine.Core/Search/FacetResult.cs

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections;
22
using System.Collections.Generic;
3+
using System.Diagnostics.CodeAnalysis;
34
using System.Linq;
45

56
namespace Examine.Search
@@ -8,7 +9,12 @@ namespace Examine.Search
89
public class FacetResult : IFacetResult
910
{
1011
private readonly IEnumerable<IFacetValue> _values;
12+
#if NETSTANDARD2_1
13+
[AllowNull]
1114
private IDictionary<string, IFacetValue> _dictValues;
15+
#else
16+
private IDictionary<string, IFacetValue>? _dictValues;
17+
#endif
1218

1319
/// <inheritdoc/>
1420
public FacetResult(IEnumerable<IFacetValue> values)
@@ -22,6 +28,9 @@ public IEnumerator<IFacetValue> GetEnumerator()
2228
return _values.GetEnumerator();
2329
}
2430

31+
#if !NETSTANDARD2_0 && !NETSTANDARD2_1
32+
[MemberNotNull(nameof(_dictValues))]
33+
#endif
2534
private void SetValuesDictionary()
2635
{
2736
if(_dictValues == null)
@@ -38,7 +47,7 @@ private void SetValuesDictionary()
3847
}
3948

4049
/// <inheritdoc/>
41-
public bool TryGetFacet(string label, out IFacetValue facetValue)
50+
public bool TryGetFacet(string label, out IFacetValue? facetValue)
4251
{
4352
SetValuesDictionary();
4453
return _dictValues.TryGetValue(label, out facetValue);

src/Examine.Core/Search/IFacetOperations.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public interface IFacetOperations : IQueryExecutor
1414
/// <param name="field"></param>
1515
/// <param name="facetConfiguration"></param>
1616
/// <returns></returns>
17-
IFacetOperations Facet(string field, Action<IFacetQueryField> facetConfiguration = null);
17+
IFacetOperations Facet(string field, Action<IFacetQueryField>? facetConfiguration = null);
1818

1919
/// <summary>
2020
/// Add a facet string to the current query, filtered by a single value or multiple values
@@ -23,7 +23,7 @@ public interface IFacetOperations : IQueryExecutor
2323
/// <param name="facetConfiguration"></param>
2424
/// <param name="values"></param>
2525
/// <returns></returns>
26-
IFacetOperations Facet(string field, Action<IFacetQueryField> facetConfiguration = null, params string[] values);
26+
IFacetOperations Facet(string field, Action<IFacetQueryField>? facetConfiguration = null, params string[] values);
2727

2828
/// <summary>
2929
/// Add a range facet to the current query

src/Examine.Lucene/Search/FacetFullTextField.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ public class FacetFullTextField : IFacetField
2929
/// <summary>
3030
/// Path hierachy
3131
/// </summary>
32-
public string[] Path { get; internal set; }
32+
public string[]? Path { get; internal set; }
3333

3434
/// <inheritdoc/>
3535
public bool IsTaxonomyIndexed { get; }
3636

3737
/// <inheritdoc/>
38-
public FacetFullTextField(string field, string[] values, string facetField, int maxCount = 10, string[] path = null, bool isTaxonomyIndexed = false)
38+
public FacetFullTextField(string field, string[] values, string facetField, int maxCount = 10, string[]? path = null, bool isTaxonomyIndexed = false)
3939
{
4040
Field = field;
4141
Values = values;

src/Examine.Lucene/Search/LuceneFacetExtractionContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Examine.Lucene.Search
88
public class LuceneFacetExtractionContext : IFacetExtractionContext
99
{
1010

11-
private SortedSetDocValuesReaderState _sortedSetReaderState = null;
11+
private SortedSetDocValuesReaderState? _sortedSetReaderState = null;
1212

1313
/// <inheritdoc/>
1414
public LuceneFacetExtractionContext(FacetsCollector facetsCollector, ISearcherReference searcherReference, FacetsConfig facetConfig)

src/Examine.Lucene/Search/LuceneFacetOperation.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ public LuceneFacetOperation(LuceneSearchQuery search)
2323
}
2424

2525
/// <inheritdoc/>
26-
public ISearchResults Execute(QueryOptions options = null) => _search.Execute(options);
26+
public ISearchResults Execute(QueryOptions? options = null) => _search.Execute(options);
2727

2828
/// <inheritdoc/>
29-
public IFacetOperations Facet(string field, Action<IFacetQueryField> facetConfiguration = null) => _search.FacetInternal(field, facetConfiguration, Array.Empty<string>());
29+
public IFacetOperations Facet(string field, Action<IFacetQueryField>? facetConfiguration = null) => _search.FacetInternal(field, facetConfiguration, Array.Empty<string>());
3030

3131
/// <inheritdoc/>
32-
public IFacetOperations Facet(string field, Action<IFacetQueryField> facetConfiguration = null, params string[] values) => _search.FacetInternal(field, facetConfiguration, values);
32+
public IFacetOperations Facet(string field, Action<IFacetQueryField>? facetConfiguration = null, params string[] values) => _search.FacetInternal(field, facetConfiguration, values);
3333

3434
/// <inheritdoc/>
3535
public IFacetOperations Facet(string field, params DoubleRange[] doubleRanges) => _search.FacetInternal(field, doubleRanges);

src/Examine.Lucene/Search/LuceneSearchQuery.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ public IBooleanOperation SelectAllFieldsInternal()
338338
/// <returns></returns>
339339
protected override LuceneBooleanOperationBase CreateOp() => new LuceneBooleanOperation(this);
340340

341-
internal IFacetOperations FacetInternal(string field, Action<IFacetQueryField> facetConfiguration, params string[] values)
341+
internal IFacetOperations FacetInternal(string field, Action<IFacetQueryField>? facetConfiguration, params string[] values)
342342
{
343343
if(values == null)
344344
{

src/Examine.Test/ExamineBaseTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public virtual void Setup()
2121
loggerFactory.CreateLogger(typeof(ExamineBaseTest)).LogDebug("Initializing test");
2222
}
2323

24-
public TestIndex GetTestIndex(Directory d, Analyzer analyzer, FieldDefinitionCollection? fieldDefinitions = null, IndexDeletionPolicy? indexDeletionPolicy = null, IReadOnlyDictionary<string, IFieldValueTypeFactory>? indexValueTypesFactory = null, FacetsConfig? facetsConfig = null)
24+
public TestIndex GetTestIndex(Directory d, Analyzer analyzer, FieldDefinitionCollection fieldDefinitions = null, IndexDeletionPolicy indexDeletionPolicy = null, IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypesFactory = null, FacetsConfig facetsConfig = null)
2525
{
2626
var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole().SetMinimumLevel(LogLevel.Debug));
2727
return new TestIndex(

0 commit comments

Comments
 (0)