Rename observables.

Author: android10

data/src/main/java/com/fernandocejas/android10/sample/data/net/RestApi.java

@@ -33,12 +33,12 @@ public interface RestApi {
   /**
    * Retrieves an {@link rx.Observable} which will emit a List of {@link UserEntity}.
    */
-  Observable<List<UserEntity>> getUserEntityList();
+  Observable<List<UserEntity>> userEntityList();
 
   /**
    * Retrieves an {@link rx.Observable} which will emit a {@link UserEntity}.
    *
    * @param userId The user id used to get user data.
    */
-  Observable<UserEntity> getUserEntityById(final int userId);
+  Observable<UserEntity> userEntityById(final int userId);
 }

data/src/main/java/com/fernandocejas/android10/sample/data/net/RestApiImpl.java

@@ -48,7 +48,7 @@ public RestApiImpl(Context context, UserEntityJsonMapper userEntityJsonMapper) {
     this.userEntityJsonMapper = userEntityJsonMapper;
   }
 
-  @Override public Observable<List<UserEntity>> getUserEntityList() {
+  @Override public Observable<List<UserEntity>> userEntityList() {
     return Observable.create(new Observable.OnSubscribe<List<UserEntity>>() {
       @Override public void call(Subscriber<? super List<UserEntity>> subscriber) {
 
@@ -72,7 +72,7 @@ public RestApiImpl(Context context, UserEntityJsonMapper userEntityJsonMapper) {
     });
   }
 
-  @Override public Observable<UserEntity> getUserEntityById(final int userId) {
+  @Override public Observable<UserEntity> userEntityById(final int userId) {
     return Observable.create(new Observable.OnSubscribe<UserEntity>() {
       @Override public void call(Subscriber<? super UserEntity> subscriber) {
 

data/src/main/java/com/fernandocejas/android10/sample/data/repository/UserDataRepository.java

@@ -48,17 +48,17 @@ public UserDataRepository(UserDataStoreFactory dataStoreFactory,
   }
 
   @SuppressWarnings("Convert2MethodRef")
-  @Override public Observable<List<User>> getUsers() {
+  @Override public Observable<List<User>> users() {
     //we always get all users from the cloud
     final UserDataStore userDataStore = this.userDataStoreFactory.createCloudDataStore();
-    return userDataStore.getUserEntityList()
+    return userDataStore.userEntityList()
         .map(userEntities -> this.userEntityDataMapper.transform(userEntities));
   }
 
   @SuppressWarnings("Convert2MethodRef")
-  @Override public Observable<User> getUser(int userId) {
+  @Override public Observable<User> user(int userId) {
     final UserDataStore userDataStore = this.userDataStoreFactory.create(userId);
-    return userDataStore.getUserEntityDetails(userId)
+    return userDataStore.userEntityDetails(userId)
         .map(userEntity -> this.userEntityDataMapper.transform(userEntity));
   }
 }

data/src/main/java/com/fernandocejas/android10/sample/data/repository/datasource/CloudUserDataStore.java

@@ -48,12 +48,12 @@ public CloudUserDataStore(RestApi restApi, UserCache userCache) {
     this.userCache = userCache;
   }
 
-  @Override public Observable<List<UserEntity>> getUserEntityList() {
-    return this.restApi.getUserEntityList();
+  @Override public Observable<List<UserEntity>> userEntityList() {
+    return this.restApi.userEntityList();
   }
 
-  @Override public Observable<UserEntity> getUserEntityDetails(final int userId) {
-    return this.restApi.getUserEntityById(userId)
+  @Override public Observable<UserEntity> userEntityDetails(final int userId) {
+    return this.restApi.userEntityById(userId)
         .doOnNext(saveToCacheAction);
   }
 }

data/src/main/java/com/fernandocejas/android10/sample/data/repository/datasource/DiskUserDataStore.java

@@ -36,12 +36,12 @@ public DiskUserDataStore(UserCache userCache) {
     this.userCache = userCache;
   }
 
-  @Override public Observable<List<UserEntity>> getUserEntityList() {
+  @Override public Observable<List<UserEntity>> userEntityList() {
     //TODO: implement simple cache for storing/retrieving collections of users.
     throw new UnsupportedOperationException("Operation is not available!!!");
   }
 
-  @Override public Observable<UserEntity> getUserEntityDetails(final int userId) {
+  @Override public Observable<UserEntity> userEntityDetails(final int userId) {
      return this.userCache.get(userId);
   }
 }

data/src/main/java/com/fernandocejas/android10/sample/data/repository/datasource/UserDataStore.java

@@ -26,12 +26,12 @@ public interface UserDataStore {
   /**
    * Get an {@link rx.Observable} which will emit a List of {@link UserEntity}.
    */
-  Observable<List<UserEntity>> getUserEntityList();
+  Observable<List<UserEntity>> userEntityList();
 
   /**
    * Get an {@link rx.Observable} which will emit a {@link UserEntity} by its id.
    *
    * @param userId The id to retrieve user data.
    */
-  Observable<UserEntity> getUserEntityDetails(final int userId);
+  Observable<UserEntity> userEntityDetails(final int userId);
 }

data/src/test/java/com/fernandocejas/android10/sample/data/repository/UserDataRepositoryTest.java

@@ -64,21 +64,21 @@ public void setUp() {
   public void testGetUsersHappyCase() {
     List<UserEntity> usersList = new ArrayList<>();
     usersList.add(new UserEntity());
-    given(mockUserDataStore.getUserEntityList()).willReturn(Observable.just(usersList));
+    given(mockUserDataStore.userEntityList()).willReturn(Observable.just(usersList));
 
-    userDataRepository.getUsers();
+    userDataRepository.users();
 
     verify(mockUserDataStoreFactory).createCloudDataStore();
-    verify(mockUserDataStore).getUserEntityList();
+    verify(mockUserDataStore).userEntityList();
   }
 
   @Test
   public void testGetUserHappyCase() {
     UserEntity userEntity = new UserEntity();
-    given(mockUserDataStore.getUserEntityDetails(FAKE_USER_ID)).willReturn(Observable.just(userEntity));
-    userDataRepository.getUser(FAKE_USER_ID);
+    given(mockUserDataStore.userEntityDetails(FAKE_USER_ID)).willReturn(Observable.just(userEntity));
+    userDataRepository.user(FAKE_USER_ID);
 
     verify(mockUserDataStoreFactory).create(FAKE_USER_ID);
-    verify(mockUserDataStore).getUserEntityDetails(FAKE_USER_ID);
+    verify(mockUserDataStore).userEntityDetails(FAKE_USER_ID);
   }
 }

data/src/test/java/com/fernandocejas/android10/sample/data/repository/datasource/CloudUserDataStoreTest.java

@@ -45,18 +45,18 @@ public void setUp() {
 
   @Test
   public void testGetUserEntityListFromApi() {
-    cloudUserDataStore.getUserEntityList();
-    verify(mockRestApi).getUserEntityList();
+    cloudUserDataStore.userEntityList();
+    verify(mockRestApi).userEntityList();
   }
 
   @Test
   public void testGetUserEntityDetailsFromApi() {
     UserEntity fakeUserEntity = new UserEntity();
     Observable<UserEntity> fakeObservable = Observable.just(fakeUserEntity);
-    given(mockRestApi.getUserEntityById(FAKE_USER_ID)).willReturn(fakeObservable);
+    given(mockRestApi.userEntityById(FAKE_USER_ID)).willReturn(fakeObservable);
 
-    cloudUserDataStore.getUserEntityDetails(FAKE_USER_ID);
+    cloudUserDataStore.userEntityDetails(FAKE_USER_ID);
 
-    verify(mockRestApi).getUserEntityById(FAKE_USER_ID);
+    verify(mockRestApi).userEntityById(FAKE_USER_ID);
   }
 }

data/src/test/java/com/fernandocejas/android10/sample/data/repository/datasource/DiskUserDataStoreTest.java

@@ -45,12 +45,12 @@ public void setUp() {
   @Test
   public void testGetUserEntityListUnsupported() {
     expectedException.expect(UnsupportedOperationException.class);
-    diskUserDataStore.getUserEntityList();
+    diskUserDataStore.userEntityList();
   }
 
   @Test
   public void testGetUserEntityDetailesFromCache() {
-    diskUserDataStore.getUserEntityDetails(FAKE_USER_ID);
+    diskUserDataStore.userEntityDetails(FAKE_USER_ID);
     verify(mockUserCache).get(FAKE_USER_ID);
   }
 }

domain/src/main/java/com/fernandocejas/android10/sample/domain/interactor/GetUserDetails.java

@@ -40,6 +40,6 @@ public GetUserDetails(int userId, UserRepository userRepository,
   }
 
   @Override protected Observable buildUseCaseObservable() {
-    return this.userRepository.getUser(this.userId);
+    return this.userRepository.user(this.userId);
   }
 }