Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.2.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2020-09-15 10:09:18 +02:00
parent f4bdc0284e f010368a66
commit d5fed34642
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,14 +234,6 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
}
}
@Override
protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
throws IOException, HttpMessageNotReadableException {
JavaType javaType = getJavaType(clazz, null);
return readJavaType(javaType, inputMessage);
}
@Override
public Object read(Type type, @Nullable Class<?> contextClass, HttpInputMessage inputMessage)
throws IOException, HttpMessageNotReadableException {
@@ -250,6 +242,14 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
return readJavaType(javaType, inputMessage);
}
@Override
protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
throws IOException, HttpMessageNotReadableException {
JavaType javaType = getJavaType(clazz, null);
return readJavaType(javaType, inputMessage);
}
private Object readJavaType(JavaType javaType, HttpInputMessage inputMessage) throws IOException {
MediaType contentType = inputMessage.getHeaders().getContentType();
Charset charset = getCharset(contentType);

10
spring-web/src/main/java/org/springframework/http/converter/json/AbstractJsonHttpMessageConverter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 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.
@@ -114,7 +114,7 @@ public abstract class AbstractJsonHttpMessageConverter extends AbstractGenericHt
}
@Override
protected final void writeInternal(Object o, @Nullable Type type, HttpOutputMessage outputMessage)
protected final void writeInternal(Object object, @Nullable Type type, HttpOutputMessage outputMessage)
throws IOException, HttpMessageNotWritableException {
Writer writer = getWriter(outputMessage);
@@ -122,7 +122,7 @@ public abstract class AbstractJsonHttpMessageConverter extends AbstractGenericHt
writer.append(this.jsonPrefix);
}
try {
writeInternal(o, type, writer);
writeInternal(object, type, writer);
}
catch (Exception ex) {
throw new HttpMessageNotWritableException("Could not write JSON: " + ex.getMessage(), ex);
@@ -142,12 +142,12 @@ public abstract class AbstractJsonHttpMessageConverter extends AbstractGenericHt
/**
* Template method that writes the JSON-bound object to the given {@link Writer}.
* @param o the object to write to the output message
* @param object the object to write to the output message
* @param type the type of object to write (may be {@code null})
* @param writer the {@code} Writer to use
* @throws Exception in case of write failures
*/
protected abstract void writeInternal(Object o, @Nullable Type type, Writer writer) throws Exception;
protected abstract void writeInternal(Object object, @Nullable Type type, Writer writer) throws Exception;
private static Reader getReader(HttpInputMessage inputMessage) throws IOException {

8
spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 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.
@@ -93,17 +93,17 @@ public class GsonHttpMessageConverter extends AbstractJsonHttpMessageConverter {
}
@Override
protected void writeInternal(Object o, @Nullable Type type, Writer writer) throws Exception {
protected void writeInternal(Object object, @Nullable Type type, Writer writer) throws Exception {
// In Gson, toJson with a type argument will exclusively use that given type,
// ignoring the actual type of the object... which might be more specific,
// e.g. a subclass of the specified type which includes additional fields.
// As a consequence, we're only passing in parameterized type declarations
// which might contain extra generics that the object instance doesn't retain.
if (type instanceof ParameterizedType) {
getGson().toJson(o, type, writer);
getGson().toJson(object, type, writer);
}
else {
getGson().toJson(o, writer);
getGson().toJson(object, writer);
}
}

8
spring-web/src/main/java/org/springframework/http/converter/json/JsonbHttpMessageConverter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 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.
@@ -101,12 +101,12 @@ public class JsonbHttpMessageConverter extends AbstractJsonHttpMessageConverter
}
@Override
protected void writeInternal(Object o, @Nullable Type type, Writer writer) throws Exception {
protected void writeInternal(Object object, @Nullable Type type, Writer writer) throws Exception {
if (type instanceof ParameterizedType) {
getJsonb().toJson(o, type, writer);
getJsonb().toJson(object, type, writer);
}
else {
getJsonb().toJson(o, writer);
getJsonb().toJson(object, writer);
}
}