Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
1ca943c6
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,体验更适合开发者的 AI 搜索 >>
提交
1ca943c6
编写于
5月 07, 2013
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed javadoc warnings
Issue: SPR-10373
上级
fcb0cf27
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
32 addition
and
31 deletion
+32
-31
build.gradle
build.gradle
+12
-10
spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
...java/org/springframework/mock/web/MockServletContext.java
+4
-5
spring-test/src/main/java/org/springframework/test/context/TestContext.java
...in/java/org/springframework/test/context/TestContext.java
+2
-1
spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java
.../context/support/DirtiesContextTestExecutionListener.java
+9
-9
spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java
...org/springframework/mock/web/test/MockServletContext.java
+5
-6
未找到文件。
build.gradle
浏览文件 @
1ca943c6
...
...
@@ -80,21 +80,23 @@ configure(allprojects) { project ->
ext
.
javadocLinks
=
[
"http://docs.oracle.com/javase/6/docs/api"
,
"http://docs.oracle.com/javaee/6/api"
,
"http://portals.apache.org/pluto/portlet-2.0-apidocs/"
,
"http://commons.apache.org/proper/commons-codec/apidocs/"
,
"http://docs.oracle.com/javaee/6/api/"
,
"http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/"
,
// CommonJ
"http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/"
,
"http://glassfish.java.net/nonav/docs/v3/api/"
,
"http://docs.jboss.org/jbossas/javadoc/4.0.5/connector/"
,
"http://docs.jboss.org/jbossas/javadoc/7.1.2.Final/"
,
"http://commons.apache.org/proper/commons-lang/javadocs/api-2.5/"
,
"http://commons.apache.org/proper/commons-codec/apidocs/"
,
"http://commons.apache.org/proper/commons-dbcp/apidocs/"
,
"http://portals.apache.org/pluto/portlet-2.0-apidocs/"
,
"http://tiles.apache.org/framework/apidocs/"
,
"http://aopalliance.sourceforge.net/doc/"
,
"http://glassfish.java.net/nonav/docs/v3/api/"
,
"http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/"
,
// commonj
"http://quartz-scheduler.org/api/2.1.7/"
,
"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/"
,
"http://fasterxml.github.com/jackson-core/javadoc/2.2.0/"
,
"http://ehcache.org/apidocs/"
,
"http://quartz-scheduler.org/api/2.1.7/"
,
"http://jackson.codehaus.org/1.9.12/javadoc/"
,
"http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/"
,
"http://tiles.apache.org/framework/apidocs/"
,
"http://commons.apache.org/proper/commons-dbcp/apidocs/"
,
"http://fasterxml.github.com/jackson-core/javadoc/2.2.0/"
,
]
as
String
[]
}
...
...
spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
浏览文件 @
1ca943c6
...
...
@@ -263,11 +263,10 @@ public class MockServletContext implements ServletContext {
}
/**
* This method uses the Java Activation framework, which returns
* "application/octet-stream" when the mime type is unknown (i.e. it never returns
* {@code null}). In order to maintain the {@link ServletContext#getMimeType(String)
* contract, as of version 3.2.2, this method returns null if the mimeType is
* "application/octet-stream".
* This method uses the Java Activation framework, which returns "application/octet-stream"
* when the mime type is unknown (i.e. it never returns {@code null}). In order to maintain
* the {@link ServletContext#getMimeType(String)} contract, this method returns {@code null}
* if the mimeType is "application/octet-stream", as of Spring 3.2.2.
*/
public
String
getMimeType
(
String
filePath
)
{
String
mimeType
=
MimeTypeResolver
.
getMimeType
(
filePath
);
...
...
spring-test/src/main/java/org/springframework/test/context/TestContext.java
浏览文件 @
1ca943c6
...
...
@@ -167,7 +167,8 @@ public class TestContext extends AttributeAccessorSupport {
* context} associated with this test context is <em>dirty</em> and should be
* discarded. Do this if a test has modified the context — for example,
* by replacing a bean definition or modifying the state of a singleton bean.
* @deprecated As of Spring 3.2.2, use {@link #markApplicationContextDirty(HierarchyMode)} instead.
* @deprecated as of Spring 3.2.2; use
* {@link #markApplicationContextDirty(DirtiesContext.HierarchyMode)} instead.
*/
@Deprecated
public
void
markApplicationContextDirty
()
{
...
...
spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java
浏览文件 @
1ca943c6
...
...
@@ -20,6 +20,7 @@ import java.lang.reflect.Method;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.test.annotation.DirtiesContext
;
import
org.springframework.test.annotation.DirtiesContext.ClassMode
;
...
...
@@ -47,8 +48,8 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi
* Marks the {@linkplain ApplicationContext application context} of the supplied
* {@linkplain TestContext test context} as
* {@linkplain TestContext#markApplicationContextDirty() dirty}, and sets the
* {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE
*
REINJECT_DEPENDENCIES_ATTRIBUTE}
in the test context to {@code true}.
* {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE
}
* in the test context to {@code true}.
* @param testContext the test context whose application context should
* marked as dirty
* @deprecated as of Spring 3.2.2, use {@link #dirtyContext(TestContext, HierarchyMode)} instead.
...
...
@@ -61,10 +62,10 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi
/**
* Marks the {@linkplain ApplicationContext application context} of the supplied
* {@linkplain TestContext test context} as
{@linkplain
*
TestContext#markApplicationContextDirty(HierarchyMode) dirty} and sets the
*
{@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE
*
REINJECT_DEPENDENCIES_ATTRIBUTE}
in the test context to {@code true}.
* {@linkplain TestContext test context} as
*
{@linkplain TestContext#markApplicationContextDirty(DirtiesContext.HierarchyMode) dirty}
*
and sets {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE}
* in the test context to {@code true}.
* @param testContext the test context whose application context should
* marked as dirty
* @param hierarchyMode the context cache clearing mode to be applied if the
...
...
@@ -85,9 +86,8 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi
* AFTER_EACH_TEST_METHOD}, the {@linkplain ApplicationContext application
* context} of the test context will be
* {@linkplain TestContext#markApplicationContextDirty() marked as dirty} and the
* {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE
* REINJECT_DEPENDENCIES_ATTRIBUTE} in the test context will be set to
* {@code true}.
* {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE}
* in the test context will be set to {@code true}.
*/
@Override
public
void
afterTestMethod
(
TestContext
testContext
)
throws
Exception
{
...
...
spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java
浏览文件 @
1ca943c6
...
...
@@ -269,16 +269,15 @@ public class MockServletContext implements ServletContext {
}
/**
* This method uses the Java Activation framework, which returns
* "application/octet-stream" when the mime type is unknown (i.e. it never returns
* {@code null}). In order to maintain the {@link ServletContext#getMimeType(String)
* contract, as of version 3.2.2, this method returns null if the mimeType is
* "application/octet-stream".
* This method uses the Java Activation framework, which returns "application/octet-stream"
* when the mime type is unknown (i.e. it never returns {@code null}). In order to maintain
* the {@link ServletContext#getMimeType(String)} contract, this method returns {@code null}
* if the mimeType is "application/octet-stream", as of Spring 3.2.2.
*/
@Override
public
String
getMimeType
(
String
filePath
)
{
String
mimeType
=
MimeTypeResolver
.
getMimeType
(
filePath
);
return
(
"application/octet-stream"
.
equals
(
mimeType
)
)
?
null
:
mimeType
;
return
(
"application/octet-stream"
.
equals
(
mimeType
)
?
null
:
mimeType
)
;
}
@Override
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录