From 704d595fc6f0a79ed4cec295909425245723186b Mon Sep 17 00:00:00 2001 From: Chao Wang Date: Tue, 17 Oct 2023 11:15:18 +0800 Subject: [PATCH 1/2] [WFLY-18653] i18n of exception message in ApplicationClientParsingDeploymentProcessor --- .../deployment/ApplicationClientParsingDeploymentProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientParsingDeploymentProcessor.java b/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientParsingDeploymentProcessor.java index 58c61205aea3..bd284481b301 100644 --- a/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientParsingDeploymentProcessor.java +++ b/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientParsingDeploymentProcessor.java @@ -96,7 +96,7 @@ private ApplicationClientMetaData parseAppClient(DeploymentUnit deploymentUnit, } catch (XMLStreamException e) { throw AppClientLogger.ROOT_LOGGER.failedToParseXml(e, descriptor, e.getLocation().getLineNumber(), e.getLocation().getColumnNumber()); } catch (IOException e) { - throw new DeploymentUnitProcessingException("Failed to parse " + descriptor, e); + throw AppClientLogger.ROOT_LOGGER.failedToParseXml(e, descriptor); } finally { try { if (is != null) { From 81e04b1ce472d2e9e66563fe63bdb74af4d2ad23 Mon Sep 17 00:00:00 2001 From: Chao Wang Date: Tue, 17 Oct 2023 11:17:24 +0800 Subject: [PATCH 2/2] [WFLY-18653] Use try-with-resources statement and remove some redundant variables --- ...ationClientParsingDeploymentProcessor.java | 33 +++---------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientParsingDeploymentProcessor.java b/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientParsingDeploymentProcessor.java index bd284481b301..db67f8b38ca9 100644 --- a/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientParsingDeploymentProcessor.java +++ b/appclient/src/main/java/org/jboss/as/appclient/deployment/ApplicationClientParsingDeploymentProcessor.java @@ -88,23 +88,12 @@ private ApplicationClientMetaData parseAppClient(DeploymentUnit deploymentUnit, descriptor = deploymentRoot.getRoot().getChild(APP_XML); } if (descriptor.exists()) { - InputStream is = null; - try { - is = descriptor.openStream(); - ApplicationClientMetaData data = new ApplicationClientMetaDataParser().parse(getXMLStreamReader(is), propertyReplacer); - return data; + try (InputStream is = descriptor.openStream()) { + return new ApplicationClientMetaDataParser().parse(getXMLStreamReader(is), propertyReplacer); } catch (XMLStreamException e) { throw AppClientLogger.ROOT_LOGGER.failedToParseXml(e, descriptor, e.getLocation().getLineNumber(), e.getLocation().getColumnNumber()); } catch (IOException e) { throw AppClientLogger.ROOT_LOGGER.failedToParseXml(e, descriptor); - } finally { - try { - if (is != null) { - is.close(); - } - } catch (IOException e) { - // Ignore - } } } else { return null; @@ -115,24 +104,13 @@ private JBossClientMetaData parseJBossClient(DeploymentUnit deploymentUnit, fina final VirtualFile deploymentRoot = deploymentUnit.getAttachment(Attachments.DEPLOYMENT_ROOT).getRoot(); final VirtualFile appXml = deploymentRoot.getChild(JBOSS_CLIENT_XML); if (appXml.exists()) { - InputStream is = null; - try { - is = appXml.openStream(); - JBossClientMetaData data = new JBossClientMetaDataParser().parse(getXMLStreamReader(is), propertyReplacer); - return data; + try (InputStream is = appXml.openStream()) { + return new JBossClientMetaDataParser().parse(getXMLStreamReader(is), propertyReplacer); } catch (XMLStreamException e) { throw AppClientLogger.ROOT_LOGGER.failedToParseXml(e, appXml, e.getLocation().getLineNumber(), e.getLocation().getColumnNumber()); } catch (IOException e) { throw AppClientLogger.ROOT_LOGGER.failedToParseXml(e, appXml); - } finally { - try { - if (is != null) { - is.close(); - } - } catch (IOException e) { - // Ignore - } } } else { //we may already have this info from jboss-all.xml @@ -143,7 +121,6 @@ private JBossClientMetaData parseJBossClient(DeploymentUnit deploymentUnit, fina private XMLStreamReader getXMLStreamReader(InputStream is) throws XMLStreamException { final XMLInputFactory inputFactory = XMLInputFactory.newInstance(); inputFactory.setXMLResolver(NoopXMLResolver.create()); - XMLStreamReader xmlReader = inputFactory.createXMLStreamReader(is); - return xmlReader; + return inputFactory.createXMLStreamReader(is); } }