root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2017-11-14 17:11:16 +01:00
parent 85baba33bf
commit 7697b398d5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
View File

@ -815,6 +815,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
/**
* Return if there are constructor argument values defined for this bean.
*/
@Override
public boolean hasConstructorArgumentValues() {
return (this.constructorArgumentValues != null && !this.constructorArgumentValues.isEmpty());
}
@ -841,6 +842,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
* Return if there are property values values defined for this bean.
* @since 5.0.2
*/
@Override
public boolean hasPropertyValues() {
return (this.propertyValues != null && !this.propertyValues.isEmpty());
}

1
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
View File

@ -508,6 +508,7 @@ public class MockHttpServletRequestTests {
request.getDateHeader(IF_MODIFIED_SINCE);
}
private void assertEqualEnumerations(Enumeration<?> enum1, Enumeration<?> enum2) {
assertNotNull(enum1);
assertNotNull(enum2);

7
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
View File

@ -62,8 +62,7 @@ public class ResourceHttpRequestHandlerTests {
@Before
public void setUp() throws Exception {
public void setup() throws Exception {
List<Resource> paths = new ArrayList<>(2);
paths.add(new ClassPathResource("test/", getClass()));
paths.add(new ClassPathResource("testalternatepath/", getClass()));
@ -79,6 +78,7 @@ public class ResourceHttpRequestHandlerTests {
this.response = new MockHttpServletResponse();
}
@Test
public void getResource() throws Exception {
this.request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
@ -598,8 +598,7 @@ public class ResourceHttpRequestHandlerTests {
assertEquals("t.", ranges[11]);
}
// SPR-14005
@Test
@Test // SPR-14005
public void doOverwriteExistingCacheControlHeaders() throws Exception {
this.request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
this.response.setHeader("Cache-Control", "no-store");