Polishing

spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java

@@ -56,6 +56,7 @@ public abstract class DataBufferUtils {
 
 	private static final Consumer<DataBuffer> RELEASE_CONSUMER = DataBufferUtils::release;
 
+
 	//---------------------------------------------------------------------
 	// Reading
 	//---------------------------------------------------------------------
@@ -74,31 +75,31 @@ public abstract class DataBufferUtils {
 	 * {@link #readInputStream(Callable, DataBufferFactory, int)}, to be removed in Spring 5.1
 	 */
 	@Deprecated
-	public static Flux<DataBuffer> read(InputStream inputStream,
+	public static Flux<DataBuffer> read(
-			DataBufferFactory dataBufferFactory, int bufferSize) {
+			InputStream inputStream, DataBufferFactory dataBufferFactory, int bufferSize) {
+
 		return readInputStream(() -> inputStream, dataBufferFactory, bufferSize);
 	}
 
 	/**
-	 * Obtain a {@link InputStream} from the given supplier, and read it into a {@code Flux} of
+	 * Obtain a {@link InputStream} from the given supplier, and read it into a {@code Flux}
-	 * {@code DataBuffer}s. Closes the input stream when the flux is terminated.
+	 * of {@code DataBuffer}s. Closes the input stream when the flux is terminated.
 	 * @param inputStreamSupplier the supplier for the input stream to read from
 	 * @param dataBufferFactory the factory to create data buffers with
 	 * @param bufferSize the maximum size of the data buffers
 	 * @return a flux of data buffers read from the given channel
 	 */
-	public static Flux<DataBuffer> readInputStream(Callable<InputStream> inputStreamSupplier,
+	public static Flux<DataBuffer> readInputStream(
-			DataBufferFactory dataBufferFactory, int bufferSize) {
+			Callable<InputStream> inputStreamSupplier, DataBufferFactory dataBufferFactory, int bufferSize) {
 
 		Assert.notNull(inputStreamSupplier, "'inputStreamSupplier' must not be null");
 
-		return readByteChannel(() -> Channels.newChannel(inputStreamSupplier.call()),
+		return readByteChannel(() -> Channels.newChannel(inputStreamSupplier.call()), dataBufferFactory, bufferSize);
-				dataBufferFactory, bufferSize);
 	}
 
 	/**
-	 * Read the given {@code ReadableByteChannel} into a <strong>read-once</strong> {@code Flux} of
+	 * Read the given {@code ReadableByteChannel} into a <strong>read-once</strong> {@code Flux}
-	 * {@code DataBuffer}s. Closes the channel when the flux is terminated.
+	 * of {@code DataBuffer}s. Closes the channel when the flux is terminated.
 	 * <p>The resulting {@code Flux} can only be subscribed to once. See
 	 * {@link #readByteChannel(Callable, DataBufferFactory, int)} for a variant that supports
 	 * multiple subscriptions.
@@ -110,8 +111,9 @@ public abstract class DataBufferUtils {
 	 * {@link #readByteChannel(Callable, DataBufferFactory, int)}, to be removed in Spring 5.1
 	 */
 	@Deprecated
-	public static Flux<DataBuffer> read(ReadableByteChannel channel,
+	public static Flux<DataBuffer> read(
-			DataBufferFactory dataBufferFactory, int bufferSize) {
+			ReadableByteChannel channel, DataBufferFactory dataBufferFactory, int bufferSize) {
+
 		return readByteChannel(() -> channel, dataBufferFactory, bufferSize);
 	}
 
@@ -123,8 +125,8 @@ public abstract class DataBufferUtils {
 	 * @param bufferSize the maximum size of the data buffers
 	 * @return a flux of data buffers read from the given channel
 	 */
-	public static Flux<DataBuffer> readByteChannel(Callable<ReadableByteChannel> channelSupplier,
+	public static Flux<DataBuffer> readByteChannel(
-			DataBufferFactory dataBufferFactory, int bufferSize) {
+			Callable<ReadableByteChannel> channelSupplier, DataBufferFactory dataBufferFactory, int bufferSize) {
 
 		Assert.notNull(channelSupplier, "'channelSupplier' must not be null");
 		Assert.notNull(dataBufferFactory, "'dataBufferFactory' must not be null");
@@ -156,8 +158,9 @@ public abstract class DataBufferUtils {
 	 * Spring 5.1
 	 */
 	@Deprecated
-	public static Flux<DataBuffer> read(AsynchronousFileChannel channel,
+	public static Flux<DataBuffer> read(
-			DataBufferFactory dataBufferFactory, int bufferSize) {
+			AsynchronousFileChannel channel, DataBufferFactory dataBufferFactory, int bufferSize) {
+
 		return readAsynchronousFileChannel(() -> channel, dataBufferFactory, bufferSize);
 	}
 
@@ -178,8 +181,9 @@ public abstract class DataBufferUtils {
 	 * in Spring 5.1
 	 */
 	@Deprecated
-	public static Flux<DataBuffer> read(AsynchronousFileChannel channel,
+	public static Flux<DataBuffer> read(
-			long position, DataBufferFactory dataBufferFactory, int bufferSize) {
+			AsynchronousFileChannel channel, long position, DataBufferFactory dataBufferFactory, int bufferSize) {
+
 		return readAsynchronousFileChannel(() -> channel, position, dataBufferFactory, bufferSize);
 	}
 
@@ -192,24 +196,22 @@ public abstract class DataBufferUtils {
 	 * @return a flux of data buffers read from the given channel
 	 */
 	public static Flux<DataBuffer> readAsynchronousFileChannel(
-			Callable<AsynchronousFileChannel> channelSupplier,
+			Callable<AsynchronousFileChannel> channelSupplier, DataBufferFactory dataBufferFactory, int bufferSize) {
-			DataBufferFactory dataBufferFactory, int bufferSize) {
 
 		return readAsynchronousFileChannel(channelSupplier, 0, dataBufferFactory, bufferSize);
 	}
 
 	/**
 	 * Obtain a {@code AsynchronousFileChannel} from the given supplier, and read it into a
-	 * {@code Flux} of {@code DataBuffer}s, starting at the given position. Closes the channel when
+	 * {@code Flux} of {@code DataBuffer}s, starting at the given position. Closes the
-	 * the flux is terminated.
+	 * channel when the flux is terminated.
 	 * @param channelSupplier the supplier for the channel to read from
 	 * @param position the position to start reading from
 	 * @param dataBufferFactory the factory to create data buffers with
 	 * @param bufferSize the maximum size of the data buffers
 	 * @return a flux of data buffers read from the given channel
 	 */
-	public static Flux<DataBuffer> readAsynchronousFileChannel(
+	public static Flux<DataBuffer> readAsynchronousFileChannel(Callable<AsynchronousFileChannel> channelSupplier,
-			Callable<AsynchronousFileChannel> channelSupplier,
 			long position, DataBufferFactory dataBufferFactory, int bufferSize) {
 
 		Assert.notNull(channelSupplier, "'channelSupplier' must not be null");
@@ -242,8 +244,8 @@ public abstract class DataBufferUtils {
 	 * @param bufferSize the maximum size of the data buffers
 	 * @return a flux of data buffers read from the given channel
 	 */
-	public static Flux<DataBuffer> read(Resource resource,
+	public static Flux<DataBuffer> read(
-			DataBufferFactory dataBufferFactory, int bufferSize) {
+			Resource resource, DataBufferFactory dataBufferFactory, int bufferSize) {
 
 		return read(resource, 0, dataBufferFactory, bufferSize);
 	}
@@ -262,13 +264,12 @@ public abstract class DataBufferUtils {
 	 * @param bufferSize the maximum size of the data buffers
 	 * @return a flux of data buffers read from the given channel
 	 */
-	public static Flux<DataBuffer> read(Resource resource, long position,
+	public static Flux<DataBuffer> read(
-			DataBufferFactory dataBufferFactory, int bufferSize) {
+			Resource resource, long position, DataBufferFactory dataBufferFactory, int bufferSize) {
 
 		try {
 			if (resource.isFile()) {
 				File file = resource.getFile();
-
 				return readAsynchronousFileChannel(
 						() -> AsynchronousFileChannel.open(file.toPath(), StandardOpenOption.READ),
 						position, dataBufferFactory, bufferSize);
@@ -283,8 +284,6 @@ public abstract class DataBufferUtils {
 	}
 
 
-
-
 	//---------------------------------------------------------------------
 	// Writing
 	//---------------------------------------------------------------------
@@ -295,16 +294,13 @@ public abstract class DataBufferUtils {
 	 * <strong>not</strong> {@linkplain #release(DataBuffer) release} the data buffers in the
 	 * source. If releasing is required, then subscribe to the returned {@code Flux} with a
 	 * {@link #releaseConsumer()}.
-	 * <p>Note that the writing process does not start until the returned {@code Flux} is subscribed
+	 * <p>Note that the writing process does not start until the returned {@code Flux} is subscribed to.
-	 * to.
 	 * @param source the stream of data buffers to be written
 	 * @param outputStream the output stream to write to
 	 * @return a flux containing the same buffers as in {@code source}, that starts the writing
 	 * process when subscribed to, and that publishes any writing errors and the completion signal
 	 */
-	public static Flux<DataBuffer> write(Publisher<DataBuffer> source,
+	public static Flux<DataBuffer> write(Publisher<DataBuffer> source, OutputStream outputStream) {
-			OutputStream outputStream) {
-
 		Assert.notNull(source, "'source' must not be null");
 		Assert.notNull(outputStream, "'outputStream' must not be null");
 
@@ -318,21 +314,17 @@ public abstract class DataBufferUtils {
 	 * <strong>not</strong> {@linkplain #release(DataBuffer) release} the data buffers in the
 	 * source. If releasing is required, then subscribe to the returned {@code Flux} with a
 	 * {@link #releaseConsumer()}.
-	 * <p>Note that the writing process does not start until the returned {@code Flux} is subscribed
+	 * <p>Note that the writing process does not start until the returned {@code Flux} is subscribed to.
-	 * to.
 	 * @param source the stream of data buffers to be written
 	 * @param channel the channel to write to
 	 * @return a flux containing the same buffers as in {@code source}, that starts the writing
 	 * process when subscribed to, and that publishes any writing errors and the completion signal
 	 */
-	public static Flux<DataBuffer> write(Publisher<DataBuffer> source,
+	public static Flux<DataBuffer> write(Publisher<DataBuffer> source, WritableByteChannel channel) {
-			WritableByteChannel channel) {
-
 		Assert.notNull(source, "'source' must not be null");
 		Assert.notNull(channel, "'channel' must not be null");
 
 		Flux<DataBuffer> flux = Flux.from(source);
-
 		return Flux.create(sink ->
 				flux.subscribe(dataBuffer -> {
 							try {
@@ -357,40 +349,36 @@ public abstract class DataBufferUtils {
 	 * <strong>not</strong> {@linkplain #release(DataBuffer) release} the data buffers in the
 	 * source. If releasing is required, then subscribe to the returned {@code Flux} with a
 	 * {@link #releaseConsumer()}.
-	 * <p>Note that the writing process does not start until the returned {@code Flux} is subscribed
+	 * <p>Note that the writing process does not start until the returned {@code Flux} is subscribed to.
-	 * to.
 	 * @param source the stream of data buffers to be written
 	 * @param channel the channel to write to
 	 * @return a flux containing the same buffers as in {@code source}, that starts the writing
 	 * process when subscribed to, and that publishes any writing errors and the completion signal
 	 */
-	public static Flux<DataBuffer> write(Publisher<DataBuffer> source, AsynchronousFileChannel channel,
+	public static Flux<DataBuffer> write(
-			long position) {
+			Publisher<DataBuffer> source, AsynchronousFileChannel channel, long position) {
 
 		Assert.notNull(source, "'source' must not be null");
 		Assert.notNull(channel, "'channel' must not be null");
 		Assert.isTrue(position >= 0, "'position' must be >= 0");
 
 		Flux<DataBuffer> flux = Flux.from(source);
-
 		return Flux.create(sink -> {
-			BaseSubscriber<DataBuffer> subscriber =
+			flux.subscribe(new AsynchronousFileChannelWriteCompletionHandler(sink, channel, position));
-					new AsynchronousFileChannelWriteCompletionHandler(sink, channel, position);
-			flux.subscribe(subscriber);
 		});
 	}
 
-
 	private static void closeChannel(@Nullable Channel channel) {
-		try {
+		if (channel != null && channel.isOpen()) {
-			if (channel != null && channel.isOpen()) {
+			try {
 				channel.close();
 			}
-		}
+			catch (IOException ignored) {
-		catch (IOException ignored) {
+			}
 		}
 	}
 
+
 	//---------------------------------------------------------------------
 	// Various
 	//---------------------------------------------------------------------
@@ -484,10 +472,7 @@ public abstract class DataBufferUtils {
 	 * @return {@code true} if the buffer was released; {@code false} otherwise.
 	 */
 	public static boolean release(@Nullable DataBuffer dataBuffer) {
-		if (dataBuffer instanceof PooledDataBuffer) {
+		return (dataBuffer instanceof PooledDataBuffer && ((PooledDataBuffer) dataBuffer).release());
-			return ((PooledDataBuffer) dataBuffer).release();
-		}
-		return false;
 	}
 
 	/**
@@ -520,8 +505,7 @@ public abstract class DataBufferUtils {
 	}
 
 
-	private static class ReadableByteChannelGenerator
+	private static class ReadableByteChannelGenerator implements Consumer<SynchronousSink<DataBuffer>> {
-			implements Consumer<SynchronousSink<DataBuffer>> {
 
 		private final ReadableByteChannel channel;
 
@@ -529,9 +513,8 @@ public abstract class DataBufferUtils {
 
 		private final int bufferSize;
 
-
+		public ReadableByteChannelGenerator(
-		public ReadableByteChannelGenerator(ReadableByteChannel channel,
+				ReadableByteChannel channel, DataBufferFactory dataBufferFactory, int bufferSize) {
-				DataBufferFactory dataBufferFactory, int bufferSize) {
 
 			this.channel = channel;
 			this.dataBufferFactory = dataBufferFactory;
@@ -563,7 +546,6 @@ public abstract class DataBufferUtils {
 				}
 			}
 		}
-
 	}
 
 
@@ -582,10 +564,9 @@ public abstract class DataBufferUtils {
 
 		private final AtomicBoolean disposed = new AtomicBoolean();
 
+		public AsynchronousFileChannelReadCompletionHandler(AsynchronousFileChannel channel,
+				FluxSink<DataBuffer> sink, long position, DataBufferFactory dataBufferFactory, int bufferSize) {
 
-		private AsynchronousFileChannelReadCompletionHandler(
-				AsynchronousFileChannel channel, FluxSink<DataBuffer> sink,
-				long position, DataBufferFactory dataBufferFactory, int bufferSize) {
 			this.channel = channel;
 			this.sink = sink;
 			this.position = new AtomicLong(position);
@@ -599,10 +580,8 @@ public abstract class DataBufferUtils {
 				long pos = this.position.addAndGet(read);
 				dataBuffer.writePosition(read);
 				this.sink.next(dataBuffer);
-
 				if (!this.disposed.get()) {
-					DataBuffer newDataBuffer =
+					DataBuffer newDataBuffer = this.dataBufferFactory.allocateBuffer(this.bufferSize);
-							this.dataBufferFactory.allocateBuffer(this.bufferSize);
 					ByteBuffer newByteBuffer = newDataBuffer.asByteBuffer(0, this.bufferSize);
 					this.channel.read(newByteBuffer, pos, newDataBuffer, this);
 				}
@@ -618,12 +597,10 @@ public abstract class DataBufferUtils {
 			release(dataBuffer);
 			this.sink.error(exc);
 		}
-
 	}
 
 
-	private static class AsynchronousFileChannelWriteCompletionHandler
+	private static class AsynchronousFileChannelWriteCompletionHandler extends BaseSubscriber<DataBuffer>
-			extends BaseSubscriber<DataBuffer>
 			implements CompletionHandler<Integer, ByteBuffer> {
 
 		private final FluxSink<DataBuffer> sink;
@@ -639,6 +616,7 @@ public abstract class DataBufferUtils {
 
 		public AsynchronousFileChannelWriteCompletionHandler(
 				FluxSink<DataBuffer> sink, AsynchronousFileChannel channel, long position) {
+
 			this.sink = sink;
 			this.channel = channel;
 			this.position = new AtomicLong(position);
@@ -653,7 +631,6 @@ public abstract class DataBufferUtils {
 		protected void hookOnNext(DataBuffer value) {
 			this.dataBuffer = value;
 			ByteBuffer byteBuffer = value.asByteBuffer();
-
 			this.channel.write(byteBuffer, this.position.get(), byteBuffer, this);
 		}
 
@@ -678,7 +655,6 @@ public abstract class DataBufferUtils {
 				this.channel.write(byteBuffer, pos, byteBuffer, this);
 				return;
 			}
-
 			if (this.dataBuffer != null) {
 				this.sink.next(this.dataBuffer);
 				this.dataBuffer = null;
@@ -696,4 +672,5 @@ public abstract class DataBufferUtils {
 			this.sink.error(exc);
 		}
 	}
+
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -200,8 +200,7 @@ class DefaultPathContainer implements PathContainer {
 
 		private final MultiValueMap<String, String> parameters;
 
-
+		public DefaultPathSegment(String value, String valueToMatch, MultiValueMap<String, String> params) {
-		DefaultPathSegment(String value, String valueToMatch, MultiValueMap<String, String> params) {
 			Assert.isTrue(!value.contains("/"), () -> "Invalid path segment value: " + value);
 			this.value = value;
 			this.valueToMatch = valueToMatch;
@@ -209,7 +208,6 @@ class DefaultPathContainer implements PathContainer {
 			this.parameters = CollectionUtils.unmodifiableMultiValueMap(params);
 		}
 
-
 		@Override
 		public String value() {
 			return this.value;
@@ -230,7 +228,6 @@ class DefaultPathContainer implements PathContainer {
 			return this.parameters;
 		}
 
-
 		@Override
 		public boolean equals(@Nullable Object other) {
 			if (this == other) {
@@ -248,7 +245,8 @@ class DefaultPathContainer implements PathContainer {
 		}
 
 		public String toString() {
-			return "[value='" + this.value + "']"; }
+			return "[value='" + this.value + "']";
+		}
 	}
 
 }

spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ import org.springframework.util.ObjectUtils;
 
 /**
  * Default implementation of {@link UriBuilderFactory} providing options to
- * pre-configure all UriBuilder instances with common properties such as a base
+ * pre-configure all {@link UriBuilder} instances with common properties
- * URI, encoding mode, and default URI variables.
+ * such as a base URI, encoding mode, and default URI variables.
  *
  * <p>Uses {@link UriComponentsBuilder} for URI building.
  *
@@ -40,7 +40,7 @@ import org.springframework.util.ObjectUtils;
  */
 public class DefaultUriBuilderFactory implements UriBuilderFactory {
 
-	public enum EncodingMode {URI_COMPONENT, VALUES_ONLY, NONE }
+	public enum EncodingMode {URI_COMPONENT, VALUES_ONLY, NONE}
 
 
 	private final UriComponentsBuilder baseUri;
@@ -78,7 +78,7 @@ public class DefaultUriBuilderFactory implements UriBuilderFactory {
 	 * {@code UriComponentsBuilder}.
 	 */
 	public DefaultUriBuilderFactory(UriComponentsBuilder baseUri) {
-		Assert.notNull(baseUri, "'baseUri' is required.");
+		Assert.notNull(baseUri, "'baseUri' is required");
 		this.baseUri = baseUri;
 	}
 
@@ -182,13 +182,11 @@ public class DefaultUriBuilderFactory implements UriBuilderFactory {
 
 		private final UriComponentsBuilder uriComponentsBuilder;
 
-
 		public DefaultUriBuilder(String uriTemplate) {
 			this.uriComponentsBuilder = initUriComponentsBuilder(uriTemplate);
 		}
 
 		private UriComponentsBuilder initUriComponentsBuilder(String uriTemplate) {
-
 			UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(uriTemplate);
 			UriComponents uriComponents = uriComponentsBuilder.build();
 

spring-webflux/src/main/java/org/springframework/web/reactive/result/SimpleHandlerAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.web.reactive.result;
 
-
 import reactor.core.publisher.Mono;
 
 import org.springframework.web.reactive.DispatcherHandler;
@@ -26,8 +25,8 @@ import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebHandler;
 
 /**
- * HandlerAdapter that allows using the plain {@link WebHandler} contract with
+ * {@link HandlerAdapter} that allows using the plain {@link WebHandler} contract
- * the generic {@link DispatcherHandler}.
+ * with the generic {@link DispatcherHandler}.
  *
  * @author Rossen Stoyanchev
  * @author Sebastien Deleuze