refactor: ♻️ remove ReplaceToVoid

use Replacements.returnVoid() closes #2
ffgiraldez · Apr 9, 2018 · c701640 · c701640
1 parent ddf2ad7
commit c701640
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 30 deletions.
diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/ReplaceToVoid.java b/app/src/main/java/es/ffgiraldez/comicsearch/ReplaceToVoid.java
diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/rx/Replacements.java b/app/src/main/java/es/ffgiraldez/comicsearch/rx/Replacements.java
@@ -0,0 +1,10 @@
+package es.ffgiraldez.comicsearch.rx;
+
+import es.ffgiraldez.comicsearch.ReplaceToVoid;
+import rx.functions.Func1;
+
+public class Replacements {
+    public static Func1<Object, Void> returnVoid() {
+        return new ReplaceToVoid();
+    }
+}
diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/search/presentation/SearchViewModel.java b/app/src/main/java/es/ffgiraldez/comicsearch/search/presentation/SearchViewModel.java
@@ -18,9 +18,9 @@
 
 import java.util.List;
 
-import es.ffgiraldez.comicsearch.ReplaceToVoid;
 import es.ffgiraldez.comicsearch.data.ComicStorage;
 import es.ffgiraldez.comicsearch.model.SearchResult;
+import es.ffgiraldez.comicsearch.rx.Replacements;
 import es.ffgiraldez.comicsearch.search.domain.FetchSearchResultTransformer;
 import rx.Observable;
 
@@ -40,7 +40,7 @@ public void initialize() {
 
         subscribe(Property.RESULTS, fetchResultObservable);
         Observable<List<String>> resultsObservable = observe(Property.RESULTS);
-        updatedResultsObservable = resultsObservable.map(new ReplaceToVoid<List<String>>());
+        updatedResultsObservable = resultsObservable.map(Replacements.returnVoid());
     }
 
     public Observable<Void> didUpdateResults() {

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/sugestion/presentation/SuggestionViewModel.java b/app/src/main/java/es/ffgiraldez/comicsearch/sugestion/presentation/SuggestionViewModel.java
@@ -19,8 +19,8 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import es.ffgiraldez.comicsearch.ReplaceToVoid;
 import es.ffgiraldez.comicsearch.data.ComicStorage;
+import es.ffgiraldez.comicsearch.rx.Replacements;
 import es.ffgiraldez.comicsearch.sugestion.domain.FetchQueryTransformer;
 import rx.Observable;
 
@@ -32,6 +32,7 @@ public class SuggestionViewModel extends ObservableSuggestionViewModel {
     public SuggestionViewModel(ComicStorage comicStorage) {
         this.comicStorage = comicStorage;
     }
+
     @Override
     public void initialize() {
         Observable<String> input = this.<String>observe(Property.QUERY)
@@ -42,7 +43,7 @@ public void initialize() {
         subscribe(Property.SUGGESTIONS, suggestionObservable);
 
         Observable<List<String>> suggestionPropObservable = observe(Property.SUGGESTIONS);
-        updatedSuggestionsObservable = suggestionPropObservable.map(new ReplaceToVoid<List<String>>());
+        updatedSuggestionsObservable = suggestionPropObservable.map(Replacements.returnVoid());
     }
 
     public Observable<Void> didUpdateSuggestion() {