Skip to content

VELTOOLS-184 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
diggernet wants to merge 2 commits into
base: master
Choose a base branch
from
Open

VELTOOLS-184 #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad5b54d
VELTOOLS-184
diggernet Nov 18, 2022
783a34e
Make json() a synonym for java()
diggernet Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
* $javascript -> He didn't say, "Stop!"
* $esc.javascript($javascript) -> He didn\'t say, \"Stop!\"
*
* $json -> He didn't say, "Stop!"
* $esc.json($json) -> He didn't say, \"Stop!\"
*
* $html -> "bread" & "butter"
* $esc.html($html) -> "bread" & "butter"
*
Expand Down Expand Up @@ -301,6 +304,18 @@ public String javascript(Object string)
return StringEscapeUtils.escapeEcmaScript(String.valueOf(string));
}

/**
* <p>Escapes the characters in a <code>String</code> using JSON String rules.</p>
* <p>Delegates the process to {@link #java(String)}.</p>
*
* @param string the string to escape values, may be null
* @return String with escaped values, <code>null</code> if null string input
*/
public String json(Object string)
{
return java(string);
}

/**
* <p>Escapes the characters in a <code>String</code> using HTML entities.</p>
* <p>Delegates the process to {@link StringEscapeUtils#escapeHtml4(String)}.</p>
Expand Down