Reorganize data layer classes.

Author: android10

app/src/androidTest/java/com/fernandocejas/android10/sample/test/exception/ErrorMessageFactoryTest.java

@@ -16,8 +16,8 @@
 package com.fernandocejas.android10.sample.test.exception;
 
 import android.test.AndroidTestCase;
-import com.fernandocejas.android10.sample.app.data.exception.NetworkConnectionException;
-import com.fernandocejas.android10.sample.app.data.exception.UserNotFoundException;
+import com.fernandocejas.android10.sample.app.exception.NetworkConnectionException;
+import com.fernandocejas.android10.sample.app.users.UserNotFoundException;
 import com.fernandocejas.android10.sample.app.R;
 import com.fernandocejas.android10.sample.app.exception.ErrorMessageFactory;
 

app/src/main/java/com/fernandocejas/android10/sample/app/core/di/components/ApplicationComponent.java

@@ -17,7 +17,7 @@
 
 import android.content.Context;
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
-import com.fernandocejas.android10.sample.app.data.executor.ThreadExecutor;
+import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
 import com.fernandocejas.android10.sample.app.users.UserRepository;
 import com.fernandocejas.android10.sample.app.core.di.modules.ApplicationModule;
 import com.fernandocejas.android10.sample.app.core.view.activity.BaseActivity;

app/src/main/java/com/fernandocejas/android10/sample/app/core/di/modules/ApplicationModule.java

@@ -16,12 +16,12 @@
 package com.fernandocejas.android10.sample.app.core.di.modules;
 
 import android.content.Context;
-import com.fernandocejas.android10.sample.app.data.cache.UserCache;
-import com.fernandocejas.android10.sample.app.data.cache.UserCacheImpl;
-import com.fernandocejas.android10.sample.app.data.executor.JobExecutor;
-import com.fernandocejas.android10.sample.app.data.repository.UserDataRepository;
+import com.fernandocejas.android10.sample.app.users.cache.UserCache;
+import com.fernandocejas.android10.sample.app.users.cache.UserCacheImpl;
+import com.fernandocejas.android10.sample.app.core.executor.JobExecutor;
+import com.fernandocejas.android10.sample.app.users.UserDataRepository;
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
-import com.fernandocejas.android10.sample.app.data.executor.ThreadExecutor;
+import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
 import com.fernandocejas.android10.sample.app.users.UserRepository;
 import com.fernandocejas.android10.sample.app.AndroidApplication;
 import com.fernandocejas.android10.sample.app.core.executor.UIThread;

app/src/main/java/com/fernandocejas/android10/sample/app/core/di/modules/UserModule.java

@@ -16,7 +16,7 @@
 package com.fernandocejas.android10.sample.app.core.di.modules;
 
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
-import com.fernandocejas.android10.sample.app.data.executor.ThreadExecutor;
+import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
 import com.fernandocejas.android10.sample.app.users.GetUserDetails;
 import com.fernandocejas.android10.sample.app.users.GetUserList;
 import com.fernandocejas.android10.sample.app.core.interactor.UseCase;

app/src/main/java/com/fernandocejas/android10/sample/app/data/executor/JobExecutor.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/executor/JobExecutor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.executor;
+package com.fernandocejas.android10.sample.app.core.executor;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;

app/src/main/java/com/fernandocejas/android10/sample/app/data/executor/ThreadExecutor.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/executor/ThreadExecutor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.executor;
+package com.fernandocejas.android10.sample.app.core.executor;
 
 import java.util.concurrent.Executor;
 

app/src/main/java/com/fernandocejas/android10/sample/app/core/interactor/UseCase.java

@@ -16,7 +16,7 @@
 package com.fernandocejas.android10.sample.app.core.interactor;
 
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
-import com.fernandocejas.android10.sample.app.data.executor.ThreadExecutor;
+import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
 import rx.Observable;
 import rx.Subscriber;
 import rx.Subscription;

app/src/main/java/com/fernandocejas/android10/sample/app/data/net/ApiConnection.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/data/ApiConnection.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.net;
+package com.fernandocejas.android10.sample.app.data;
 
 import android.support.annotation.Nullable;
 import com.squareup.okhttp.OkHttpClient;

