Use Supplier variants of Assert

dreis2211 · snicoll · commit d8e2349e4710 · 2020-01-28T15:04:11.000+01:00
See gh-19864
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -124,7 +124,7 @@ public void addSourceFolders(Iterable<File> folders) {
 	 */
 	public void addSourceFolder(File folder) {
 		Assert.notNull(folder, "Folder must not be null");
-		Assert.isTrue(!folder.isFile(), "Folder '" + folder + "' must not be a file");
+		Assert.isTrue(!folder.isFile(), () -> "Folder '" + folder + "' must not be a file");
 		synchronized (this.monitor) {
 			checkNotStarted();
 			this.folders.put(folder, null);
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FolderSnapshot.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FolderSnapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ class FolderSnapshot {
 	 */
 	FolderSnapshot(File folder) {
 		Assert.notNull(folder, "Folder must not be null");
-		Assert.isTrue(!folder.isFile(), "Folder '" + folder + "' must not be a file");
+		Assert.isTrue(!folder.isFile(), () -> "Folder '" + folder + "' must not be a file");
 		this.folder = folder;
 		this.time = new Date();
 		Set<FileSnapshot> files = new LinkedHashSet<>();
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/ApiVersion.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/ApiVersion.java
@@ -121,7 +121,7 @@ public String toString() {
 	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));
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildOwner.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildOwner.java
@@ -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);
 		}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuilderMetadata.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuilderMetadata.java
@@ -123,7 +123,7 @@ static BuilderMetadata fromImageConfig(ImageConfig imageConfig) throws IOExcepti
 		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);
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/StackId.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/StackId.java
@@ -77,7 +77,7 @@ static StackId fromImage(Image image) {
 	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);
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageReference.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/ImageReference.java
@@ -151,7 +151,7 @@ public ImageReference withDigest(String digest) {
 	 * @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 ImageReference inTaggedForm() {
 	 */
 	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) {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/LayerId.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/LayerId.java
@@ -85,7 +85,7 @@ public String toString() {
 	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));
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/VolumeName.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/type/VolumeName.java
@@ -124,7 +124,8 @@ private static String getDigest(String name, int length) {
 	}
 
 	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));
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/MappedObject.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/MappedObject.java
@@ -200,7 +200,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 			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);
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/BsdDomainSocket.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/BsdDomainSocket.java
@@ -65,7 +65,7 @@ public static class SockaddrUn extends Structure implements Structure.ByReferenc
 		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);
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/LinuxDomainSocket.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/LinuxDomainSocket.java
@@ -63,7 +63,7 @@ public static class SockaddrUn extends Structure implements Structure.ByReferenc
 		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;
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/IndexedLayers.java b/spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/IndexedLayers.java
@@ -69,7 +69,7 @@ public String getLayer(ZipEntry entry) {
 		Matcher matcher = LAYER_PATTERN.matcher(name);
 		if (matcher.matches()) {
 			String layer = matcher.group(1);
-			Assert.state(this.layers.contains(layer), "Unexpected layer '" + layer + "'");
+			Assert.state(this.layers.contains(layer), () -> "Unexpected layer '" + layer + "'");
 			return layer;
 		}
 		return this.layers.contains(APPLICATION_LAYER) ? APPLICATION_LAYER : SPRING_BOOT_APPLICATION_LAYER;
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/ImagePackager.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/ImagePackager.java
@@ -52,8 +52,8 @@ public void packageImage(Libraries libraries, BiConsumer<ZipEntry, EntryWriter>
 
 	private void packageImage(Libraries libraries, AbstractJarWriter writer) throws IOException {
 		File source = isAlreadyPackaged() ? getBackupFile() : getSource();
-		Assert.state(source.exists() && source.isFile(), "Unable to read jar file " + source);
-		Assert.state(!isAlreadyPackaged(source), "Repackaged jar file " + source + " cannot be exported");
+		Assert.state(source.exists() && source.isFile(), () -> "Unable to read jar file " + source);
+		Assert.state(!isAlreadyPackaged(source), () -> "Repackaged jar file " + source + " cannot be exported");
 		try (JarFile sourceJar = new JarFile(source)) {
 			write(sourceJar, libraries, writer);
 		}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layer.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layer.java
@@ -40,9 +40,9 @@ public class Layer {
 	 */
 	public Layer(String name) {
 		Assert.hasText(name, "Name must not be empty");
-		Assert.isTrue(PATTERN.matcher(name).matches(), "Malformed layer name '" + name + "'");
+		Assert.isTrue(PATTERN.matcher(name).matches(), () -> "Malformed layer name '" + name + "'");
 		Assert.isTrue(!name.equalsIgnoreCase("ext") && !name.toLowerCase().startsWith("springboot"),
-				"Layer name '" + name + "' is reserved");
+				() -> "Layer name '" + name + "' is reserved");
 		this.name = name;
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.java
@@ -413,7 +413,7 @@ public JarArchiveEntry transform(JarArchiveEntry entry) {
 		private String transformName(String name) {
 			if (this.layout instanceof LayeredLayout) {
 				Layer layer = this.layers.getLayer(name);
-				Assert.state(layer != null, "Invalid 'null' layer from " + this.layers.getClass().getName());
+				Assert.state(layer != null, () -> "Invalid 'null' layer from " + this.layers.getClass().getName());
 				return ((LayeredLayout) this.layout).getRepackagedClassesLocation(layer) + name;
 			}
 			return this.layout.getRepackagedClassesLocation() + name;
@@ -455,7 +455,7 @@ private void addLibrary(Library library) {
 			if (location != null) {
 				String path = location + library.getName();
 				Library existing = this.libraries.putIfAbsent(path, library);
-				Assert.state(existing == null, "Duplicate library " + library.getName());
+				Assert.state(existing == null, () -> "Duplicate library " + library.getName());
 			}
 		}
 
@@ -464,7 +464,7 @@ private String getLocation(Library library) {
 			if (layout instanceof LayeredLayout) {
 				Layers layers = Packager.this.layers;
 				Layer layer = layers.getLayer(library);
-				Assert.state(layer != null, "Invalid 'null' library layer from " + layers.getClass().getName());
+				Assert.state(layer != null, () -> "Invalid 'null' library layer from " + layers.getClass().getName());
 				return ((LayeredLayout) layout).getLibraryLocation(library.getName(), library.getScope(), layer);
 			}
 			return layout.getLibraryLocation(library.getName(), library.getScope());
@@ -479,7 +479,7 @@ public boolean requiresUnpack(String name) {
 		@Override
 		public String sha1Hash(String name) throws IOException {
 			Library library = this.libraries.get(name);
-			Assert.notNull(library, "No library found for entry name '" + name + "'");
+			Assert.notNull(library, () -> "No library found for entry name '" + name + "'");
 			return Digest.sha1(library::openStream);
 		}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -371,7 +371,7 @@ private ClassLoader wrapWithCustomClassLoader(ClassLoader parent, String classNa
 		if (classLoader == null) {
 			classLoader = newClassLoader(type, NO_PARAMS);
 		}
-		Assert.notNull(classLoader, "Unable to create class loader for " + className);
+		Assert.notNull(classLoader, () -> "Unable to create class loader for " + className);
 		return classLoader;
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathExtension.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathExtension.java
@@ -118,7 +118,7 @@ private Method findMethod(Class<?> testClass, String testMethodName) {
 				}
 			}
 		}
-		Assert.state(method != null, "Unable to find " + testClass + "." + testMethodName);
+		Assert.state(method != null, () -> "Unable to find " + testClass + "." + testMethodName);
 		return method;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class BuildOwner implements Owner {`
`49`	`49`
`50`	`50`	`private long getValue(Map<String, String> env, String name) {`
`51`	`51`	`String value = env.get(name);`
`52`		`- Assert.state(StringUtils.hasText(value), "Missing '" + name + "' value from the builder environment");`
	`52`	`+ Assert.state(StringUtils.hasText(value), () -> "Missing '" + name + "' value from the builder environment");`
`53`	`53`	`try {`
`54`	`54`	`return Long.parseLong(value);`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ static BuilderMetadata fromImageConfig(ImageConfig imageConfig) throws IOExcepti`
`123`	`123`	`Assert.notNull(imageConfig, "ImageConfig must not be null");`
`124`	`124`	`Map<String, String> labels = imageConfig.getLabels();`
`125`	`125`	`String json = (labels != null) ? labels.get(LABEL_NAME) : null;`
`126`		`- Assert.notNull(json, "No '" + LABEL_NAME + "' label found in image config");`
	`126`	`+ Assert.notNull(json, () -> "No '" + LABEL_NAME + "' label found in image config");`
`127`	`127`	`return fromJson(json);`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ static StackId fromImage(Image image) {`
`77`	`77`	`private static StackId fromImageConfig(ImageConfig imageConfig) {`
`78`	`78`	`Map<String, String> labels = imageConfig.getLabels();`
`79`	`79`	`String value = (labels != null) ? labels.get(LABEL_NAME) : null;`
`80`		`- Assert.state(StringUtils.hasText(value), "Missing '" + LABEL_NAME + "' stack label");`
	`80`	`+ Assert.state(StringUtils.hasText(value), () -> "Missing '" + LABEL_NAME + "' stack label");`
`81`	`81`	`return new StackId(value);`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public String toString() {`
`85`	`85`	`public static LayerId of(String value) {`
`86`	`86`	`Assert.hasText(value, "Value must not be empty");`
`87`	`87`	`int i = value.indexOf(':');`
`88`		`- Assert.isTrue(i >= 0, "Invalid layer ID '" + value + "'");`
	`88`	`+ Assert.isTrue(i >= 0, () -> "Invalid layer ID '" + value + "'");`
`89`	`89`	`return new LayerId(value, value.substring(0, i), value.substring(i + 1));`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,8 @@ private static String getDigest(String name, int length) {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`private static String asHexString(byte[] digest, int digestLength) {`
`127`		`- Assert.isTrue(digestLength <= digest.length, "DigestLength must be less than or equal to " + digest.length);`
	`127`	`+ Assert.isTrue(digestLength <= digest.length,`
	`128`	`+ () -> "DigestLength must be less than or equal to " + digest.length);`
`128`	`129`	`byte[] shortDigest = new byte[6];`
`129`	`130`	`System.arraycopy(digest, 0, shortDigest, 0, shortDigest.length);`
`130`	`131`	`return String.format("%0" + digestLength + "x", new BigInteger(1, shortDigest));`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl`
`200`	`200`	`if (declaringClass == Object.class) {`
`201`	`201`	`method.invoke(proxy, args);`
`202`	`202`	`}`
`203`		`- Assert.state(args == null \|\| args.length == 0, "Unsupported method " + method);`
	`203`	`+ Assert.state(args == null \|\| args.length == 0, () -> "Unsupported method " + method);`
`204`	`204`	`String name = getName(method.getName());`
`205`	`205`	`Class<?> type = method.getReturnType();`
`206`	`206`	`return valueForProperty(name, type);`