Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

URL Cleanup - upgrade to more modern Xalan namespace

Browse Source 
See gh-22676
This commit is contained in:
Sam Brannen
2019-03-27 16:49:10 +01:00
parent 5d91a21914
commit a7254ce7b9
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ public abstract class TransformerUtils {
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
try {
// Xalan-specific, but this is the most common XSLT engine in any case
transformer.setOutputProperty("{https://xml.apache.org/xslt}indent-amount", String.valueOf(indentAmount));
transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", String.valueOf(indentAmount));
}
catch (IllegalArgumentException ignored) {
}

8
spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,6 +30,8 @@ import static org.junit.Assert.assertNotNull;
import org.junit.Test;
/**
* Unit tests for {@link TransformerUtils}.
*
* @author Rick Evans
* @author Arjen Poutsma
*/
@@ -42,7 +44,7 @@ public class TransformerUtilsTests {
String indent = transformer.getOutputProperty(OutputKeys.INDENT);
assertNotNull(indent);
assertEquals("yes", indent);
String indentAmount = transformer.getOutputProperty("{https://xml.apache.org/xslt}indent-amount");
String indentAmount = transformer.getOutputProperty("{http://xml.apache.org/xalan}indent-amount");
assertNotNull(indentAmount);
assertEquals(String.valueOf(TransformerUtils.DEFAULT_INDENT_AMOUNT), indentAmount);
}
@@ -55,7 +57,7 @@ public class TransformerUtilsTests {
String indent = transformer.getOutputProperty(OutputKeys.INDENT);
assertNotNull(indent);
assertEquals("yes", indent);
String indentAmount = transformer.getOutputProperty("{https://xml.apache.org/xslt}indent-amount");
String indentAmount = transformer.getOutputProperty("{http://xml.apache.org/xalan}indent-amount");
assertNotNull(indentAmount);
assertEquals(indentAmountProperty, indentAmount);
}