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 eb83bb2961930ff9c5227b28abd5c2ec8c9bda56 Author: Gary Gregory <[email protected]> AuthorDate: Fri Aug 28 13:16:53 2026 -0400 Rename HardeningSchema to SecureSchema. Local build OK. --- src/main/java/org/apache/commons/xml/HardeningSchemaFactory.java | 6 +++--- .../apache/commons/xml/{HardeningSchema.java => SecureSchema.java} | 4 ++-- src/test/java/org/apache/commons/xml/OverrideDefaultParserTest.java | 4 ++-- src/test/java/org/apache/commons/xml/ShadingFootprintTest.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/commons/xml/HardeningSchemaFactory.java b/src/main/java/org/apache/commons/xml/HardeningSchemaFactory.java index 0117779..5d1e500 100644 --- a/src/main/java/org/apache/commons/xml/HardeningSchemaFactory.java +++ b/src/main/java/org/apache/commons/xml/HardeningSchemaFactory.java @@ -151,7 +151,7 @@ private HardeningSchemaFactory() { * <li>{@link HardeningSchemaFactory} installs an ignore-all {@link FallbackIgnoreLSResourceResolver} floor on the factory (blocking * {@code xs:import}/{@code xs:include}/{@code xs:redefine} at compile time) and rewrites the Source on every {@code newSchema(Source[])} entry point * through {@link SecureSAXParserFactory#harden(Source, boolean)}.</li> - * <li>{@link HardeningSchema} wraps every Validator/ValidatorHandler the inner Schema produces and re-installs the floor on each (blocking + * <li>{@link SecureSchema} wraps every Validator/ValidatorHandler the inner Schema produces and re-installs the floor on each (blocking * {@code xsi:schemaLocation} at validation time), since neither the JDK nor Xerces reliably propagates it through {@code Schema}.</li> * <li>{@link HardeningValidator} rewrites the Source on every {@link Validator#validate(Source)} call.</li> * </ol> @@ -235,7 +235,7 @@ public boolean isSchemaLanguageSupported(final String schemaLanguage) { @Override public Schema newSchema() throws SAXException { - return new HardeningSchema(delegate.newSchema(), overrideDefaultParser()); + return new SecureSchema(delegate.newSchema(), overrideDefaultParser()); } /** @@ -246,7 +246,7 @@ public Schema newSchema() throws SAXException { */ @Override public Schema newSchema(final Source[] schemas) throws SAXException { - return new HardeningSchema(delegate.newSchema(harden(schemas)), overrideDefaultParser()); + return new SecureSchema(delegate.newSchema(harden(schemas)), overrideDefaultParser()); } /** diff --git a/src/main/java/org/apache/commons/xml/HardeningSchema.java b/src/main/java/org/apache/commons/xml/SecureSchema.java similarity index 95% rename from src/main/java/org/apache/commons/xml/HardeningSchema.java rename to src/main/java/org/apache/commons/xml/SecureSchema.java index 981ec17..011eb1b 100644 --- a/src/main/java/org/apache/commons/xml/HardeningSchema.java +++ b/src/main/java/org/apache/commons/xml/SecureSchema.java @@ -29,7 +29,7 @@ * floor), and each {@link ValidatorHandler} is wrapped in a {@link HardeningValidatorHandler} that keeps the same ignore-all resolver floor so * {@code xsi:schemaLocation} is not resolved during SAX-driven validation. */ -final class HardeningSchema extends Schema { +final class SecureSchema extends Schema { private final Schema delegate; @@ -45,7 +45,7 @@ final class HardeningSchema extends Schema { * @param overrideDefaultParser whether the produced Validators' source rewrites should use the pluggable parser lookup instead of the platform's built-in parser. * @throws NullPointerException if {@code delegate} is {@code null}. */ - HardeningSchema(final Schema delegate, final boolean overrideDefaultParser) { + SecureSchema(final Schema delegate, final boolean overrideDefaultParser) { this.delegate = Objects.requireNonNull(delegate, "delegate"); this.overrideDefaultParser = overrideDefaultParser; } diff --git a/src/test/java/org/apache/commons/xml/OverrideDefaultParserTest.java b/src/test/java/org/apache/commons/xml/OverrideDefaultParserTest.java index c15ce95..ea1ceb6 100644 --- a/src/test/java/org/apache/commons/xml/OverrideDefaultParserTest.java +++ b/src/test/java/org/apache/commons/xml/OverrideDefaultParserTest.java @@ -80,9 +80,9 @@ void schemaFactoryReadsFeatureAtCreation() throws Exception { assumeFalse(AttackTestSupport.IS_ANDROID); final SchemaFactory factory = HardeningSchemaFactory.newDefaultInstance(); assertFalse(factory.getFeature(FEATURE)); - assertFalse(((HardeningSchema) factory.newSchema(AttackTestSupport.streamSource(AttackTestSupport.BENIGN_SCHEMA))).overrideDefaultParser); + assertFalse(((SecureSchema) factory.newSchema(AttackTestSupport.streamSource(AttackTestSupport.BENIGN_SCHEMA))).overrideDefaultParser); factory.setFeature(FEATURE, true); - assertTrue(((HardeningSchema) factory.newSchema(AttackTestSupport.streamSource(AttackTestSupport.BENIGN_SCHEMA))).overrideDefaultParser); + assertTrue(((SecureSchema) factory.newSchema(AttackTestSupport.streamSource(AttackTestSupport.BENIGN_SCHEMA))).overrideDefaultParser); } @Test diff --git a/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java b/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java index 1f31827..e8c469f 100644 --- a/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java +++ b/src/test/java/org/apache/commons/xml/ShadingFootprintTest.java @@ -160,7 +160,7 @@ class ShadingFootprintTest { "SecureSAXParserFactory$1", "SecureSAXParserFactory$HardeningExpatXMLReader", "SecureSAXParserFactory$Wrapper", - "HardeningSchema", + "SecureSchema", "HardeningSchemaFactory", "HardeningSchemaFactory$1", "HardeningSchemaFactory$Wrapper",
