From 6b512390cfe009f701e67d1f9eb12dd42f04aa9e Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Tue, 16 Jul 2019 10:49:36 +0900
Subject: [PATCH] Upgrade soy to 2019-07-14

Migrate IndexServlet's usage of the deprecated render() and
setExpectedContentKind(...) methods to renderHtml().

Similar migration in OutgoingEmail is done in a follow-up
commit.

Change-Id: I5a5ac6e0b6674b2d2aa9a1cf60fab400b036cea7
---
 WORKSPACE                                          | 4 ++--
 java/com/google/gerrit/httpd/raw/IndexServlet.java | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index fa72a35d41..ece770662d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -752,8 +752,8 @@ maven_jar(
 # Keep this version of Soy synchronized with the version used in Gitiles.
 maven_jar(
     name = "soy",
-    artifact = "com.google.template:soy:2019-04-18",
-    sha1 = "5750208855562d74f29eee39ee497d5cf6df1490",
+    artifact = "com.google.template:soy:2019-07-14",
+    sha1 = "547dee679bac6011126f3a54619d3aec336216d0",
 )
 
 maven_jar(
diff --git a/java/com/google/gerrit/httpd/raw/IndexServlet.java b/java/com/google/gerrit/httpd/raw/IndexServlet.java
index 4c9fc3b8b9..a0b41b2155 100644
--- a/java/com/google/gerrit/httpd/raw/IndexServlet.java
+++ b/java/com/google/gerrit/httpd/raw/IndexServlet.java
@@ -74,11 +74,7 @@ public class IndexServlet extends HttpServlet {
       ImmutableMap<String, Object> templateData =
           IndexHtmlUtil.templateData(
               gerritApi, canonicalUrl, cdnPath, faviconPath, parameterMap, urlOrdainer);
-      renderer =
-          soySauce
-              .renderTemplate("com.google.gerrit.httpd.raw.Index")
-              .setExpectedContentKind(SanitizedContent.ContentKind.HTML)
-              .setData(templateData);
+      renderer = soySauce.renderTemplate("com.google.gerrit.httpd.raw.Index").setData(templateData);
     } catch (URISyntaxException | RestApiException e) {
       throw new IOException(e);
     }
@@ -87,7 +83,7 @@ public class IndexServlet extends HttpServlet {
     rsp.setContentType("text/html");
     rsp.setStatus(SC_OK);
     try (OutputStream w = rsp.getOutputStream()) {
-      w.write(renderer.render().get().getBytes(UTF_8));
+      w.write(renderer.renderHtml().get().toString().getBytes(UTF_8));
     }
   }
 }