Skip to content

Commit 7697b39

Browse files
committed
Polishing
1 parent 85baba3 commit 7697b39

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -815,6 +815,7 @@ public ConstructorArgumentValues getConstructorArgumentValues() {
815815
/**
816816
* Return if there are constructor argument values defined for this bean.
817817
*/
818+
@Override
818819
public boolean hasConstructorArgumentValues() {
819820
return (this.constructorArgumentValues != null && !this.constructorArgumentValues.isEmpty());
820821
}
@@ -841,6 +842,7 @@ public MutablePropertyValues getPropertyValues() {
841842
* Return if there are property values values defined for this bean.
842843
* @since 5.0.2
843844
*/
845+
@Override
844846
public boolean hasPropertyValues() {
845847
return (this.propertyValues != null && !this.propertyValues.isEmpty());
846848
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ public void httpHeaderFormatedDateError() {
508508
request.getDateHeader(IF_MODIFIED_SINCE);
509509
}
510510

511+
511512
private void assertEqualEnumerations(Enumeration<?> enum1, Enumeration<?> enum2) {
512513
assertNotNull(enum1);
513514
assertNotNull(enum2);

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ public class ResourceHttpRequestHandlerTests {
6262

6363

6464
@Before
65-
public void setUp() throws Exception {
66-
65+
public void setup() throws Exception {
6766
List<Resource> paths = new ArrayList<>(2);
6867
paths.add(new ClassPathResource("test/", getClass()));
6968
paths.add(new ClassPathResource("testalternatepath/", getClass()));
@@ -79,6 +78,7 @@ public void setUp() throws Exception {
7978
this.response = new MockHttpServletResponse();
8079
}
8180

81+
8282
@Test
8383
public void getResource() throws Exception {
8484
this.request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
@@ -598,8 +598,7 @@ public void partialContentMultipleByteRanges() throws Exception {
598598
assertEquals("t.", ranges[11]);
599599
}
600600

601-
// SPR-14005
602-
@Test
601+
@Test // SPR-14005
603602
public void doOverwriteExistingCacheControlHeaders() throws Exception {
604603
this.request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
605604
this.response.setHeader("Cache-Control", "no-store");

0 commit comments

Comments
 (0)