Skip to content

Commit 3cc31b2

Browse files
author
JiaYan Lin
committed
Remove an unneeded use of the LoggingAdvisingAppendable api
The Soy rendering apis can accept an Appendable/Writer directly. Change-Id: I106220b1f4a3c02817af4cbf0b8e59ea17cbbecb
1 parent e1f30cb commit 3cc31b2

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

java/com/google/gitiles/LogSoyData.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.common.collect.Maps;
2323
import com.google.common.collect.Sets;
2424
import com.google.gitiles.CommitData.Field;
25-
import com.google.template.soy.data.LoggingAdvisingAppendable;
2625
import com.google.template.soy.jbcsrc.api.SoySauce;
2726
import java.io.IOException;
2827
import java.io.Writer;
@@ -78,8 +77,7 @@ public LogSoyData(HttpServletRequest req, GitilesAccess access, String pretty)
7877
variant = firstNonNull(config.getString("logFormat", pretty, "variant"), pretty);
7978
}
8079

81-
private void renderHtml(SoySauce.Renderer renderer, LoggingAdvisingAppendable out)
82-
throws IOException {
80+
private void renderHtml(SoySauce.Renderer renderer, Appendable out) throws IOException {
8381
if (!renderer.renderHtml(out).result().isDone()) {
8482
throw new IOException("failed to render HTML");
8583
}
@@ -93,29 +91,28 @@ public void renderStreaming(
9391
DateFormatter df,
9492
FooterBehavior footerBehavior)
9593
throws IOException {
96-
LoggingAdvisingAppendable out = LoggingAdvisingAppendable.delegating(writer);
9794
renderHtml(
9895
renderer
9996
.newRenderer("com.google.gitiles.templates.LogDetail.logEntriesHeader")
10097
.setData(toHeaderSoyData(paginator, revision)),
101-
out);
98+
writer);
10299

103100
SoySauce.Renderer entryRenderer =
104101
renderer.newRenderer("com.google.gitiles.templates.LogDetail.logEntryWrapper");
105102
boolean renderedEntries = false;
106103
for (RevCommit c : paginator) {
107-
renderHtml(entryRenderer.setData(toEntrySoyData(paginator, c, df)), out);
104+
renderHtml(entryRenderer.setData(toEntrySoyData(paginator, c, df)), writer);
108105
renderedEntries = true;
109106
}
110107
if (!renderedEntries) {
111-
renderHtml(renderer.newRenderer("com.google.gitiles.templates.LogDetail.emptyLog"), out);
108+
renderHtml(renderer.newRenderer("com.google.gitiles.templates.LogDetail.emptyLog"), writer);
112109
}
113110

114111
renderHtml(
115112
renderer
116113
.newRenderer("com.google.gitiles.templates.LogDetail.logEntriesFooter")
117114
.setData(toFooterSoyData(paginator, revision, footerBehavior)),
118-
out);
115+
writer);
119116
}
120117

121118
private Map<String, Object> toHeaderSoyData(Paginator paginator, @Nullable String revision) {

0 commit comments

Comments
 (0)