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

Fixed javadoc warnings

Browse Source 
Issue: SPR-10373
This commit is contained in:
Juergen Hoeller
2013-05-07 21:26:01 +02:00
parent fcb0cf27d7
commit 1ca943c681
5 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
View File

@@ -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);

3
spring-test/src/main/java/org/springframework/test/context/TestContext.java
View File

@@ -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 &mdash; 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() {

18
spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java
View File

@@ -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 {