app/src/main/java/com/fernandocejas/android10/sample/app/data/cache/FileManager.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/data/FileManager.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.cache;
+package com.fernandocejas.android10.sample.app.data;
 
 import android.content.Context;
 import android.content.SharedPreferences;

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

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.net;
+package com.fernandocejas.android10.sample.app.data;
 
-import com.fernandocejas.android10.sample.app.data.entity.UserEntity;
+import com.fernandocejas.android10.sample.app.users.UserEntity;
 import java.util.List;
 import rx.Observable;
 

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

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.net;
+package com.fernandocejas.android10.sample.app.data;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import com.fernandocejas.android10.sample.app.data.entity.UserEntity;
-import com.fernandocejas.android10.sample.app.data.exception.NetworkConnectionException;
-import com.fernandocejas.android10.sample.app.data.mapper.UserEntityJsonMapper;
+import com.fernandocejas.android10.sample.app.users.UserEntity;
+import com.fernandocejas.android10.sample.app.exception.NetworkConnectionException;
+import com.fernandocejas.android10.sample.app.users.UserEntityJsonMapper;
 import com.fernandocejas.frodo.annotation.RxLogObservable;
 import java.net.MalformedURLException;
 import java.util.List;
@@ -92,11 +92,11 @@ public RestApiImpl(Context context, UserEntityJsonMapper userEntityJsonMapper) {
   }
 
   private String getUserEntitiesFromApi() throws MalformedURLException {
-    return ApiConnection.createGET(RestApi.API_URL_GET_USER_LIST).requestSyncCall();
+    return ApiConnection.createGET(API_URL_GET_USER_LIST).requestSyncCall();
   }
 
   private String getUserDetailsFromApi(int userId) throws MalformedURLException {
-    String apiUrl = RestApi.API_URL_GET_USER_DETAILS + userId + ".json";
+    String apiUrl = API_URL_GET_USER_DETAILS + userId + ".json";
     return ApiConnection.createGET(apiUrl).requestSyncCall();
   }
 

app/src/main/java/com/fernandocejas/android10/sample/app/exception/ErrorMessageFactory.java

@@ -17,8 +17,7 @@
 
 import android.content.Context;
 import com.fernandocejas.android10.sample.app.R;
