Skip to content

Commit 3941eba

Browse files
Covert to lambda
1 parent 1d7b06a commit 3941eba

File tree

4 files changed

+17
-41
lines changed

4 files changed

+17
-41
lines changed

app/src/main/java/com/rxjava2/android/samples/ui/cache/source/DataSource.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.rxjava2.android.samples.ui.cache.model.Data;
44

55
import io.reactivex.Observable;
6-
import io.reactivex.functions.Consumer;
76

87
/**
98
* The DataSource to handle 3 data sources - memory, disk, network
@@ -27,21 +26,13 @@ public Observable<Data> getDataFromMemory() {
2726
}
2827

2928
public Observable<Data> getDataFromDisk() {
30-
return diskDataSource.getData().doOnNext(new Consumer<Data>() {
31-
@Override
32-
public void accept(Data data) throws Exception {
33-
memoryDataSource.cacheInMemory(data);
34-
}
35-
});
29+
return diskDataSource.getData().doOnNext(memoryDataSource::cacheInMemory);
3630
}
3731

3832
public Observable<Data> getDataFromNetwork() {
39-
return networkDataSource.getData().doOnNext(new Consumer<Data>() {
40-
@Override
41-
public void accept(Data data) throws Exception {
42-
diskDataSource.saveToDisk(data);
43-
memoryDataSource.cacheInMemory(data);
44-
}
33+
return networkDataSource.getData().doOnNext(data -> {
34+
diskDataSource.saveToDisk(data);
35+
memoryDataSource.cacheInMemory(data);
4536
});
4637
}
4738

app/src/main/java/com/rxjava2/android/samples/ui/cache/source/DiskDataSource.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import com.rxjava2.android.samples.ui.cache.model.Data;
44

55
import io.reactivex.Observable;
6-
import io.reactivex.ObservableEmitter;
7-
import io.reactivex.ObservableOnSubscribe;
86

97
/**
108
* Class to simulate Disk DataSource
@@ -14,14 +12,11 @@ public class DiskDataSource {
1412
private Data data;
1513

1614
public Observable<Data> getData() {
17-
return Observable.create(new ObservableOnSubscribe<Data>() {
18-
@Override
19-
public void subscribe(ObservableEmitter<Data> emitter) throws Exception {
20-
if (data != null) {
21-
emitter.onNext(data);
22-
}
23-
emitter.onComplete();
15+
return Observable.create(emitter -> {
16+
if (data != null) {
17+
emitter.onNext(data);
2418
}
19+
emitter.onComplete();
2520
});
2621
}
2722

app/src/main/java/com/rxjava2/android/samples/ui/cache/source/MemoryDataSource.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import com.rxjava2.android.samples.ui.cache.model.Data;
44

55
import io.reactivex.Observable;
6-
import io.reactivex.ObservableEmitter;
7-
import io.reactivex.ObservableOnSubscribe;
86

97
/**
108
* Class to simulate InMemory DataSource
@@ -14,14 +12,11 @@ public class MemoryDataSource {
1412
private Data data;
1513

1614
public Observable<Data> getData() {
17-
return Observable.create(new ObservableOnSubscribe<Data>() {
18-
@Override
19-
public void subscribe(ObservableEmitter<Data> emitter) throws Exception {
20-
if (data != null) {
21-
emitter.onNext(data);
22-
}
23-
emitter.onComplete();
15+
return Observable.create(emitter -> {
16+
if (data != null) {
17+
emitter.onNext(data);
2418
}
19+
emitter.onComplete();
2520
});
2621
}
2722

app/src/main/java/com/rxjava2/android/samples/ui/cache/source/NetworkDataSource.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import com.rxjava2.android.samples.ui.cache.model.Data;
44

55
import io.reactivex.Observable;
6-
import io.reactivex.ObservableEmitter;
7-
import io.reactivex.ObservableOnSubscribe;
86

97

108
/**
@@ -13,14 +11,11 @@
1311
public class NetworkDataSource {
1412

1513
public Observable<Data> getData() {
16-
return Observable.create(new ObservableOnSubscribe<Data>() {
17-
@Override
18-
public void subscribe(ObservableEmitter<Data> emitter) throws Exception {
19-
Data data = new Data();
20-
data.source = "network";
21-
emitter.onNext(data);
22-
emitter.onComplete();
23-
}
14+
return Observable.create(emitter -> {
15+
Data data = new Data();
16+
data.source = "network";
17+
emitter.onNext(data);
18+
emitter.onComplete();
2419
});
2520
}
2621

0 commit comments

Comments
 (0)