commit 9cdfe2345157ba2b825dbe57fd121fc38dbdfceb
author Christian Aistleitner <christian@quelltextlich.at> Fri May 15 14:06:47 2020 +0200
committer Christian Aistleitner <christian@quelltextlich.at> Sat May 16 15:06:48 2020 +0200
tree b26da630debf8b4a8e03d3d945f2f22a52663541
parent c177f1c03600a74c99e586799e2118db857f582f

Switch from deprecated SoyTofu to current SoySauce

This makes the warnings in AddSoyComment go away.

Change-Id: I17fa6c2b52190730755c5de0e89dfb4eff6df5e0

src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/AddSoyComment.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/AddSoyComment.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/AddSoyComment.java
index 60ce159..d3f73a2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/AddSoyComment.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/workflow/AddSoyComment.java
@@ -20,9 +20,7 @@
 import com.google.inject.Inject;
 import com.google.inject.ProvisionException;
 import com.google.template.soy.SoyFileSet;
-import com.google.template.soy.SoyFileSet.Builder;
-import com.google.template.soy.data.SanitizedContent;
-import com.google.template.soy.tofu.SoyTofu;
+import com.google.template.soy.jbcsrc.api.SoySauce.Renderer;
 import com.googlesource.gerrit.plugins.its.base.ItsPath;
 import com.googlesource.gerrit.plugins.its.base.its.ItsFacade;
 import java.io.IOException;
@@ -53,11 +51,9 @@
     this.templateDir = itsPath.resolve("templates");
   }
 
-  private String soyTemplate(
-      SoyFileSet.Builder builder,
-      String template,
-      SanitizedContent.ContentKind kind,
-      Map<String, String> properties) {
+  private String soyTextTemplate(
+      SoyFileSet.Builder builder, String template, Map<String, String> properties) {
+
     Path templatePath = templateDir.resolve(template + ".soy");
     String content;
 
@@ -69,22 +65,17 @@
     }
 
     builder.add(content, templatePath.toAbsolutePath().toString());
-    SoyTofu.Renderer renderer =
+    Renderer renderer =
         builder
             .build()
-            .compileToTofu()
-            .newRenderer("etc.its.templates." + template)
-            .setContentKind(kind)
+            .compileTemplates()
+            .renderTemplate("etc.its.templates." + template)
             .setData(properties);
-    String rendered = renderer.render();
+    String rendered = renderer.renderText().get();
     logger.atFinest().log("Rendered template %s to:\n%s", templatePath, rendered);
     return rendered;
   }
 
-  private String soyTextTemplate(Builder builder, String template, Map<String, String> properties) {
-    return soyTemplate(builder, template, SanitizedContent.ContentKind.TEXT, properties);
-  }
-
   @Override
   public void execute(
       ItsFacade its, String issue, ActionRequest actionRequest, Map<String, String> properties)