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 93184b691200d40e07fdbf046a048cc41d570bf1 Author: Gary Gregory <[email protected]> AuthorDate: Fri Aug 28 13:09:35 2026 -0400 Rename Hardening* to Secure* classes. --- .../org/apache/commons/xml/HardeningDocumentBuilderFactory.java | 4 ++-- .../{HardeningDocumentBuilder.java => SecureDocumentBuilder.java} | 4 ++-- src/test/java/org/apache/commons/xml/ShadingFootprintTest.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/apache/commons/xml/HardeningDocumentBuilderFactory.java b/src/main/java/org/apache/commons/xml/HardeningDocumentBuilderFactory.java index 2421305..2284d9f 100644 --- a/src/main/java/org/apache/commons/xml/HardeningDocumentBuilderFactory.java +++ b/src/main/java/org/apache/commons/xml/HardeningDocumentBuilderFactory.java @@ -243,7 +243,7 @@ private HardeningDocumentBuilderFactory() { /** * {@link DocumentBuilderFactory} wrapper that keeps an ignore-all {@link EntityResolver} floor on every {@link DocumentBuilder} produced. * <p> - * Wraps each produced builder in a {@link HardeningDocumentBuilder}; required when the underlying factory carries no resolver of its own and does not honor + * Wraps each produced builder in a {@link SecureDocumentBuilder}; required when the underlying factory carries no resolver of its own and does not honor * JAXP 1.5 {@code ACCESS_EXTERNAL_*} (e.g. the external Xerces distribution). A caller-set resolver is routed through the floor rather than replacing it. Kept * as a standalone wrapper so any hardener can reuse the floor. * </p> @@ -316,7 +316,7 @@ public boolean isXIncludeAware() { @Override public DocumentBuilder newDocumentBuilder() throws ParserConfigurationException { - return new HardeningDocumentBuilder(delegate.newDocumentBuilder()); + return new SecureDocumentBuilder(delegate.newDocumentBuilder()); } @Override diff --git a/src/main/java/org/apache/commons/xml/HardeningDocumentBuilder.java b/src/main/java/org/apache/commons/xml/SecureDocumentBuilder.java similarity index 96% rename from src/main/java/org/apache/commons/xml/HardeningDocumentBuilder.java rename to src/main/java/org/apache/commons/xml/SecureDocumentBuilder.java index 7c85944..067017c 100644 --- a/src/main/java/org/apache/commons/xml/HardeningDocumentBuilder.java +++ b/src/main/java/org/apache/commons/xml/SecureDocumentBuilder.java @@ -37,7 +37,7 @@ * caller's resolver does not satisfy resolves to empty rather than being fetched. {@link #reset()} re-establishes the bare ignore-all floor, matching the just-constructed * state.</p> */ -final class HardeningDocumentBuilder extends DocumentBuilder { +final class SecureDocumentBuilder extends DocumentBuilder { private final DocumentBuilder delegate; @@ -49,7 +49,7 @@ final class HardeningDocumentBuilder extends DocumentBuilder { * @param delegate the delegate to wrap; must not be {@code null}. * @throws NullPointerException if {@code delegate} is {@code null}. */ - HardeningDocumentBuilder(final DocumentBuilder delegate) { + SecureDocumentBuilder(final DocumentBuilder delegate) { this.delegate = Objects.requireNonNull(delegate, "delegate"); delegate.setEntityResolver(floor); } diff --git a/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java b/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java index bfe669b..407be28 100644 --- a/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java +++ b/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java @@ -58,7 +58,7 @@ class ShadingFootprintTest { // @formatter:off private static final Set<String> DOCUMENT_BUILDER_FACTORY = set( "FallbackIgnoreEntityResolver2", - "HardeningDocumentBuilder", + "SecureDocumentBuilder", "HardeningDocumentBuilderFactory", "HardeningDocumentBuilderFactory$1", "HardeningDocumentBuilderFactory$Wrapper", @@ -98,7 +98,7 @@ class ShadingFootprintTest { private static final Set<String> TRANSFORMER_FACTORY = saxParserFactoryPlus( "FallbackIgnoreEntityResolver2", "FallbackIgnoreURIResolver", - "HardeningDocumentBuilder", + "SecureDocumentBuilder", "HardeningDocumentBuilderFactory", "HardeningDocumentBuilderFactory$1", "HardeningDocumentBuilderFactory$Wrapper", @@ -127,7 +127,7 @@ class ShadingFootprintTest { private static final Set<String> XPATH_FACTORY = saxParserFactoryPlus( "FallbackIgnoreEntityResolver2", "FallbackIgnoreURIResolver", - "HardeningDocumentBuilder", + "SecureDocumentBuilder", "HardeningDocumentBuilderFactory", "HardeningDocumentBuilderFactory$1", "HardeningDocumentBuilderFactory$Wrapper",
