Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove redundant methods from Sample(Observable) #6469

Merged
merged 6 commits into from
Apr 26, 2019
Merged

Remove redundant methods from Sample(Observable) #6469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77f2f80
Update Maybe.java
lxsmnsyc Apr 4, 2019
e3c328e
Update Single.java
lxsmnsyc Apr 4, 2019
1ac2618
Update ObservableSampleWithObservable.java
lxsmnsyc Apr 26, 2019
0f53351
Update FlowableSamplePublisher.java
lxsmnsyc Apr 26, 2019
84d5c27
Update FlowableSamplePublisher.java
lxsmnsyc Apr 26, 2019
308f7d0
Merge pull request #1 from ReactiveX/2.x
lxsmnsyc Apr 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions src/main/java/io/reactivex/internal/operators/flowable/FlowableSamplePublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void onError(Throwable t) {
@Override
public void onComplete() {
SubscriptionHelper.cancel(other);
completeMain();
completion();
}

void setOther(Subscription o) {
Expand All @@ -117,7 +117,7 @@ public void error(Throwable e) {

public void complete() {
upstream.cancel();
completeOther();
completion();
}

void emit() {
Expand All @@ -134,9 +134,7 @@ void emit() {
}
}

abstract void completeMain();

abstract void completeOther();
abstract void completion();

abstract void run();
}
Expand Down Expand Up @@ -178,12 +176,7 @@ static final class SampleMainNoLast<T> extends SamplePublisherSubscriber<T> {
}

@Override
void completeMain() {
downstream.onComplete();
}

@Override
void completeOther() {
void completion() {
downstream.onComplete();
}

Expand All @@ -207,16 +200,7 @@ static final class SampleMainEmitLast<T> extends SamplePublisherSubscriber<T> {
}

@Override
void completeMain() {
done = true;
if (wip.getAndIncrement() == 0) {
emit();
downstream.onComplete();
}
}

@Override
void completeOther() {
void completion() {
done = true;
if (wip.getAndIncrement() == 0) {
emit();
Expand Down
26 changes: 5 additions & 21 deletions src/main/java/io/reactivex/internal/operators/observable/ObservableSampleWithObservable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public void onError(Throwable t) {
@Override
public void onComplete() {
DisposableHelper.dispose(other);
completeMain();
completion();
}

boolean setOther(Disposable o) {
Expand All @@ -109,7 +109,7 @@ public void error(Throwable e) {

public void complete() {
upstream.dispose();
completeOther();
completion();
}

void emit() {
Expand All @@ -119,9 +119,7 @@ void emit() {
}
}

abstract void completeMain();

abstract void completeOther();
abstract void completion();

abstract void run();
}
Expand Down Expand Up @@ -163,12 +161,7 @@ static final class SampleMainNoLast<T> extends SampleMainObserver<T> {
}

@Override
void completeMain() {
downstream.onComplete();
}

@Override
void completeOther() {
void completion() {
downstream.onComplete();
}

Expand All @@ -192,16 +185,7 @@ static final class SampleMainEmitLast<T> extends SampleMainObserver<T> {
}

@Override
void completeMain() {
done = true;
if (wip.getAndIncrement() == 0) {
emit();
downstream.onComplete();
}
}

@Override
void completeOther() {
void completion() {
done = true;
if (wip.getAndIncrement() == 0) {
emit();
Expand Down