From 567c7695dd9b99fe1145ed2ef123ca0d098d86fa Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Sun, 1 Dec 2019 00:20:00 +0100
Subject: [PATCH] Polishing

---
 .../messaging/converter/ProtobufMessageConverter.java     | 8 ++++----
 .../http/converter/FormHttpMessageConverter.java          | 3 +--
 .../function/client/DefaultExchangeStrategiesBuilder.java | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufMessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufMessageConverter.java
index 1d5dbf820c..ed7c10fa62 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufMessageConverter.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufMessageConverter.java
@@ -48,15 +48,15 @@ import static org.springframework.util.MimeTypeUtils.TEXT_PLAIN;
  * <p>This converter supports by default {@code "application/x-protobuf"} with the official
  * {@code "com.google.protobuf:protobuf-java"} library.
  *
- * <p>{@code "application/json"} can be supported with the official {@code "com.google.protobuf:protobuf-java-util"} 3.x
- *  with 3.3 or higher recommended
+ * <p>{@code "application/json"} can be supported with the official
+ * {@code "com.google.protobuf:protobuf-java-util"} 3.x, with 3.3 or higher recommended.
  *
  * @author Parviz Rozikov
+ * @author Rossen Stoyanchev
  * @since 5.2.2
  */
 public class ProtobufMessageConverter extends AbstractMessageConverter {
 
-
 	/**
 	 * The default charset used by the converter.
 	 */
@@ -187,7 +187,7 @@ public class ProtobufMessageConverter extends AbstractMessageConverter {
 			}
 		}
 		catch (IOException ex) {
-			throw new MessageConversionException("Could not write proto message" + ex.getMessage(), ex);
+			throw new MessageConversionException("Failed to print Protobuf message: " + ex.getMessage(), ex);
 
 		}
 		return payload;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
index 76496f5832..5c2594fe47 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
@@ -408,9 +408,8 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
 	 * {@linkplain #setCharset(Charset) charset} if it does not have one.
 	 * If {@code contentType} is {@code null},
 	 * {@code application/x-www-form-urlencoded; charset=UTF-8} is returned.
-	 *
 	 * <p>Subclasses can override this method to change this behavior.
-	 * @param contentType the preferred content type, can be {@code null}
+	 * @param contentType the preferred content type (can be {@code null})
 	 * @return the content type to be used
 	 * @since 5.2.2
 	 */
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java
index 02b0cc5e55..e39d4a5957 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java
@@ -29,6 +29,7 @@ import org.springframework.http.codec.HttpMessageWriter;
  * Default implementation of {@link ExchangeStrategies.Builder}.
  *
  * @author Arjen Poutsma
+ * @author Brian Clozel
  * @since 5.0
  */
 final class DefaultExchangeStrategiesBuilder implements ExchangeStrategies.Builder {
@@ -79,7 +80,6 @@ final class DefaultExchangeStrategiesBuilder implements ExchangeStrategies.Build
 
 		private final List<HttpMessageWriter<?>> writers;
 
-
 		public DefaultExchangeStrategies(ClientCodecConfigurer codecConfigurer) {
 			this.codecConfigurer = codecConfigurer;
 			this.readers = unmodifiableCopy(this.codecConfigurer.getReaders());
@@ -90,9 +90,8 @@ final class DefaultExchangeStrategiesBuilder implements ExchangeStrategies.Build
 			return Collections.unmodifiableList(new ArrayList<>(list));
 		}
 
-
-		@Override
 		@Deprecated
+		@Override
 		public Builder mutate() {
 			return new DefaultExchangeStrategiesBuilder(this);
 		}