Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4915 Replace deprecated commons-lang3 classes (replace StringEscapeUtils.escapeXml with StringEscapeUtils.escapeXml10)

Browse Source
This commit is contained in:
Aleksandr Mashchenko
2018-02-05 21:17:42 +02:00
parent eb6ea76567
commit dac624431e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/components/Property.java
+5 -5
View File
@@ -19,7 +19,7 @@
package org.apache.struts2.components;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.views.annotations.StrutsTag;
@@ -162,15 +162,15 @@ public class Property extends Component {
}
private String prepare(String value) {
String result = value;
String result = value;
if (escapeHtml) {
result = StringEscapeUtils.escapeHtml4(result);
result = StringEscapeUtils.escapeHtml4(result);
}
if (escapeJavaScript) {
result = StringEscapeUtils.escapeEcmaScript(result);
result = StringEscapeUtils.escapeEcmaScript(result);
}
if (escapeXml) {
result = StringEscapeUtils.escapeXml(result);
result = StringEscapeUtils.escapeXml10(result);
}
if (escapeCsv) {
result = StringEscapeUtils.escapeCsv(result);
core/src/main/java/org/apache/struts2/components/Text.java
+2 -2
View File
@@ -19,7 +19,7 @@
package org.apache.struts2.components;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -225,7 +225,7 @@ public class Text extends ContextBean implements Param.UnnamedParametric {
result = StringEscapeUtils.escapeEcmaScript(result);
}
if (escapeXml) {
result = StringEscapeUtils.escapeXml(result);
result = StringEscapeUtils.escapeXml10(result);
}
if (escapeCsv) {
result = StringEscapeUtils.escapeCsv(result);