Browse Source

Polishing

pull/1594/head
Juergen Hoeller 8 years ago
parent
commit
7697b398d5
  1. 2
      spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
  2. 1
      spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
  3. 7
      spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java

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

@ -815,6 +815,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess @@ -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 @@ -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

@ -508,6 +508,7 @@ public class MockHttpServletRequestTests { @@ -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

@ -62,8 +62,7 @@ public class ResourceHttpRequestHandlerTests { @@ -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 { @@ -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 { @@ -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");

Loading…
Cancel
Save