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

Raise the minimum Spring Framework version to 4.3.x

Browse Source 
Closes gh-284
This commit is contained in:
Andy Wilkinson
2016-07-26 12:09:20 +01:00
parent 65571d98dd
commit f2717363f0
11 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-restdocs-core/src/main/java/org/springframework/restdocs/operation/AbstractOperationMessage.java
View File

@@ -63,7 +63,7 @@ abstract class AbstractOperationMessage {
if (contentType == null) {
return null;
}
return contentType.getCharSet();
return contentType.getCharset();
}
}

4
spring-restdocs-core/src/main/java/org/springframework/restdocs/operation/preprocess/PatternReplacingContentModifier.java
View File

@@ -49,8 +49,8 @@ class PatternReplacingContentModifier implements ContentModifier {
@Override
public byte[] modifyContent(byte[] content, MediaType contentType) {
String original;
if (contentType != null && contentType.getCharSet() != null) {
original = new String(content, contentType.getCharSet());
if (contentType != null && contentType.getCharset() != null) {
original = new String(content, contentType.getCharset());
}
else {
original = new String(content);