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 fa6cc3b4f2ebdad42e02536c131c58f29bb72731 Author: Gary Gregory <[email protected]> AuthorDate: Fri Aug 28 13:22:36 2026 -0400 Rename HardeningXMLFilter to SecureXMLFilter. Local build OK. --- src/main/java/org/apache/commons/xml/SecureTransformerFactory.java | 6 +++--- .../commons/xml/{HardeningXMLFilter.java => SecureXMLFilter.java} | 4 ++-- src/test/java/org/apache/commons/xml/ShadingFootprintTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/commons/xml/SecureTransformerFactory.java b/src/main/java/org/apache/commons/xml/SecureTransformerFactory.java index d121963..2d1b751 100644 --- a/src/main/java/org/apache/commons/xml/SecureTransformerFactory.java +++ b/src/main/java/org/apache/commons/xml/SecureTransformerFactory.java @@ -203,7 +203,7 @@ private SecureTransformerFactory() { * * <p>The {@link SAXTransformerFactory} extension products ride the same wrappers: {@code newTransformerHandler}/{@code newTemplatesHandler} products are * wrapped ({@link SecureTransformerHandler}, {@link SecureTemplatesHandler}) so the {@link Transformer}/{@link Templates} they expose carry the resolver - * floor, and {@code newXMLFilter} returns a {@link HardeningXMLFilter} composed from these wrappers instead of the implementation's filter, which would + * floor, and {@code newXMLFilter} returns a {@link SecureXMLFilter} composed from these wrappers instead of the implementation's filter, which would * self-provision an unhardened input reader.</p> * * <h2>Caveats</h2> @@ -422,12 +422,12 @@ public TransformerHandler newTransformerHandler(final Templates templates) throw @Override public XMLFilter newXMLFilter(final Source source) throws TransformerConfigurationException { final Templates templates = newTemplates(source); - return templates == null ? null : new HardeningXMLFilter((SecureTemplates) templates); + return templates == null ? null : new SecureXMLFilter((SecureTemplates) templates); } @Override public XMLFilter newXMLFilter(final Templates templates) throws TransformerConfigurationException { - return new HardeningXMLFilter(templates instanceof SecureTemplates ? (SecureTemplates) templates + return new SecureXMLFilter(templates instanceof SecureTemplates ? (SecureTemplates) templates : new SecureTemplates(templates, getURIResolver(), emptySource, overrideDefaultParser())); } diff --git a/src/main/java/org/apache/commons/xml/HardeningXMLFilter.java b/src/main/java/org/apache/commons/xml/SecureXMLFilter.java similarity index 97% rename from src/main/java/org/apache/commons/xml/HardeningXMLFilter.java rename to src/main/java/org/apache/commons/xml/SecureXMLFilter.java index 7ba554d..0068195 100644 --- a/src/main/java/org/apache/commons/xml/HardeningXMLFilter.java +++ b/src/main/java/org/apache/commons/xml/SecureXMLFilter.java @@ -42,7 +42,7 @@ * caller has not set a parent (a caller-set parent is trusted configuration, used as-is), and the transformation runs on a {@link SecureTransformer}, so * runtime {@code document()} sits on the resolver floor.</p> */ -final class HardeningXMLFilter extends XMLFilterImpl { +final class SecureXMLFilter extends XMLFilterImpl { private final SecureTemplates templates; @@ -52,7 +52,7 @@ final class HardeningXMLFilter extends XMLFilterImpl { * @param templates the delegate to wrap; must not be {@code null}. * @throws NullPointerException if {@code delegate} is {@code null}. */ - HardeningXMLFilter(final SecureTemplates templates) { + SecureXMLFilter(final SecureTemplates templates) { this.templates = Objects.requireNonNull(templates, "templates"); } diff --git a/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java b/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java index 125372e..3a18143 100644 --- a/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java +++ b/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java @@ -115,7 +115,7 @@ class ShadingFootprintTest { "SecureTransformerFactory$1", "SecureTransformerFactory$Wrapper", "SecureTransformerHandler", - "HardeningXMLFilter", + "SecureXMLFilter", "HardeningXMLReader", "SaxonProvider", "SaxonProvider$1",
