Move creation of FSTFilter objects to static create method on FSTFilter. (#1512)

Rather than previously inlining it in the calling code. This is to unify
filter creation across platforms.

(This change involves altering FSTFilter from a protocol to an abstract
class.)

1 files changed, 8 insertions, 8 deletions

diff --git a/Firestore/Source/Remote/FSTSerializerBeta.mm b/Firestore/Source/Remote/FSTSerializerBeta.mm
index 263fe6d..81c6958 100644
--- a/Firestore/Source/Remote/FSTSerializerBeta.mm
+++ b/Firestore/Source/Remote/FSTSerializerBeta.mm
@@ -802,7 +802,7 @@ NS_ASSUME_NONNULL_BEGIN
     path = path.Append(util::MakeString(from.collectionId));
   }
 
-  NSArray<id<FSTFilter>> *filterBy;
+  NSArray<FSTFilter *> *filterBy;
   if (query.hasWhere) {
     filterBy = [self decodedFilters:query.where];
   } else {
@@ -841,14 +841,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark Filters
 
-- (GCFSStructuredQuery_Filter *_Nullable)encodedFilters:(NSArray<id<FSTFilter>> *)filters {
+- (GCFSStructuredQuery_Filter *_Nullable)encodedFilters:(NSArray<FSTFilter *> *)filters {
   if (filters.count == 0) {
     return nil;
   }
   NSMutableArray<GCFSStructuredQuery_Filter *> *protos = [NSMutableArray array];
-  for (id<FSTFilter> filter in filters) {
+  for (FSTFilter *filter in filters) {
     if ([filter isKindOfClass:[FSTRelationFilter class]]) {
-      [protos addObject:[self encodedRelationFilter:filter]];
+      [protos addObject:[self encodedRelationFilter:(FSTRelationFilter *)filter]];
     } else {
       [protos addObject:[self encodedUnaryFilter:filter]];
     }
@@ -864,8 +864,8 @@ NS_ASSUME_NONNULL_BEGIN
   return composite;
 }
 
-- (NSArray<id<FSTFilter>> *)decodedFilters:(GCFSStructuredQuery_Filter *)proto {
-  NSMutableArray<id<FSTFilter>> *result = [NSMutableArray array];
+- (NSArray<FSTFilter *> *)decodedFilters:(GCFSStructuredQuery_Filter *)proto {
+  NSMutableArray<FSTFilter *> *result = [NSMutableArray array];
 
   NSArray<GCFSStructuredQuery_Filter *> *filters;
   if (proto.filterTypeOneOfCase ==
@@ -913,7 +913,7 @@ NS_ASSUME_NONNULL_BEGIN
   return [FSTRelationFilter filterWithField:fieldPath filterOperator:filterOperator value:value];
 }
 
-- (GCFSStructuredQuery_Filter *)encodedUnaryFilter:(id<FSTFilter>)filter {
+- (GCFSStructuredQuery_Filter *)encodedUnaryFilter:(FSTFilter *)filter {
   GCFSStructuredQuery_Filter *proto = [GCFSStructuredQuery_Filter message];
   proto.unaryFilter.field = [self encodedFieldPath:filter.field];
   if ([filter isKindOfClass:[FSTNanFilter class]]) {
@@ -926,7 +926,7 @@ NS_ASSUME_NONNULL_BEGIN
   return proto;
 }
 
-- (id<FSTFilter>)decodedUnaryFilter:(GCFSStructuredQuery_UnaryFilter *)proto {
+- (FSTFilter *)decodedUnaryFilter:(GCFSStructuredQuery_UnaryFilter *)proto {
   FieldPath field = FieldPath::FromServerFormat(util::MakeString(proto.field.fieldPath));
   switch (proto.op) {
     case GCFSStructuredQuery_UnaryFilter_Operator_IsNan: