Skip to content

Commit c99eeb0

Browse files
JoeWang-JavaJoeWang-Java
committedFeb 19, 2021
8260858: Implementation specific property xsltcIsStandalone for XSLTC Serializer
Reviewed-by: lancea, naoto
·
JEP-429-branchpoint
1 parent 5caf686 commit c99eeb0

File tree

7 files changed

+239
-76
lines changed

7 files changed

+239
-76
lines changed
 

‎src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java

+20-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
33
*/
44
/*
55
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -83,6 +83,7 @@
8383
import javax.xml.transform.stream.StreamSource;
8484
import jdk.xml.internal.JdkXmlFeatures;
8585
import jdk.xml.internal.JdkXmlUtils;
86+
import jdk.xml.internal.SecuritySupport;
8687
import jdk.xml.internal.TransformErrorListener;
8788
import org.xml.sax.ContentHandler;
8889
import org.xml.sax.InputSource;
@@ -94,7 +95,7 @@
9495
* @author Morten Jorgensen
9596
* @author G. Todd Miller
9697
* @author Santiago Pericas-Geertsen
97-
* @LastModified: Aug 2019
98+
* @LastModified: Feb 2021
9899
*/
99100
public final class TransformerImpl extends Transformer
100101
implements DOMCache
@@ -278,6 +279,10 @@ protected TransformerImpl(Translet translet, Properties outputProperties,
278279
_translet.setMessageHandler(new MessageHandler(_errorListener));
279280
}
280281
_properties = createOutputProperties(outputProperties);
282+
String v = SecuritySupport.getJAXPSystemProperty(OutputPropertiesFactory.SP_IS_STANDALONE);
283+
if (v != null) {
284+
_properties.setProperty(OutputPropertiesFactory.JDK_IS_STANDALONE, v);
285+
}
281286
_propertiesClone = (Properties) _properties.clone();
282287
_indentNumber = indentNumber;
283288
_tfactory = tfactory;
@@ -1032,7 +1037,7 @@ else if (name.equals(OutputKeys.CDATA_SECTION_ELEMENTS)) {
10321037
}
10331038
}
10341039
}
1035-
else if (name.equals(OutputPropertiesFactory.ORACLE_IS_STANDALONE)) {
1040+
else if (isStandaloneProperty(name)) {
10361041
if (value != null && value.equals("yes")) {
10371042
translet._isStandalone = true;
10381043
}
@@ -1096,7 +1101,7 @@ else if (name.equals(OutputPropertiesFactory.S_BUILTIN_EXTENSIONS_UNIVERSAL +"in
10961101
handler.setIndentAmount(Integer.parseInt(value));
10971102
}
10981103
}
1099-
else if (name.equals(OutputPropertiesFactory.ORACLE_IS_STANDALONE)) {
1104+
else if (isStandaloneProperty(name)) {
11001105
if (value != null && value.equals("yes")) {
11011106
handler.setIsStandalone(true);
11021107
}
@@ -1214,10 +1219,20 @@ private boolean validOutputProperty(String name) {
12141219
name.equals(OutputKeys.OMIT_XML_DECLARATION) ||
12151220
name.equals(OutputKeys.STANDALONE) ||
12161221
name.equals(OutputKeys.VERSION) ||
1217-
name.equals(OutputPropertiesFactory.ORACLE_IS_STANDALONE) ||
1222+
isStandaloneProperty(name) ||
12181223
name.charAt(0) == '{');
12191224
}
12201225

1226+
/**
1227+
* Checks whether the property requested is the isStandalone property. Both
1228+
* the new and legacy property names are supported.
1229+
* @param name the property name
1230+
* @return true if the property is "isStandalone", false otherwise
1231+
*/
1232+
private boolean isStandaloneProperty(String name) {
1233+
return (name.equals(OutputPropertiesFactory.JDK_IS_STANDALONE) ||
1234+
name.equals(OutputPropertiesFactory.ORACLE_IS_STANDALONE));
1235+
}
12211236
/**
12221237
* Checks if a given output property is default (2nd layer only)
12231238
*/

‎src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
33
*/
44
/*
55
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,6 +20,7 @@
2020

2121
package com.sun.org.apache.xml.internal.serializer;
2222

23+
import com.sun.org.apache.xerces.internal.impl.Constants;
2324
import java.util.Properties;
2425
import javax.xml.transform.OutputKeys;
2526
import jdk.xml.internal.SecuritySupport;
@@ -70,7 +71,7 @@
7071
* @see SerializerFactory
7172
* @see Method
7273
* @see Serializer
73-
* @LastModified: Mar 2019
74+
* @LastModified: Feb 2021
7475
*/
7576
public final class OutputPropertiesFactory
7677
{
@@ -186,6 +187,13 @@ public final class OutputPropertiesFactory
186187
*/
187188
public static final String ORACLE_IS_STANDALONE = "http://www.oracle.com/xml/is-standalone";
188189

190+
// standardized property, refer to the definition in java.xml module-info
191+
public static final String JDK_IS_STANDALONE = Constants.ORACLE_JAXP_PROPERTY_PREFIX +
192+
"xsltcIsStandalone";
193+
194+
// Corresponding System property
195+
public static final String SP_IS_STANDALONE = "jdk.xml.xsltcIsStandalone";
196+
189197
//************************************************************
190198
//* PRIVATE CONSTANTS
191199
//************************************************************
@@ -212,7 +220,8 @@ public final class OutputPropertiesFactory
212220
"media-type",
213221
"{http://xml.apache.org/xalan}indent-amount",
214222
"{http://xml.apache.org/xalan}content-handler",
215-
"{http://xml.apache.org/xalan}entities"
223+
"{http://xml.apache.org/xalan}entities",
224+
JDK_IS_STANDALONE
216225
};
217226

218227
private static final String[] PROP_XML_VALUE = {
@@ -225,7 +234,8 @@ public final class OutputPropertiesFactory
225234
"text/xml",
226235
"0",
227236
"com.sun.org.apache.xml.internal.serializer.ToXMLStream",
228-
"com/sun/org/apache/xml/internal/serializer/XMLEntities"
237+
"com/sun/org/apache/xml/internal/serializer/XMLEntities",
238+
"no"
229239
};
230240

231241
private static final String[] PROP_HTML = {

‎src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ void setProp(String name, String val, boolean defaultVal) {
494494
setIndentAmount(Integer.parseInt(val));
495495
} else if (OutputKeys.INDENT.equals(name)) {
496496
m_doIndent = val.endsWith("yes");
497-
} else if ((DOMConstants.S_JDK_PROPERTIES_NS + DOMConstants.S_IS_STANDALONE)
497+
} else if ((DOMConstants.NS_IS_STANDALONE)
498498
.equals(name)) {
499499
m_isStandalone = val.endsWith("yes");
500500
}

‎src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
33
*/
44
/*
55
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -49,7 +49,7 @@
4949
*
5050
* This class is not a public API, it is public because it is used within Xalan.
5151
* @xsl.usage internal
52-
* @LastModified: Aug 2019
52+
* @LastModified: Feb 2021
5353
*/
5454
public final class ToUnknownStream extends SerializerBase
5555
{
@@ -655,6 +655,11 @@ public void setStandalone(String standalone) {
655655
m_handler.setStandalone(standalone);
656656
}
657657

658+
@Override
659+
public void setIsStandalone(boolean isStandalone) {
660+
super.setIsStandalone(isStandalone);
661+
m_handler.setIsStandalone(isStandalone);
662+
}
658663
/**
659664
* Pass the call on to the underlying handler
660665
* @see org.xml.sax.ext.DeclHandler#attributeDecl(String, String, String, String, String)

‎src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/LSSerializerImpl.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,7 @@ public void initializeSerializerProps () {
358358
fDOMConfigProperties.setProperty(DOMConstants.S_XSL_OUTPUT_OMIT_XML_DECL, "no");
359359

360360
// JDK specific property isStandalone
361-
String p = SecuritySupport.getSystemProperty(DOMConstants.SP_IS_STANDALONE);
362-
if (p == null || p.isEmpty()) {
363-
p = SecuritySupport.readJAXPProperty(DOMConstants.SP_IS_STANDALONE);
364-
}
361+
String p = SecuritySupport.getJAXPSystemProperty(DOMConstants.SP_IS_STANDALONE);
365362
// the system property is true only if it is "true" and false otherwise
366363
if (p != null && p.equals("true")) {
367364
fFeatures |= IS_STANDALONE;

‎src/java.xml/share/classes/module-info.java

+35-2
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,13 @@
174174
* {@code factory.setAttribute(name, value);}
175175
* </td>
176176
* </tr>
177+
* <tr>
178+
* <th scope="row" style="font-weight:normal" id="XSLTCSerializer">XSLTC Serializer</th>
179+
* <td>XSLTC Serializer</td>
180+
* <td>
181+
* {@code Transformer transformer = TransformerFactory.newInstance().newTransformer();}<br>
182+
* {@code transformer.setOutputProperty(name, value);}
183+
* </td>
177184
* </tr>
178185
* <tr>
179186
* <th scope="row" style="font-weight:normal" id="DOMLS">DOMLS</th>
@@ -230,6 +237,28 @@
230237
* <td><a href="#DOMLS">DOMLS</a></td>
231238
* <td>17</td>
232239
* </tr>
240+
* <tr>
241+
* <th scope="row" style="font-weight:normal" id="XSLTCISSTANDALONE">xsltcIsStandalone</th>
242+
* <td>indicates that the <a href="#XSLTCSerializer">XSLTC serializer</a> should
243+
* treat the output as a standalone document. The property can be used to ensure
244+
* a newline is written after the XML declaration. Unlike the property
245+
* {@link javax.xml.transform.OutputKeys#OMIT_XML_DECLARATION OMIT_XML_DECLARATION},
246+
* this property does not have an effect on whether an XML declaration should be
247+
* written out.
248+
* <p>
249+
* This property behaves similar to that for <a href="#DOMLS">DOMLS</a> above,
250+
* except that it is for the <a href="#XSLTCSerializer">XSLTC Serializer</a>
251+
* and its value is a String.
252+
* </td>
253+
* <td>yes</td>
254+
* <td>yes</td>
255+
* <td>String</td>
256+
* <th id="Value" scope="row" style="font-weight:normal">yes/no</th>
257+
* <th id="Default" scope="row" style="font-weight:normal">no</th>
258+
* <td>No</td>
259+
* <td><a href="#XSLTCSerializer">XSLTC Serializer</a></td>
260+
* <td>17</td>
261+
* </tr>
233262
* </tbody>
234263
* </table>
235264
* <p>
@@ -241,8 +270,12 @@
241270
*
242271
* <p>
243272
* <b>[3]</b> The value must be exactly as listed in this table, case-sensitive.
244-
* The value type for the corresponding System Property is String. For boolean
245-
* type, the system property is true only if it is "true" and false otherwise.
273+
* The value of the corresponding System Property is the String representation of
274+
* the property value. If the type is boolean, the system property is true only
275+
* if it is "true"; If the type is String, the system property is true only if
276+
* it is exactly the same string representing the positive value (e.g. "yes" for
277+
* {@code xsltcIsStandalone}); The system property is false otherwise.
278+
*
246279
* <p>
247280
* <b>[4]</b> A value "yes" indicates the property is a Security Property. Refer
248281
* to the <a href="#ScopeAndOrder">Scope and Order</a> on how secure processing

‎test/jaxp/javax/xml/jaxp/unittest/common/prettyprint/PrettyPrintTest.java

+161-58
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
* or visit www.oracle.com if you need additional information or have any
2121
* questions.
2222
*/
23-
2423
package common.prettyprint;
2524

25+
import java.io.ByteArrayInputStream;
2626
import static jaxp.library.JAXPTestUtilities.clearSystemProperty;
2727
import static jaxp.library.JAXPTestUtilities.setSystemProperty;
2828

@@ -66,18 +66,23 @@
6666

6767
/*
6868
* @test
69-
* @bug 6439439 8087303 8174025 8223291 8249867 8261209
69+
* @bug 6439439 8087303 8174025 8223291 8249867 8261209 8260858
7070
* @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
7171
* @run testng/othervm -DrunSecMngr=true common.prettyprint.PrettyPrintTest
7272
* @run testng/othervm common.prettyprint.PrettyPrintTest
7373
* @summary Test serializing xml and html with indentation.
7474
*/
7575
@Listeners({jaxp.library.FilePolicy.class})
7676
public class PrettyPrintTest {
77+
7778
private static final String DOM_FORMAT_PRETTY_PRINT = "format-pretty-print";
78-
private static final String JDK_IS_STANDALONE =
79-
"http://www.oracle.com/xml/jaxp/properties/isStandalone";
79+
private static final String JDK_IS_STANDALONE
80+
= "http://www.oracle.com/xml/jaxp/properties/isStandalone";
8081
private static final String SP_JDK_IS_STANDALONE = "jdk.xml.isStandalone";
82+
private static final String XSLTC_IS_STANDALONE
83+
= "http://www.oracle.com/xml/jaxp/properties/xsltcIsStandalone";
84+
private static final String SP_XSLTC_IS_STANDALONE = "jdk.xml.xsltcIsStandalone";
85+
8186
// pretty-print=true, isStandalone=true, linebreak added after header
8287
private static final String XML_LB
8388
= "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<sometag/>\n";
@@ -87,19 +92,32 @@ public class PrettyPrintTest {
8792
// pretty-print=false, isStandalone=true, linebreak added after header
8893
private static final String XML_PPFALSE_LB
8994
= "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<sometag/>";
95+
96+
private static final String XSL = "<?xml version=\"1.0\"?>\n"
97+
+ "<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">\n"
98+
+ "\n"
99+
+ "<!--Identity template, copies all content into the output -->\n"
100+
+ " <xsl:template match=\"@*|node()\">\n"
101+
+ " <xsl:copy>\n"
102+
+ " <xsl:apply-templates select=\"@*|node()\"/>\n"
103+
+ " </xsl:copy>\n"
104+
+ " </xsl:template>\n"
105+
+ "\n"
106+
+ "</xsl:stylesheet>";
107+
90108
/*
91109
* test CDATA, elements only, text and element, xml:space property, mixed
92110
* node types.
93111
*/
94112
@DataProvider(name = "xml-data")
95113
public Object[][] xmlData() throws Exception {
96-
return new Object[][] {
97-
{ "xmltest1.xml", "xmltest1.out" },
98-
{ "xmltest2.xml", "xmltest2.out" },
99-
{ "xmltest3.xml", "xmltest3.out" },
100-
{ "xmltest4.xml", "xmltest4.out" },
101-
{ "xmltest6.xml", "xmltest6.out" },
102-
{ "xmltest8.xml", "xmltest8.out" } };
114+
return new Object[][]{
115+
{"xmltest1.xml", "xmltest1.out"},
116+
{"xmltest2.xml", "xmltest2.out"},
117+
{"xmltest3.xml", "xmltest3.out"},
118+
{"xmltest4.xml", "xmltest4.out"},
119+
{"xmltest6.xml", "xmltest6.out"},
120+
{"xmltest8.xml", "xmltest8.out"}};
103121
}
104122

105123
/*
@@ -111,16 +129,38 @@ public Object[][] xmlData() throws Exception {
111129
Object[][] getData() throws Exception {
112130
return new Object[][]{
113131
// pretty-print = true
114-
{true, false, true, true, XML_LB}, //set System property = true
132+
{true, false, true, true, XML_LB}, //set System property = true
133+
115134
{true, false, true, false, XML_PPTRUE_NOLB}, //set System property = false
116-
{true, true, false, true, XML_LB}, //set property = true
135+
{true, true, false, true, XML_LB}, //set property = true
117136
{true, true, false, false, XML_PPTRUE_NOLB}, //set property = false
118137
{true, false, false, false, XML_PPTRUE_NOLB},//default
119138

120139
// pretty-print = false
121140
{false, false, true, true, XML_PPFALSE_LB}, //System property = true
122-
{false, true, false, true, XML_PPFALSE_LB}, //set property = true
141+
{false, true, false, true, XML_PPFALSE_LB} //set property = true
142+
};
143+
}
144+
145+
/*
146+
* Bug: 8249867 8260858
147+
* DataProvider: for testing the xsltcIsStandalone property
148+
* Data columns: xsl, pretty-print, property, system property, value, expected result
149+
*/
150+
@DataProvider(name = "dataWithTemplate")
151+
Object[][] getDataWTemplate() throws Exception {
152+
return new Object[][]{
153+
// pretty-print = true
154+
{XSL, true, false, true, true, XML_LB}, //set System property = true
123155

156+
{XSL, true, false, true, false, XML_PPTRUE_NOLB}, //set System property = false
157+
{XSL, true, true, false, true, XML_LB}, //set property = true
158+
{XSL, true, true, false, false, XML_PPTRUE_NOLB}, //set property = false
159+
{XSL, true, false, false, false, XML_PPTRUE_NOLB},//default
160+
161+
// pretty-print = false
162+
{XSL, false, false, true, true, XML_PPFALSE_LB}, //System property = true
163+
{XSL, false, true, false, true, XML_PPFALSE_LB} //set property = true
124164
};
125165
}
126166

@@ -136,10 +176,36 @@ Object[][] getSystemProperty() throws Exception {
136176
{"true", true},
137177
{"false", false},
138178
{"yes", false},
139-
{"", false},
179+
{"", false}
140180
};
141181
}
142182

183+
/*
184+
* Bug: 8260858
185+
* Verifies the use of the new property "xsltcIsStandalone" and the
186+
* corresponding System property "jdk.xml.xsltcIsStandalone".
187+
*/
188+
@Test(dataProvider = "setting")
189+
public void testIsStandalone_XSLTC(boolean pretty, boolean p, boolean sp,
190+
boolean val, String expected)
191+
throws Exception {
192+
String result = transform(null, expected, false, pretty, p, sp, val);
193+
Assert.assertEquals(result, expected);
194+
}
195+
196+
/*
197+
* Bug: 8260858
198+
* Samiliar to testIsStandalone_XSLTC, except that the transformer is created
199+
* from a template.
200+
*/
201+
@Test(dataProvider = "dataWithTemplate")
202+
public void testIsStandalone_Template(String xsl, boolean pretty, boolean p,
203+
boolean sp, boolean val, String expected)
204+
throws Exception {
205+
String result = transform(xsl, expected, false, pretty, p, sp, val);
206+
Assert.assertEquals(result, expected);
207+
}
208+
143209
/*
144210
* Bug: 8249867
145211
* Verifies the use of the new property "isStandalone" and the
@@ -157,7 +223,7 @@ public void testIsStandalone_DOMLS(boolean pretty, boolean p, boolean sp,
157223
setSystemProperty(SP_JDK_IS_STANDALONE, Boolean.toString(val));
158224
}
159225
Document document = getDocument();
160-
DOMImplementationLS impl = (DOMImplementationLS)document.getImplementation();
226+
DOMImplementationLS impl = (DOMImplementationLS) document.getImplementation();
161227
LSSerializer ser = impl.createLSSerializer();
162228
DOMConfiguration config = ser.getDomConfig();
163229
if (pretty) {
@@ -265,9 +331,9 @@ public void testSequentTextNodesWithLSSerializer() throws Exception {
265331
*/
266332
@DataProvider(name = "xml-data-whitespace-ls")
267333
public Object[][] whitespaceLS() throws Exception {
268-
return new Object[][] {
269-
{ "xmltest5.xml", "xmltest5ls.out" },
270-
{ "xmltest7.xml", "xmltest7ls.out" } };
334+
return new Object[][]{
335+
{"xmltest5.xml", "xmltest5ls.out"},
336+
{"xmltest7.xml", "xmltest7ls.out"}};
271337
}
272338

273339
/*
@@ -294,9 +360,9 @@ public void testWhitespaceWithLSSerializer(String sourceFile, String expectedFil
294360
*/
295361
@DataProvider(name = "xml-data-whitespace-xslt")
296362
public Object[][] whitespaceXSLT() throws Exception {
297-
return new Object[][] {
298-
{ "xmltest5.xml", "xmltest5xslt.out" },
299-
{ "xmltest7.xml", "xmltest7xslt.out" } };
363+
return new Object[][]{
364+
{"xmltest5.xml", "xmltest5xslt.out"},
365+
{"xmltest7.xml", "xmltest7xslt.out"}};
300366
}
301367

302368
/*
@@ -324,15 +390,15 @@ public void testWhitespaceWithTransformer(String sourceFile, String expectedFile
324390
*/
325391
@DataProvider(name = "html-data")
326392
public Object[][] htmlData() throws Exception {
327-
return new Object[][] {
328-
{ "htmltest1.xml", "htmltest1.out" },
329-
{ "htmltest2.xml", "htmltest2.out" },
330-
{ "htmltest3.xml", "htmltest3.out" },
331-
{ "htmltest4.xml", "htmltest4.out" },
332-
{ "htmltest5.xml", "htmltest5.out" },
333-
{ "htmltest6.xml", "htmltest6.out" },
393+
return new Object[][]{
394+
{"htmltest1.xml", "htmltest1.out"},
395+
{"htmltest2.xml", "htmltest2.out"},
396+
{"htmltest3.xml", "htmltest3.out"},
397+
{"htmltest4.xml", "htmltest4.out"},
398+
{"htmltest5.xml", "htmltest5.out"},
399+
{"htmltest6.xml", "htmltest6.out"},
334400
/* @bug 8174025, test whitespace between inline elements */
335-
{ "htmltest7.xml", "htmltest7.out" } };
401+
{"htmltest7.xml", "htmltest7.out"}};
336402
}
337403

338404
/*
@@ -366,9 +432,9 @@ public void testTransformToHTML(String sourceFile, String expectedFile)
366432
*/
367433
@Test
368434
public void testDisableOutputEscaping() throws Exception {
369-
final String xsl ="generate-catalog.xsl";
370-
final String xml ="simple-entity-resolver-config.xml";
371-
final String expectedOutput ="simple-entity-resolver-config-transformed.xml";
435+
final String xsl = "generate-catalog.xsl";
436+
final String xml = "simple-entity-resolver-config.xml";
437+
final String expectedOutput = "simple-entity-resolver-config-transformed.xml";
372438
TransformerFactory factory = TransformerFactory.newInstance();
373439
Transformer transformer = factory.newTemplates(
374440
new StreamSource(new StringReader(read(xsl)))).newTransformer();
@@ -388,25 +454,25 @@ public void testLSSerializerFormatPrettyPrint() {
388454
final String XML_DOCUMENT = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>\n"
389455
+ "<hello>before child element<child><children/><children/></child>"
390456
+ "after child element</hello>";
391-
/**JDK-8035467
392-
* no newline in default output
457+
/**
458+
* JDK-8035467 no newline in default output
393459
*/
394-
final String XML_DOCUMENT_DEFAULT_PRINT =
395-
"<?xml version=\"1.0\" encoding=\"UTF-16\"?>"
460+
final String XML_DOCUMENT_DEFAULT_PRINT
461+
= "<?xml version=\"1.0\" encoding=\"UTF-16\"?>"
396462
+ "<hello>"
397463
+ "before child element"
398464
+ "<child><children/><children/></child>"
399465
+ "after child element</hello>";
400466

401-
final String XML_DOCUMENT_PRETTY_PRINT =
402-
"<?xml version=\"1.0\" encoding=\"UTF-16\"?><hello>\n" +
403-
" before child element\n" +
404-
" <child>\n" +
405-
" <children/>\n" +
406-
" <children/>\n" +
407-
" </child>\n" +
408-
" after child element\n" +
409-
"</hello>\n";
467+
final String XML_DOCUMENT_PRETTY_PRINT
468+
= "<?xml version=\"1.0\" encoding=\"UTF-16\"?><hello>\n"
469+
+ " before child element\n"
470+
+ " <child>\n"
471+
+ " <children/>\n"
472+
+ " <children/>\n"
473+
+ " </child>\n"
474+
+ " after child element\n"
475+
+ "</hello>\n";
410476

411477
// it all begins with a Document
412478
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
@@ -443,12 +509,12 @@ public void testLSSerializerFormatPrettyPrint() {
443509
DOMConfiguration domConfiguration = lsSerializer.getDomConfig();
444510

445511
// query current configuration
446-
Boolean defaultFormatPrettyPrint =
447-
(Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT);
448-
Boolean canSetFormatPrettyPrintFalse =
449-
(Boolean) domConfiguration.canSetParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.FALSE);
450-
Boolean canSetFormatPrettyPrintTrue =
451-
(Boolean) domConfiguration.canSetParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.TRUE);
512+
Boolean defaultFormatPrettyPrint
513+
= (Boolean) domConfiguration.getParameter(DOM_FORMAT_PRETTY_PRINT);
514+
Boolean canSetFormatPrettyPrintFalse
515+
= (Boolean) domConfiguration.canSetParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.FALSE);
516+
Boolean canSetFormatPrettyPrintTrue
517+
= (Boolean) domConfiguration.canSetParameter(DOM_FORMAT_PRETTY_PRINT, Boolean.TRUE);
452518

453519
System.out.println(DOM_FORMAT_PRETTY_PRINT + " default/can set false/can set true = "
454520
+ defaultFormatPrettyPrint + "/"
@@ -501,8 +567,8 @@ public void testLSSerializerFormatPrettyPrint() {
501567

502568
private String serializerWrite(Node xml, boolean pretty) throws Exception {
503569
DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();
504-
DOMImplementationLS domImplementation =
505-
(DOMImplementationLS) registry.getDOMImplementation("LS");
570+
DOMImplementationLS domImplementation
571+
= (DOMImplementationLS) registry.getDOMImplementation("LS");
506572
StringWriter writer = new StringWriter();
507573
LSOutput formattedOutput = domImplementation.createLSOutput();
508574
formattedOutput.setCharacterStream(writer);
@@ -520,6 +586,14 @@ private String transform(Node xml, boolean pretty) throws Exception {
520586
return writer.toString();
521587
}
522588

589+
private String transform(String xsl, String xml, boolean omit, boolean pretty, boolean p, boolean sp, boolean standalone)
590+
throws Exception {
591+
Transformer transformer = getTransformer(xsl, false, omit, pretty, p, sp, standalone);
592+
StringWriter writer = new StringWriter();
593+
transformer.transform(new StreamSource(new StringReader(xml)), new StreamResult(writer));
594+
return writer.toString();
595+
}
596+
523597
private Document toXmlDocument(String xmlString) throws Exception {
524598
InputSource xmlInputSource = new InputSource(new StringReader(xmlString));
525599
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -589,12 +663,41 @@ private Document createDocWithSequentTextNodes() throws Exception {
589663
}
590664

591665
private Transformer getTransformer(boolean html, boolean pretty) throws Exception {
592-
Transformer transformer = TransformerFactory.newInstance().newTransformer();
666+
return getTransformer(null, html, true, pretty, false, false, false);
667+
}
668+
669+
private Transformer getTransformer(String xsl) throws Exception {
670+
TransformerFactory tf = TransformerFactory.newInstance();
671+
if (xsl == null) {
672+
return tf.newTransformer();
673+
}
674+
675+
return tf.newTemplates(
676+
new StreamSource(new ByteArrayInputStream(xsl.getBytes())))
677+
.newTransformer();
678+
}
679+
680+
private Transformer getTransformer(String xsl, boolean html, boolean omit,
681+
boolean pretty, boolean p, boolean sp, boolean standalone)
682+
throws Exception {
683+
if (sp) {
684+
setSystemProperty(SP_XSLTC_IS_STANDALONE, standalone ? "yes" : "no");
685+
}
686+
Transformer transformer = getTransformer(xsl);
593687
transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
594-
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
595-
if (html)
688+
if (omit) {
689+
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
690+
}
691+
if (html) {
596692
transformer.setOutputProperty(OutputKeys.METHOD, "html");
693+
}
597694
transformer.setOutputProperty(OutputKeys.INDENT, pretty ? "yes" : "no");
695+
if (p && !sp) {
696+
transformer.setOutputProperty(XSLTC_IS_STANDALONE, standalone ? "yes" : "no");
697+
}
698+
if (sp) {
699+
clearSystemProperty(SP_XSLTC_IS_STANDALONE);
700+
}
598701
return transformer;
599702
}
600703

@@ -616,7 +719,7 @@ private Document getDocument() throws Exception {
616719

617720
private DOMImplementationLS getImpl() throws Exception {
618721
Document document = getDocument();
619-
return (DOMImplementationLS)document.getImplementation();
722+
return (DOMImplementationLS) document.getImplementation();
620723
}
621724

622725
private DOMConfiguration getConfig() throws Exception {

0 commit comments

Comments
 (0)
Please sign in to comment.