diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityService.java index e0b8a3a3142..9e0eb8125b1 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityService.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityService.java @@ -109,7 +109,7 @@ class CloudFoundrySecurityService { return extractTokenKeys(this.restTemplate .getForObject(getUaaUrl() + "/token_keys", Map.class)); } - catch (HttpStatusCodeException e) { + catch (HttpStatusCodeException ex) { throw new CloudFoundryAuthorizationException(Reason.SERVICE_UNAVAILABLE, "UAA not reachable"); } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java index e83da4cb57c..f9534bd25d8 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java @@ -151,7 +151,7 @@ public class StatsdMetricWriterTests { try { Thread.sleep(50L); } - catch (InterruptedException e) { + catch (InterruptedException ex) { Thread.currentThread().interrupt(); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java index e6f834a0781..ebf6480c902 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java @@ -205,7 +205,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit collectBeanNamesForAnnotation(names, beanFactory, annotationType, considerHierarchy); } - catch (ClassNotFoundException e) { + catch (ClassNotFoundException ex) { // Continue } return StringUtils.toStringArray(names); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java index 0398a035d4a..57a15bc0763 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java @@ -349,10 +349,10 @@ public class ArtemisAutoConfigurationTests { + "' was not expected but got " + destination); } } - catch (JMSException e) { + catch (JMSException ex) { if (shouldExist) { throw new IllegalStateException("Destination '" + name - + "' was expected but got " + e.getMessage()); + + "' was expected but got " + ex.getMessage()); } } return null; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java index 19ee7c518d1..76616f4ecc9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java @@ -143,7 +143,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-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java index fdbe934f58a..66c80f2434e 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java @@ -221,7 +221,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-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java index 6cf0e45518f..5245ffc926a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java @@ -210,7 +210,7 @@ public class SecurityAutoConfigurationTests { manager.authenticate(new UsernamePasswordAuthenticationToken("foo", "wrong")); fail("Expected BadCredentialsException"); } - catch (BadCredentialsException e) { + catch (BadCredentialsException ex) { // expected } assertThat(listener.event) diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java index c65490c6733..1d2f30289ed 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java @@ -359,8 +359,8 @@ class ProjectGenerationRequest { return builder.build(); } - catch (URISyntaxException e) { - throw new ReportableException("Invalid service URL (" + e.getMessage() + ")"); + catch (URISyntaxException ex) { + throw new ReportableException("Invalid service URL (" + ex.getMessage() + ")"); } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java index fabf061962e..f387de62bb3 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java @@ -222,8 +222,8 @@ public class DependencyManagementBomTransformation return new UrlModelSource( Grape.getInstance().resolve(null, dependency)[0].toURL()); } - catch (MalformedURLException e) { - throw new UnresolvableModelException(e.getMessage(), groupId, artifactId, + catch (MalformedURLException ex) { + throw new UnresolvableModelException(ex.getMessage(), groupId, artifactId, version); } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java index 7e1e9315a54..be97bad166f 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java @@ -116,8 +116,8 @@ public class MavenSettingsReader { try { this._cipher = new DefaultPlexusCipher(); } - catch (PlexusCipherException e) { - throw new IllegalStateException(e); + catch (PlexusCipherException ex) { + throw new IllegalStateException(ex); } } diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java index 826e113d425..86d5a9053be 100644 --- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java +++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java @@ -186,7 +186,7 @@ class JsonReader { try { return Deprecation.Level.valueOf(value.toUpperCase(Locale.ENGLISH)); } - catch (IllegalArgumentException e) { + catch (IllegalArgumentException ex) { // let's use the default } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestConfigurationMetadataAnnotationProcessor.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestConfigurationMetadataAnnotationProcessor.java index 220fbb4ab14..9820e0317e3 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestConfigurationMetadataAnnotationProcessor.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestConfigurationMetadataAnnotationProcessor.java @@ -84,8 +84,8 @@ public class TestConfigurationMetadataAnnotationProcessor } return this.metadata; } - catch (IOException e) { - throw new RuntimeException("Failed to read metadata from disk", e); + catch (IOException ex) { + throw new RuntimeException("Failed to read metadata from disk", ex); } } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JvmUtils.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JvmUtils.java index 1f6b80c9c63..345db50cd24 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JvmUtils.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JvmUtils.java @@ -60,8 +60,8 @@ abstract class JvmUtils { return new File(System.getProperty("java.home")).toURI().toURL() .toExternalForm(); } - catch (MalformedURLException e) { - throw new IllegalStateException("Cannot locate java.home", e); + catch (MalformedURLException ex) { + throw new IllegalStateException("Cannot locate java.home", ex); } } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java index 7bb9d1d7b75..a63ca7da5c8 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java @@ -529,8 +529,8 @@ public class UndertowEmbeddedServletContainerFactory root = (root != null ? root : createTempDir("undertow-docbase")); return root.getCanonicalFile(); } - catch (IOException e) { - throw new IllegalStateException("Cannot get canonical document root", e); + catch (IOException ex) { + throw new IllegalStateException("Cannot get canonical document root", ex); } } diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/narayana/DataSourceXAResourceRecoveryHelper.java b/spring-boot/src/main/java/org/springframework/boot/jta/narayana/DataSourceXAResourceRecoveryHelper.java index 5f33ee29806..5b83082b90b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jta/narayana/DataSourceXAResourceRecoveryHelper.java +++ b/spring-boot/src/main/java/org/springframework/boot/jta/narayana/DataSourceXAResourceRecoveryHelper.java @@ -127,8 +127,8 @@ public class DataSourceXAResourceRecoveryHelper try { this.xaConnection.close(); } - catch (SQLException e) { - logger.warn("Failed to close connection", e); + catch (SQLException ex) { + logger.warn("Failed to close connection", ex); } finally { this.xaConnection = null; diff --git a/spring-boot/src/test/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrarTests.java b/spring-boot/src/test/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrarTests.java index 42af0518105..bf24704c1bc 100644 --- a/spring-boot/src/test/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrarTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrarTests.java @@ -177,8 +177,8 @@ public class SpringApplicationAdminMXBeanRegistrarTests { try { return new ObjectName(jmxName); } - catch (MalformedObjectNameException e) { - throw new IllegalStateException("Invalid jmx name " + jmxName, e); + catch (MalformedObjectNameException ex) { + throw new IllegalStateException("Invalid jmx name " + jmxName, ex); } }