Use LegacyConversions instead of UnsafeSanitizedContentOrdainer. UnsafeSanitizedContentOrdainer is deprecated and might be deleted in the future. PiperOrigin-RevId: 241509029 Change-Id: If658a6e52f5b0f4368a5034eda5a93e6a2bc30b9
diff --git a/java/com/google/gitiles/ReadmeHelper.java b/java/com/google/gitiles/ReadmeHelper.java index 911c4ef..a01c7f0 100644 --- a/java/com/google/gitiles/ReadmeHelper.java +++ b/java/com/google/gitiles/ReadmeHelper.java
@@ -14,10 +14,10 @@ package com.google.gitiles; +import com.google.common.html.types.SafeHtml; import com.google.gitiles.doc.GitilesMarkdown; import com.google.gitiles.doc.MarkdownConfig; import com.google.gitiles.doc.MarkdownToHtml; -import com.google.template.soy.data.SanitizedContent; import java.io.IOException; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.IncorrectObjectTypeException; @@ -87,7 +87,7 @@ return readmePath; } - SanitizedContent render() { + SafeHtml render() { try { byte[] raw = reader.open(readmeId, Constants.OBJ_BLOB).getCachedBytes(config.inputLimit); return MarkdownToHtml.builder()
diff --git a/java/com/google/gitiles/RepositoryIndexServlet.java b/java/com/google/gitiles/RepositoryIndexServlet.java index 7d7ac36..8e13155 100644 --- a/java/com/google/gitiles/RepositoryIndexServlet.java +++ b/java/com/google/gitiles/RepositoryIndexServlet.java
@@ -21,10 +21,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; +import com.google.common.html.types.SafeHtml; import com.google.gitiles.DateFormatter.Format; import com.google.gitiles.doc.MarkdownConfig; import com.google.gson.reflect.TypeToken; -import com.google.template.soy.data.SanitizedContent; import java.io.IOException; import java.io.OutputStream; import java.io.Writer; @@ -174,7 +174,7 @@ req.getRequestURI()); readme.scanTree(rootTree); if (readme.isPresent()) { - SanitizedContent html = readme.render(); + SafeHtml html = readme.render(); if (html != null) { return ImmutableMap.<String, Object>of("readmeHtml", html); }
diff --git a/java/com/google/gitiles/doc/MarkdownToHtml.java b/java/com/google/gitiles/doc/MarkdownToHtml.java index 64758b2..e45503d 100644 --- a/java/com/google/gitiles/doc/MarkdownToHtml.java +++ b/java/com/google/gitiles/doc/MarkdownToHtml.java
@@ -19,11 +19,11 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.base.Strings; +import com.google.common.html.types.SafeHtml; import com.google.gitiles.GitilesView; import com.google.gitiles.ThreadSafePrettifyParser; import com.google.gitiles.doc.html.HtmlBuilder; import com.google.gitiles.doc.html.SoyHtmlBuilder; -import com.google.template.soy.data.SanitizedContent; import java.util.List; import javax.annotation.Nullable; import org.commonmark.ext.gfm.strikethrough.Strikethrough; @@ -168,7 +168,7 @@ } /** Render the document AST to sanitized HTML. */ - public SanitizedContent toSoyHtml(Node node) { + public SafeHtml toSoyHtml(Node node) { if (node != null) { SoyHtmlBuilder out = new SoyHtmlBuilder(); renderToHtml(out, node);
diff --git a/java/com/google/gitiles/doc/html/SoyHtmlBuilder.java b/java/com/google/gitiles/doc/html/SoyHtmlBuilder.java index 23e6ee6..a130ce4 100644 --- a/java/com/google/gitiles/doc/html/SoyHtmlBuilder.java +++ b/java/com/google/gitiles/doc/html/SoyHtmlBuilder.java
@@ -14,9 +14,8 @@ package com.google.gitiles.doc.html; -import com.google.template.soy.data.SanitizedContent; -import com.google.template.soy.data.SanitizedContent.ContentKind; -import com.google.template.soy.data.UnsafeSanitizedContentOrdainer; +import com.google.common.html.types.LegacyConversions; +import com.google.common.html.types.SafeHtml; /** Builds a document fragment using a restricted subset of HTML. */ public final class SoyHtmlBuilder extends HtmlBuilder { @@ -32,8 +31,8 @@ } /** Bless the current content as HTML. */ - public SanitizedContent toSoy() { + public SafeHtml toSoy() { finish(); - return UnsafeSanitizedContentOrdainer.ordainAsSafe(buf.toString(), ContentKind.HTML); + return LegacyConversions.riskilyAssumeSafeHtml(buf.toString()); } }