Skip to content

Commit ead7ce3

Browse files
craiggwilsoncraiggwilson
committed
renaming criteria to filter.
1 parent b80d0ab commit ead7ce3

Some content is hidden

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

44 files changed

+386
-386
lines changed

‎src/MongoDB.Driver.Core.TestConsoleApplication/Program.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ private async static Task DoWork(ICluster cluster, CancellationToken cancellatio
158158
{
159159
try
160160
{
161-
var criteria = new BsonDocument("_id", docs[0]["_id"]);
161+
var filter = new BsonDocument("_id", docs[0]["_id"]);
162162
var update = new BsonDocument("$set", new BsonDocument("i", i + 1));
163-
await Update(binding, criteria, update);
163+
await Update(binding, filter, update);
164164
//Console.Write(".");
165165
}
166166
catch (Exception)
@@ -179,22 +179,22 @@ private static Task Insert(IWriteBinding binding, BsonDocument document)
179179
return insertOp.ExecuteAsync(binding, CancellationToken.None);
180180
}
181181

182-
private static Task<IAsyncCursor<BsonDocument>> Query(IReadBinding binding, BsonDocument query)
182+
private static Task<IAsyncCursor<BsonDocument>> Query(IReadBinding binding, BsonDocument filter)
183183
{
184184
var findOp = new FindOperation<BsonDocument>(__collection, BsonDocumentSerializer.Instance, __messageEncoderSettings)
185185
{
186-
Criteria = query,
186+
Filter = filter,
187187
Limit = -1
188188
};
189189

190190
return findOp.ExecuteAsync(binding, CancellationToken.None);
191191
}
192192

193-
private static Task Update(IWriteBinding binding, BsonDocument criteria, BsonDocument update)
193+
private static Task Update(IWriteBinding binding, BsonDocument filter, BsonDocument update)
194194
{
195195
var updateOp = new UpdateOpcodeOperation(
196196
__collection,
197-
new UpdateRequest(UpdateType.Update, criteria, update),
197+
new UpdateRequest(UpdateType.Update, filter, update),
198198
__messageEncoderSettings);
199199

200200
return updateOp.ExecuteAsync(binding, CancellationToken.None);

‎src/MongoDB.Driver.Core.Tests/Core/Operations/CountOperationTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ public void Constructor_should_throw_when_message_encoder_settings_is_null()
4646
[Test]
4747
public void CreateCommand_should_create_the_correct_command()
4848
{
49-
var criteria = new BsonDocument("x", 1);
49+
var filter = new BsonDocument("x", 1);
5050
var hint = "funny";
5151
var limit = 10;
5252
var skip = 30;
5353
var maxTime = TimeSpan.FromSeconds(20);
5454
var subject = new CountOperation(_collectionNamespace, _messageEncoderSettings)
5555
{
56-
Criteria = criteria,
56+
Filter = filter,
5757
Hint = hint,
5858
Limit = limit,
5959
MaxTime = maxTime,
@@ -62,7 +62,7 @@ public void CreateCommand_should_create_the_correct_command()
6262
var expectedResult = new BsonDocument
6363
{
6464
{ "count", _collectionNamespace.CollectionName },
65-
{ "query", criteria },
65+
{ "query", filter },
6666
{ "limit", limit },
6767
{ "skip", skip },
6868
{ "hint", hint },
@@ -91,10 +91,10 @@ public async Task ExecuteAsync_should_return_expected_result()
9191

9292
[Test]
9393
[RequiresServer("EnsureTestData")]
94-
public async Task ExecuteAsync_should_return_expected_result_when_criteria_is_provided()
94+
public async Task ExecuteAsync_should_return_expected_result_when_filter_is_provided()
9595
{
9696
var subject = new CountOperation(_collectionNamespace, _messageEncoderSettings);
97-
subject.Criteria = BsonDocument.Parse("{ _id : { $gt : 1 } }");
97+
subject.Filter = BsonDocument.Parse("{ _id : { $gt : 1 } }");
9898

9999
long result;
100100
using (var binding = SuiteConfiguration.GetReadBinding())

‎src/MongoDB.Driver.Core.Tests/Core/Operations/DistinctOperationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void CreateCommand_should_create_the_correct_command()
7474
{
7575
var subject = new DistinctOperation<int>(_collectionNamespace, _valueSerializer, _fieldName, _messageEncoderSettings)
7676
{
77-
Criteria = new BsonDocument("x", 1),
77+
Filter = new BsonDocument("x", 1),
7878
MaxTime = TimeSpan.FromSeconds(20),
7979
};
8080

@@ -96,7 +96,7 @@ public async Task ExecuteAsync_should_return_the_correct_results()
9696
{
9797
var subject = new DistinctOperation<int>(_collectionNamespace, _valueSerializer, _fieldName, _messageEncoderSettings)
9898
{
99-
Criteria = BsonDocument.Parse("{ _id : { $gt : 2 } }"),
99+
Filter = BsonDocument.Parse("{ _id : { $gt : 2 } }"),
100100
MaxTime = TimeSpan.FromSeconds(20),
101101
};
102102

‎src/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndDeleteOperationTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ namespace MongoDB.Driver.Core.Operations
2525
[TestFixture]
2626
public class FindOneAndDeleteOperationTests : OperationTestBase
2727
{
28-
private BsonDocument _criteria;
28+
private BsonDocument _filter;
2929

3030
public override void TestFixtureSetUp()
3131
{
3232
base.TestFixtureSetUp();
3333

34-
_criteria = new BsonDocument("x", 1);
34+
_filter = new BsonDocument("x", 1);
3535
}
3636

3737
[Test]
3838
public void Constructor_should_throw_when_collection_namespace_is_null()
3939
{
40-
Action act = () => new FindOneAndDeleteOperation<BsonDocument>(null, _criteria, BsonDocumentSerializer.Instance, _messageEncoderSettings);
40+
Action act = () => new FindOneAndDeleteOperation<BsonDocument>(null, _filter, BsonDocumentSerializer.Instance, _messageEncoderSettings);
4141

4242
act.ShouldThrow<ArgumentNullException>();
4343
}
4444

4545
[Test]
46-
public void Constructor_should_throw_when_criteria_is_null()
46+
public void Constructor_should_throw_when_filter_is_null()
4747
{
4848
Action act = () => new FindOneAndDeleteOperation<BsonDocument>(_collectionNamespace, null, BsonDocumentSerializer.Instance, _messageEncoderSettings);
4949

@@ -53,26 +53,26 @@ public void Constructor_should_throw_when_criteria_is_null()
5353
[Test]
5454
public void Constructor_should_throw_when_result_serializer_is_null()
5555
{
56-
Action act = () => new FindOneAndDeleteOperation<BsonDocument>(_collectionNamespace, _criteria, null, _messageEncoderSettings);
56+
Action act = () => new FindOneAndDeleteOperation<BsonDocument>(_collectionNamespace, _filter, null, _messageEncoderSettings);
5757

5858
act.ShouldThrow<ArgumentNullException>();
5959
}
6060

6161
[Test]
6262
public void Constructor_should_throw_when_message_encoder_settings_is_null()
6363
{
64-
Action act = () => new FindOneAndDeleteOperation<BsonDocument>(_collectionNamespace, _criteria, BsonDocumentSerializer.Instance, null);
64+
Action act = () => new FindOneAndDeleteOperation<BsonDocument>(_collectionNamespace, _filter, BsonDocumentSerializer.Instance, null);
6565

6666
act.ShouldThrow<ArgumentNullException>();
6767
}
6868

6969
[Test]
7070
public void Constructor_should_initialize_object()
7171
{
72-
var subject = new FindOneAndDeleteOperation<BsonDocument>(_collectionNamespace, _criteria, BsonDocumentSerializer.Instance, _messageEncoderSettings);
72+
var subject = new FindOneAndDeleteOperation<BsonDocument>(_collectionNamespace, _filter, BsonDocumentSerializer.Instance, _messageEncoderSettings);
7373

7474
subject.CollectionNamespace.Should().Be(_collectionNamespace);
75-
subject.Criteria.Should().Be(_criteria);
75+
subject.Filter.Should().Be(_filter);
7676
subject.ResultSerializer.Should().NotBeNull();
7777
subject.MessageEncoderSettings.Should().BeEquivalentTo(_messageEncoderSettings);
7878
}
@@ -85,7 +85,7 @@ public void CreateCommand_should_create_the_correct_command(
8585
{
8686
var projectionDoc = projection == null ? (BsonDocument)null : BsonDocument.Parse(projection);
8787
var sortDoc = sort == null ? (BsonDocument)null : BsonDocument.Parse(sort);
88-
var subject = new FindOneAndDeleteOperation<BsonDocument>(_collectionNamespace, _criteria, BsonDocumentSerializer.Instance, _messageEncoderSettings)
88+
var subject = new FindOneAndDeleteOperation<BsonDocument>(_collectionNamespace, _filter, BsonDocumentSerializer.Instance, _messageEncoderSettings)
8989
{
9090
MaxTime = maxTimeMS.HasValue ? TimeSpan.FromMilliseconds(maxTimeMS.Value) : (TimeSpan?)null,
9191
Projection = projectionDoc,
@@ -95,7 +95,7 @@ public void CreateCommand_should_create_the_correct_command(
9595
var expectedResult = new BsonDocument
9696
{
9797
{ "findAndModify", _collectionNamespace.CollectionName },
98-
{ "query", _criteria },
98+
{ "query", _filter },
9999
{ "sort", sortDoc, sortDoc != null },
100100
{ "remove", true },
101101
{ "fields", projectionDoc, projectionDoc != null },

‎src/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndReplaceOperationTests.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,27 @@ namespace MongoDB.Driver.Core.Operations
2525
[TestFixture]
2626
public class FindOneAndReplaceOperationTests : OperationTestBase
2727
{
28-
private BsonDocument _criteria;
28+
private BsonDocument _filter;
2929
private BsonDocument _replacement;
3030

3131
public override void TestFixtureSetUp()
3232
{
3333
base.TestFixtureSetUp();
3434

35-
_criteria = new BsonDocument("x", 1);
35+
_filter = new BsonDocument("x", 1);
3636
_replacement = BsonDocument.Parse("{_id: 10, a: 2}");
3737
}
3838

3939
[Test]
4040
public void Constructor_should_throw_when_collection_namespace_is_null()
4141
{
42-
Action act = () => new FindOneAndReplaceOperation<BsonDocument>(null, _criteria, _replacement, BsonDocumentSerializer.Instance, _messageEncoderSettings);
42+
Action act = () => new FindOneAndReplaceOperation<BsonDocument>(null, _filter, _replacement, BsonDocumentSerializer.Instance, _messageEncoderSettings);
4343

4444
act.ShouldThrow<ArgumentNullException>();
4545
}
4646

4747
[Test]
48-
public void Constructor_should_throw_when_criteria_is_null()
48+
public void Constructor_should_throw_when_filter_is_null()
4949
{
5050
Action act = () => new FindOneAndReplaceOperation<BsonDocument>(_collectionNamespace, null, _replacement, BsonDocumentSerializer.Instance, _messageEncoderSettings);
5151

@@ -55,34 +55,34 @@ public void Constructor_should_throw_when_criteria_is_null()
5555
[Test]
5656
public void Constructor_should_throw_when_replacement_is_null()
5757
{
58-
Action act = () => new FindOneAndReplaceOperation<BsonDocument>(_collectionNamespace, _criteria, null, BsonDocumentSerializer.Instance, _messageEncoderSettings);
58+
Action act = () => new FindOneAndReplaceOperation<BsonDocument>(_collectionNamespace, _filter, null, BsonDocumentSerializer.Instance, _messageEncoderSettings);
5959

6060
act.ShouldThrow<ArgumentNullException>();
6161
}
6262

6363
[Test]
6464
public void Constructor_should_throw_when_result_serializer_is_null()
6565
{
66-
Action act = () => new FindOneAndReplaceOperation<BsonDocument>(_collectionNamespace, _criteria, _replacement, null, _messageEncoderSettings);
66+
Action act = () => new FindOneAndReplaceOperation<BsonDocument>(_collectionNamespace, _filter, _replacement, null, _messageEncoderSettings);
6767

6868
act.ShouldThrow<ArgumentNullException>();
6969
}
7070

7171
[Test]
7272
public void Constructor_should_throw_when_message_encoder_settings_is_null()
7373
{
74-
Action act = () => new FindOneAndReplaceOperation<BsonDocument>(_collectionNamespace, _criteria, _replacement, BsonDocumentSerializer.Instance, null);
74+
Action act = () => new FindOneAndReplaceOperation<BsonDocument>(_collectionNamespace, _filter, _replacement, BsonDocumentSerializer.Instance, null);
7575

7676
act.ShouldThrow<ArgumentNullException>();
7777
}
7878

7979
[Test]
8080
public void Constructor_should_initialize_object()
8181
{
82-
var subject = new FindOneAndReplaceOperation<BsonDocument>(_collectionNamespace, _criteria, _replacement, BsonDocumentSerializer.Instance, _messageEncoderSettings);
82+
var subject = new FindOneAndReplaceOperation<BsonDocument>(_collectionNamespace, _filter, _replacement, BsonDocumentSerializer.Instance, _messageEncoderSettings);
8383

8484
subject.CollectionNamespace.Should().Be(_collectionNamespace);
85-
subject.Criteria.Should().Be(_criteria);
85+
subject.Filter.Should().Be(_filter);
8686
subject.Replacement.Should().Be(_replacement);
8787
subject.ResultSerializer.Should().NotBeNull();
8888
subject.MessageEncoderSettings.Should().BeEquivalentTo(_messageEncoderSettings);
@@ -98,7 +98,7 @@ public void CreateCommand_should_create_the_correct_command(
9898
{
9999
var projectionDoc = projection == null ? (BsonDocument)null : BsonDocument.Parse(projection);
100100
var sortDoc = sort == null ? (BsonDocument)null : BsonDocument.Parse(sort);
101-
var subject = new FindOneAndReplaceOperation<BsonDocument>(_collectionNamespace, _criteria, _replacement, BsonDocumentSerializer.Instance, _messageEncoderSettings)
101+
var subject = new FindOneAndReplaceOperation<BsonDocument>(_collectionNamespace, _filter, _replacement, BsonDocumentSerializer.Instance, _messageEncoderSettings)
102102
{
103103
IsUpsert = isUpsert,
104104
MaxTime = maxTimeMS.HasValue ? TimeSpan.FromMilliseconds(maxTimeMS.Value) : (TimeSpan?)null,
@@ -110,7 +110,7 @@ public void CreateCommand_should_create_the_correct_command(
110110
var expectedResult = new BsonDocument
111111
{
112112
{ "findAndModify", _collectionNamespace.CollectionName },
113-
{ "query", _criteria },
113+
{ "query", _filter },
114114
{ "sort", sortDoc, sortDoc != null },
115115
{ "update", _replacement, _replacement != null },
116116
{ "new", !returnOriginal },
@@ -130,7 +130,7 @@ public async Task ExecuteAsync_against_an_existing_document_returning_the_origin
130130
{
131131
var subject = new FindOneAndReplaceOperation<BsonDocument>(
132132
_collectionNamespace,
133-
_criteria,
133+
_filter,
134134
_replacement,
135135
new FindAndModifyValueDeserializer<BsonDocument>(BsonDocumentSerializer.Instance),
136136
_messageEncoderSettings)
@@ -153,7 +153,7 @@ public async Task ExecuteAsync_against_an_existing_document_returning_the_replac
153153
{
154154
var subject = new FindOneAndReplaceOperation<BsonDocument>(
155155
_collectionNamespace,
156-
_criteria,
156+
_filter,
157157
_replacement,
158158
new FindAndModifyValueDeserializer<BsonDocument>(BsonDocumentSerializer.Instance),
159159
_messageEncoderSettings)

0 commit comments

Comments
 (0)