Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb 2021-06-10 00:12:34 -07:00
parent 456fcac0f2
commit 3b48526732
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/RandomValuePropertySource.java vendored
View File

@ -20,9 +20,7 @@ import java.util.OptionalInt;
import java.util.OptionalLong; import java.util.OptionalLong;
import java.util.Random; import java.util.Random;
import java.util.UUID; import java.util.UUID;
import java.util.function.BiPredicate;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Predicate;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -98,11 +96,11 @@ public class RandomValuePropertySource extends PropertySource<Random> {
} }
String range = getRange(type, "int"); String range = getRange(type, "int");
if (range != null) { if (range != null) {
return getNextIntInRange(range); return getNextIntInRange(Range.of(range, Integer::parseInt));
} }
range = getRange(type, "long"); range = getRange(type, "long");
if (range != null) { if (range != null) {
return getNextLongInRange(range); return getNextLongInRange(Range.of(range, Long::parseLong));
} }
if (type.equals("uuid")) { if (type.equals("uuid")) {
return UUID.randomUUID().toString(); return UUID.randomUUID().toString();
@ -120,24 +118,22 @@ public class RandomValuePropertySource extends PropertySource<Random> {
return null; return null;
} }
private int getNextIntInRange(String range) { private int getNextIntInRange(Range<Integer> range) {
Range<Integer> intRange = Range.get(range, Integer::parseInt, (t) -> t > 0, 0, (t1, t2) -> t1 < t2); OptionalInt first = getSource().ints(1, range.getMin(), range.getMax()).findFirst();
OptionalInt first = getSource().ints(1, intRange.getMin(), intRange.getMax()).findFirst(); assertPresent(first.isPresent(), range);
if (!first.isPresent()) {
throw new RuntimeException("Could not get random number for range '" + range + "'");
}
return first.getAsInt(); return first.getAsInt();
} }
private long getNextLongInRange(String range) { private long getNextLongInRange(Range<Long> range) {
Range<Long> longRange = Range.get(range, Long::parseLong, (t) -> t > 0L, 0L, (t1, t2) -> t1 < t2); OptionalLong first = getSource().longs(1, range.getMin(), range.getMax()).findFirst();
OptionalLong first = getSource().longs(1, longRange.getMin(), longRange.getMax()).findFirst(); assertPresent(first.isPresent(), range);
if (!first.isPresent()) {
throw new RuntimeException("Could not get random number for range '" + range + "'");
}
return first.getAsLong(); return first.getAsLong();
} }
private void assertPresent(boolean present, Range<?> range) {
Assert.state(present, () -> "Could not get random number for range '" + range + "'");
}
private Object getRandomBytes() { private Object getRandomBytes() {
byte[] bytes = new byte[32]; byte[] bytes = new byte[32];
getSource().nextBytes(bytes); getSource().nextBytes(bytes);
@ -152,27 +148,16 @@ public class RandomValuePropertySource extends PropertySource<Random> {
static final class Range<T extends Number> { static final class Range<T extends Number> {
private final String value;
private final T min; private final T min;
private final T max; private final T max;
private Range(T min, T max) { private Range(String value, T min, T max) {
this.value = value;
this.min = min; this.min = min;
this.max = max; this.max = max;
}
static <T extends Number> Range<T> get(String range, Function<String, T> parse, Predicate<T> boundValidator,
T defaultMin, BiPredicate<T, T> rangeValidator) {
String[] tokens = StringUtils.commaDelimitedListToStringArray(range);
T token1 = parse.apply(tokens[0]);
if (tokens.length == 1) {
Assert.isTrue(boundValidator.test(token1), "Bound must be positive.");
return new Range<>(defaultMin, token1);
}
T token2 = parse.apply(tokens[1]);
Assert.isTrue(rangeValidator.test(token1, token2), "Lower bound must be less than upper bound.");
return new Range<>(token1, token2);
} }
T getMin() { T getMin() {
@ -183,6 +168,24 @@ public class RandomValuePropertySource extends PropertySource<Random> {
return this.max; return this.max;
} }
@Override
public String toString() {
return this.value;
}
static <T extends Number & Comparable<T>> Range<T> of(String value, Function<String, T> parse) {
T zero = parse.apply("0");
String[] tokens = StringUtils.commaDelimitedListToStringArray(value);
T min = parse.apply(tokens[0]);
if (tokens.length == 1) {
Assert.isTrue(min.compareTo(zero) > 0, "Bound must be positive.");
return new Range<>(value, zero, min);
}
T max = parse.apply(tokens[1]);
Assert.isTrue(min.compareTo(max) < 0, "Lower bound must be less than upper bound.");
return new Range<>(value, min, max);
}
} }
} }