Skip to content

Commit c7445e3

Browse files
committed
Rename filter variables to start with verbs for better sorting
1 parent 575d286 commit c7445e3

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

src/Weaviate.Client.Tests/Integration/Datasets/Datasets.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,17 @@ public class DatasetFilteringReferences : TheoryData<string>
196196
1
197197
),
198198
["RefPropertyLengthLessThan6"] = (
199-
Filter.Reference("ref").Property("name").Length().LessThan(6),
199+
Filter.Reference("ref").Property("name").HasLength().LessThan(6),
200200
0
201201
),
202202
["RefIDEquals"] = (Filter.Reference("ref").ID.Equal(_reusableUuids[1]), 1),
203203
["IndirectSelfRefLengthLessThan6"] = (
204-
Filter.Reference("ref2").Reference("ref").Property("name").Length().LessThan(6),
204+
Filter
205+
.Reference("ref2")
206+
.Reference("ref")
207+
.Property("name")
208+
.HasLength()
209+
.LessThan(6),
205210
2
206211
),
207212
};

src/Weaviate.Client.Tests/Unit/TestFilters.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void FilterRequestCreatesProperGrpcMessage_4()
142142
public void Filter_Property_Length()
143143
{
144144
// Arrange
145-
var f = Filter.Property("name").Length().Equal(5);
145+
var f = Filter.Property("name").HasLength().Equal(5);
146146

147147
var expected = new Filters()
148148
{
@@ -179,7 +179,7 @@ public void Filter_AllOf_And_AnyOf()
179179
{
180180
var uuid2 = Guid.NewGuid();
181181
var f1 = Filter.Property("uuids").ContainsAny(new[] { uuid2 });
182-
var f2 = Filter.Property("name").Length().Equal(5);
182+
var f2 = Filter.Property("name").HasLength().Equal(5);
183183

184184
var expectedAllOf = f1 & f2;
185185
var expectedAnyOf = f1 | f2;

src/Weaviate.Client/Models/Filter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ internal PropertyFilter(string name)
280280
WithProperty(name);
281281
}
282282

283-
public TypedValue<int> Length()
283+
public TypedValue<int> HasLength()
284284
{
285285
if (_target is null)
286286
{
@@ -334,11 +334,11 @@ public Filter IsLessThan<T>(T value) =>
334334
public Filter IsLessThanEqual<T>(T value) =>
335335
WithOperator(Filters.Types.Operator.LessThanEqual).WithValue(value);
336336

337-
public Filter WithinGeoRange(GeoCoordinate coord, float radius) =>
337+
public Filter IsWithinGeoRange(GeoCoordinate coord, float radius) =>
338338
WithOperator(Filters.Types.Operator.WithinGeoRange)
339339
.WithValue(new GeoCoordinateConstraint(coord.Latitude, coord.Longitude, radius));
340340

341-
public Filter WithinGeoRange(GeoCoordinateConstraint value) =>
341+
public Filter IsWithinGeoRange(GeoCoordinateConstraint value) =>
342342
WithOperator(Filters.Types.Operator.WithinGeoRange).WithValue(value);
343343

344344
public Filter IsLike<T>(T value) => WithOperator(Filters.Types.Operator.Like).WithValue(value);

src/Weaviate.Client/Models/FilterExpression.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ internal PropertyFilter(string name)
2929

3030
public Filter LessThanEqual(TResult value) => _prop.IsLessThanEqual(value);
3131

32-
public Filter WithinGeoRange(GeoCoordinateConstraint value) => _prop.WithinGeoRange(value);
32+
public Filter WithinGeoRange(GeoCoordinateConstraint value) =>
33+
_prop.IsWithinGeoRange(value);
3334

3435
public Filter Like(TResult value) => _prop.IsLike(value);
3536

0 commit comments

Comments
 (0)