Refactor to use lambdas instead of Rx Func1.

Author: android10

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +15,6 @@
  */
 package com.fernandocejas.android10.sample.data.repository;
 
-import com.fernandocejas.android10.sample.data.entity.UserEntity;
 import com.fernandocejas.android10.sample.data.entity.mapper.UserEntityDataMapper;
 import com.fernandocejas.android10.sample.data.repository.datasource.UserDataStore;
 import com.fernandocejas.android10.sample.data.repository.datasource.UserDataStoreFactory;
@@ -25,7 +24,6 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import rx.Observable;
-import rx.functions.Func1;
 
 /**
  * {@link UserRepository} for retrieving user data.
@@ -36,20 +34,6 @@ public class UserDataRepository implements UserRepository {
   private final UserDataStoreFactory userDataStoreFactory;
   private final UserEntityDataMapper userEntityDataMapper;
 
-  private final Func1<List<UserEntity>, List<User>> userListEntityMapper =
-      new Func1<List<UserEntity>, List<User>>() {
-        @Override public List<User> call(List<UserEntity> userEntities) {
-          return UserDataRepository.this.userEntityDataMapper.transform(userEntities);
-        }
-      };
-
-  private final Func1<UserEntity, User>
-      userDetailsEntityMapper = new Func1<UserEntity, User>() {
-    @Override public User call(UserEntity userEntity) {
-      return UserDataRepository.this.userEntityDataMapper.transform(userEntity);
-    }
-  };
-
   /**
    * Constructs a {@link UserRepository}.
    *
@@ -63,14 +47,18 @@ public UserDataRepository(UserDataStoreFactory dataStoreFactory,
     this.userEntityDataMapper = userEntityDataMapper;
   }
 
+  @SuppressWarnings("Convert2MethodRef")
   @Override public Observable<List<User>> getUsers() {
     //we always get all users from the cloud
     final UserDataStore userDataStore = this.userDataStoreFactory.createCloudDataStore();
-    return userDataStore.getUserEntityList().map(userListEntityMapper);
+    return userDataStore.getUserEntityList()
+        .map(userEntities -> this.userEntityDataMapper.transform(userEntities));
   }
 
+  @SuppressWarnings("Convert2MethodRef")
   @Override public Observable<User> getUser(int userId) {
     final UserDataStore userDataStore = this.userDataStoreFactory.create(userId);
-    return userDataStore.getUserEntityDetails(userId).map(userDetailsEntityMapper);
+    return userDataStore.getUserEntityDetails(userId)
+        .map(userEntity -> this.userEntityDataMapper.transform(userEntity));
   }
 }

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -30,13 +30,12 @@ public class CloudUserDataStore implements UserDataStore {
   private final RestApi restApi;
   private final UserCache userCache;
 
-  private final Action1<UserEntity> saveToCacheAction = new Action1<UserEntity>() {
-    @Override public void call(UserEntity userEntity) {
-      if (userEntity != null) {
-        CloudUserDataStore.this.userCache.put(userEntity);
-      }
-    }
-  };
+  private final Action1<UserEntity> saveToCacheAction =
+      userEntity -> {
+        if (userEntity != null) {
+          CloudUserDataStore.this.userCache.put(userEntity);
+        }
+      };
 
   /**
    * Construct a {@link UserDataStore} based on connections to the api (Cloud).
@@ -54,6 +53,7 @@ public CloudUserDataStore(RestApi restApi, UserCache userCache) {
   }
 
   @Override public Observable<UserEntity> getUserEntityDetails(final int userId) {
-    return this.restApi.getUserEntityById(userId).doOnNext(saveToCacheAction);
+    return this.restApi.getUserEntityById(userId)
+        .doOnNext(saveToCacheAction);
   }
 }