From 2eba1c5f625dafdfdae66cb2e41d5d2e3b759b0a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 17 Oct 2017 15:36:51 +0200 Subject: [PATCH] Polish "Use Assert.state() with Supplier where possible" Closes gh-10658 --- .../boot/cli/infrastructure/CommandLineInvoker.java | 4 ++-- .../boot/test/mock/mockito/DefinitionsParser.java | 4 ++-- .../main/java/org/springframework/boot/ApplicationTemp.java | 3 ++- .../boot/web/embedded/jetty/JettyWebServer.java | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java b/spring-boot-project/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java index 05f4a09bb80..8155e2febae 100644 --- a/spring-boot-project/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java +++ b/spring-boot-project/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java @@ -93,8 +93,8 @@ public final class CommandLineInvoker { } File bin = new File(unpacked.listFiles()[0], "bin"); File launchScript = new File(bin, isWindows() ? "spring.bat" : "spring"); - Assert.state(launchScript.exists() && launchScript.isFile(), - () -> "Could not find CLI launch script " + launchScript.getAbsolutePath()); + Assert.state(launchScript.exists() && launchScript.isFile(), () -> + "Could not find CLI launch script " + launchScript.getAbsolutePath()); return launchScript; } diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java index 0aa4befdfc0..d79ac0c1e62 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java @@ -109,8 +109,8 @@ class DefinitionsParser { private void addDefinition(AnnotatedElement element, Definition definition, String type) { boolean isNewDefinition = this.definitions.add(definition); - Assert.state(isNewDefinition, - () -> "Duplicate " + type + " definition " + definition); + Assert.state(isNewDefinition, () -> + "Duplicate " + type + " definition " + definition); if (element instanceof Field) { Field field = (Field) element; this.definitionFields.put(definition, field); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationTemp.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationTemp.java index 5e1b17c2ada..132d9dddceb 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationTemp.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationTemp.java @@ -91,7 +91,8 @@ public class ApplicationTemp { Assert.state(StringUtils.hasLength(property), "No 'java.io.tmpdir' property set"); File file = new File(property); Assert.state(file.exists(), () -> "Temp directory" + file + " does not exist"); - Assert.state(file.isDirectory(), () -> "Temp location " + file + " is not a directory"); + Assert.state(file.isDirectory(), () -> "Temp location " + file + + " is not a directory"); return file; } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyWebServer.java index 94ac909204f..5d92fc79c21 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyWebServer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyWebServer.java @@ -92,8 +92,8 @@ public class JettyWebServer implements WebServer { @Override protected void doStart() throws Exception { for (Connector connector : JettyWebServer.this.connectors) { - Assert.state(connector.isStopped(), () -> "Connector " + connector - + " has been started prematurely"); + Assert.state(connector.isStopped(), () -> "Connector " + + connector + " has been started prematurely"); } JettyWebServer.this.server.setConnectors(null); }