Add constructor collaborators and fix classes scope

Author: android10

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/ActivityObservableConcatVsFlatMapSample.java

@@ -19,14 +19,16 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 import butterknife.ButterKnife;
 import butterknife.InjectView;
 import butterknife.OnClick;
 import com.fernandocejas.android10.rx.sample.R;
 import com.fernandocejas.android10.rx.sample.data.DataManager;
+import com.fernandocejas.android10.rx.sample.data.NumberGenerator;
+import com.fernandocejas.android10.rx.sample.data.RandomStringGenerator;
+import com.fernandocejas.android10.rx.sample.executor.JobExecutor;
 import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
@@ -50,8 +52,6 @@ public class ActivityObservableConcatVsFlatMapSample extends BaseActivity {
  @InjectView(R.id.tv_streamOriginalOrder) TextView tv_streamOriginalOrder;
  @InjectView(R.id.tv_flatMapResult) TextView tv_flatMapResult;
  @InjectView(R.id.tv_concatMapResult) TextView tv_concatMapResult;
- @InjectView(R.id.btn_flatMap) Button btn_flatMap;
- @InjectView(R.id.btn_concatMap) Button btn_concatMap;
 
  private DataManager dataManager;
  private Subscription subscription;
@@ -77,7 +77,8 @@ protected void onDestroy() {
  }
 
  private void initialize() {
- this.dataManager = new DataManager();
+ this.dataManager = new DataManager(new RandomStringGenerator(), new NumberGenerator(),
+ JobExecutor.getInstance());
  this.subscription = Subscriptions.empty();
  }
 
@@ -132,7 +133,7 @@ private void initialize() {
  }
 
  private Observable<Integer> buildNumbersObservable() {
- return this.dataManager.getNumbers();
+ return this.dataManager.numbers();
  }
 
  private void showToast(String message) {
@@ -153,7 +154,7 @@ private void printConcatMapResult(String result) {
 
  private void populateData() {
  StringBuilder stringBuilder = new StringBuilder(15);
- for (int number : dataManager.getNumbersSync()) {
+ for (int number : dataManager.getNumbersSynchronously()) {
  stringBuilder.append(number);
  stringBuilder.append(SEPARATOR);
  }

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/ActivitySubscriberSample.java

@@ -27,6 +27,9 @@
 import com.fernandocejas.android10.rx.sample.R;
 import com.fernandocejas.android10.rx.sample.adapter.ElementsAdapter;
 import com.fernandocejas.android10.rx.sample.data.DataManager;
+import com.fernandocejas.android10.rx.sample.data.NumberGenerator;
+import com.fernandocejas.android10.rx.sample.data.RandomStringGenerator;
+import com.fernandocejas.android10.rx.sample.executor.JobExecutor;
 import rx.Subscription;
 import rx.subscriptions.Subscriptions;
 
@@ -61,18 +64,19 @@ protected void onDestroy() {
 
  private void initialize() {
  this.subscription = Subscriptions.empty();
- this.dataManager = new DataManager();
+ this.dataManager = new DataManager(new RandomStringGenerator(), new NumberGenerator(),
+ JobExecutor.getInstance());
  this.adapter = new ElementsAdapter(this);
  this.rv_elements.setLayoutManager(new LinearLayoutManager(this));
  this.rv_elements.setAdapter(this.adapter);
  }
 
  private void fillData() {
- this.subscription = this.dataManager.getElements().subscribe(this.adapter);
+ this.subscription = this.dataManager.elements().subscribe(this.adapter);
  }
 
  @OnClick(android.R.id.button1) void onAddElementClick() {
- this.subscription = this.dataManager.getNewElement().subscribe(this.adapter);
+ this.subscription = this.dataManager.newElement().subscribe(this.adapter);
  Toast.makeText(this, "Element added using an observable!!!", Toast.LENGTH_SHORT).show();
  }
 }

app/src/main/java/com/fernandocejas/android10/rx/sample/data/DataManager.java

@@ -15,7 +15,6 @@
  */
 package com.fernandocejas.android10.rx.sample.data;
 
-import com.fernandocejas.android10.rx.sample.executor.JobExecutor;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -28,7 +27,9 @@ public class DataManager {
 
  private final List<Integer> numbers;
  private final List<String> elements;
+
  private final RandomStringGenerator randomStringGenerator;
+ private final NumberGenerator numberGenerator;
  private final Executor jobExecutor;
 
  private static final Func1<String, String> RANDOM_ITEM_FUNCTION = new Func1<String, String>() {
@@ -37,32 +38,33 @@ public class DataManager {
  }
  };
 
- public DataManager() {
+ public DataManager(RandomStringGenerator randomStringGenerator, NumberGenerator numberGenerator,
+ Executor jobExecutor) {
  this.numbers = new ArrayList<>(Arrays.asList(2, 3, 4, 5, 6, 7, 8, 9, 10));
  this.elements = new ArrayList<>();
- this.randomStringGenerator = new RandomStringGenerator();
-
+ this.randomStringGenerator = randomStringGenerator;
+ this.numberGenerator = numberGenerator;
+ this.jobExecutor = jobExecutor;
  populateUsernameList();
- jobExecutor = JobExecutor.getInstance();
  }
 
- public Observable<Integer> getNumbers() {
+ public Observable<Integer> numbers() {
  return Observable.from(numbers);
  }
 
- public List<Integer> getNumbersSync() {
+ public List<Integer> getNumbersSynchronously() {
  return this.numbers;
  }
 
  public Observable<Integer> squareOfAsync(int number) {
  return Observable.just(number * number).subscribeOn(Schedulers.from(this.jobExecutor));
  }
 
- public Observable<String> getElements() {
+ public Observable<String> elements() {
  return Observable.from(elements);
  }
 
- public Observable<String> getNewElement() {
+ public Observable<String> newElement() {
  return Observable.just(randomStringGenerator.nextString()).map(RANDOM_ITEM_FUNCTION);
  }
 

app/src/main/java/com/fernandocejas/android10/rx/sample/data/NumberGenerator.java

@@ -22,7 +22,7 @@
 
 public class NumberGenerator {
 
- public static final Func2<Integer, Integer, Integer> sumNumbers =
+ private static final Func2<Integer, Integer, Integer> sumNumbers =
  new Func2<Integer, Integer, Integer>() {
  @Override public Integer call(Integer integer, Integer integer2) {
  return integer + integer2;
@@ -31,7 +31,7 @@ public class NumberGenerator {
 
  public NumberGenerator() {}
 
- public Observable<Integer> getResults() {
+ Observable<Integer> results() {
  return Observable.zip(getNumbersFast(), getNumbersSlow(), sumNumbers);
  }
 

app/src/main/java/com/fernandocejas/android10/rx/sample/data/RandomStringGenerator.java

@@ -47,7 +47,7 @@ public RandomStringGenerator(int stringLength) {
  this.random = new Random();
  }
 
- public String nextString() {
+ String nextString() {
  for (int i = 0; i < charArray.length; i++) {
  charArray[i] = symbols[random.nextInt(symbols.length)];
  }