Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-06 18:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Java 7: Identical 'catch' branches in 'try' statement

Browse Source
This commit is contained in:
Lars Grefer 2019-08-09 00:48:57 +02:00 committed by Rob Winch
parent 5e44a249f8
commit 25c06be1eb
5 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java
View File

@ -111,11 +111,7 @@ public class DefaultAuthenticationEventPublisher implements AuthenticationEventP
try { try {
event = constructor.newInstance(authentication, exception); event = constructor.newInstance(authentication, exception);
} }
catch (IllegalAccessException ignored) { catch (IllegalAccessException | InvocationTargetException | InstantiationException ignored) {
}
catch (InstantiationException ignored) {
}
catch (InvocationTargetException ignored) {
} }
} }

9
core/src/main/java/org/springframework/security/authentication/ProviderManager.java
View File

@ -179,17 +179,12 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar
break; break;
} }
} }
catch (AccountStatusException e) { catch (AccountStatusException | InternalAuthenticationServiceException e) {
prepareException(e, authentication); prepareException(e, authentication);
// SEC-546: Avoid polling additional providers if auth failure is due to // SEC-546: Avoid polling additional providers if auth failure is due to
// invalid account status // invalid account status
throw e; throw e;
} } catch (AuthenticationException e) {
catch (InternalAuthenticationServiceException e) {
prepareException(e, authentication);
throw e;
}
catch (AuthenticationException e) {
lastException = e; lastException = e;
} }
} }

14
openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java
View File

@ -116,11 +116,7 @@ public class OpenID4JavaConsumer implements OpenIDConsumer {
authReq.addExtension(fetchRequest); authReq.addExtension(fetchRequest);
} }
} }
catch (MessageException e) { catch (MessageException | ConsumerException e) {
throw new OpenIDConsumerException(
"Error processing ConsumerManager authentication", e);
}
catch (ConsumerException e) {
throw new OpenIDConsumerException( throw new OpenIDConsumerException(
"Error processing ConsumerManager authentication", e); "Error processing ConsumerManager authentication", e);
} }
@ -164,13 +160,7 @@ public class OpenID4JavaConsumer implements OpenIDConsumer {
verification = consumerManager.verify(receivingURL.toString(), openidResp, verification = consumerManager.verify(receivingURL.toString(), openidResp,
discovered); discovered);
} }
catch (MessageException e) { catch (MessageException | AssociationException | DiscoveryException e) {
throw new OpenIDConsumerException("Error verifying openid response", e);
}
catch (DiscoveryException e) {
throw new OpenIDConsumerException("Error verifying openid response", e);
}
catch (AssociationException e) {
throw new OpenIDConsumerException("Error verifying openid response", e); throw new OpenIDConsumerException("Error verifying openid response", e);
} }

9
samples/xml/contacts/src/main/java/sample/contact/ClientApplication.java
View File

@ -77,10 +77,7 @@ public class ClientApplication {
System.out System.out
.println("This client proxy factory does not have a setUsername(String) method"); .println("This client proxy factory does not have a setUsername(String) method");
} }
catch (IllegalAccessException ignored) { catch (IllegalAccessException | InvocationTargetException ignored) {
ignored.printStackTrace();
}
catch (InvocationTargetException ignored) {
ignored.printStackTrace(); ignored.printStackTrace();
} }
@ -98,9 +95,7 @@ public class ClientApplication {
System.out System.out
.println("This client proxy factory does not have a setPassword(String) method"); .println("This client proxy factory does not have a setPassword(String) method");
} }
catch (IllegalAccessException ignored) { catch (IllegalAccessException | InvocationTargetException ignored) {
}
catch (InvocationTargetException ignored) {
} }
System.out.println("Calling ContactManager '" + beanName + "'"); System.out.println("Calling ContactManager '" + beanName + "'");

14
web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java
View File

@ -114,19 +114,9 @@ public class WebXmlMappableAttributesRetriever implements ResourceLoaderAware,
doc = db.parse(aStream); doc = db.parse(aStream);
return doc; return doc;
} }
catch (FactoryConfigurationError e) { catch (FactoryConfigurationError | IOException | SAXException | ParserConfigurationException e) {
throw new RuntimeException("Unable to parse document object", e); throw new RuntimeException("Unable to parse document object", e);
} } finally {
catch (ParserConfigurationException e) {
throw new RuntimeException("Unable to parse document object", e);
}
catch (SAXException e) {
throw new RuntimeException("Unable to parse document object", e);
}
catch (IOException e) {
throw new RuntimeException("Unable to parse document object", e);
}
finally {
try { try {
aStream.close(); aStream.close();
} }