-import com.fernandocejas.android10.sample.app.data.exception.NetworkConnectionException;
-import com.fernandocejas.android10.sample.app.data.exception.UserNotFoundException;
+import com.fernandocejas.android10.sample.app.users.UserNotFoundException;
 
 /**
  * Factory used to create error messages from an Exception as a condition.

app/src/main/java/com/fernandocejas/android10/sample/app/data/exception/NetworkConnectionException.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/exception/NetworkConnectionException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.exception;
+package com.fernandocejas.android10.sample.app.exception;
 
 /**
  * Exception throw by the application when a there is a network connection exception.

app/src/main/java/com/fernandocejas/android10/sample/app/data/exception/RepositoryErrorBundle.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/exception/RepositoryErrorBundle.java

@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.exception;
-
-import com.fernandocejas.android10.sample.app.exception.ErrorBundle;
+package com.fernandocejas.android10.sample.app.exception;
 
 /**
  * Wrapper around Exceptions used to manage errors in the repository.

app/src/main/java/com/fernandocejas/android10/sample/app/data/repository/datasource/CloudUserDataStore.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/CloudUserDataStore.java

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.repository.datasource;
+package com.fernandocejas.android10.sample.app.users;
 
-import com.fernandocejas.android10.sample.app.data.cache.UserCache;
-import com.fernandocejas.android10.sample.app.data.entity.UserEntity;
-import com.fernandocejas.android10.sample.app.data.net.RestApi;
+import com.fernandocejas.android10.sample.app.users.cache.UserCache;
+import com.fernandocejas.android10.sample.app.data.RestApi;
 import java.util.List;
 import rx.Observable;
 import rx.functions.Action1;

app/src/main/java/com/fernandocejas/android10/sample/app/data/repository/datasource/DiskUserDataStore.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/DiskUserDataStore.java

@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.repository.datasource;
+package com.fernandocejas.android10.sample.app.users;
 
-import com.fernandocejas.android10.sample.app.data.cache.UserCache;
-import com.fernandocejas.android10.sample.app.data.entity.UserEntity;
+import com.fernandocejas.android10.sample.app.users.cache.UserCache;
 import java.util.List;
 import rx.Observable;
 

app/src/main/java/com/fernandocejas/android10/sample/app/users/GetUserDetails.java

@@ -16,7 +16,7 @@
 package com.fernandocejas.android10.sample.app.users;
 
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
-import com.fernandocejas.android10.sample.app.data.executor.ThreadExecutor;
+import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
 import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
 import javax.inject.Inject;
 import rx.Observable;

app/src/main/java/com/fernandocejas/android10/sample/app/users/GetUserList.java

@@ -16,7 +16,7 @@
 package com.fernandocejas.android10.sample.app.users;
 
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
-import com.fernandocejas.android10.sample.app.data.executor.ThreadExecutor;
+import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
 import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
 import javax.inject.Inject;
 import rx.Observable;

app/src/main/java/com/fernandocejas/android10/sample/app/data/repository/UserDataRepository.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDataRepository.java

@@ -13,13 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.repository;
+package com.fernandocejas.android10.sample.app.users;
 
-import com.fernandocejas.android10.sample.app.data.mapper.UserEntityDataMapper;
-import com.fernandocejas.android10.sample.app.data.repository.datasource.UserDataStore;
-import com.fernandocejas.android10.sample.app.data.repository.datasource.UserDataStoreFactory;
-import com.fernandocejas.android10.sample.app.users.User;
-import com.fernandocejas.android10.sample.app.users.UserRepository;
 import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;

app/src/main/java/com/fernandocejas/android10/sample/app/data/repository/datasource/UserDataStore.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDataStore.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.repository.datasource;
+package com.fernandocejas.android10.sample.app.users;
 
-import com.fernandocejas.android10.sample.app.data.entity.UserEntity;
+import com.fernandocejas.android10.sample.app.users.UserEntity;
 import java.util.List;
 import rx.Observable;
 

app/src/main/java/com/fernandocejas/android10/sample/app/data/repository/datasource/UserDataStoreFactory.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDataStoreFactory.java

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.repository.datasource;
+package com.fernandocejas.android10.sample.app.users;
 
 import android.content.Context;
-import com.fernandocejas.android10.sample.app.data.cache.UserCache;
-import com.fernandocejas.android10.sample.app.data.mapper.UserEntityJsonMapper;
-import com.fernandocejas.android10.sample.app.data.net.RestApi;
-import com.fernandocejas.android10.sample.app.data.net.RestApiImpl;
+import com.fernandocejas.android10.sample.app.users.cache.UserCache;
+import com.fernandocejas.android10.sample.app.data.RestApi;
+import com.fernandocejas.android10.sample.app.data.RestApiImpl;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 

app/src/main/java/com/fernandocejas/android10/sample/app/data/entity/UserEntity.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/UserEntity.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.entity;
+package com.fernandocejas.android10.sample.app.users;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/fernandocejas/android10/sample/app/data/mapper/UserEntityDataMapper.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/UserEntityDataMapper.java

@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.mapper;
+package com.fernandocejas.android10.sample.app.users;
 
-import com.fernandocejas.android10.sample.app.data.entity.UserEntity;
-import com.fernandocejas.android10.sample.app.users.User;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

app/src/main/java/com/fernandocejas/android10/sample/app/data/mapper/UserEntityJsonMapper.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/UserEntityJsonMapper.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.mapper;
+package com.fernandocejas.android10.sample.app.users;
 
-import com.fernandocejas.android10.sample.app.data.entity.UserEntity;
+import com.fernandocejas.android10.sample.app.users.UserEntity;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;

app/src/main/java/com/fernandocejas/android10/sample/app/data/exception/UserNotFoundException.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/UserNotFoundException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.exception;
+package com.fernandocejas.android10.sample.app.users;
 
 /**
  * Exception throw by the application when a User search can't return a valid result.

app/src/main/java/com/fernandocejas/android10/sample/app/data/cache/UserCache.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/cache/UserCache.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.cache;
+package com.fernandocejas.android10.sample.app.users.cache;
 
-import com.fernandocejas.android10.sample.app.data.entity.UserEntity;
+import com.fernandocejas.android10.sample.app.users.UserEntity;
 import rx.Observable;
 
 /**

app/src/main/java/com/fernandocejas/android10/sample/app/data/cache/UserCacheImpl.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/cache/UserCacheImpl.java

@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.cache;
+package com.fernandocejas.android10.sample.app.users.cache;
 
 import android.content.Context;
-import com.fernandocejas.android10.sample.app.data.cache.serializer.JsonSerializer;
-import com.fernandocejas.android10.sample.app.data.entity.UserEntity;
-import com.fernandocejas.android10.sample.app.data.exception.UserNotFoundException;
-import com.fernandocejas.android10.sample.app.data.executor.ThreadExecutor;
+import com.fernandocejas.android10.sample.app.data.FileManager;
+import com.fernandocejas.android10.sample.app.users.cache.serializer.JsonSerializer;
+import com.fernandocejas.android10.sample.app.users.UserEntity;
+import com.fernandocejas.android10.sample.app.users.UserNotFoundException;
+import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
 import java.io.File;
 import javax.inject.Inject;
 import javax.inject.Singleton;

app/src/main/java/com/fernandocejas/android10/sample/app/data/cache/serializer/JsonSerializer.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/cache/serializer/JsonSerializer.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.cache.serializer;
+package com.fernandocejas.android10.sample.app.users.cache.serializer;
 
-import com.fernandocejas.android10.sample.app.data.entity.UserEntity;
+import com.fernandocejas.android10.sample.app.users.UserEntity;
 import com.google.gson.Gson;
 import javax.inject.Inject;
 import javax.inject.Singleton;

app/src/test/java/com/fernandocejas/android10/sample/app/ApplicationTestCase.java

@@ -24,5 +24,5 @@
  * Inherit from this class to create a test.
  */
 @RunWith(RobolectricGradleTestRunner.class)
