This is an automated email from the ASF dual-hosted git repository. garydgregory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/commons-xml.git
commit 8cd17d80a7b9a63cd379150929a77cf7a9b95f8f Author: Gary Gregory <[email protected]> AuthorDate: Fri Aug 28 13:25:31 2026 -0400 Rename HardeningXPathExpression to SecureXPathExpression. Local build OK. --- src/main/java/org/apache/commons/xml/SecureXPath.java | 4 ++-- .../xml/{HardeningXPathExpression.java => SecureXPathExpression.java} | 4 ++-- src/test/java/org/apache/commons/xml/ShadingFootprintTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/commons/xml/SecureXPath.java b/src/main/java/org/apache/commons/xml/SecureXPath.java index 98a6f8b..c63ab0f 100644 --- a/src/main/java/org/apache/commons/xml/SecureXPath.java +++ b/src/main/java/org/apache/commons/xml/SecureXPath.java @@ -44,7 +44,7 @@ * stock JDK and Apache Xalan provision an internal parser for that build which {@link javax.xml.XMLConstants#FEATURE_SECURE_PROCESSING} on the * {@link javax.xml.xpath.XPathFactory} does not reach. Parsing here puts the build on the library's resolver floor: an external reference inside the document * resolves to empty content, so it is neither fetched nor leaked, and the evaluation proceeds on whatever the parse produced. {@link #compile(String)} wraps - * the compiled expression in a {@link HardeningXPathExpression} on the same terms.</p> + * the compiled expression in a {@link SecureXPathExpression} on the same terms.</p> * * <p>The {@code evaluateExpression} default methods added to the interface by Java 9 route through the {@code evaluate} overloads overridden here, so they * carry the same rewrite on newer runtimes even though this class targets Java 8.</p> @@ -96,7 +96,7 @@ static Document parse(final InputSource source, final boolean overrideDefaultPar @Override public XPathExpression compile(final String expression) throws XPathExpressionException { final XPathExpression compiled = delegate.compile(expression); - return compiled == null ? null : new HardeningXPathExpression(compiled, overrideDefaultParser); + return compiled == null ? null : new SecureXPathExpression(compiled, overrideDefaultParser); } /** diff --git a/src/main/java/org/apache/commons/xml/HardeningXPathExpression.java b/src/main/java/org/apache/commons/xml/SecureXPathExpression.java similarity index 95% rename from src/main/java/org/apache/commons/xml/HardeningXPathExpression.java rename to src/main/java/org/apache/commons/xml/SecureXPathExpression.java index 37b7e97..22f26d4 100644 --- a/src/main/java/org/apache/commons/xml/HardeningXPathExpression.java +++ b/src/main/java/org/apache/commons/xml/SecureXPathExpression.java @@ -34,7 +34,7 @@ * overloads as well. * </p> */ -final class HardeningXPathExpression implements XPathExpression { +final class SecureXPathExpression implements XPathExpression { private final XPathExpression delegate; @@ -50,7 +50,7 @@ final class HardeningXPathExpression implements XPathExpression { * @param overrideDefaultParser whether the {@link InputSource} document builds should use the pluggable parser lookup instead of the platform's built-in parser. * @throws NullPointerException if {@code delegate} is {@code null}. */ - HardeningXPathExpression(final XPathExpression delegate, final boolean overrideDefaultParser) { + SecureXPathExpression(final XPathExpression delegate, final boolean overrideDefaultParser) { this.delegate = Objects.requireNonNull(delegate, "delegate"); this.overrideDefaultParser = overrideDefaultParser; } diff --git a/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java b/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java index 540ca14..d45d533 100644 --- a/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java +++ b/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java @@ -140,7 +140,7 @@ class ShadingFootprintTest { "SecureSAXParserFactory$Wrapper", "SecureXMLReader", "SecureXPath", - "HardeningXPathExpression", + "SecureXPathExpression", "HardeningXPathFactory", "HardeningXPathFactory$1", "HardeningXPathFactory$Wrapper",
