Make everything compile in one module. Unit tests passing. Wip.

Author: android10

app/build.gradle

@@ -1,6 +1,16 @@
+buildscript {
+  repositories {
+    mavenCentral()
+  }
+  dependencies {
+    classpath 'me.tatarka:gradle-retrolambda:3.2.3'
+  }
+}
+
 apply plugin: 'com.android.application'
 apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'com.fernandocejas.frodo'
+apply plugin: 'me.tatarka.retrolambda'
 
 frodo {
   enabled = true
@@ -24,8 +34,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_7
-    targetCompatibility JavaVersion.VERSION_1_7
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
   }
 
   packagingOptions {
@@ -65,17 +75,19 @@ android {
 dependencies {
   def presentationDependencies = rootProject.ext.presentationDependencies
   def presentationTestDependencies = rootProject.ext.presentationTestDependencies
+  def dataDependencies = rootProject.ext.dataDependencies
+  def testDependencies = rootProject.ext.dataTestDependencies
   def developmentDependencies = rootProject.ext.developmentDependencies
 
-  compile project(':domain')
-  compile project(':data')
-
   apt presentationDependencies.daggerCompiler
   compile presentationDependencies.dagger
+  compile dataDependencies.okHttp
+  compile dataDependencies.gson
   compile presentationDependencies.butterKnife
   compile presentationDependencies.recyclerView
   compile presentationDependencies.rxJava
   compile presentationDependencies.rxAndroid
+  compile dataDependencies.androidAnnotations
   provided presentationDependencies.javaxAnnotation
 
   androidTestCompile presentationTestDependencies.mockito
@@ -84,6 +96,11 @@ dependencies {
   androidTestCompile presentationTestDependencies.espresso
   androidTestCompile presentationTestDependencies.testingSupportLib
 
+  testCompile testDependencies.junit
+  testCompile testDependencies.assertj
+  testCompile testDependencies.mockito
+  testCompile testDependencies.robolectric
+
   //Development
   compile developmentDependencies.leakCanary
 }

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.data.exception.NetworkConnectionException;
-import com.fernandocejas.android10.sample.data.exception.UserNotFoundException;
+import com.fernandocejas.android10.sample.app.data.exception.NetworkConnectionException;
+import com.fernandocejas.android10.sample.app.data.exception.UserNotFoundException;
 import com.fernandocejas.android10.sample.app.R;
 import com.fernandocejas.android10.sample.app.exception.ErrorMessageFactory;
 

app/src/androidTest/java/com/fernandocejas/android10/sample/test/mapper/UserModelDataMapperTest.java

@@ -15,9 +15,9 @@
  */
 package com.fernandocejas.android10.sample.test.mapper;
 
-import com.fernandocejas.android10.sample.domain.User;
-import com.fernandocejas.android10.sample.app.mapper.UserModelDataMapper;
-import com.fernandocejas.android10.sample.app.model.UserModel;
+import com.fernandocejas.android10.sample.app.users.User;
+import com.fernandocejas.android10.sample.app.users.UserModelDataMapper;
+import com.fernandocejas.android10.sample.app.users.UserModel;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

app/src/androidTest/java/com/fernandocejas/android10/sample/test/presenter/UserDetailsPresenterTest.java

@@ -17,10 +17,10 @@
 
 import android.content.Context;
 import android.test.AndroidTestCase;
-import com.fernandocejas.android10.sample.domain.interactor.GetUserDetails;
-import com.fernandocejas.android10.sample.app.mapper.UserModelDataMapper;
-import com.fernandocejas.android10.sample.app.presenter.UserDetailsPresenter;
-import com.fernandocejas.android10.sample.app.view.UserDetailsView;
+import com.fernandocejas.android10.sample.app.users.GetUserDetails;
+import com.fernandocejas.android10.sample.app.users.UserModelDataMapper;
+import com.fernandocejas.android10.sample.app.users.UserDetailsPresenter;
+import com.fernandocejas.android10.sample.app.users.UserDetailsView;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import rx.Subscriber;

app/src/androidTest/java/com/fernandocejas/android10/sample/test/presenter/UserListPresenterTest.java

@@ -17,10 +17,10 @@
 
 import android.content.Context;
 import android.test.AndroidTestCase;
-import com.fernandocejas.android10.sample.domain.interactor.GetUserList;
-import com.fernandocejas.android10.sample.app.mapper.UserModelDataMapper;
-import com.fernandocejas.android10.sample.app.presenter.UserListPresenter;
-import com.fernandocejas.android10.sample.app.view.UserListView;
+import com.fernandocejas.android10.sample.app.users.GetUserList;
+import com.fernandocejas.android10.sample.app.users.UserModelDataMapper;
+import com.fernandocejas.android10.sample.app.users.UserListPresenter;
+import com.fernandocejas.android10.sample.app.users.UserListView;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import rx.Subscriber;

app/src/androidTest/java/com/fernandocejas/android10/sample/test/view/activity/UserDetailsActivityTest.java

@@ -19,7 +19,7 @@
 import android.content.Intent;
 import android.test.ActivityInstrumentationTestCase2;
 import com.fernandocejas.android10.sample.app.R;
-import com.fernandocejas.android10.sample.app.view.activity.UserDetailsActivity;
+import com.fernandocejas.android10.sample.app.users.UserDetailsActivity;
 
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;

app/src/androidTest/java/com/fernandocejas/android10/sample/test/view/activity/UserListActivityTest.java

@@ -19,7 +19,7 @@
 import android.content.Intent;
 import android.test.ActivityInstrumentationTestCase2;
 import com.fernandocejas.android10.sample.app.R;
-import com.fernandocejas.android10.sample.app.view.activity.UserListActivity;
+import com.fernandocejas.android10.sample.app.users.UserListActivity;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
       android:theme="@style/AppTheme">
 
     <activity
-        android:name="com.fernandocejas.android10.sample.app.view.activity.MainActivity"
+        android:name=".core.view.activity.MainActivity"
         android:label="@string/app_name">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -22,12 +22,12 @@
     </activity>
 
     <activity
-        android:name="com.fernandocejas.android10.sample.app.view.activity.UserListActivity"
+        android:name=".users.UserListActivity"
         android:label="@string/activity_title_user_list">
     </activity>
 
     <activity
-        android:name="com.fernandocejas.android10.sample.app.view.activity.UserDetailsActivity"
+        android:name=".users.UserDetailsActivity"
         android:label="@string/activity_title_user_details">
     </activity>
   </application>

app/src/main/java/com/fernandocejas/android10/sample/app/AndroidApplication.java

@@ -16,9 +16,9 @@
 package com.fernandocejas.android10.sample.app;
 
 import android.app.Application;
-import com.fernandocejas.android10.sample.app.internal.di.components.ApplicationComponent;
-import com.fernandocejas.android10.sample.app.internal.di.components.DaggerApplicationComponent;
-import com.fernandocejas.android10.sample.app.internal.di.modules.ApplicationModule;
+import com.fernandocejas.android10.sample.app.core.di.components.ApplicationComponent;
+import com.fernandocejas.android10.sample.app.core.di.components.DaggerApplicationComponent;
+import com.fernandocejas.android10.sample.app.core.di.modules.ApplicationModule;
 import com.squareup.leakcanary.LeakCanary;
 
 /**

app/src/main/java/com/fernandocejas/android10/sample/app/internal/di/HasComponent.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/di/HasComponent.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.internal.di;
+package com.fernandocejas.android10.sample.app.core.di;
 
 /**
  * Interface representing a contract for clients that contains a component for dependency injection.

app/src/main/java/com/fernandocejas/android10/sample/app/internal/di/PerActivity.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/di/PerActivity.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.internal.di;
+package com.fernandocejas.android10.sample.app.core.di;
 
 import java.lang.annotation.Retention;
 import javax.inject.Scope;

app/src/main/java/com/fernandocejas/android10/sample/app/internal/di/components/ActivityComponent.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/di/components/ActivityComponent.java

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.internal.di.components;
+package com.fernandocejas.android10.sample.app.core.di.components;
 
 import android.app.Activity;
-import com.fernandocejas.android10.sample.app.internal.di.PerActivity;
-import com.fernandocejas.android10.sample.app.internal.di.modules.ActivityModule;
+import com.fernandocejas.android10.sample.app.core.di.PerActivity;
+import com.fernandocejas.android10.sample.app.core.di.modules.ActivityModule;
 import dagger.Component;
 
 /**
  * A base component upon which fragment's components may depend.
  * Activity-level components should extend this component.
  *
  * Subtypes of ActivityComponent should be decorated with annotation:
- * {@link com.fernandocejas.android10.sample.app.internal.di.PerActivity}
+ * {@link PerActivity}
  */
 @PerActivity
 @Component(dependencies = ApplicationComponent.class, modules = ActivityModule.class)

app/src/main/java/com/fernandocejas/android10/sample/app/internal/di/components/ApplicationComponent.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/di/components/ApplicationComponent.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.internal.di.components;
+package com.fernandocejas.android10.sample.app.core.di.components;
 
 import android.content.Context;
-import com.fernandocejas.android10.sample.domain.executor.PostExecutionThread;
-import com.fernandocejas.android10.sample.domain.executor.ThreadExecutor;
-import com.fernandocejas.android10.sample.domain.repository.UserRepository;
-import com.fernandocejas.android10.sample.app.internal.di.modules.ApplicationModule;
-import com.fernandocejas.android10.sample.app.view.activity.BaseActivity;
+import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
+import com.fernandocejas.android10.sample.app.data.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;
 import dagger.Component;
 import javax.inject.Singleton;
 

app/src/main/java/com/fernandocejas/android10/sample/app/internal/di/components/UserComponent.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/di/components/UserComponent.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.internal.di.components;
+package com.fernandocejas.android10.sample.app.core.di.components;
 
-import com.fernandocejas.android10.sample.app.internal.di.PerActivity;
-import com.fernandocejas.android10.sample.app.internal.di.modules.ActivityModule;
-import com.fernandocejas.android10.sample.app.internal.di.modules.UserModule;
-import com.fernandocejas.android10.sample.app.view.fragment.UserDetailsFragment;
-import com.fernandocejas.android10.sample.app.view.fragment.UserListFragment;
+import com.fernandocejas.android10.sample.app.core.di.PerActivity;
+import com.fernandocejas.android10.sample.app.core.di.modules.ActivityModule;
+import com.fernandocejas.android10.sample.app.core.di.modules.UserModule;
+import com.fernandocejas.android10.sample.app.users.UserDetailsFragment;
+import com.fernandocejas.android10.sample.app.users.UserListFragment;
 import dagger.Component;
 
 /**
- * A scope {@link com.fernandocejas.android10.sample.app.internal.di.PerActivity} component.
+ * A scope {@link PerActivity} component.
  * Injects user specific Fragments.
  */
 @PerActivity

app/src/main/java/com/fernandocejas/android10/sample/app/internal/di/modules/ActivityModule.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/di/modules/ActivityModule.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.internal.di.modules;
+package com.fernandocejas.android10.sample.app.core.di.modules;
 
 import android.app.Activity;
-import com.fernandocejas.android10.sample.app.internal.di.PerActivity;
+import com.fernandocejas.android10.sample.app.core.di.PerActivity;
 import dagger.Module;
 import dagger.Provides;
 

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

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.internal.di.modules;
+package com.fernandocejas.android10.sample.app.core.di.modules;
 
 import android.content.Context;
-import com.fernandocejas.android10.sample.data.cache.UserCache;
-import com.fernandocejas.android10.sample.data.cache.UserCacheImpl;
-import com.fernandocejas.android10.sample.data.executor.JobExecutor;
-import com.fernandocejas.android10.sample.data.repository.UserDataRepository;
-import com.fernandocejas.android10.sample.domain.executor.PostExecutionThread;
-import com.fernandocejas.android10.sample.domain.executor.ThreadExecutor;
-import com.fernandocejas.android10.sample.domain.repository.UserRepository;
+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.core.executor.PostExecutionThread;
+import com.fernandocejas.android10.sample.app.data.executor.ThreadExecutor;
+import com.fernandocejas.android10.sample.app.users.UserRepository;
 import com.fernandocejas.android10.sample.app.AndroidApplication;
-import com.fernandocejas.android10.sample.app.UIThread;
+import com.fernandocejas.android10.sample.app.core.executor.UIThread;
 import dagger.Module;
 import dagger.Provides;
 import javax.inject.Singleton;

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

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.internal.di.modules;
+package com.fernandocejas.android10.sample.app.core.di.modules;
 
-import com.fernandocejas.android10.sample.domain.executor.PostExecutionThread;
-import com.fernandocejas.android10.sample.domain.executor.ThreadExecutor;
-import com.fernandocejas.android10.sample.domain.interactor.GetUserDetails;
-import com.fernandocejas.android10.sample.domain.interactor.GetUserList;
-import com.fernandocejas.android10.sample.domain.interactor.UseCase;
-import com.fernandocejas.android10.sample.domain.repository.UserRepository;
-import com.fernandocejas.android10.sample.app.internal.di.PerActivity;
+import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
+import com.fernandocejas.android10.sample.app.data.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;
+import com.fernandocejas.android10.sample.app.users.UserRepository;
+import com.fernandocejas.android10.sample.app.core.di.PerActivity;
 import dagger.Module;
 import dagger.Provides;
 import javax.inject.Named;

domain/src/main/java/com/fernandocejas/android10/sample/domain/executor/PostExecutionThread.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/executor/PostExecutionThread.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.domain.executor;
+package com.fernandocejas.android10.sample.app.core.executor;
 
 import rx.Scheduler;
 

app/src/main/java/com/fernandocejas/android10/sample/app/UIThread.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/executor/UIThread.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;
+package com.fernandocejas.android10.sample.app.core.executor;
 
-import com.fernandocejas.android10.sample.domain.executor.PostExecutionThread;
+import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import rx.Scheduler;

domain/src/main/java/com/fernandocejas/android10/sample/domain/interactor/DefaultSubscriber.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/interactor/DefaultSubscriber.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.domain.interactor;
+package com.fernandocejas.android10.sample.app.core.interactor;
 
 /**
  * Default subscriber base class to be used whenever you want default error handling.

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

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.domain.interactor;
+package com.fernandocejas.android10.sample.app.core.interactor;
 
-import com.fernandocejas.android10.sample.domain.executor.PostExecutionThread;
-import com.fernandocejas.android10.sample.domain.executor.ThreadExecutor;
-import rx.Subscriber;
+import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
+import com.fernandocejas.android10.sample.app.data.executor.ThreadExecutor;
 import rx.Observable;
+import rx.Subscriber;
 import rx.Subscription;
 import rx.schedulers.Schedulers;
 import rx.subscriptions.Subscriptions;

app/src/main/java/com/fernandocejas/android10/sample/app/presenter/Presenter.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/presenter/Presenter.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.presenter;
+package com.fernandocejas.android10.sample.app.core.presenter;
 
 /**
  * Interface representing a Presenter in a model view presenter (MVP) pattern.