Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
chenpeng_fei
spring-framework
提交
b7dd5207
S
spring-framework
项目概览
chenpeng_fei
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b7dd5207
编写于
3月 05, 2015
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix formatting
上级
8ab2e475
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
20 deletion
+13
-20
spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
...ork/http/converter/BufferedImageHttpMessageConverter.java
+6
-11
spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
...ingframework/http/converter/FormHttpMessageConverter.java
+5
-7
spring-web/src/test/java/org/springframework/http/client/AbstractJettyServerTestCase.java
...ingframework/http/client/AbstractJettyServerTestCase.java
+1
-1
spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
...ingframework/web/client/RestTemplateIntegrationTests.java
+1
-1
未找到文件。
spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
浏览文件 @
b7dd5207
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -210,26 +210,21 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter<B
throws
IOException
,
HttpMessageNotWritableException
{
if
(
outputMessage
instanceof
StreamingHttpOutputMessage
)
{
StreamingHttpOutputMessage
streamingOutputMessage
=
(
StreamingHttpOutputMessage
)
outputMessage
;
StreamingHttpOutputMessage
streamingOutputMessage
=
(
StreamingHttpOutputMessage
)
outputMessage
;
streamingOutputMessage
.
setBody
(
new
StreamingHttpOutputMessage
.
Body
()
{
@Override
public
void
writeTo
(
OutputStream
outputStream
)
throws
IOException
{
writeInternal
(
image
,
contentType
,
outputMessage
.
getHeaders
(),
outputStream
);
writeInternal
(
image
,
contentType
,
outputMessage
.
getHeaders
(),
outputStream
);
}
});
}
else
{
writeInternal
(
image
,
contentType
,
outputMessage
.
getHeaders
(),
outputMessage
.
getBody
());
writeInternal
(
image
,
contentType
,
outputMessage
.
getHeaders
(),
outputMessage
.
getBody
());
}
}
private
void
writeInternal
(
BufferedImage
image
,
MediaType
contentType
,
HttpHeaders
headers
,
OutputStream
body
)
throws
IOException
,
HttpMessageNotWritableException
{
private
void
writeInternal
(
BufferedImage
image
,
MediaType
contentType
,
HttpHeaders
headers
,
OutputStream
body
)
throws
IOException
,
HttpMessageNotWritableException
{
if
(
contentType
==
null
||
contentType
.
isWildcardType
()
||
contentType
.
isWildcardSubtype
())
{
contentType
=
getDefaultContentType
();
...
...
spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
浏览文件 @
b7dd5207
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -257,8 +257,8 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
return
false
;
}
private
void
writeForm
(
MultiValueMap
<
String
,
String
>
form
,
MediaType
contentType
,
HttpOutputMessage
outputMessage
)
throws
IOException
{
private
void
writeForm
(
MultiValueMap
<
String
,
String
>
form
,
MediaType
contentType
,
HttpOutputMessage
outputMessage
)
throws
IOException
{
Charset
charset
;
if
(
contentType
!=
null
)
{
...
...
@@ -291,8 +291,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
outputMessage
.
getHeaders
().
setContentLength
(
bytes
.
length
);
if
(
outputMessage
instanceof
StreamingHttpOutputMessage
)
{
StreamingHttpOutputMessage
streamingOutputMessage
=
(
StreamingHttpOutputMessage
)
outputMessage
;
StreamingHttpOutputMessage
streamingOutputMessage
=
(
StreamingHttpOutputMessage
)
outputMessage
;
streamingOutputMessage
.
setBody
(
new
StreamingHttpOutputMessage
.
Body
()
{
@Override
public
void
writeTo
(
OutputStream
outputStream
)
throws
IOException
{
...
...
@@ -314,8 +313,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
headers
.
setContentType
(
contentType
);
if
(
outputMessage
instanceof
StreamingHttpOutputMessage
)
{
StreamingHttpOutputMessage
streamingOutputMessage
=
(
StreamingHttpOutputMessage
)
outputMessage
;
StreamingHttpOutputMessage
streamingOutputMessage
=
(
StreamingHttpOutputMessage
)
outputMessage
;
streamingOutputMessage
.
setBody
(
new
StreamingHttpOutputMessage
.
Body
()
{
@Override
public
void
writeTo
(
OutputStream
outputStream
)
throws
IOException
{
...
...
spring-web/src/test/java/org/springframework/http/client/AbstractJettyServerTestCase.java
浏览文件 @
b7dd5207
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
浏览文件 @
b7dd5207
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录