diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufJsonFormatMessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufJsonFormatMessageConverter.java
index 2f07568b641..62fa2c62065 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufJsonFormatMessageConverter.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/ProtobufJsonFormatMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.converter;
 
 import com.google.protobuf.ExtensionRegistry;
@@ -37,16 +38,18 @@ import org.springframework.lang.Nullable;
 public class ProtobufJsonFormatMessageConverter extends ProtobufMessageConverter {
 
 	/**
-	 * Constructor with default instances of {@link JsonFormat.Parser},
-	 * {@link JsonFormat.Printer}, and {@link ExtensionRegistry}.
+	 * Constructor with default instances of {@link com.google.protobuf.util.JsonFormat.Parser
+	 * JsonFormat.Parser}, {@link com.google.protobuf.util.JsonFormat.Printer
+	 * JsonFormat.Printer}, and {@link ExtensionRegistry}.
 	 */
 	public ProtobufJsonFormatMessageConverter(@Nullable ExtensionRegistry extensionRegistry) {
 		this(null, null);
 	}
 
 	/**
-	 * Constructor with given instances of {@link JsonFormat.Parser},
-	 * {@link JsonFormat.Printer}, and a default instance of {@link ExtensionRegistry}.
+	 * Constructor with given instances of {@link com.google.protobuf.util.JsonFormat.Parser
+	 * JsonFormat.Parser}, {@link com.google.protobuf.util.JsonFormat.Printer
+	 * JsonFormat.Printer}, and a default instance of {@link ExtensionRegistry}.
 	 */
 	public ProtobufJsonFormatMessageConverter(
 			@Nullable JsonFormat.Parser parser, @Nullable JsonFormat.Printer printer) {
@@ -55,8 +58,9 @@ public class ProtobufJsonFormatMessageConverter extends ProtobufMessageConverter
 	}
 
 	/**
-	 * Constructor with given instances of {@link JsonFormat.Parser},
-	 * {@link JsonFormat.Printer}, and {@link ExtensionRegistry}.
+	 * Constructor with given instances of {@link com.google.protobuf.util.JsonFormat.Parser
+	 * JsonFormat.Parser}, {@link com.google.protobuf.util.JsonFormat.Printer
+	 * JsonFormat.Printer}, and {@link ExtensionRegistry}.
 	 */
 	public ProtobufJsonFormatMessageConverter(@Nullable JsonFormat.Parser parser,
 			@Nullable JsonFormat.Printer printer, @Nullable ExtensionRegistry extensionRegistry) {
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
index 1c772e50b40..bb4d2d8f402 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -658,8 +658,8 @@ public interface WebTestClient {
 
 		/**
 		 * Set the body to the given {@code Object} value. This method invokes the
-		 * {@link WebClient.RequestBodySpec#bodyValue(Object) bodyValue} method
-		 * on the underlying {@code WebClient}.
+		 * {@link org.springframework.web.reactive.function.client.WebClient.RequestBodySpec#bodyValue(Object)
+		 * bodyValue} method on the underlying {@code WebClient}.
 		 * @param body the value to write to the request body
 		 * @return spec for further declaration of the request
 		 * @since 5.2
@@ -693,8 +693,8 @@ public interface WebTestClient {
 
 		/**
 		 * Set the body from the given producer. This method invokes the
-		 * {@link WebClient.RequestBodySpec#body(Object, Class)} method on the
-		 * underlying {@code WebClient}.
+		 * {@link org.springframework.web.reactive.function.client.WebClient.RequestBodySpec#body(Object, Class)
+		 * body(Object, Class)} method on the underlying {@code WebClient}.
 		 * @param producer the producer to write to the request. This must be a
 		 * {@link Publisher} or another producer adaptable to a
 		 * {@code Publisher} via {@link ReactiveAdapterRegistry}
@@ -706,8 +706,8 @@ public interface WebTestClient {
 
 		/**
 		 * Set the body from the given producer. This method invokes the
-		 * {@link WebClient.RequestBodySpec#body(Object, ParameterizedTypeReference)}
-		 * method on the underlying {@code WebClient}.
+		 * {@link org.springframework.web.reactive.function.client.WebClient.RequestBodySpec#body(Object, ParameterizedTypeReference)
+		 * body(Object, ParameterizedTypeReference)} method on the underlying {@code WebClient}.
 		 * @param producer the producer to write to the request. This must be a
 		 * {@link Publisher} or another producer adaptable to a
 		 * {@code Publisher} via {@link ReactiveAdapterRegistry}
@@ -720,8 +720,8 @@ public interface WebTestClient {
 		/**
 		 * Set the body of the request to the given {@code BodyInserter}.
 		 * This method invokes the
-		 * {@link WebClient.RequestBodySpec#body(BodyInserter)} method on the
-		 * underlying {@code WebClient}.
+		 * {@link org.springframework.web.reactive.function.client.WebClient.RequestBodySpec#body(BodyInserter)
+		 * body(BodyInserter)} method on the underlying {@code WebClient}.
 		 * @param inserter the body inserter to use
 		 * @return spec for further declaration of the request
 		 * @see org.springframework.web.reactive.function.BodyInserters
diff --git a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverter.java
index a89df049cd7..80e4a829724 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufJsonFormatHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -37,31 +37,37 @@ import org.springframework.lang.Nullable;
  * @since 5.0
  * @see JsonFormat#parser()
  * @see JsonFormat#printer()
- * @see #ProtobufJsonFormatHttpMessageConverter(JsonFormat.Parser, JsonFormat.Printer)
+ * @see #ProtobufJsonFormatHttpMessageConverter(com.google.protobuf.util.JsonFormat.Parser, com.google.protobuf.util.JsonFormat.Printer)
  */
 public class ProtobufJsonFormatHttpMessageConverter extends ProtobufHttpMessageConverter {
 
 	/**
-	 * Constructor with default instances of {@link JsonFormat.Parser},
-	 * {@link JsonFormat.Printer}, and {@link ExtensionRegistry}.
+	 * Constructor with default instances of
+	 * {@link com.google.protobuf.util.JsonFormat.Parser JsonFormat.Parser},
+	 * {@link com.google.protobuf.util.JsonFormat.Printer JsonFormat.Printer},
+	 * and {@link ExtensionRegistry}.
 	 */
 	public ProtobufJsonFormatHttpMessageConverter() {
-		this(null,  null, (ExtensionRegistry)null);
+		this(null, null);
 	}
 
 	/**
-	 * Constructor with given instances of {@link JsonFormat.Parser},
-	 * {@link JsonFormat.Printer}, and a default instance of {@link ExtensionRegistry}.
+	 * Constructor with given instances of
+	 * {@link com.google.protobuf.util.JsonFormat.Parser JsonFormat.Parser},
+	 * {@link com.google.protobuf.util.JsonFormat.Printer JsonFormat.Printer},
+	 * and a default instance of {@link ExtensionRegistry}.
 	 */
 	public ProtobufJsonFormatHttpMessageConverter(
 			@Nullable JsonFormat.Parser parser, @Nullable JsonFormat.Printer printer) {
 
-		this(parser, printer, (ExtensionRegistry)null);
+		this(parser, printer, (ExtensionRegistry) null);
 	}
 
 	/**
-	 * Constructor with given instances of {@link JsonFormat.Parser},
-	 * {@link JsonFormat.Printer}, and {@link ExtensionRegistry}.
+	 * Constructor with given instances of
+	 * {@link com.google.protobuf.util.JsonFormat.Parser JsonFormat.Parser},
+	 * {@link com.google.protobuf.util.JsonFormat.Printer JsonFormat.Printer},
+	 * and {@link ExtensionRegistry}.
 	 */
 	public ProtobufJsonFormatHttpMessageConverter(@Nullable JsonFormat.Parser parser,
 			@Nullable JsonFormat.Printer printer, @Nullable ExtensionRegistry extensionRegistry) {
@@ -77,7 +83,7 @@ public class ProtobufJsonFormatHttpMessageConverter extends ProtobufHttpMessageC
 	 * @param printer the JSON printer configuration
 	 * @param registryInitializer an initializer for message extensions
 	 * @deprecated as of 5.1, in favor of
-	 * {@link #ProtobufJsonFormatHttpMessageConverter(JsonFormat.Parser, JsonFormat.Printer, ExtensionRegistry)}
+	 * {@link #ProtobufJsonFormatHttpMessageConverter(com.google.protobuf.util.JsonFormat.Parser, com.google.protobuf.util.JsonFormat.Printer, ExtensionRegistry)}
 	 */
 	@Deprecated
 	public ProtobufJsonFormatHttpMessageConverter(@Nullable JsonFormat.Parser parser,