root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix method order in ChannelSendOperator 

1. Group by contract
2. Follow lifecycle -- Subscriber 1st, Subscription 2nd, Publisher last
3. Order of declaration in implemented contracts
This commit is contained in:
Rossen Stoyanchev 2017-07-12 12:29:38 +02:00
parent 42188020b4
commit fbcd554f42
1 changed files with 86 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
spring-web/src/main/java/org/springframework/http/server/reactive/ChannelSendOperator.java
View File

@ -119,58 +119,14 @@ public class ChannelSendOperator<T> extends Mono<Void> implements Scannable {
}
@Override
public void cancel() {
Subscription s = this.subscription;
if (s != null) {
this.subscription = null;
s.cancel();
}
}
// CoreSubscriber<T> methods (we're the subscriber to the write source)..
@Override
public Context currentContext() {
return completionSubscriber.currentContext();
}
@Override
public final void onComplete() {
if (this.readyToWrite) {
requiredWriteSubscriber().onComplete();
return;
}
synchronized (this) {
if (this.readyToWrite) {
requiredWriteSubscriber().onComplete();
}
else if (this.beforeFirstEmission) {
this.completed = true;
this.beforeFirstEmission = false;
writeFunction.apply(this).subscribe(new DownstreamBridge(this.completionSubscriber));
}
else {
this.completed = true;
}
}
}
@Override
public final void onError(Throwable ex) {
if (this.readyToWrite) {
requiredWriteSubscriber().onError(ex);
return;
}
synchronized (this) {
if (this.readyToWrite) {
requiredWriteSubscriber().onError(ex);
}
else if (this.beforeFirstEmission) {
this.beforeFirstEmission = false;
this.completionSubscriber.onError(ex);
}
else {
this.error = ex;
}
public final void onSubscribe(Subscription s) {
if (Operators.validate(this.subscription, s)) {
this.subscription = s;
this.completionSubscriber.onSubscribe(this);
s.request(1);
}
}
@ -199,49 +155,60 @@ public class ChannelSendOperator<T> extends Mono<Void> implements Scannable {
}
}
@Override
public final void onSubscribe(Subscription s) {
if (Operators.validate(this.subscription, s)) {
this.subscription = s;
this.completionSubscriber.onSubscribe(this);
s.request(1);
}
private Subscriber<? super T> requiredWriteSubscriber() {
Assert.state(this.writeSubscriber != null, "No write subscriber");
return this.writeSubscriber;
}
@Override
public void subscribe(Subscriber<? super T> writeSubscriber) {
public final void onError(Throwable ex) {
if (this.readyToWrite) {
requiredWriteSubscriber().onError(ex);
return;
}
synchronized (this) {
Assert.state(this.writeSubscriber == null, "Only one write subscriber supported");
this.writeSubscriber = writeSubscriber;
if (this.error != null || this.completed) {
this.writeSubscriber.onSubscribe(Operators.emptySubscription());
emitCachedSignals();
if (this.readyToWrite) {
requiredWriteSubscriber().onError(ex);
}
else if (this.beforeFirstEmission) {
this.beforeFirstEmission = false;
this.completionSubscriber.onError(ex);
}
else {
this.writeSubscriber.onSubscribe(this);
this.error = ex;
}
}
}
/**
* Emit cached signals to the write subscriber.
* @return true if no more signals expected
*/
private boolean emitCachedSignals() {
if (this.item != null) {
requiredWriteSubscriber().onNext(this.item);
}
if (this.error != null) {
requiredWriteSubscriber().onError(this.error);
return true;
}
if (this.completed) {
@Override
public final void onComplete() {
if (this.readyToWrite) {
requiredWriteSubscriber().onComplete();
return true;
return;
}
synchronized (this) {
if (this.readyToWrite) {
requiredWriteSubscriber().onComplete();
}
else if (this.beforeFirstEmission) {
this.completed = true;
this.beforeFirstEmission = false;
writeFunction.apply(this).subscribe(new DownstreamBridge(this.completionSubscriber));
}
else {
this.completed = true;
}
}
return false;
}
@Override
public Context currentContext() {
return this.completionSubscriber.currentContext();
}
// Subscription methods (we're the subscription to completion~ and writeSubscriber)..
@Override
public void request(long n) {
Subscription s = this.subscription;
@ -267,9 +234,46 @@ public class ChannelSendOperator<T> extends Mono<Void> implements Scannable {
s.request(n);
}
private Subscriber<? super T> requiredWriteSubscriber() {
Assert.state(this.writeSubscriber != null, "No write subscriber");
return this.writeSubscriber;
private boolean emitCachedSignals() {
if (this.item != null) {
requiredWriteSubscriber().onNext(this.item);
}
if (this.error != null) {
requiredWriteSubscriber().onError(this.error);
return true;
}
if (this.completed) {
requiredWriteSubscriber().onComplete();
return true;
}
return false;
}
@Override
public void cancel() {
Subscription s = this.subscription;
if (s != null) {
this.subscription = null;
s.cancel();
}
}
// Publisher<T> methods (we're the Publisher to the write subscriber)...
@Override
public void subscribe(Subscriber<? super T> writeSubscriber) {
synchronized (this) {
Assert.state(this.writeSubscriber == null, "Only one write subscriber supported");
this.writeSubscriber = writeSubscriber;
if (this.error != null || this.completed) {
this.writeSubscriber.onSubscribe(Operators.emptySubscription());
emitCachedSignals();
}
else {
this.writeSubscriber.onSubscribe(this);
}
}
}
}