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
e3228716
Commit
e3228716
authored
Dec 15, 2017
by
Johnny Lim
Committed by
Stephane Nicoll
Dec 23, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Supplier version of Assert.state()
Closes gh-11362
parent
db2de631
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
DurationConverter.java
...ot/context/properties/bind/convert/DurationConverter.java
+2
-2
SessionStoreDirectory.java
...mework/boot/web/servlet/server/SessionStoreDirectory.java
+6
-2
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/convert/DurationConverter.java
View file @
e3228716
...
@@ -90,7 +90,7 @@ class DurationConverter implements GenericConverter {
...
@@ -90,7 +90,7 @@ class DurationConverter implements GenericConverter {
return
Duration
.
parse
(
source
);
return
Duration
.
parse
(
source
);
}
}
Matcher
matcher
=
SIMPLE
.
matcher
(
source
);
Matcher
matcher
=
SIMPLE
.
matcher
(
source
);
Assert
.
state
(
matcher
.
matches
(),
"'"
+
source
+
"' is not a valid duration"
);
Assert
.
state
(
matcher
.
matches
(),
()
->
"'"
+
source
+
"' is not a valid duration"
);
long
amount
=
Long
.
parseLong
(
matcher
.
group
(
1
));
long
amount
=
Long
.
parseLong
(
matcher
.
group
(
1
));
ChronoUnit
unit
=
getUnit
(
matcher
.
group
(
2
),
defaultUnit
);
ChronoUnit
unit
=
getUnit
(
matcher
.
group
(
2
),
defaultUnit
);
return
Duration
.
of
(
amount
,
unit
);
return
Duration
.
of
(
amount
,
unit
);
...
@@ -106,7 +106,7 @@ class DurationConverter implements GenericConverter {
...
@@ -106,7 +106,7 @@ class DurationConverter implements GenericConverter {
return
(
defaultUnit
!=
null
?
defaultUnit
.
value
()
:
ChronoUnit
.
MILLIS
);
return
(
defaultUnit
!=
null
?
defaultUnit
.
value
()
:
ChronoUnit
.
MILLIS
);
}
}
ChronoUnit
unit
=
UNITS
.
get
(
value
.
toLowerCase
());
ChronoUnit
unit
=
UNITS
.
get
(
value
.
toLowerCase
());
Assert
.
state
(
unit
!=
null
,
"Unknown unit '"
+
value
+
"'"
);
Assert
.
state
(
unit
!=
null
,
()
->
"Unknown unit '"
+
value
+
"'"
);
return
unit
;
return
unit
;
}
}
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/SessionStoreDirectory.java
View file @
e3228716
...
@@ -51,9 +51,13 @@ class SessionStoreDirectory {
...
@@ -51,9 +51,13 @@ class SessionStoreDirectory {
if
(!
dir
.
exists
()
&&
mkdirs
)
{
if
(!
dir
.
exists
()
&&
mkdirs
)
{
dir
.
mkdirs
();
dir
.
mkdirs
();
}
}
Assert
.
state
(!
mkdirs
||
dir
.
exists
(),
"Session dir "
+
dir
+
" does not exist"
);
assertDirectory
(
mkdirs
,
dir
);
Assert
.
state
(!
dir
.
isFile
(),
"Session dir "
+
dir
+
" points to a file"
);
return
dir
;
return
dir
;
}
}
private
void
assertDirectory
(
boolean
mkdirs
,
File
dir
)
{
Assert
.
state
(!
mkdirs
||
dir
.
exists
(),
()
->
"Session dir "
+
dir
+
" does not exist"
);
Assert
.
state
(!
dir
.
isFile
(),
()
->
"Session dir "
+
dir
+
" points to a file"
);
}
}
}
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