Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
287520a8
Commit
287520a8
authored
Mar 23, 2017
by
Johnny Lim
Committed by
Stephane Nicoll
Mar 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-8698
parent
ee0a1516
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
3 deletions
+6
-3
DefaultErrorViewIntegrationTests.java
...e/web/servlet/error/DefaultErrorViewIntegrationTests.java
+1
-1
OriginTrackedValue.java
...java/org/springframework/boot/env/OriginTrackedValue.java
+1
-1
TextResourcePropertyOrigin.java
.../springframework/boot/env/TextResourcePropertyOrigin.java
+1
-1
TextResourcePropertyOriginTests.java
...ngframework/boot/env/TextResourcePropertyOriginTests.java
+3
-0
No files found.
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewIntegrationTests.java
View file @
287520a8
...
@@ -49,7 +49,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
...
@@ -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.
* I
n
tegration tests for the default error view.
*
*
* @author Dave Syer
* @author Dave Syer
*/
*/
...
...
spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedValue.java
View file @
287520a8
...
@@ -65,7 +65,7 @@ class OriginTrackedValue {
...
@@ -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 a
n
{@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
)
{
...
...
spring-boot/src/main/java/org/springframework/boot/env/TextResourcePropertyOrigin.java
View file @
287520a8
...
@@ -40,7 +40,7 @@ public class TextResourcePropertyOrigin implements PropertyOrigin {
...
@@ -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
;
...
...
spring-boot/src/test/java/org/springframework/boot/env/TextResourcePropertyOriginTests.java
View file @
287520a8
...
@@ -109,6 +109,7 @@ public class TextResourcePropertyOriginTests {
...
@@ -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 {
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment