diff --git a/core/spring-boot/src/main/java/org/springframework/boot/bootstrap/BootstrapRegistry.java b/core/spring-boot/src/main/java/org/springframework/boot/bootstrap/BootstrapRegistry.java
index 9d6a4dda29e..132a80417be 100644
--- a/core/spring-boot/src/main/java/org/springframework/boot/bootstrap/BootstrapRegistry.java
+++ b/core/spring-boot/src/main/java/org/springframework/boot/bootstrap/BootstrapRegistry.java
@@ -105,8 +105,7 @@ public interface BootstrapRegistry {
 		 * bootstrap instances.
 		 * @return the instance or {@code null}
 		 */
-		@Nullable
-		T get(BootstrapContext context);
+		@Nullable T get(BootstrapContext context);
 
 		/**
 		 * Return the scope of the supplied instance.
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java
index b66f64e3a77..0dd6bd47960 100644
--- a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java
+++ b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java
@@ -383,8 +383,7 @@ public final class PropertyMapper {
 			 * @param value the value to adapt
 			 * @return an adapted value or {@code null}
 			 */
-			@Nullable
-			R adapt(T value);
+			@Nullable R adapt(T value);
 
 		}
 
@@ -512,8 +511,7 @@ public final class PropertyMapper {
 				 * @param value the value to adapt
 				 * @return an adapted value or {@code null}
 				 */
-				@Nullable
-				R adapt(@Nullable T value);
+				@Nullable R adapt(@Nullable T value);
 
 			}
 
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java b/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java
index dab2a420944..0ebaa0c24f1 100644
--- a/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java
+++ b/core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java
@@ -355,8 +355,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry, Ordered {
 			}
 		}
 
-		@Nullable
-		String getMessage() {
+		@Nullable String getMessage() {
 			return this.message;
 		}
 
diff --git a/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java b/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java
index 8a9f2dbd728..93c4c595ef6 100644
--- a/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java
+++ b/loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java
@@ -362,8 +362,7 @@ public abstract class AbstractJarWriter implements LoaderClassesWriter {
 		 */
 		EntryTransformer NONE = (jarEntry) -> jarEntry;
 
-		@Nullable
-		JarArchiveEntry transform(JarArchiveEntry jarEntry);
+		@Nullable JarArchiveEntry transform(JarArchiveEntry jarEntry);
 
 	}
 
diff --git a/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java b/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java
index 42bd53ac9e4..91ea4f9993c 100644
--- a/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java
+++ b/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java
@@ -169,7 +169,7 @@ public class EntityManagerFactoryBuilder {
 		 * @return the builder for fluent usage
 		 * @see #managedTypes(PersistenceManagedTypes)
 		 */
-		public Builder packages(String @Nullable... packagesToScan) {
+		public Builder packages(String @Nullable ... packagesToScan) {
 			this.packagesToScan = packagesToScan;
 			return this;
 		}
@@ -222,7 +222,7 @@ public class EntityManagerFactoryBuilder {
 		 * @param mappingResources the mapping resources to use
 		 * @return the builder for fluent usage
 		 */
-		public Builder mappingResources(String @Nullable... mappingResources) {
+		public Builder mappingResources(String @Nullable ... mappingResources) {
 			this.mappingResources = mappingResources;
 			return this;
 		}
diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerApplicationContext.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerApplicationContext.java
index 577c2030488..c26a5835f71 100644
--- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerApplicationContext.java
+++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerApplicationContext.java
@@ -50,8 +50,7 @@ public interface WebServerApplicationContext extends ApplicationContext {
 	 * the server has not yet been created.
 	 * @return the web server
 	 */
-	@Nullable
-	WebServer getWebServer();
+	@Nullable WebServer getWebServer();
 
 	/**
 	 * Returns the namespace of the web server application context or {@code null} if no
@@ -60,8 +59,7 @@ public interface WebServerApplicationContext extends ApplicationContext {
 	 * different port).
 	 * @return the server namespace
 	 */
-	@Nullable
-	String getServerNamespace();
+	@Nullable String getServerNamespace();
 
 	/**
 	 * Returns {@code true} if the specified context is a