Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Supplier variants of Assert

Browse Source 
See gh-19864
This commit is contained in:
dreis2211
2020-01-23 07:44:54 +01:00
committed by Stephane Nicoll
parent 9fbaf7611b
commit d8e2349e47
18 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/ApiVersion.java
View File

@@ -121,7 +121,7 @@ final class ApiVersion {
static ApiVersion parse(String value) {
Assert.hasText(value, "Value must not be empty");
Matcher matcher = PATTERN.matcher(value);
Assert.isTrue(matcher.matches(), "Malformed version number '" + value + "'");
Assert.isTrue(matcher.matches(), () -> "Malformed version number '" + value + "'");
try {
int major = Integer.parseInt(matcher.group(1));
int minor = Integer.parseInt(matcher.group(2));

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildOwner.java
View File

@@ -49,7 +49,7 @@ class BuildOwner implements Owner {
private long getValue(Map<String, String> env, String name) {
String value = env.get(name);
Assert.state(StringUtils.hasText(value), "Missing '" + name + "' value from the builder environment");
Assert.state(StringUtils.hasText(value), () -> "Missing '" + name + "' value from the builder environment");
try {
return Long.parseLong(value);
}

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuilderMetadata.java
View File

@@ -123,7 +123,7 @@ class BuilderMetadata extends MappedObject {
Assert.notNull(imageConfig, "ImageConfig must not be null");
Map<String, String> labels = imageConfig.getLabels();
String json = (labels != null) ? labels.get(LABEL_NAME) : null;
Assert.notNull(json, "No '" + LABEL_NAME + "' label found in image config");
Assert.notNull(json, () -> "No '" + LABEL_NAME + "' label found in image config");
return fromJson(json);
}

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/StackId.java
View File

@@ -77,7 +77,7 @@ class StackId {
private static StackId fromImageConfig(ImageConfig imageConfig) {
Map<String, String> labels = imageConfig.getLabels();
String value = (labels != null) ? labels.get(LABEL_NAME) : null;
Assert.state(StringUtils.hasText(value), "Missing '" + LABEL_NAME + "' stack label");
Assert.state(StringUtils.hasText(value), () -> "Missing '" + LABEL_NAME + "' stack label");
return new StackId(value);
}

4
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageReference.java
View File

@@ -151,7 +151,7 @@ public final class ImageReference {
* @throws IllegalStateException if the image reference contains a digest
*/
public ImageReference inTaggedForm() {
Assert.state(this.digest == null, "Image reference '" + this + "' cannot contain a digest");
Assert.state(this.digest == null, () -> "Image reference '" + this + "' cannot contain a digest");
return new ImageReference(this.name, (this.tag != null) ? this.tag : LATEST, this.digest);
}
@@ -163,7 +163,7 @@ public final class ImageReference {
*/
public static ImageReference forJarFile(File jarFile) {
String filename = jarFile.getName();
Assert.isTrue(filename.toLowerCase().endsWith(".jar"), "File '" + jarFile + "' is not a JAR");
Assert.isTrue(filename.toLowerCase().endsWith(".jar"), () -> "File '" + jarFile + "' is not a JAR");
filename = filename.substring(0, filename.length() - 4);
int firstDot = filename.indexOf('.');
if (firstDot == -1) {

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/LayerId.java
View File

@@ -85,7 +85,7 @@ public final class LayerId {
public static LayerId of(String value) {
Assert.hasText(value, "Value must not be empty");
int i = value.indexOf(':');
Assert.isTrue(i >= 0, "Invalid layer ID '" + value + "'");
Assert.isTrue(i >= 0, () -> "Invalid layer ID '" + value + "'");
return new LayerId(value, value.substring(0, i), value.substring(i + 1));
}

3
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/VolumeName.java
View File

@@ -124,7 +124,8 @@ public final class VolumeName {
}
private static String asHexString(byte[] digest, int digestLength) {
Assert.isTrue(digestLength <= digest.length, "DigestLength must be less than or equal to " + digest.length);
Assert.isTrue(digestLength <= digest.length,
() -> "DigestLength must be less than or equal to " + digest.length);
byte[] shortDigest = new byte[6];
System.arraycopy(digest, 0, shortDigest, 0, shortDigest.length);
return String.format("%0" + digestLength + "x", new BigInteger(1, shortDigest));

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/MappedObject.java
View File

@@ -200,7 +200,7 @@ public class MappedObject {
if (declaringClass == Object.class) {
method.invoke(proxy, args);
}
Assert.state(args == null || args.length == 0, "Unsupported method " + method);
Assert.state(args == null || args.length == 0, () -> "Unsupported method " + method);
String name = getName(method.getName());
Class<?> type = method.getReturnType();
return valueForProperty(name, type);

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/BsdDomainSocket.java
View File

@@ -65,7 +65,7 @@ class BsdDomainSocket extends DomainSocket {
public byte[] sunPath = new byte[MAX_PATH_LENGTH];
private SockaddrUn(byte sunFamily, byte[] path) {
Assert.isTrue(path.length < MAX_PATH_LENGTH, "Path cannot exceed " + MAX_PATH_LENGTH + " bytes");
Assert.isTrue(path.length < MAX_PATH_LENGTH, () -> "Path cannot exceed " + MAX_PATH_LENGTH + " bytes");
System.arraycopy(path, 0, this.sunPath, 0, path.length);
this.sunPath[path.length] = 0;
this.sunLen = (byte) (fieldOffset("sunPath") + path.length);

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/LinuxDomainSocket.java
View File

@@ -63,7 +63,7 @@ class LinuxDomainSocket extends DomainSocket {
public byte[] sunPath = new byte[MAX_PATH_LENGTH];
private SockaddrUn(byte sunFamily, byte[] path) {
Assert.isTrue(path.length < MAX_PATH_LENGTH, "Path cannot exceed " + MAX_PATH_LENGTH + " bytes");
Assert.isTrue(path.length < MAX_PATH_LENGTH, () -> "Path cannot exceed " + MAX_PATH_LENGTH + " bytes");
System.arraycopy(path, 0, this.sunPath, 0, path.length);
this.sunPath[path.length] = 0;
this.sunFamily = sunFamily;