Skip to content

Commit ead76b6

Browse files
committed
Merge branch '6.2.x'
2 parents 838b4d6 + 56eb135 commit ead76b6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -181,7 +181,7 @@ public void registerObjectMappersForType(Class<?> clazz, Consumer<Map<MediaType,
181181
* or empty if in case of no registrations for the given class.
182182
* @since 5.3.4
183183
*/
184-
public @Nullable Map<MediaType, ObjectMapper> getObjectMappersForType(Class<?> clazz) {
184+
public Map<MediaType, ObjectMapper> getObjectMappersForType(Class<?> clazz) {
185185
for (Map.Entry<Class<?>, Map<MediaType, ObjectMapper>> entry : getObjectMapperRegistrations().entrySet()) {
186186
if (entry.getKey().isAssignableFrom(clazz)) {
187187
return entry.getValue();

0 commit comments

Comments
 (0)