From 4c49adf1bad3023619019182345b07ecc5cd2ff5 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Mon, 2 Jan 2017 21:44:59 -0500 Subject: [PATCH] reduced code duplication --- .../xml/hints/HintErrorHandler.java | 32 ++----------------- .../suppression/SuppressionErrorHandler.java | 32 ++----------------- .../owasp/dependencycheck/utils/XmlUtils.java | 28 ++++++++++++++++ 3 files changed, 34 insertions(+), 58 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintErrorHandler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintErrorHandler.java index 80818de45..f73dc4382 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintErrorHandler.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintErrorHandler.java @@ -17,6 +17,7 @@ */ package org.owasp.dependencycheck.xml.hints; +import org.owasp.dependencycheck.utils.XmlUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.ErrorHandler; @@ -35,33 +36,6 @@ public class HintErrorHandler implements ErrorHandler { */ private static final Logger LOGGER = LoggerFactory.getLogger(HintErrorHandler.class); - /** - * Builds a prettier exception message. - * - * @param ex the SAXParseException - * @return an easier to read exception message - */ - private String getPrettyParseExceptionInfo(SAXParseException ex) { - - final StringBuilder sb = new StringBuilder(); - - if (ex.getSystemId() != null) { - sb.append("systemId=").append(ex.getSystemId()).append(", "); - } - if (ex.getPublicId() != null) { - sb.append("publicId=").append(ex.getPublicId()).append(", "); - } - if (ex.getLineNumber() > 0) { - sb.append("Line=").append(ex.getLineNumber()); - } - if (ex.getColumnNumber() > 0) { - sb.append(", Column=").append(ex.getColumnNumber()); - } - sb.append(": ").append(ex.getMessage()); - - return sb.toString(); - } - /** * Logs warnings. * @@ -81,7 +55,7 @@ public class HintErrorHandler implements ErrorHandler { */ @Override public void error(SAXParseException ex) throws SAXException { - throw new SAXException(getPrettyParseExceptionInfo(ex)); + throw new SAXException(XmlUtils.getPrettyParseExceptionInfo(ex)); } /** @@ -92,6 +66,6 @@ public class HintErrorHandler implements ErrorHandler { */ @Override public void fatalError(SAXParseException ex) throws SAXException { - throw new SAXException(getPrettyParseExceptionInfo(ex)); + throw new SAXException(XmlUtils.getPrettyParseExceptionInfo(ex)); } } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java index 07d4b661e..b4801b380 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java @@ -17,6 +17,7 @@ */ package org.owasp.dependencycheck.xml.suppression; +import org.owasp.dependencycheck.utils.XmlUtils; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -33,33 +34,6 @@ public class SuppressionErrorHandler implements ErrorHandler { */ //private static final Logger LOGGER = LoggerFactory.getLogger(SuppressionErrorHandler.class); - /** - * Builds a prettier exception message. - * - * @param ex the SAXParseException - * @return an easier to read exception message - */ - private String getPrettyParseExceptionInfo(SAXParseException ex) { - - final StringBuilder sb = new StringBuilder(); - - if (ex.getSystemId() != null) { - sb.append("systemId=").append(ex.getSystemId()).append(", "); - } - if (ex.getPublicId() != null) { - sb.append("publicId=").append(ex.getPublicId()).append(", "); - } - if (ex.getLineNumber() > 0) { - sb.append("Line=").append(ex.getLineNumber()); - } - if (ex.getColumnNumber() > 0) { - sb.append(", Column=").append(ex.getColumnNumber()); - } - sb.append(": ").append(ex.getMessage()); - - return sb.toString(); - } - /** * Logs warnings. * @@ -79,7 +53,7 @@ public class SuppressionErrorHandler implements ErrorHandler { */ @Override public void error(SAXParseException ex) throws SAXException { - throw new SAXException(getPrettyParseExceptionInfo(ex)); + throw new SAXException(XmlUtils.getPrettyParseExceptionInfo(ex)); } /** @@ -90,6 +64,6 @@ public class SuppressionErrorHandler implements ErrorHandler { */ @Override public void fatalError(SAXParseException ex) throws SAXException { - throw new SAXException(getPrettyParseExceptionInfo(ex)); + throw new SAXException(XmlUtils.getPrettyParseExceptionInfo(ex)); } } diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/XmlUtils.java b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/XmlUtils.java index 9c167356e..f7a975b34 100644 --- a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/XmlUtils.java +++ b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/XmlUtils.java @@ -27,6 +27,7 @@ import javax.xml.parsers.SAXParserFactory; import org.xml.sax.SAXException; import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotSupportedException; +import org.xml.sax.SAXParseException; /** * Collection of XML related code. @@ -122,4 +123,31 @@ public final class XmlUtils { final DocumentBuilder db = factory.newDocumentBuilder(); return db; } + + /** + * Builds a prettier exception message. + * + * @param ex the SAXParseException + * @return an easier to read exception message + */ + public static String getPrettyParseExceptionInfo(SAXParseException ex) { + + final StringBuilder sb = new StringBuilder(); + + if (ex.getSystemId() != null) { + sb.append("systemId=").append(ex.getSystemId()).append(", "); + } + if (ex.getPublicId() != null) { + sb.append("publicId=").append(ex.getPublicId()).append(", "); + } + if (ex.getLineNumber() > 0) { + sb.append("Line=").append(ex.getLineNumber()); + } + if (ex.getColumnNumber() > 0) { + sb.append(", Column=").append(ex.getColumnNumber()); + } + sb.append(": ").append(ex.getMessage()); + + return sb.toString(); + } }