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

Use Supplier version of Assert.state() 

Closes gh-11362
This commit is contained in:
Johnny Lim 2017-12-16 02:04:59 +09:00 committed by Stephane Nicoll
parent db2de63106
commit e32287164b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/convert/DurationConverter.java
View File

@ -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 {
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;
} }

8
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/SessionStoreDirectory.java
View File

@ -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");
}
} }