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
The following commit(s) were added to refs/heads/main by this push:
new 050171a Rename methods to "secure".
050171a is described below
commit 050171a4d01220811fe84b481cc0041071bb56e1
Author: Gary Gregory <[email protected]>
AuthorDate: Fri Aug 28 17:27:36 2026 -0400
Rename methods to "secure".
---
.../org/apache/commons/xml/SecureTransformerFactory.java | 12 ++++++------
1 file 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 74394f4..232482a 100644
--- a/src/main/java/org/apache/commons/xml/SecureTransformerFactory.java
+++ b/src/main/java/org/apache/commons/xml/SecureTransformerFactory.java
@@ -190,7 +190,7 @@ private Wrapper(final SAXTransformerFactory delegate, final
Supplier<Source> emp
public Source getAssociatedStylesheet(final Source source, final
String media, final String title, final String charset)
throws TransformerConfigurationException {
// Xalan's getAssociatedStylesheet drops a SAXSource's reader and
self-provisions its own to scan for xml-stylesheet PIs (XALANJ-2849).
- final Source secure = isXalan(delegate) ?
hardenSourceToDom(source) : SecureSAXParserFactory.secure(source,
overrideDefaultParser());
+ final Source secure = isXalan(delegate) ?
secureSourceToDom(source) : SecureSAXParserFactory.secure(source,
overrideDefaultParser());
return delegate.getAssociatedStylesheet(secure, media, title,
charset);
}
@@ -214,7 +214,7 @@ public URIResolver getURIResolver() {
return floor.getDelegate();
}
- private TransformerHandler hardenHandler(final TransformerHandler
handler) {
+ private TransformerHandler secure(final TransformerHandler handler) {
return handler == null ? null : new
SecureTransformerHandler(handler, getURIResolver(), emptySource,
overrideDefaultParser());
}
@@ -230,7 +230,7 @@ private TransformerHandler hardenHandler(final
TransformerHandler handler) {
* configuration error} or if the
implementation is not available or cannot be instantiated.
* @throws SecureException Thrown if a (non-Android) factory cannot
support the secure processing feature {@link
XMLConstants#FEATURE_SECURE_PROCESSING}.
*/
- private Source hardenSourceToDom(final Source source) throws
TransformerConfigurationException {
+ private Source secureSourceToDom(final Source source) throws
TransformerConfigurationException {
if (source instanceof StreamSource || source instanceof SAXSource
&& ((SAXSource) source).getXMLReader() == null) {
final InputSource inputSource =
SAXSource.sourceToInputSource(source);
if (inputSource != null) {
@@ -285,7 +285,7 @@ public Transformer newTransformer(final Source source)
throws TransformerConfigu
@Override
public TransformerHandler newTransformerHandler() throws
TransformerConfigurationException {
- return hardenHandler(delegate.newTransformerHandler());
+ return secure(delegate.newTransformerHandler());
}
/**
@@ -296,13 +296,13 @@ public TransformerHandler newTransformerHandler() throws
TransformerConfiguratio
*/
@Override
public TransformerHandler newTransformerHandler(final Source source)
throws TransformerConfigurationException {
- return
hardenHandler(delegate.newTransformerHandler(SecureSAXParserFactory.secure(source,
overrideDefaultParser())));
+ return
secure(delegate.newTransformerHandler(SecureSAXParserFactory.secure(source,
overrideDefaultParser())));
}
@Override
public TransformerHandler newTransformerHandler(final Templates
templates) throws TransformerConfigurationException {
// Implementations cast templates.newTransformer() to their own
Transformer type, so hand them the wrapped implementation Templates, not the
wrapper.
- return
hardenHandler(delegate.newTransformerHandler(unwrap(templates)));
+ return secure(delegate.newTransformerHandler(unwrap(templates)));
}
/**