Polish

Author: rstoyanchev

spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerServerHttpResponse.java

@@ -26,18 +26,22 @@
 import org.springframework.core.io.buffer.DataBufferFactory;
 
 /**
- * Abstract base class for listener-based server responses, i.e. Servlet 3.1 and Undertow.
+ * Abstract base class for listener-based server responses, e.g. Servlet 3.1
+ * and Undertow.
+ *
  * @author Arjen Poutsma
  * @since 5.0
  */
 public abstract class AbstractListenerServerHttpResponse extends AbstractServerHttpResponse {
 
 	private final AtomicBoolean writeCalled = new AtomicBoolean();
 
+
 	public AbstractListenerServerHttpResponse(DataBufferFactory dataBufferFactory) {
 		super(dataBufferFactory);
 	}
 
+
 	@Override
 	protected final Mono<Void> writeWithInternal(Publisher<DataBuffer> body) {
 		return writeAndFlushWithInternal(Mono.just(body));
@@ -46,13 +50,13 @@ protected final Mono<Void> writeWithInternal(Publisher<DataBuffer> body) {
 	@Override
 	protected final Mono<Void> writeAndFlushWithInternal(Publisher<Publisher<DataBuffer>> body) {
 		if (this.writeCalled.compareAndSet(false, true)) {
-			Processor<Publisher<DataBuffer>, Void> bodyProcessor =
-					createBodyFlushProcessor();
+			Processor<Publisher<DataBuffer>, Void> bodyProcessor = createBodyFlushProcessor();
 			return Mono.from(subscriber -> {
 				body.subscribe(bodyProcessor);
 				bodyProcessor.subscribe(subscriber);
 			});
-		} else {
+		}
+		else {
 			return Mono.error(new IllegalStateException(
 					"writeWith() or writeAndFlushWith() has already been called"));
 		}
@@ -64,4 +68,5 @@ protected final Mono<Void> writeAndFlushWithInternal(Publisher<Publisher<DataBuf
 	 * {@link #writeAndFlushWithInternal(Publisher)}.
 	 */
 	protected abstract Processor<Publisher<DataBuffer>, Void> createBodyFlushProcessor();
+
 }

spring-web/src/main/java/org/springframework/http/server/reactive/AbstractResponseBodyFlushProcessor.java

@@ -35,26 +35,25 @@
  * Servlet 3.1 and Undertow support.
  *
  * @author Arjen Poutsma
+ * @author Violeta Georgieva
  * @since 5.0
  * @see ServletServerHttpRequest
  * @see UndertowHttpHandlerAdapter
  * @see ServerHttpResponse#writeAndFlushWith(Publisher)
  */
-abstract class AbstractResponseBodyFlushProcessor
-		implements Processor<Publisher<DataBuffer>, Void> {
+abstract class AbstractResponseBodyFlushProcessor implements Processor<Publisher<DataBuffer>, Void> {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private final ResponseBodyWriteResultPublisher publisherDelegate =
-			new ResponseBodyWriteResultPublisher();
+	private final ResponseBodyWriteResultPublisher resultPublisher = new ResponseBodyWriteResultPublisher();
 
-	private final AtomicReference<State> state =
-			new AtomicReference<>(State.UNSUBSCRIBED);
+	private final AtomicReference<State> state = new AtomicReference<>(State.UNSUBSCRIBED);
 
 	private volatile boolean subscriberCompleted;
 
 	private Subscription subscription;
 
+
 	// Subscriber
 
 	@Override
@@ -89,13 +88,15 @@ public final void onComplete() {
 		this.state.get().onComplete(this);
 	}
 
+
 	// Publisher
 
 	@Override
 	public final void subscribe(Subscriber<? super Void> subscriber) {
-		this.publisherDelegate.subscribe(subscriber);
+		this.resultPublisher.subscribe(subscriber);
 	}
 
+
 	/**
 	 * Creates a new processor for subscribing to a body chunk.
 	 */
@@ -106,8 +107,9 @@ public final void subscribe(Subscriber<? super Void> subscriber) {
 	 */
 	protected abstract void flush() throws IOException;
 
-	private void cancel() {
-		this.subscription.cancel();
+
+	private boolean changeState(State oldState, State newState) {
+		return this.state.compareAndSet(oldState, newState);
 	}
 
 	private void writeComplete() {
@@ -118,15 +120,17 @@ private void writeComplete() {
 
 	}
 
-	private boolean changeState(State oldState, State newState) {
-		return this.state.compareAndSet(oldState, newState);
+	private void cancel() {
+		this.subscription.cancel();
 	}
 
+
 	private enum State {
+
 		UNSUBSCRIBED {
+
 			@Override
-			public void onSubscribe(AbstractResponseBodyFlushProcessor processor,
-					Subscription subscription) {
+			public void onSubscribe(AbstractResponseBodyFlushProcessor processor, Subscription subscription) {
 				Objects.requireNonNull(subscription, "Subscription cannot be null");
 				if (processor.changeState(this, REQUESTED)) {
 					processor.subscription = subscription;
@@ -138,25 +142,25 @@ public void onSubscribe(AbstractResponseBodyFlushProcessor processor,
 			}
 		},
 		REQUESTED {
+
 			@Override
-			public void onNext(AbstractResponseBodyFlushProcessor processor,
-					Publisher<DataBuffer> chunk) {
+			public void onNext(AbstractResponseBodyFlushProcessor processor, Publisher<DataBuffer> chunk) {
 				if (processor.changeState(this, RECEIVED)) {
-					Processor<DataBuffer, Void> chunkProcessor =
-							processor.createBodyProcessor();
+					Processor<DataBuffer, Void> chunkProcessor = processor.createBodyProcessor();
 					chunk.subscribe(chunkProcessor);
 					chunkProcessor.subscribe(new WriteSubscriber(processor));
 				}
 			}
 
 			@Override
-			void onComplete(AbstractResponseBodyFlushProcessor processor) {
+			public void onComplete(AbstractResponseBodyFlushProcessor processor) {
 				if (processor.changeState(this, COMPLETED)) {
-					processor.publisherDelegate.publishComplete();
+					processor.resultPublisher.publishComplete();
 				}
 			}
 		},
 		RECEIVED {
+
 			@Override
 			public void writeComplete(AbstractResponseBodyFlushProcessor processor) {
 				try {
@@ -169,7 +173,7 @@ public void writeComplete(AbstractResponseBodyFlushProcessor processor) {
 
 				if (processor.subscriberCompleted) {
 					if (processor.changeState(this, COMPLETED)) {
-						processor.publisherDelegate.publishComplete();
+						processor.resultPublisher.publishComplete();
 					}
 				}
 				else {
@@ -180,11 +184,12 @@ public void writeComplete(AbstractResponseBodyFlushProcessor processor) {
 			}
 
 			@Override
-			void onComplete(AbstractResponseBodyFlushProcessor processor) {
+			public void onComplete(AbstractResponseBodyFlushProcessor processor) {
 				processor.subscriberCompleted = true;
 			}
 		},
 		COMPLETED {
+
 			@Override
 			public void onNext(AbstractResponseBodyFlushProcessor processor,
 					Publisher<DataBuffer> publisher) {
@@ -193,40 +198,39 @@ public void onNext(AbstractResponseBodyFlushProcessor processor,
 			}
 
 			@Override
-			void onError(AbstractResponseBodyFlushProcessor processor, Throwable t) {
+			public void onError(AbstractResponseBodyFlushProcessor processor, Throwable t) {
 				// ignore
 			}
 
 			@Override
-			void onComplete(AbstractResponseBodyFlushProcessor processor) {
+			public void onComplete(AbstractResponseBodyFlushProcessor processor) {
 				// ignore
 			}
 		};
 
-		public void onSubscribe(AbstractResponseBodyFlushProcessor processor,
-				Subscription subscription) {
+		public void onSubscribe(AbstractResponseBodyFlushProcessor processor, Subscription subscription) {
 			subscription.cancel();
 		}
 
-		public void onNext(AbstractResponseBodyFlushProcessor processor,
-				Publisher<DataBuffer> publisher) {
+		public void onNext(AbstractResponseBodyFlushProcessor processor, Publisher<DataBuffer> publisher) {
 			throw new IllegalStateException(toString());
 		}
 
-		void onError(AbstractResponseBodyFlushProcessor processor, Throwable t) {
+		public void onError(AbstractResponseBodyFlushProcessor processor, Throwable ex) {
 			if (processor.changeState(this, COMPLETED)) {
-				processor.publisherDelegate.publishError(t);
+				processor.resultPublisher.publishError(ex);
 			}
 		}
 
-		void onComplete(AbstractResponseBodyFlushProcessor processor) {
+		public void onComplete(AbstractResponseBodyFlushProcessor processor) {
 			throw new IllegalStateException(toString());
 		}
 
 		public void writeComplete(AbstractResponseBodyFlushProcessor processor) {
 			// ignore
 		}
 
+
 		private static class WriteSubscriber implements Subscriber<Void> {
 
 			private final AbstractResponseBodyFlushProcessor processor;
@@ -236,23 +240,23 @@ public WriteSubscriber(AbstractResponseBodyFlushProcessor processor) {
 			}
 
 			@Override
-			public void onSubscribe(Subscription s) {
-				s.request(Long.MAX_VALUE);
+			public void onSubscribe(Subscription subscription) {
+				subscription.request(Long.MAX_VALUE);
 			}
 
 			@Override
 			public void onNext(Void aVoid) {
 			}
 
 			@Override
-			public void onError(Throwable t) {
-				processor.cancel();
-				processor.onError(t);
+			public void onError(Throwable ex) {
+				this.processor.cancel();
+				this.processor.onError(ex);
 			}
 
 			@Override
 			public void onComplete() {
-				processor.writeComplete();
+				this.processor.writeComplete();
 			}
 		}
 	}