Minor revision of reactive support layout (ahead of 5.0 M1)

DataSourceUtils moved to main core.io.buffer package.
Consistently named Jackson2JsonDecoder/Encoder and Jaxb2XmlDecoder/Encoder.
Plenty of related polishing.

Author: jhoeller

spring-core/src/main/java/org/springframework/core/codec/AbstractDecoder.java

@@ -17,7 +17,6 @@
 package org.springframework.core.codec;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import org.reactivestreams.Publisher;
@@ -36,7 +35,7 @@
  */
 public abstract class AbstractDecoder<T> implements Decoder<T> {
 
-	private List<MimeType> decodableMimeTypes = Collections.emptyList();
+	private final List<MimeType> decodableMimeTypes;
 
 
 	protected AbstractDecoder(MimeType... supportedMimeTypes) {
@@ -54,7 +53,7 @@ public boolean canDecode(ResolvableType elementType, MimeType mimeType, Object..
 		if (mimeType == null) {
 			return true;
 		}
-		return this.decodableMimeTypes.stream().anyMatch(m -> m.isCompatibleWith(mimeType));
+		return this.decodableMimeTypes.stream().anyMatch(candidate -> candidate.isCompatibleWith(mimeType));
 	}
 
 	@Override

spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java

@@ -17,7 +17,6 @@
 package org.springframework.core.codec;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import org.springframework.core.ResolvableType;
@@ -32,7 +31,7 @@
  */
 public abstract class AbstractEncoder<T> implements Encoder<T> {
 
-	private List<MimeType> encodableMimeTypes = Collections.emptyList();
+	private final List<MimeType> encodableMimeTypes;
 
 
 	protected AbstractEncoder(MimeType... supportedMimeTypes) {
@@ -50,7 +49,7 @@ public boolean canEncode(ResolvableType elementType, MimeType mimeType, Object..
 		if (mimeType == null) {
 			return true;
 		}
-		return this.encodableMimeTypes.stream().anyMatch(m -> m.isCompatibleWith(mimeType));
+		return this.encodableMimeTypes.stream().anyMatch(candidate -> candidate.isCompatibleWith(mimeType));
 	}
 
 }

spring-core/src/main/java/org/springframework/core/codec/AbstractSingleValueEncoder.java

@@ -40,9 +40,8 @@ public AbstractSingleValueEncoder(MimeType... supportedMimeTypes) {
 
 
 	@Override
-	public final Flux<DataBuffer> encode(Publisher<? extends T> inputStream,
-			DataBufferFactory bufferFactory, ResolvableType elementType, MimeType mimeType,
-			Object... hints) {
+	public final Flux<DataBuffer> encode(Publisher<? extends T> inputStream, DataBufferFactory bufferFactory,
+			ResolvableType elementType, MimeType mimeType, Object... hints) {
 
 		return Flux.from(inputStream).
 				take(1).

spring-core/src/main/java/org/springframework/core/codec/ByteBufferDecoder.java

@@ -23,7 +23,7 @@
 
 import org.springframework.core.ResolvableType;
 import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.support.DataBufferUtils;
+import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.util.MimeType;
 import org.springframework.util.MimeTypeUtils;
 
@@ -36,7 +36,6 @@
  */
 public class ByteBufferDecoder extends AbstractDecoder<ByteBuffer> {
 
-
 	public ByteBufferDecoder() {
 		super(MimeTypeUtils.ALL);
 	}
@@ -61,4 +60,4 @@ public Flux<ByteBuffer> decode(Publisher<DataBuffer> inputStream, ResolvableType
 		});
 	}
 
-}
+}

spring-core/src/main/java/org/springframework/core/codec/ByteBufferEncoder.java

@@ -35,7 +35,6 @@
  */
 public class ByteBufferEncoder extends AbstractEncoder<ByteBuffer> {
 
-
 	public ByteBufferEncoder() {
 		super(MimeTypeUtils.ALL);
 	}
@@ -55,4 +54,4 @@ public Flux<DataBuffer> encode(Publisher<? extends ByteBuffer> inputStream,
 		return Flux.from(inputStream).map(bufferFactory::wrap);
 	}
 
-}
+}

spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java

@@ -30,7 +30,7 @@
 import org.springframework.util.MimeType;
 
 /**
- * Encode from a CharSequence stream to a bytes stream.
+ * Encode from a {@code CharSequence} stream to a bytes stream.
  *
  * @author Sebastien Deleuze
  * @author Arjen Poutsma

spring-core/src/main/java/org/springframework/core/codec/CodecException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -27,12 +27,12 @@
 @SuppressWarnings("serial")
 public class CodecException extends NestedRuntimeException {
 
-	public CodecException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-
 	public CodecException(String msg) {
 		super(msg);
 	}
 
+	public CodecException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
+
 }

spring-core/src/main/java/org/springframework/core/codec/Decoder.java

@@ -32,15 +32,14 @@
  *
  * @author Sebastien Deleuze
  * @author Rossen Stoyanchev
- * @param <T> the type of elements in the output stream
  * @since 5.0
+ * @param <T> the type of elements in the output stream
  */
 public interface Decoder<T> {
 
 	/**
 	 * Whether the decoder supports the given target element type and the MIME
 	 * type of the source stream.
-	 *
 	 * @param elementType the target element type for the output stream
 	 * @param mimeType the mime type associated with the stream to decode
 	 * @param hints additional information about how to do decode, optional
@@ -50,7 +49,6 @@ public interface Decoder<T> {
 
 	/**
 	 * Decode a {@link DataBuffer} input stream into a Flux of {@code T}.
-	 *
 	 * @param inputStream the {@code DataBuffer} input stream to decode
 	 * @param elementType the expected type of elements in the output stream;
 	 * this type must have been previously passed to the {@link #canDecode}
@@ -64,7 +62,6 @@ Flux<T> decode(Publisher<DataBuffer> inputStream, ResolvableType elementType,
 
 	/**
 	 * Decode a {@link DataBuffer} input stream into a Mono of {@code T}.
-	 *
 	 * @param inputStream the {@code DataBuffer} input stream to decode
 	 * @param elementType the expected type of elements in the output stream;
 	 * this type must have been previously passed to the {@link #canDecode}

spring-core/src/main/java/org/springframework/core/codec/Encoder.java

@@ -32,15 +32,14 @@
  *
  * @author Sebastien Deleuze
  * @author Rossen Stoyanchev
- * @param <T> the type of elements in the input stream
  * @since 5.0
+ * @param <T> the type of elements in the input stream
  */
 public interface Encoder<T> {
 
 	/**
 	 * Whether the encoder supports the given source element type and the MIME
 	 * type for the output stream.
-	 *
 	 * @param elementType the type of elements in the source stream
 	 * @param mimeType the MIME type for the output stream
 	 * @param hints additional information about how to do encode, optional
@@ -51,7 +50,6 @@ public interface Encoder<T> {
 	/**
 	 * Encode a stream of Objects of type {@code T} into a {@link DataBuffer}
 	 * output stream.
-	 *
 	 * @param inputStream the input stream of Objects to encode
 	 * @param bufferFactory for creating output stream {@code DataBuffer}'s
 	 * @param elementType the expected type of elements in the input stream;

spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java

@@ -27,7 +27,7 @@
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.support.DataBufferUtils;
+import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.util.MimeType;
 import org.springframework.util.MimeTypeUtils;
 
@@ -39,7 +39,6 @@
  */
 public class ResourceDecoder extends AbstractDecoder<Resource> {
 
-
 	public ResourceDecoder() {
 		super(MimeTypeUtils.ALL);
 	}
@@ -79,4 +78,5 @@ else if (clazz.isAssignableFrom(ByteArrayResource.class)) {
 			return Flux.error(new IllegalStateException("Unsupported resource class: " + clazz));
 		}
 	}
+
 }