Merge branch '6.2.x'

spring-web/src/main/java/org/springframework/http/converter/AbstractKotlinSerializationHttpMessageConverter.java

@@ -19,6 +19,7 @@ package org.springframework.http.converter;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
+import java.util.List;
 import java.util.Map;
 
 import kotlin.reflect.KFunction;
@@ -76,6 +77,11 @@ public abstract class AbstractKotlinSerializationHttpMessageConverter<T extends
 		this.format = format;
 	}
 
+	@Override
+	public List<MediaType> getSupportedMediaTypes(Class<?> clazz) {
+		return getSupportedMediaTypes();
+	}
+
 	@Override
 	protected boolean supports(Class<?> clazz) {
 		return serializer(ResolvableType.forClass(clazz)) != null;