Merge branch '2.2.x'

Closes gh-19104
2019-11-23 12:05:43 +01:00
parent 6bbc3d1acf 36f4d2f061
commit 12c5cdceb1
4 changed files with 4 additions and 8 deletions
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointMediaTypes.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointMediaTypes.java
@@ -51,7 +51,7 @@ public class EndpointMediaTypes {
 	 * @since 2.2.0
 	 */
 	public EndpointMediaTypes(String... producedAndConsumed) {
-		this((producedAndConsumed != null) ? Arrays.asList(producedAndConsumed) : (List<String>) null);
+		this((producedAndConsumed != null) ? Arrays.asList(producedAndConsumed) : null);
 	}

 	/**