-@Config(constants = BuildConfig.class, application = ApplicationStub.class)
+@Config(constants = BuildConfig.class, application = ApplicationStub.class, sdk = 21)
 public abstract class ApplicationTestCase {}

app/src/test/java/com/fernandocejas/android10/sample/app/data/exception/RepositoryErrorBundleTest.java renamed to app/src/test/java/com/fernandocejas/android10/sample/app/exception/RepositoryErrorBundleTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.exception;
+package com.fernandocejas.android10.sample.app.exception;
 
 import com.fernandocejas.android10.sample.app.ApplicationTestCase;
 import org.junit.Before;

app/src/test/java/com/fernandocejas/android10/sample/app/interactor/UseCaseTest.java

@@ -16,7 +16,7 @@
 package com.fernandocejas.android10.sample.app.interactor;
 
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
-import com.fernandocejas.android10.sample.app.data.executor.ThreadExecutor;
+import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
 import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
 import org.junit.Before;
 import org.junit.Test;

app/src/test/java/com/fernandocejas/android10/sample/app/data/repository/datasource/CloudUserDataStoreTest.java renamed to app/src/test/java/com/fernandocejas/android10/sample/app/users/CloudUserDataStoreTest.java

@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.repository.datasource;
+package com.fernandocejas.android10.sample.app.users;
 
 import com.fernandocejas.android10.sample.app.ApplicationTestCase;
-import com.fernandocejas.android10.sample.app.data.cache.UserCache;
-import com.fernandocejas.android10.sample.app.data.entity.UserEntity;
-import com.fernandocejas.android10.sample.app.data.net.RestApi;
+import com.fernandocejas.android10.sample.app.data.RestApi;
+import com.fernandocejas.android10.sample.app.users.cache.UserCache;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;

app/src/test/java/com/fernandocejas/android10/sample/app/data/repository/datasource/DiskUserDataStoreTest.java renamed to app/src/test/java/com/fernandocejas/android10/sample/app/users/DiskUserDataStoreTest.java

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.data.repository.datasource;
+package com.fernandocejas.android10.sample.app.users;
 
 import com.fernandocejas.android10.sample.app.ApplicationTestCase;
-import com.fernandocejas.android10.sample.app.data.cache.UserCache;
+import com.fernandocejas.android10.sample.app.users.cache.UserCache;
+import com.fernandocejas.android10.sample.app.users.DiskUserDataStore;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;