Merge branch '3.1.x' into 3.2.x

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementWebServerFactoryCustomizer.java

@@ -81,6 +81,7 @@ public abstract class ManagementWebServerFactoryCustomizer<T extends Configurabl
 				customizers.add(BeanFactoryUtils.beanOfTypeIncludingAncestors(this.beanFactory, customizerClass));
 			}
 			catch (NoSuchBeanDefinitionException ex) {
+				// Ignore
 			}
 		}
 		invokeCustomizers(factory, customizers);

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java

@@ -110,6 +110,7 @@ public class CachingOperationInvoker implements OperationInvoker {
 			this.cachedResponses.entrySet().removeIf((entry) -> entry.getValue().isStale(accessTime, this.timeToLive));
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthEndpointTests.java

@@ -79,6 +79,7 @@ class HealthEndpointTests extends
 				Thread.sleep(100);
 			}
 			catch (InterruptedException ex) {
+				// Ignore
 			}
 			return this.up;
 		};

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

@@ -124,6 +124,7 @@ class SharedMetadataReaderFactoryContextInitializer implements
 						registry.getBeanDefinition(AnnotationConfigUtils.CONFIGURATION_ANNOTATION_PROCESSOR_BEAN_NAME));
 			}
 			catch (NoSuchBeanDefinitionException ex) {
+				// Ignore
 			}
 		}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheCondition.java

@@ -56,6 +56,7 @@ class CacheCondition extends SpringBootCondition {
 			}
 		}
 		catch (BindException ex) {
+			// Ignore
 		}
 		return ConditionOutcome.noMatch(message.because("unknown cache type"));
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java

@@ -500,6 +500,7 @@ class OnBeanCondition extends FilteringSpringBootCondition implements Configurat
 					resolved.add(resolve(className, this.classLoader));
 				}
 				catch (ClassNotFoundException | NoClassDefFoundError ex) {
+					// Ignore
 				}
 			}
 			return resolved;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java

@@ -164,6 +164,7 @@ public class UndertowWebServerFactoryCustomizer
 						lookup.put(getCanonicalName(field.getName()), option);
 					}
 					catch (IllegalAccessException ex) {
+						// Ignore
 					}
 				}
 			});

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java

@@ -495,6 +495,7 @@ public class WebMvcAutoConfiguration {
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 			return null;
 		}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolver.java

@@ -126,6 +126,7 @@ public class DefaultErrorViewResolver implements ErrorViewResolver, Ordered {
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 		return null;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java

@@ -578,6 +578,7 @@ class BatchAutoConfigurationTests {
 					jobRegistry.register(getJobFactory());
 				}
 				catch (DuplicateJobException ex) {
+					// Ignore
 				}
 			}
 			return bean;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java

@@ -106,6 +106,7 @@ class SessionAutoConfigurationTests extends AbstractSessionAutoConfigurationTest
 				delegatingFilterProxy.doFilter(null, null, null);
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 			assertThat(delegatingFilterProxy).extracting("delegate")
 				.isSameAs(context.getBean(SessionRepositoryFilter.class));

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/TcpConnectServiceReadinessCheck.java

@@ -72,6 +72,7 @@ class TcpConnectServiceReadinessCheck {
 			}
 		}
 		catch (SocketTimeoutException ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTypeExcludeFilter.java

@@ -43,6 +43,7 @@ public final class JsonTypeExcludeFilter extends StandardAnnotationCustomizableT
 			includes.add(ClassUtils.forName(JACKSON_MODULE, null));
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 		includes.add(JsonComponent.class);
 		DEFAULT_INCLUDES = Collections.unmodifiableSet(includes);

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java

@@ -204,6 +204,7 @@ class ImportsContextCustomizer implements ContextCustomizer {
 				registry.removeBeanDefinition(ImportsConfiguration.BEAN_NAME);
 			}
 			catch (NoSuchBeanDefinitionException ex) {
+				// Ignore
 			}
 		}
 

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java

@@ -167,6 +167,7 @@ public class SpringBootContextLoader extends AbstractContextLoader implements Ao
 				mainMethod = ReflectionUtils.findMethod(kotlinClass, "main", String[].class);
 			}
 			catch (ClassNotFoundException ex) {
+				// Ignore
 			}
 		}
 		Assert.state(mainMethod != null || useMainMethod == UseMainMethod.WHEN_AVAILABLE,
@@ -555,6 +556,7 @@ public class SpringBootContextLoader extends AbstractContextLoader implements Ao
 				}
 			}
 			catch (AbandonedRunException ex) {
+				// Ignore
 			}
 			catch (Exception ex) {
 				if (this.failedContexts.size() == 1) {

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java

@@ -203,6 +203,7 @@ public class ApplicationContextAssert<C extends ApplicationContext>
 					getApplicationContext(), name, bean));
 		}
 		catch (NoSuchBeanDefinitionException ex) {
+			// Ignore
 		}
 		return this;
 	}

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java

