Merge branch '2.7.x'

Closes gh-31178

spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -17,7 +17,6 @@
 package org.springframework.boot.devtools.tests;
 
 import java.io.File;
-import java.io.IOException;
 
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.client.StandardHttpRequestRetryHandler;
@@ -153,7 +152,7 @@ class DevToolsIntegrationTests extends AbstractDevToolsIntegrationTests {
 				.isEqualTo(HttpStatus.NOT_FOUND);
 	}
 
-	static Object[] parameters() throws IOException {
+	static Object[] parameters() {
 		Directories directories = new Directories(buildOutput, temp);
 		return new Object[] { new Object[] { new LocalApplicationLauncher(directories) },
 				new Object[] { new ExplodedRemoteApplicationLauncher(directories) },

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -49,7 +49,7 @@ public class OptionalLiveReloadServer implements InitializingBean {
 		startServer();
 	}
 
-	void startServer() throws Exception {
+	void startServer() {
 		if (this.server != null) {
 			try {
 				if (!this.server.isStarted()) {

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java

@@ -320,12 +320,12 @@ public class Restarter {
 		System.runFinalization();
 	}
 
-	private void cleanupCaches() throws Exception {
+	private void cleanupCaches() {
 		Introspector.flushCaches();
 		cleanupKnownCaches();
 	}
 
-	private void cleanupKnownCaches() throws Exception {
+	private void cleanupKnownCaches() {
 		// Whilst not strictly necessary it helps to cleanup soft reference caches
 		// early rather than waiting for memory limits to be reached
 		ResolvableType.clearCache();
@@ -334,13 +334,13 @@ public class Restarter {
 		clearAnnotationUtilsCache();
 	}
 
-	private void cleanCachedIntrospectionResultsCache() throws Exception {
+	private void cleanCachedIntrospectionResultsCache() {
 		clear(CachedIntrospectionResults.class, "acceptedClassLoaders");
 		clear(CachedIntrospectionResults.class, "strongClassCache");
 		clear(CachedIntrospectionResults.class, "softClassCache");
 	}
 
-	private void clearAnnotationUtilsCache() throws Exception {
+	private void clearAnnotationUtilsCache() {
 		try {
 			AnnotationUtils.clearCache();
 		}
@@ -350,7 +350,7 @@ public class Restarter {
 		}
 	}
 
-	private void clear(Class<?> type, String fieldName) throws Exception {
+	private void clear(Class<?> type, String fieldName) {
 		try {
 			Field field = type.getDeclaredField(fieldName);
 			field.setAccessible(true);

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServerTests.java

@@ -33,7 +33,7 @@ import static org.mockito.Mockito.never;
 class OptionalLiveReloadServerTests {
 
 	@Test
-	void nullServer() throws Exception {
+	void nullServer() {
 		OptionalLiveReloadServer server = new OptionalLiveReloadServer(null);
 		server.startServer();
 		server.triggerReload();

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestarterTests.java

@@ -79,7 +79,7 @@ class RestarterTests {
 	}
 
 	@Test
-	void testRestart(CapturedOutput output) throws Exception {
+	void testRestart(CapturedOutput output) {
 		Restarter.clearInstance();
 		Thread thread = new Thread(SampleApplication::main);
 		thread.start();