From 2d70a7ae5e3610d3db1162d8e1c69ca9e4c2a325 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Thu, 3 May 2018 12:50:16 -0700
Subject: [PATCH] Polish caught exception names

Prefer `ex` over `e`.
---
 .../integrationtest/JmxEndpointIntegrationTests.java          | 2 +-
 .../metrics/export/prometheus/PrometheusScrapeEndpoint.java   | 4 ++--
 .../actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java | 4 ++--
 .../webservices/WebServicesAutoConfiguration.java             | 2 +-
 .../boot/autoconfigure/jooq/JooqPropertiesTests.java          | 2 +-
 .../orm/jpa/CustomHibernateJpaAutoConfigurationTests.java     | 2 +-
 .../boot/autoconfigure/orm/jpa/JpaPropertiesTests.java        | 2 +-
 .../context/runner/AbstractApplicationContextRunnerTests.java | 2 +-
 .../boot/testsupport/testcontainers/Container.java            | 2 +-
 .../boot/testsupport/testcontainers/Neo4jContainer.java       | 4 ++--
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java
index 5fa24d3dbf..76ffe93a87 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java
@@ -105,7 +105,7 @@ public class JmxEndpointIntegrationTests {
 			getMBeanInfo(mBeanServer, objectName);
 			return true;
 		}
-		catch (InstanceNotFoundException e) {
+		catch (InstanceNotFoundException ex) {
 			return false;
 		}
 	}
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpoint.java
index 15d52f256f..e742a50c48 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpoint.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpoint.java
@@ -50,10 +50,10 @@ public class PrometheusScrapeEndpoint {
 			TextFormat.write004(writer, this.collectorRegistry.metricFamilySamples());
 			return writer.toString();
 		}
-		catch (IOException e) {
+		catch (IOException ex) {
 			// This actually never happens since StringWriter::write() doesn't throw any
 			// IOException
-			throw new RuntimeException("Writing metrics failed", e);
+			throw new RuntimeException("Writing metrics failed", ex);
 		}
 	}
 
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java
index 267cb899a8..db6a9038dd 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterTests.java
@@ -250,8 +250,8 @@ public class WebMvcMetricsFilterTests {
 				result.set(this.mvc.perform(get("/api/c1/completableFuture/{id}", 1))
 						.andExpect(request().asyncStarted()).andReturn());
 			}
-			catch (Exception e) {
-				fail("Failed to execute async request", e);
+			catch (Exception ex) {
+				fail("Failed to execute async request", ex);
 			}
 		});
 		backgroundRequest.start();
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java
index 3e5e426cc6..eb5d5cc906 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java
@@ -146,7 +146,7 @@ public class WebServicesAutoConfiguration {
 				return this.applicationContext
 						.getResources(ensureTrailingSlash(location) + pattern);
 			}
-			catch (IOException e) {
+			catch (IOException ex) {
 				return new Resource[0];
 			}
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java
index 588f4e17b8..37564a977f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqPropertiesTests.java
@@ -101,7 +101,7 @@ public class JooqPropertiesTests {
 			given(connection.getMetaData()).willReturn(metadata);
 			given(ds.getConnection()).willReturn(connection);
 		}
-		catch (SQLException e) {
+		catch (SQLException ex) {
 			// Do nothing
 		}
 		return ds;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java
index da04ffa673..c4314c12d7 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java
@@ -136,7 +136,7 @@ public class CustomHibernateJpaAutoConfigurationTests {
 				given(dataSource.getConnection().getMetaData())
 						.willReturn(mock(DatabaseMetaData.class));
 			}
-			catch (SQLException e) {
+			catch (SQLException ex) {
 				// Do nothing
 			}
 			return dataSource;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java
index dd68b33db7..55204d7de5 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java
@@ -307,7 +307,7 @@ public class JpaPropertiesTests {
 			given(connection.getMetaData()).willReturn(metadata);
 			given(ds.getConnection()).willReturn(connection);
 		}
-		catch (SQLException e) {
+		catch (SQLException ex) {
 			// Do nothing
 		}
 		return ds;
diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java
index ee6ef51d5a..24ec3c8c7c 100644
--- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java
+++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java
@@ -158,7 +158,7 @@ public abstract class AbstractApplicationContextRunnerTests<T extends AbstractAp
 								context.getClassLoader());
 						fail("Should have thrown a ClassNotFoundException");
 					}
-					catch (ClassNotFoundException e) {
+					catch (ClassNotFoundException ex) {
 						// expected
 					}
 				});
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Container.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Container.java
index 089e194899..c60b2393a2 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Container.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Container.java
@@ -64,7 +64,7 @@ class Container implements TestRule {
 		try {
 			DockerClientFactory.instance().client();
 		}
-		catch (Throwable t) {
+		catch (Throwable ex) {
 			return new SkipStatement();
 		}
 		this.container = this.containerFactory.get();
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Neo4jContainer.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Neo4jContainer.java
index 86c3d2ade0..4209abb5e8 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Neo4jContainer.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Neo4jContainer.java
@@ -62,8 +62,8 @@ public class Neo4jContainer extends Container {
 				Unreliables.retryUntilTrue((int) this.startupTimeout.getSeconds(),
 						TimeUnit.SECONDS, checkConnection(sessionFactory));
 			}
-			catch (TimeoutException e) {
-				throw new IllegalStateException();
+			catch (TimeoutException ex) {
+				throw new IllegalStateException(ex);
 			}
 		}