@@ -316,6 +316,7 @@ public abstract class AbstractJsonMarshalTester<T> {
 			closeable.close();
 		}
 		catch (IOException ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java

@@ -1095,6 +1095,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
 				failWithMessage("Expecting no JSON path \"%s\"", this.expression);
 			}
 			catch (PathNotFoundException ex) {
+				// Ignore
 			}
 		}
 

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleBeanFactoryPostProcessor.java

@@ -50,6 +50,7 @@ class TestcontainersLifecycleBeanFactoryPostProcessor implements BeanFactoryPost
 				}
 			}
 			catch (NoSuchBeanDefinitionException ex) {
+				// Ignore
 			}
 		}
 	}

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionDetailsFactory.java

@@ -93,6 +93,7 @@ public abstract class ContainerConnectionDetailsFactory<C extends Container<?>,
 			}
 		}
 		catch (NoClassDefFoundError ex) {
+			// Ignore
 		}
 		return null;
 	}

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PrivateKeyParser.java

@@ -203,6 +203,7 @@ final class PrivateKeyParser {
 					return keyFactory.generatePrivate(keySpec);
 				}
 				catch (InvalidKeySpecException | NoSuchAlgorithmException ex) {
+					// Ignore
 				}
 			}
 			return null;

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressListenerTests.java

@@ -78,6 +78,7 @@ class TotalProgressListenerTests extends AbstractJsonTests {
 				Thread.sleep(10);
 			}
 			catch (InterruptedException ex) {
+				// Ignore
 			}
 		}
 

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSON.java

@@ -51,7 +51,8 @@ class JSON {
 			try {
 				return Double.valueOf((String) value);
 			}
-			catch (NumberFormatException ignored) {
+			catch (NumberFormatException ex) {
+				// Ignore
 			}
 		}
 		return null;
@@ -68,7 +69,8 @@ class JSON {
 			try {
 				return (int) Double.parseDouble((String) value);
 			}
-			catch (NumberFormatException ignored) {
+			catch (NumberFormatException ex) {
+				// Ignore
 			}
 		}
 		return null;
@@ -85,7 +87,8 @@ class JSON {
 			try {
 				return (long) Double.parseDouble((String) value);
 			}
-			catch (NumberFormatException ignored) {
+			catch (NumberFormatException ex) {
+				// Ignore
 			}
 		}
 		return null;

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONObject.java

@@ -827,7 +827,8 @@ public class JSONObject {
 				return o.toString();
 			}
 		}
-		catch (Exception ignored) {
+		catch (Exception ex) {
+			// Ignore
 		}
 		return null;
 	}

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java

@@ -320,7 +320,8 @@ public class JSONTokener {
 		try {
 			return Double.valueOf(literal);
 		}
-		catch (NumberFormatException ignored) {
+		catch (NumberFormatException ex) {
+			// Ignore
 		}
 
 		/* ... finally give up. We have an unquoted string */

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java

@@ -204,6 +204,7 @@ class BootZipCopyAction implements CopyAction {
 			outputStream.close();
 		}
 		catch (IOException ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java

@@ -127,6 +127,7 @@ public class LaunchedURLClassLoader extends URLClassLoader {
 				return result;
 			}
 			catch (ClassNotFoundException ex) {
+				// Ignore
 			}
 		}
 		if (this.exploded) {

spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java

@@ -151,6 +151,7 @@ public class JarFileArchive implements Archive {
 				return unpackDirectory;
 			}
 			catch (IOException ex) {
+				// Ignore
 			}
 		}
 		throw new IllegalStateException("Failed to create unpack directory in directory '" + parent + "'");

spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/Handler.java

@@ -140,6 +140,7 @@ public class Handler extends URLStreamHandler {
 				return connection;
 			}
 			catch (IOException ex) {
+				// Ignore
 			}
 		}
 		return null;
@@ -154,6 +155,7 @@ public class Handler extends URLStreamHandler {
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 		return false;
@@ -174,6 +176,7 @@ public class Handler extends URLStreamHandler {
 			}
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 		return null;
 	}
@@ -425,6 +428,7 @@ public class Handler extends URLStreamHandler {
 					}
 				}
 				catch (Exception ex) {
+					// Ignore
 				}
 			}
 			finally {

spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/JarFile.java

@@ -144,6 +144,7 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
 				super.close();
 			}
 			catch (IOException ioex) {
+				// Ignore
 			}
 			throw ex;
 		}

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/NestedFileSystem.java

@@ -138,6 +138,7 @@ class NestedFileSystem extends FileSystem {
 			zipFileSystem.close();
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/ZipContentTests.java

@@ -88,6 +88,7 @@ class ZipContentTests {
 				this.zipContent.close();
 			}
 			catch (IllegalStateException ex) {
+				// Ignore
 			}
 		}
 	}

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

@@ -349,6 +349,7 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests {
 					.anyMatch((dependency) -> dependency.startsWith("BOOT-INF/lib/log4j-api-2"));
 			}
 			catch (IOException ex) {
+				// Ignore
 			}
 		});
 	}

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

@@ -167,6 +167,7 @@ class WarIntegrationTests extends AbstractArchiveIntegrationTests {
 					.anyMatch((dependency) -> dependency.startsWith("WEB-INF/lib-provided/"));
 			}
 			catch (IOException ex) {
+				// Ignore
 			}
 		});
 	}

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

