Skip to content

[ggj][engx] fix: use singleton in HtmlEscaper #272

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

Merged
miraleung merged 3 commits into from
Sep 4, 2020
Merged

[ggj][engx] fix: use singleton in HtmlEscaper #272

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67f12a4
fix: use singleton in HtmlEscaper
miraleung Sep 3, 2020
4ddc3ae
fix: linter
miraleung Sep 3, 2020
6e03a63
fix: merge
miraleung Sep 4, 2020
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
8 changes: 5 additions & 3 deletions src/main/java/com/google/api/generator/engine/escaper/HtmlEscaper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@
import com.google.common.escape.Escapers;

public class HtmlEscaper extends Escaper {
private static final HtmlEscaper SINGLETON = new HtmlEscaper();

// Based on the observation of the generated java files, we escape the following
// five characters by html escaper. We do not directly use guava HtmlEscapers here because
// it only escapes`<>&\"'` as specified by HTML 4.01.
private static final Escaper escaper =
private static final Escaper charEscaper =
Escapers.builder()
.addEscape('<', "&lt;")
.addEscape('>', "&gt;")
Expand All @@ -34,10 +36,10 @@ private HtmlEscaper() {}

@Override
public String escape(String sourceString) {
return escaper.escape(sourceString);
return charEscaper.escape(sourceString);
}

public static String escaper(String source) {
return new HtmlEscaper().escape(source);
return SINGLETON.escape(source);
}
}