Rename all the onlineStateChanged methods to applyChangedOnlineState. (#574)

mikelehen · web-flow · commit faca4ea11be2 · 2017-12-19T16:05:20.000-08:00
diff --git a/Firestore/Example/Tests/Core/FSTEventManagerTests.m b/Firestore/Example/Tests/Core/FSTEventManagerTests.m
@@ -139,11 +139,11 @@ - (void)testWillForwardOnlineStateChanges {
   FSTQueryListener *fakeListener = OCMClassMock([FSTQueryListener class]);
   NSMutableArray *events = [NSMutableArray array];
   OCMStub([fakeListener query]).andReturn(query);
-  OCMStub([fakeListener clientDidChangeOnlineState:FSTOnlineStateUnknown])
+  OCMStub([fakeListener applyChangedOnlineState:FSTOnlineStateUnknown])
       .andDo(^(NSInvocation *invocation) {
         [events addObject:@(FSTOnlineStateUnknown)];
       });
-  OCMStub([fakeListener clientDidChangeOnlineState:FSTOnlineStateHealthy])
+  OCMStub([fakeListener applyChangedOnlineState:FSTOnlineStateHealthy])
       .andDo(^(NSInvocation *invocation) {
         [events addObject:@(FSTOnlineStateHealthy)];
       });
@@ -154,7 +154,7 @@ - (void)testWillForwardOnlineStateChanges {
 
   [eventManager addListener:fakeListener];
   XCTAssertEqualObjects(events, @[ @(FSTOnlineStateUnknown) ]);
-  [eventManager watchStreamDidChangeOnlineState:FSTOnlineStateHealthy];
+  [eventManager applyChangedOnlineState:FSTOnlineStateHealthy];
   XCTAssertEqualObjects(events, (@[ @(FSTOnlineStateUnknown), @(FSTOnlineStateHealthy) ]));
 }
 
diff --git a/Firestore/Example/Tests/Core/FSTQueryListenerTests.m b/Firestore/Example/Tests/Core/FSTQueryListenerTests.m
@@ -340,10 +340,10 @@ - (void)testWillWaitForSyncIfOnline {
                           [FSTTargetChange changeWithDocuments:@[ doc1, doc2 ]
                                            currentStatusUpdate:FSTCurrentStatusUpdateMarkCurrent]);
 
-  [listener clientDidChangeOnlineState:FSTOnlineStateHealthy];  // no event
+  [listener applyChangedOnlineState:FSTOnlineStateHealthy];  // no event
   [listener queryDidChangeViewSnapshot:snap1];
-  [listener clientDidChangeOnlineState:FSTOnlineStateUnknown];
-  [listener clientDidChangeOnlineState:FSTOnlineStateHealthy];
+  [listener applyChangedOnlineState:FSTOnlineStateUnknown];
+  [listener applyChangedOnlineState:FSTOnlineStateHealthy];
   [listener queryDidChangeViewSnapshot:snap2];
   [listener queryDidChangeViewSnapshot:snap3];
 
@@ -379,12 +379,12 @@ - (void)testWillRaiseInitialEventWhenGoingOffline {
   FSTViewSnapshot *snap1 = FSTTestApplyChanges(view, @[ doc1 ], nil);
   FSTViewSnapshot *snap2 = FSTTestApplyChanges(view, @[ doc2 ], nil);
 
-  [listener clientDidChangeOnlineState:FSTOnlineStateHealthy];  // no event
-  [listener queryDidChangeViewSnapshot:snap1];                  // no event
-  [listener clientDidChangeOnlineState:FSTOnlineStateFailed];   // event
-  [listener clientDidChangeOnlineState:FSTOnlineStateUnknown];  // no event
-  [listener clientDidChangeOnlineState:FSTOnlineStateFailed];   // no event
-  [listener queryDidChangeViewSnapshot:snap2];                  // another event
+  [listener applyChangedOnlineState:FSTOnlineStateHealthy];  // no event
+  [listener queryDidChangeViewSnapshot:snap1];               // no event
+  [listener applyChangedOnlineState:FSTOnlineStateFailed];   // event
+  [listener applyChangedOnlineState:FSTOnlineStateUnknown];  // no event
+  [listener applyChangedOnlineState:FSTOnlineStateFailed];   // no event
+  [listener queryDidChangeViewSnapshot:snap2];               // another event
 
   FSTDocumentViewChange *change1 =
       [FSTDocumentViewChange changeWithDocument:doc1 type:FSTDocumentViewChangeTypeAdded];
@@ -419,9 +419,9 @@ - (void)testWillRaiseInitialEventWhenGoingOfflineAndThereAreNoDocs {
   FSTView *view = [[FSTView alloc] initWithQuery:query remoteDocuments:[FSTDocumentKeySet keySet]];
   FSTViewSnapshot *snap1 = FSTTestApplyChanges(view, @[], nil);
 
-  [listener clientDidChangeOnlineState:FSTOnlineStateHealthy];  // no event
-  [listener queryDidChangeViewSnapshot:snap1];                  // no event
-  [listener clientDidChangeOnlineState:FSTOnlineStateFailed];   // event
+  [listener applyChangedOnlineState:FSTOnlineStateHealthy];  // no event
+  [listener queryDidChangeViewSnapshot:snap1];               // no event
+  [listener applyChangedOnlineState:FSTOnlineStateFailed];   // event
 
   FSTViewSnapshot *expectedSnap = [[FSTViewSnapshot alloc]
          initWithQuery:query
@@ -445,8 +445,8 @@ - (void)testWillRaiseInitialEventWhenStartingOfflineAndThereAreNoDocs {
   FSTView *view = [[FSTView alloc] initWithQuery:query remoteDocuments:[FSTDocumentKeySet keySet]];
   FSTViewSnapshot *snap1 = FSTTestApplyChanges(view, @[], nil);
 
-  [listener clientDidChangeOnlineState:FSTOnlineStateFailed];  // no event
-  [listener queryDidChangeViewSnapshot:snap1];                 // event
+  [listener applyChangedOnlineState:FSTOnlineStateFailed];  // no event
+  [listener queryDidChangeViewSnapshot:snap1];              // event
 
   FSTViewSnapshot *expectedSnap = [[FSTViewSnapshot alloc]
          initWithQuery:query
diff --git a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m
@@ -139,9 +139,9 @@ - (instancetype)initWithPersistence:(id<FSTPersistence>)persistence
   return self;
 }
 
-- (void)watchStreamDidChangeOnlineState:(FSTOnlineState)onlineState {
-  [self.syncEngine applyOnlineStateChange:onlineState];
-  [self.eventManager watchStreamDidChangeOnlineState:onlineState];
+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState {
+  [self.syncEngine applyChangedOnlineState:onlineState];
+  [self.eventManager applyChangedOnlineState:onlineState];
 }
 
 - (void)start {
diff --git a/Firestore/Source/Core/FSTEventManager.h b/Firestore/Source/Core/FSTEventManager.h
@@ -62,7 +62,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)queryDidChangeViewSnapshot:(FSTViewSnapshot *)snapshot;
 - (void)queryDidError:(NSError *)error;
-- (void)clientDidChangeOnlineState:(FSTOnlineState)onlineState;
+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState;
 
 @property(nonatomic, strong, readonly) FSTQuery *query;
 
diff --git a/Firestore/Source/Core/FSTEventManager.m b/Firestore/Source/Core/FSTEventManager.m
@@ -151,7 +151,7 @@ - (void)queryDidError:(NSError *)error {
   self.viewSnapshotHandler(nil, error);
 }
 
-- (void)clientDidChangeOnlineState:(FSTOnlineState)onlineState {
+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState {
   self.onlineState = onlineState;
   if (self.snapshot && !self.raisedInitialEvent &&
       [self shouldRaiseInitialEventForSnapshot:self.snapshot onlineState:onlineState]) {
@@ -268,7 +268,7 @@ - (FSTTargetID)addListener:(FSTQueryListener *)listener {
   }
   [queryInfo.listeners addObject:listener];
 
-  [listener clientDidChangeOnlineState:self.onlineState];
+  [listener applyChangedOnlineState:self.onlineState];
 
   if (queryInfo.viewSnapshot) {
     [listener queryDidChangeViewSnapshot:queryInfo.viewSnapshot];
@@ -321,11 +321,11 @@ - (void)handleError:(NSError *)error forQuery:(FSTQuery *)query {
   [self.queries removeObjectForKey:query];
 }
 
-- (void)watchStreamDidChangeOnlineState:(FSTOnlineState)onlineState {
+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState {
   self.onlineState = onlineState;
   for (FSTQueryListenersInfo *info in self.queries.objectEnumerator) {
     for (FSTQueryListener *listener in info.listeners) {
-      [listener clientDidChangeOnlineState:onlineState];
+      [listener applyChangedOnlineState:onlineState];
     }
   }
 }
diff --git a/Firestore/Source/Core/FSTFirestoreClient.m b/Firestore/Source/Core/FSTFirestoreClient.m
@@ -187,9 +187,9 @@ - (void)userDidChange:(FSTUser *)user {
   [self.syncEngine userDidChange:user];
 }
 
-- (void)watchStreamDidChangeOnlineState:(FSTOnlineState)onlineState {
-  [self.syncEngine applyOnlineStateChange:onlineState];
-  [self.eventManager watchStreamDidChangeOnlineState:onlineState];
+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState {
+  [self.syncEngine applyChangedOnlineState:onlineState];
+  [self.eventManager applyChangedOnlineState:onlineState];
 }
 
 - (void)disableNetworkWithCompletion:(nullable FSTVoidErrorBlock)completion {
diff --git a/Firestore/Source/Core/FSTSyncEngine.h b/Firestore/Source/Core/FSTSyncEngine.h
@@ -101,7 +101,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)userDidChange:(FSTUser *)user;
 
 /** Applies an FSTOnlineState change to the sync engine and notifies any views of the change. */
-- (void)applyOnlineStateChange:(FSTOnlineState)onlineState;
+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState;
 
 @end
 
diff --git a/Firestore/Source/Core/FSTSyncEngine.m b/Firestore/Source/Core/FSTSyncEngine.m
@@ -318,11 +318,11 @@ - (void)applyRemoteEvent:(FSTRemoteEvent *)remoteEvent {
   [self emitNewSnapshotsWithChanges:changes remoteEvent:remoteEvent];
 }
 
-- (void)applyOnlineStateChange:(FSTOnlineState)onlineState {
+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState {
   NSMutableArray<FSTViewSnapshot *> *newViewSnapshots = [NSMutableArray array];
   [self.queryViewsByQuery
       enumerateKeysAndObjectsUsingBlock:^(FSTQuery *query, FSTQueryView *queryView, BOOL *stop) {
-        FSTViewChange *viewChange = [queryView.view applyOnlineStateChange:onlineState];
+        FSTViewChange *viewChange = [queryView.view applyChangedOnlineState:onlineState];
         FSTAssert(viewChange.limboChanges.count == 0,
                   @"OnlineState should not affect limbo documents.");
         if (viewChange.snapshot) {
diff --git a/Firestore/Source/Core/FSTView.h b/Firestore/Source/Core/FSTView.h
@@ -143,7 +143,7 @@ typedef NS_ENUM(NSInteger, FSTLimboDocumentChangeType) {
  * Applies an FSTOnlineState change to the view, potentially generating an FSTViewChange if the
  * view's syncState changes as a result.
  */
-- (FSTViewChange *)applyOnlineStateChange:(FSTOnlineState)onlineState;
+- (FSTViewChange *)applyChangedOnlineState:(FSTOnlineState)onlineState;
 
 @end
 
diff --git a/Firestore/Source/Core/FSTView.m b/Firestore/Source/Core/FSTView.m
@@ -336,7 +336,7 @@ - (FSTViewChange *)applyChangesToDocuments:(FSTViewDocumentChanges *)docChanges
   }
 }
 
-- (FSTViewChange *)applyOnlineStateChange:(FSTOnlineState)onlineState {
+- (FSTViewChange *)applyChangedOnlineState:(FSTOnlineState)onlineState {
   if (self.isCurrent && onlineState == FSTOnlineStateFailed) {
     // If we're offline, set `current` to NO and then call applyChanges to refresh our syncState
     // and generate an FSTViewChange as appropriate. We are guaranteed to get a new FSTTargetChange
diff --git a/Firestore/Source/Remote/FSTRemoteStore.h b/Firestore/Source/Remote/FSTRemoteStore.h
@@ -83,7 +83,7 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol FSTOnlineStateDelegate <NSObject>
 
 /** Called whenever the online state of the watch stream changes */
-- (void)watchStreamDidChangeOnlineState:(FSTOnlineState)onlineState;
+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState;
 
 @end
 
diff --git a/Firestore/Source/Remote/FSTRemoteStore.m b/Firestore/Source/Remote/FSTRemoteStore.m
@@ -180,7 +180,7 @@ - (void)updateOnlineState:(FSTOnlineState)newState {
       self.watchStreamFailures = 0;
     }
     self.watchStreamOnlineState = newState;
-    [self.onlineStateDelegate watchStreamDidChangeOnlineState:newState];
+    [self.onlineStateDelegate applyChangedOnlineState:newState];
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,9 @@ - (instancetype)initWithPersistence:(id<FSTPersistence>)persistence`
`139`	`139`	`return self;`
`140`	`140`	`}`
`141`	`141`
`142`		`-- (void)watchStreamDidChangeOnlineState:(FSTOnlineState)onlineState {`
`143`		`- [self.syncEngine applyOnlineStateChange:onlineState];`
`144`		`- [self.eventManager watchStreamDidChangeOnlineState:onlineState];`
	`142`	`+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState {`
	`143`	`+ [self.syncEngine applyChangedOnlineState:onlineState];`
	`144`	`+ [self.eventManager applyChangedOnlineState:onlineState];`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`- (void)start {`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ - (void)queryDidError:(NSError *)error {`
`151`	`151`	`self.viewSnapshotHandler(nil, error);`
`152`	`152`	`}`
`153`	`153`
`154`		`-- (void)clientDidChangeOnlineState:(FSTOnlineState)onlineState {`
	`154`	`+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState {`
`155`	`155`	`self.onlineState = onlineState;`
`156`	`156`	`if (self.snapshot && !self.raisedInitialEvent &&`
`157`	`157`	`[self shouldRaiseInitialEventForSnapshot:self.snapshot onlineState:onlineState]) {`
`@@ -268,7 +268,7 @@ - (FSTTargetID)addListener:(FSTQueryListener *)listener {`
`268`	`268`	`}`
`269`	`269`	`[queryInfo.listeners addObject:listener];`
`270`	`270`
`271`		`- [listener clientDidChangeOnlineState:self.onlineState];`
	`271`	`+ [listener applyChangedOnlineState:self.onlineState];`
`272`	`272`
`273`	`273`	`if (queryInfo.viewSnapshot) {`
`274`	`274`	`[listener queryDidChangeViewSnapshot:queryInfo.viewSnapshot];`
`@@ -321,11 +321,11 @@ - (void)handleError:(NSError )error forQuery:(FSTQuery )query {`
`321`	`321`	`[self.queries removeObjectForKey:query];`
`322`	`322`	`}`
`323`	`323`
`324`		`-- (void)watchStreamDidChangeOnlineState:(FSTOnlineState)onlineState {`
	`324`	`+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState {`
`325`	`325`	`self.onlineState = onlineState;`
`326`	`326`	`for (FSTQueryListenersInfo *info in self.queries.objectEnumerator) {`
`327`	`327`	`for (FSTQueryListener *listener in info.listeners) {`
`328`		`- [listener clientDidChangeOnlineState:onlineState];`
	`328`	`+ [listener applyChangedOnlineState:onlineState];`
`329`	`329`	`}`
`330`	`330`	`}`
`331`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,9 +187,9 @@ - (void)userDidChange:(FSTUser *)user {`
`187`	`187`	`[self.syncEngine userDidChange:user];`
`188`	`188`	`}`
`189`	`189`
`190`		`-- (void)watchStreamDidChangeOnlineState:(FSTOnlineState)onlineState {`
`191`		`- [self.syncEngine applyOnlineStateChange:onlineState];`
`192`		`- [self.eventManager watchStreamDidChangeOnlineState:onlineState];`
	`190`	`+- (void)applyChangedOnlineState:(FSTOnlineState)onlineState {`
	`191`	`+ [self.syncEngine applyChangedOnlineState:onlineState];`
	`192`	`+ [self.eventManager applyChangedOnlineState:onlineState];`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`- (void)disableNetworkWithCompletion:(nullable FSTVoidErrorBlock)completion {`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ - (FSTViewChange )applyChangesToDocuments:(FSTViewDocumentChanges )docChanges`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`
`339`		`-- (FSTViewChange *)applyOnlineStateChange:(FSTOnlineState)onlineState {`
	`339`	`+- (FSTViewChange *)applyChangedOnlineState:(FSTOnlineState)onlineState {`
`340`	`340`	`if (self.isCurrent && onlineState == FSTOnlineStateFailed) {`
`341`	`341`	// If we're offline, set `current` to NO and then call applyChanges to refresh our syncState
`342`	`342`	`// and generate an FSTViewChange as appropriate. We are guaranteed to get a new FSTTargetChange`