Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
4b22558a
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
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,发现更多精彩内容 >>
提交
4b22558a
编写于
6月 20, 2013
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add HTTP method to RequestDataValueProcessor method
Issue: SPR-10041, SPR-10652
上级
26fb8806
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
11 deletion
+13
-11
spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
...mework/web/servlet/support/RequestDataValueProcessor.java
+3
-2
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
...va/org/springframework/web/servlet/tags/form/FormTag.java
+6
-3
spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
...web/servlet/support/RequestDataValueProcessorWrapper.java
+3
-5
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
...g/springframework/web/servlet/tags/form/FormTagTests.java
+1
-1
未找到文件。
spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
浏览文件 @
4b22558a
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
3
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.
...
...
@@ -42,9 +42,10 @@ public interface RequestDataValueProcessor {
* Invoked when a new form action is rendered.
* @param request the current request
* @param action the form action
* @param httpMethod the form HTTP method
* @return the action to use, possibly modified
*/
String
processAction
(
HttpServletRequest
request
,
String
action
);
String
processAction
(
HttpServletRequest
request
,
String
action
,
String
httpMethod
);
/**
* Invoked when a form field value is rendered.
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
浏览文件 @
4b22558a
...
...
@@ -346,8 +346,7 @@ public class FormTag extends AbstractHtmlElementTag {
tagWriter
.
startTag
(
FORM_TAG
);
writeDefaultAttributes
(
tagWriter
);
tagWriter
.
writeAttribute
(
ACTION_ATTRIBUTE
,
resolveAction
());
writeOptionalAttribute
(
tagWriter
,
METHOD_ATTRIBUTE
,
isMethodBrowserSupported
(
getMethod
())
?
getMethod
()
:
DEFAULT_METHOD
);
writeOptionalAttribute
(
tagWriter
,
METHOD_ATTRIBUTE
,
getHttpMethod
());
writeOptionalAttribute
(
tagWriter
,
TARGET_ATTRIBUTE
,
getTarget
());
writeOptionalAttribute
(
tagWriter
,
ENCTYPE_ATTRIBUTE
,
getEnctype
());
writeOptionalAttribute
(
tagWriter
,
ACCEPT_CHARSET_ATTRIBUTE
,
getAcceptCharset
());
...
...
@@ -382,6 +381,10 @@ public class FormTag extends AbstractHtmlElementTag {
return
EVAL_BODY_INCLUDE
;
}
private
String
getHttpMethod
()
{
return
isMethodBrowserSupported
(
getMethod
())
?
getMethod
()
:
DEFAULT_METHOD
;
}
private
void
assertHttpMethod
(
String
method
)
{
for
(
HttpMethod
httpMethod
:
HttpMethod
.
values
())
{
if
(
httpMethod
.
name
().
equalsIgnoreCase
(
method
))
{
...
...
@@ -465,7 +468,7 @@ public class FormTag extends AbstractHtmlElementTag {
RequestDataValueProcessor
processor
=
getRequestContext
().
getRequestDataValueProcessor
();
ServletRequest
request
=
this
.
pageContext
.
getRequest
();
if
((
processor
!=
null
)
&&
(
request
instanceof
HttpServletRequest
))
{
action
=
processor
.
processAction
((
HttpServletRequest
)
request
,
action
);
action
=
processor
.
processAction
((
HttpServletRequest
)
request
,
action
,
getHttpMethod
()
);
}
return
action
;
}
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
浏览文件 @
4b22558a
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
3
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.
...
...
@@ -20,8 +20,6 @@ import java.util.Map;
import
javax.servlet.http.HttpServletRequest
;
import
org.springframework.web.servlet.support.RequestDataValueProcessor
;
public
class
RequestDataValueProcessorWrapper
implements
RequestDataValueProcessor
{
private
RequestDataValueProcessor
processor
;
...
...
@@ -41,8 +39,8 @@ public class RequestDataValueProcessorWrapper implements RequestDataValueProcess
}
@Override
public
String
processAction
(
HttpServletRequest
request
,
String
action
)
{
return
(
this
.
processor
!=
null
)
?
this
.
processor
.
processAction
(
request
,
action
)
:
action
;
public
String
processAction
(
HttpServletRequest
request
,
String
action
,
String
httpMethod
)
{
return
(
this
.
processor
!=
null
)
?
this
.
processor
.
processAction
(
request
,
action
,
httpMethod
)
:
action
;
}
@Override
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
浏览文件 @
4b22558a
...
...
@@ -326,7 +326,7 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
public
void
testRequestDataValueProcessorHooks
()
throws
Exception
{
String
action
=
"/my/form?foo=bar"
;
RequestDataValueProcessor
processor
=
getMockRequestDataValueProcessor
();
given
(
processor
.
processAction
(
this
.
request
,
action
)).
willReturn
(
action
);
given
(
processor
.
processAction
(
this
.
request
,
action
,
"post"
)).
willReturn
(
action
);
given
(
processor
.
getExtraHiddenFields
(
this
.
request
)).
willReturn
(
Collections
.
singletonMap
(
"key"
,
"value"
));
this
.
tag
.
doStartTag
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录