From 78e8f7a3f8448319a606380851ec98517a5056ce Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Tue, 27 Aug 2019 02:11:22 +0200 Subject: [PATCH] Java 7: Identical 'catch' branches in 'try' statement --- .../webflow/config/FlowRegistryFactoryBean.java | 6 +----- .../springframework/webflow/upgrade/WebFlowUpgrader.java | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java index fd1a69b5..4f3092b7 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java @@ -289,11 +289,7 @@ class FlowRegistryFactoryBean implements FactoryBean, Be flowRegistry, flowBuilderServices); FlowAssembler assembler = new FlowAssembler(builder, builderContext); return assembler.assembleFlow(); - } catch (IllegalArgumentException e) { - throw new FlowDefinitionConstructionException(builderInfo.getId(), e); - } catch (InstantiationException e) { - throw new FlowDefinitionConstructionException(builderInfo.getId(), e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException | InstantiationException e) { throw new FlowDefinitionConstructionException(builderInfo.getId(), e); } } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java b/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java index 8a4079c5..1f39d16b 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java @@ -63,9 +63,7 @@ public class WebFlowUpgrader { Source source = new StreamSource(flowResource.getInputStream()); Result result = new StreamResult(output); transform(source, result); - } catch (TransformerException e) { - e.printStackTrace(); - } catch (IOException e) { + } catch (TransformerException | IOException e) { e.printStackTrace(); } return output.toString();