Commit bfacb00

authored

Merge pull request #155 from rashiq/master

Some little things

2 parents 1809185 + 7f7c1b4 commit bfacb00Copy full SHA for bfacb00

File tree

+10

-16

lines changed

data/src/main/java/com/fernandocejas/android10/sample/data
- cache
  - UserCacheImpl.java
- repository
  - UserDataRepository.java
  - datasource
    - UserDataStoreFactory.java
domain/src/main/java/com/fernandocejas/android10/sample/domain/interactor
- UseCase.java
presentation/src/main/java/com/fernandocejas/android10/sample/presentation/view/activity
- BaseActivity.java

+10

-16

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,10 @@ public UserCacheImpl(Context context, JsonSerializer userCacheSerializer,`
`80`	`80`
`81`	`81`	`@Override public void put(UserEntity userEntity) {`
`82`	`82`	`if (userEntity != null) {`
`83`		`- File userEntitiyFile = this.buildFile(userEntity.getUserId());`
	`83`	`+ File userEntityFile = this.buildFile(userEntity.getUserId());`
`84`	`84`	`if (!isCached(userEntity.getUserId())) {`
`85`	`85`	`String jsonString = this.serializer.serialize(userEntity);`
`86`		`- this.executeAsynchronously(new CacheWriter(this.fileManager, userEntitiyFile,`
	`86`	`+ this.executeAsynchronously(new CacheWriter(this.fileManager, userEntityFile,`
`87`	`87`	`jsonString));`
`88`	`88`	`setLastCacheUpdateTimeMillis();`
`89`	`89`	`}`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,18 +47,14 @@ public UserDataRepository(UserDataStoreFactory dataStoreFactory,`
`47`	`47`	`this.userEntityDataMapper = userEntityDataMapper;`
`48`	`48`	`}`
`49`	`49`
`50`		`- @SuppressWarnings("Convert2MethodRef")`
`51`	`50`	`@Override public Observable<List<User>> users() {`
`52`	`51`	`//we always get all users from the cloud`
`53`	`52`	`final UserDataStore userDataStore = this.userDataStoreFactory.createCloudDataStore();`
`54`		`- return userDataStore.userEntityList()`
`55`		`- .map(userEntities -> this.userEntityDataMapper.transform(userEntities));`
	`53`	`+ return userDataStore.userEntityList().map(this.userEntityDataMapper::transform);`
`56`	`54`	`}`
`57`	`55`
`58`		`- @SuppressWarnings("Convert2MethodRef")`
`59`	`56`	`@Override public Observable<User> user(int userId) {`
`60`	`57`	`final UserDataStore userDataStore = this.userDataStoreFactory.create(userId);`
`61`		`- return userDataStore.userEntityDetails(userId)`
`62`		`- .map(userEntity -> this.userEntityDataMapper.transform(userEntity));`
	`58`	`+ return userDataStore.userEntityDetails(userId).map(this.userEntityDataMapper::transform);`
`63`	`59`	`}`
`64`	`60`	`}`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`package com.fernandocejas.android10.sample.data.repository.datasource;`
`17`	`17`
`18`	`18`	`import android.content.Context;`
	`19`	`+import android.support.annotation.NonNull;`
`19`	`20`	`import com.fernandocejas.android10.sample.data.cache.UserCache;`
`20`	`21`	`import com.fernandocejas.android10.sample.data.entity.mapper.UserEntityJsonMapper;`
`21`	`22`	`import com.fernandocejas.android10.sample.data.net.RestApi;`
`@@ -33,10 +34,7 @@ public class UserDataStoreFactory {`
`33`	`34`	`private final UserCache userCache;`
`34`	`35`
`35`	`36`	`@Inject`
`36`		`- public UserDataStoreFactory(Context context, UserCache userCache) {`
`37`		`- if (context == null \|\| userCache == null) {`
`38`		`- throw new IllegalArgumentException("Constructor parameters cannot be null!!!");`
`39`		`- }`
	`37`	`+ public UserDataStoreFactory(@NonNull Context context, @NonNull UserCache userCache) {`
`40`	`38`	`this.context = context.getApplicationContext();`
`41`	`39`	`this.userCache = userCache;`
`42`	`40`	`}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,15 +52,15 @@ protected UseCase(ThreadExecutor threadExecutor,`
`52`	`52`	`/**`
`53`	`53`	`* Executes the current use case.`
`54`	`54`	`*`
`55`		`- * @param UseCaseSubscriber The guy who will be listen to the observable build`
	`55`	`+ * @param useCaseSubscriber The guy who will be listen to the observable build`
`56`	`56`	`* with {@link #buildUseCaseObservable()}.`
`57`	`57`	`*/`
`58`	`58`	`@SuppressWarnings("unchecked")`
`59`		`- public void execute(Subscriber UseCaseSubscriber) {`
	`59`	`+ public void execute(Subscriber useCaseSubscriber) {`
`60`	`60`	`this.subscription = this.buildUseCaseObservable()`
`61`	`61`	`.subscribeOn(Schedulers.from(threadExecutor))`
`62`	`62`	`.observeOn(postExecutionThread.getScheduler())`
`63`		`- .subscribe(UseCaseSubscriber);`
	`63`	`+ .subscribe(useCaseSubscriber);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/**`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ protected void addFragment(int containerViewId, Fragment fragment) {`
`41`	`41`	`* @return {@link com.fernandocejas.android10.sample.presentation.internal.di.components.ApplicationComponent}`
`42`	`42`	`*/`
`43`	`43`	`protected ApplicationComponent getApplicationComponent() {`
`44`		`- return ((AndroidApplication)getApplication()).getApplicationComponent();`
	`44`	`+ return ((AndroidApplication)getApplication()).getApplicationComponent();`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`

Comments

(0)