@@ -186,6 +186,7 @@ final class ModifiedClassPathClassLoader extends URLClassLoader {
 				return createdBy != null && createdBy.contains("IntelliJ");
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 		return false;
@@ -330,6 +331,7 @@ final class ModifiedClassPathClassLoader extends URLClassLoader {
 					}
 				}
 				catch (URISyntaxException ex) {
+					// Ignore
 				}
 			}
 			return false;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiPropertySource.java

@@ -150,7 +150,8 @@ public class AnsiPropertySource extends PropertySource<AnsiElement> {
 				try {
 					return this.factory.apply(Integer.parseInt(postfix));
 				}
-				catch (IllegalArgumentException ignored) {
+				catch (IllegalArgumentException ex) {
+					// Ignore
 				}
 			}
 			return null;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBean.java

@@ -168,6 +168,7 @@ public final class ConfigurationPropertiesBean {
 					}
 				}
 				catch (Exception ex) {
+					// Ignore
 				}
 			}
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/handler/NoUnboundElementsBindHandler.java

@@ -110,6 +110,7 @@ public class NoUnboundElementsBindHandler extends AbstractBindHandler {
 						source.filter((candidate) -> isUnbound(name, candidate)).getConfigurationProperty(unboundName));
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandler.java

@@ -212,6 +212,7 @@ public class ValidationBindHandler extends AbstractBindHandler {
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 			return null;
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesPropertyResolver.java

@@ -49,6 +49,7 @@ class ConfigurationPropertySourcesPropertyResolver extends AbstractPropertyResol
 					return attached.findConfigurationProperty(name) != null;
 				}
 				catch (Exception ex) {
+					// Ignore
 				}
 			}
 		}
@@ -91,6 +92,7 @@ class ConfigurationPropertySourcesPropertyResolver extends AbstractPropertyResol
 					return (configurationProperty != null) ? configurationProperty.getValue() : null;
 				}
 				catch (Exception ex) {
+					// Ignore
 				}
 			}
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/DefaultPropertyMapper.java

@@ -75,6 +75,7 @@ final class DefaultPropertyMapper implements PropertyMapper {
 			}
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 		return ConfigurationPropertyName.EMPTY;
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySource.java

@@ -89,6 +89,7 @@ class SpringConfigurationPropertySource implements ConfigurationPropertySource {
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 		return null;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/TextResourceOrigin.java

@@ -121,6 +121,7 @@ public class TextResourceOrigin implements Origin {
 			}
 		}
 		catch (IOException ex) {
+			// Ignore
 		}
 		return resource.getDescription();
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/ApplicationHome.java

@@ -82,6 +82,7 @@ public class ApplicationHome {
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 		return null;
@@ -98,6 +99,7 @@ public class ApplicationHome {
 			}
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 		return null;
 	}
@@ -112,6 +114,7 @@ public class ApplicationHome {
 			}
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 		return false;
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java

@@ -155,6 +155,7 @@ public class UndertowWebServer implements WebServer {
 			closeable.close();
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java

@@ -304,6 +304,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry, Ordered {
 			collection.add(ClassUtils.forName(className, null));
 		}
 		catch (Throwable ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/metrics/buffering/BufferingApplicationStartupTests.java

@@ -139,6 +139,7 @@ class BufferingApplicationStartupTests {
 							Thread.sleep(1);
 						}
 						catch (InterruptedException ex) {
+							// Ignore
 						}
 						step.end();
 					}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindConverterTests.java

@@ -208,6 +208,7 @@ class BindConverterTests {
 				thread.join();
 			}
 			catch (InterruptedException ex) {
+				// Ignore
 			}
 		}
 		assertThat(results).isNotEmpty().doesNotContainNull();

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcherTests.java

@@ -133,6 +133,7 @@ class ApplicationContextRequestMatcherTests {
 			thread.join(1000);
 		}
 		catch (InterruptedException ex) {
+			// Ignore
 		}
 	}
 
@@ -205,6 +206,7 @@ class ApplicationContextRequestMatcherTests {
 				Thread.sleep(200);
 			}
 			catch (InterruptedException ex) {
+				// Ignore
 			}
 			this.initialized.set(true);
 		}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java

@@ -1275,7 +1275,7 @@ public abstract class AbstractServletWebServerFactoryTests {
 			blockingServlet.admitOne();
 		}
 		catch (RuntimeException ex) {
-
+			// Ignore
 		}
 	}
 
@@ -1331,7 +1331,7 @@ public abstract class AbstractServletWebServerFactoryTests {
 			blockingServlet.admitOne();
 		}
 		catch (RuntimeException ex) {
-
+			// Ignore
 		}
 	}
 

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/intTest/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java

@@ -132,6 +132,7 @@ abstract class AbstractApplicationLauncher implements BeforeEachCallback {
 				StreamUtils.copy(this.input, this.output);
 			}
 			catch (IOException ex) {
+				// Ignore
 			}
 		}