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

Polish 

Closes gh-8698
This commit is contained in:
Johnny Lim 2017-03-23 09:49:54 +09:00 committed by Stephane Nicoll
parent ee0a151671
commit 287520a810
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewIntegrationTests.java
View File

@ -49,7 +49,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
/** /**
* Itegration tests for the default error view. * Integration tests for the default error view.
* *
* @author Dave Syer * @author Dave Syer
*/ */

2
spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedValue.java vendored
View File

@ -65,7 +65,7 @@ class OriginTrackedValue {
* the resulting {@link OriginTrackedValue}. * the resulting {@link OriginTrackedValue}.
* @param value the source value * @param value the source value
* @param origin the origin * @param origin the origin
* @return a {@link OriginTrackedValue} or {@code null} if the source value was * @return an {@link OriginTrackedValue} or {@code null} if the source value was
* {@code null}. * {@code null}.
*/ */
public static OriginTrackedValue of(Object value, PropertyOrigin origin) { public static OriginTrackedValue of(Object value, PropertyOrigin origin) {

2
spring-boot/src/main/java/org/springframework/boot/env/TextResourcePropertyOrigin.java vendored
View File

@ -40,7 +40,7 @@ public class TextResourcePropertyOrigin implements PropertyOrigin {
/** /**
* Return the resource where the property originated. * Return the resource where the property originated.
* @return the resource the text resource or {@code null} * @return the text resource or {@code null}
*/ */
public Resource getResource() { public Resource getResource() {
return this.resource; return this.resource;

3
spring-boot/src/test/java/org/springframework/boot/env/TextResourcePropertyOriginTests.java vendored
View File

@ -109,6 +109,7 @@ public class TextResourcePropertyOriginTests {
Location location3 = new Location(2, 2); Location location3 = new Location(2, 2);
assertThat(location1.hashCode()).isEqualTo(location1.hashCode()); assertThat(location1.hashCode()).isEqualTo(location1.hashCode());
assertThat(location1.hashCode()).isEqualTo(location2.hashCode()); assertThat(location1.hashCode()).isEqualTo(location2.hashCode());
assertThat(location1.hashCode()).isNotEqualTo(location3.hashCode());
assertThat(location1).isEqualTo(location1); assertThat(location1).isEqualTo(location1);
assertThat(location1).isEqualTo(location2); assertThat(location1).isEqualTo(location2);
assertThat(location1).isNotEqualTo(location3); assertThat(location1).isNotEqualTo(location3);
@ -126,6 +127,8 @@ public class TextResourcePropertyOriginTests {
new ClassPathResource("foo2.txt"), new Location(1, 2)); new ClassPathResource("foo2.txt"), new Location(1, 2));
assertThat(origin1.hashCode()).isEqualTo(origin1.hashCode()); assertThat(origin1.hashCode()).isEqualTo(origin1.hashCode());
assertThat(origin1.hashCode()).isEqualTo(origin2.hashCode()); assertThat(origin1.hashCode()).isEqualTo(origin2.hashCode());
assertThat(origin1.hashCode()).isNotEqualTo(origin3.hashCode());
assertThat(origin1.hashCode()).isNotEqualTo(origin4.hashCode());
assertThat(origin1).isEqualTo(origin1); assertThat(origin1).isEqualTo(origin1);
assertThat(origin1).isEqualTo(origin2); assertThat(origin1).isEqualTo(origin2);
assertThat(origin1).isNotEqualTo(origin3); assertThat(origin1).isNotEqualTo(origin3);