Merge branch '2.4.x'

Closes gh-25506

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationTests.java

 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -284,7 +284,7 @@ class Neo4jAutoConfigurationTests {
 	@Test
 	void securityWithCustomCertificates(@TempDir File directory) throws IOException {
 		File certFile = new File(directory, "neo4j-driver.cert");
-		assertThat(certFile.createNewFile());
+		assertThat(certFile.createNewFile()).isTrue();
 
 		Neo4jProperties properties = new Neo4jProperties();
 		properties.getSecurity().setTrustStrategy(TrustStrategy.TRUST_CUSTOM_CA_SIGNED_CERTIFICATES);

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests.java

 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -80,7 +80,7 @@ class BuildInfoIntegrationTests {
 		Properties second = buildInfoProperties();
 		String secondBuildTime = second.getProperty("build.time");
 		assertThat(secondBuildTime).isNotNull();
-		assertThat(Instant.parse(firstBuildTime).isBefore(Instant.parse(secondBuildTime)));
+		assertThat(Instant.parse(firstBuildTime)).isBefore(Instant.parse(secondBuildTime));
 	}
 
 	@TestTemplate

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.java

 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -61,7 +61,7 @@ public class BootBuildImageRegistryIntegrationTests {
 
 	@BeforeEach
 	void setUp() {
-		assertThat(registry.isRunning());
+		assertThat(registry.isRunning()).isTrue();
 		this.registryAddress = registry.getHost() + ":" + registry.getFirstMappedPort();
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AbstractArchiveIntegrationTests.java

@@ -98,7 +98,7 @@ abstract class AbstractArchiveIntegrationTests {
 
 		private JarAssert(File actual) {
 			super(actual, JarAssert.class);
-			assertThat(actual.exists());
+			assertThat(actual).exists();
 		}
 
 		JarAssert doesNotHaveEntryWithName(String name) {

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java

 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -55,7 +55,7 @@ public class BuildImageRegistryIntegrationTests extends AbstractArchiveIntegrati
 
 	@BeforeEach
 	void setUp() {
-		assertThat(registry.isRunning());
+		assertThat(registry.isRunning()).isTrue();
 		this.dockerClient = registry.getDockerClient();
 		this.registryAddress = registry.getHost() + ":" + registry.getFirstMappedPort();
 	}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -1228,10 +1228,10 @@ class SpringApplicationTests {
 		application.addListeners(listener);
 		application.run();
 		ApplicationStartingEvent startingEvent = listener.getEvent(ApplicationStartingEvent.class);
-		assertThat(startingEvent.getBootstrapContext().get(String.class));
+		assertThat(startingEvent.getBootstrapContext().get(String.class)).isEqualTo("boot");
 		ApplicationEnvironmentPreparedEvent environmentPreparedEvent = listener
 				.getEvent(ApplicationEnvironmentPreparedEvent.class);
-		assertThat(environmentPreparedEvent.getBootstrapContext().get(String.class));
+		assertThat(environmentPreparedEvent.getBootstrapContext().get(String.class)).isEqualTo("boot");
 	}
 
 	@Test

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java

 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -54,7 +54,6 @@ import org.springframework.messaging.rsocket.RSocketStrategies;
 import org.springframework.util.SocketUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.will;
 import static org.mockito.Mockito.inOrder;
@@ -203,7 +202,7 @@ class NettyRSocketServerFactoryTests {
 		String payload = "test payload";
 		Mono<String> responseMono = this.requester.route("test").data(payload).retrieveMono(String.class);
 		StepVerifier.create(responseMono)
-				.verifyErrorSatisfies((ex) -> assertThatExceptionOfType(ClosedChannelException.class));
+				.verifyErrorSatisfies((ex) -> assertThat(ex).isInstanceOf(ClosedChannelException.class));
 	}
 
 	private RSocketRequester createRSocketTcpClient() {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/Jetty10ServletWebServerFactoryTests.java

@@ -40,7 +40,7 @@ public class Jetty10ServletWebServerFactoryTests extends JettyServletWebServerFa
 	@Test
 	protected void correctVersionOfJettyUsed() {
 		String jettyVersion = ErrorHandler.class.getPackage().getImplementationVersion();
-		assertThat(jettyVersion.startsWith("10.0"));
+		assertThat(jettyVersion).startsWith("10.0");
 	}
 
 	@Override