Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
64930d4e
Commit
64930d4e
authored
May 02, 2018
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish caught exception names
Prefer `ex` over `e`.
parent
3ee777e1
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
25 additions
and
25 deletions
+25
-25
CloudFoundrySecurityService.java
...oot/actuate/cloudfoundry/CloudFoundrySecurityService.java
+1
-1
StatsdMetricWriterTests.java
.../boot/actuate/metrics/statsd/StatsdMetricWriterTests.java
+1
-1
OnBeanCondition.java
...amework/boot/autoconfigure/condition/OnBeanCondition.java
+1
-1
ArtemisAutoConfigurationTests.java
...oconfigure/jms/artemis/ArtemisAutoConfigurationTests.java
+2
-2
CustomHibernateJpaAutoConfigurationTests.java
...ure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java
+1
-1
JpaPropertiesTests.java
...mework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java
+1
-1
SecurityAutoConfigurationTests.java
...utoconfigure/security/SecurityAutoConfigurationTests.java
+1
-1
ProjectGenerationRequest.java
...ework/boot/cli/command/init/ProjectGenerationRequest.java
+2
-2
DependencyManagementBomTransformation.java
...t/cli/compiler/DependencyManagementBomTransformation.java
+2
-2
MavenSettingsReader.java
...ramework/boot/cli/compiler/maven/MavenSettingsReader.java
+2
-2
JsonReader.java
...pringframework/boot/configurationmetadata/JsonReader.java
+1
-1
TestConfigurationMetadataAnnotationProcessor.java
...ocessor/TestConfigurationMetadataAnnotationProcessor.java
+2
-2
JvmUtils.java
.../java/org/springframework/boot/loader/tools/JvmUtils.java
+2
-2
UndertowEmbeddedServletContainerFactory.java
...ded/undertow/UndertowEmbeddedServletContainerFactory.java
+2
-2
DataSourceXAResourceRecoveryHelper.java
...boot/jta/narayana/DataSourceXAResourceRecoveryHelper.java
+2
-2
SpringApplicationAdminMXBeanRegistrarTests.java
...oot/admin/SpringApplicationAdminMXBeanRegistrarTests.java
+2
-2
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityService.java
View file @
64930d4e
...
...
@@ -109,7 +109,7 @@ class CloudFoundrySecurityService {
return
extractTokenKeys
(
this
.
restTemplate
.
getForObject
(
getUaaUrl
()
+
"/token_keys"
,
Map
.
class
));
}
catch
(
HttpStatusCodeException
e
)
{
catch
(
HttpStatusCodeException
e
x
)
{
throw
new
CloudFoundryAuthorizationException
(
Reason
.
SERVICE_UNAVAILABLE
,
"UAA not reachable"
);
}
...
...
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java
View file @
64930d4e
...
...
@@ -151,7 +151,7 @@ public class StatsdMetricWriterTests {
try
{
Thread
.
sleep
(
50L
);
}
catch
(
InterruptedException
e
)
{
catch
(
InterruptedException
e
x
)
{
Thread
.
currentThread
().
interrupt
();
}
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
View file @
64930d4e
...
...
@@ -205,7 +205,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
collectBeanNamesForAnnotation
(
names
,
beanFactory
,
annotationType
,
considerHierarchy
);
}
catch
(
ClassNotFoundException
e
)
{
catch
(
ClassNotFoundException
e
x
)
{
// Continue
}
return
StringUtils
.
toStringArray
(
names
);
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java
View file @
64930d4e
...
...
@@ -349,10 +349,10 @@ public class ArtemisAutoConfigurationTests {
+
"' was not expected but got "
+
destination
);
}
}
catch
(
JMSException
e
)
{
catch
(
JMSException
e
x
)
{
if
(
shouldExist
)
{
throw
new
IllegalStateException
(
"Destination '"
+
name
+
"' was expected but got "
+
e
.
getMessage
());
+
"' was expected but got "
+
e
x
.
getMessage
());
}
}
return
null
;
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java
View file @
64930d4e
...
...
@@ -143,7 +143,7 @@ public class CustomHibernateJpaAutoConfigurationTests {
given
(
dataSource
.
getConnection
().
getMetaData
())
.
willReturn
(
mock
(
DatabaseMetaData
.
class
));
}
catch
(
SQLException
e
)
{
catch
(
SQLException
e
x
)
{
// Do nothing
}
return
dataSource
;
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java
View file @
64930d4e
...
...
@@ -221,7 +221,7 @@ public class JpaPropertiesTests {
given
(
connection
.
getMetaData
()).
willReturn
(
metadata
);
given
(
ds
.
getConnection
()).
willReturn
(
connection
);
}
catch
(
SQLException
e
)
{
catch
(
SQLException
e
x
)
{
// Do nothing
}
return
ds
;
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java
View file @
64930d4e
...
...
@@ -210,7 +210,7 @@ public class SecurityAutoConfigurationTests {
manager
.
authenticate
(
new
UsernamePasswordAuthenticationToken
(
"foo"
,
"wrong"
));
fail
(
"Expected BadCredentialsException"
);
}
catch
(
BadCredentialsException
e
)
{
catch
(
BadCredentialsException
e
x
)
{
// expected
}
assertThat
(
listener
.
event
)
...
...
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java
View file @
64930d4e
...
...
@@ -359,8 +359,8 @@ class ProjectGenerationRequest {
return
builder
.
build
();
}
catch
(
URISyntaxException
e
)
{
throw
new
ReportableException
(
"Invalid service URL ("
+
e
.
getMessage
()
+
")"
);
catch
(
URISyntaxException
e
x
)
{
throw
new
ReportableException
(
"Invalid service URL ("
+
e
x
.
getMessage
()
+
")"
);
}
}
...
...
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java
View file @
64930d4e
...
...
@@ -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
e
x
)
{
throw
new
UnresolvableModelException
(
e
x
.
getMessage
(),
groupId
,
artifactId
,
version
);
}
}
...
...
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java
View file @
64930d4e
...
...
@@ -116,8 +116,8 @@ public class MavenSettingsReader {
try
{
this
.
_cipher
=
new
DefaultPlexusCipher
();
}
catch
(
PlexusCipherException
e
)
{
throw
new
IllegalStateException
(
e
);
catch
(
PlexusCipherException
e
x
)
{
throw
new
IllegalStateException
(
e
x
);
}
}
...
...
spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java
View file @
64930d4e
...
...
@@ -186,7 +186,7 @@ class JsonReader {
try
{
return
Deprecation
.
Level
.
valueOf
(
value
.
toUpperCase
(
Locale
.
ENGLISH
));
}
catch
(
IllegalArgumentException
e
)
{
catch
(
IllegalArgumentException
e
x
)
{
// let's use the default
}
}
...
...
spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestConfigurationMetadataAnnotationProcessor.java
View file @
64930d4e
...
...
@@ -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
e
x
)
{
throw
new
RuntimeException
(
"Failed to read metadata from disk"
,
e
x
);
}
}
...
...
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JvmUtils.java
View file @
64930d4e
...
...
@@ -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
e
x
)
{
throw
new
IllegalStateException
(
"Cannot locate java.home"
,
e
x
);
}
}
...
...
spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java
View file @
64930d4e
...
...
@@ -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
e
x
)
{
throw
new
IllegalStateException
(
"Cannot get canonical document root"
,
e
x
);
}
}
...
...
spring-boot/src/main/java/org/springframework/boot/jta/narayana/DataSourceXAResourceRecoveryHelper.java
View file @
64930d4e
...
...
@@ -127,8 +127,8 @@ public class DataSourceXAResourceRecoveryHelper
try
{
this
.
xaConnection
.
close
();
}
catch
(
SQLException
e
)
{
logger
.
warn
(
"Failed to close connection"
,
e
);
catch
(
SQLException
e
x
)
{
logger
.
warn
(
"Failed to close connection"
,
e
x
);
}
finally
{
this
.
xaConnection
=
null
;
...
...
spring-boot/src/test/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrarTests.java
View file @
64930d4e
...
...
@@ -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
e
x
)
{
throw
new
IllegalStateException
(
"Invalid jmx name "
+
jmxName
,
e
x
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment