Skip to content

Consistent naming for CurrentUserController #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2015
Merged

Consistent naming for CurrentUserController #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Parse/src/main/java/com/parse/CachedCurrentUserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public String then(Task<ParseUser> task) throws Exception {
}

@Override
public Task<Void> logoutAsync() {
public Task<Void> logOutAsync() {
return taskQueue.enqueue(new Continuation<Void, Task<Void>>() {
@Override
public Task<Void> then(Task<Void> toAwait) throws Exception {
Expand Down
8 changes: 4 additions & 4 deletions Parse/src/main/java/com/parse/ParseCurrentUserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
extends ParseObjectCurrentController<ParseUser> {

/**
* Get the persisted current ParseUser
* Gets the persisted current ParseUser.
* @param shouldAutoCreateUser
* @return
*/
Expand All @@ -28,14 +28,14 @@
Task<Void> setIfNeededAsync(ParseUser user);

/**
* Get the session token of the persisted current ParseUser
* Gets the session token of the persisted current ParseUser.
* @return
*/
Task<String> getCurrentSessionTokenAsync();

/**
* Logout the current ParseUser
* Logs out the current ParseUser.
* @return
*/
Task<Void> logoutAsync();
Task<Void> logOutAsync();
}
2 changes: 1 addition & 1 deletion Parse/src/main/java/com/parse/ParseUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ private static Task<Void> saveCurrentUserAsync(ParseUser user) {
* @return A Task that is resolved when logging out completes.
*/
public static Task<Void> logOutInBackground() {
return getCurrentUserController().logoutAsync();
return getCurrentUserController().logOutAsync();
}

/**
Expand Down
4 changes: 2 additions & 2 deletions Parse/src/test/java/com/parse/CachedCurrentUserControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public void testLogOutAsyncWithDeleteInDiskCurrentUserSuccess() throws Exception
when(currentUser.logOutAsync()).thenReturn(Task.<Void>forResult(null));
controller.currentUser = currentUser;

ParseTaskUtils.wait(controller.logoutAsync());
ParseTaskUtils.wait(controller.logOutAsync());

// Make sure currentUser.logout() is called
verify(currentUser, times(1)).logOutAsync();
Expand All @@ -316,7 +316,7 @@ public void testLogOutAsyncWithDeleteInDiskCurrentUserFailure() throws Exception
CachedCurrentUserController controller =
new CachedCurrentUserController(store);

ParseTaskUtils.wait(controller.logoutAsync());
ParseTaskUtils.wait(controller.logOutAsync());

// Make sure controller state is correct
assertNull(controller.currentUser);
Expand Down