diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-02-12 21:38:00 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-02-12 21:38:00 +0000 |
commit | 1a6abd7597167c066d419fc408f2a2fdd4a4dddd (patch) | |
tree | 99baf8b9332ec96cdd2e7cd248d515276d74aa9a | |
parent | 94b00309052e520213f63a39e0ef7f5929d88272 (diff) |
consume -> accept
3 files changed, 7 insertions, 6 deletions
diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/TraceRenderer.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/TraceRenderer.java index 0c03dcad8dd..295786aa15d 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/TraceRenderer.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/TraceRenderer.java @@ -24,7 +24,7 @@ public class TraceRenderer extends TraceVisitor { private boolean insideOpenObject = false; public interface FieldConsumer { - void consume(Object object) throws IOException; + void accept(Object object) throws IOException; } private static class Consumer implements FieldConsumer { @@ -35,7 +35,7 @@ public class TraceRenderer extends TraceVisitor { } @Override - public void consume(Object object) throws IOException { + public void accept(Object object) throws IOException { if (object instanceof Inspectable) { renderInspectorDirect(((Inspectable) object).inspect()); } else { @@ -101,7 +101,7 @@ public class TraceRenderer extends TraceVisitor { generator.writeStartObject(); } generator.writeFieldName(TRACE_MESSAGE); - fieldConsumer.consume(payload); + fieldConsumer.accept(payload); dirty = true; } if (dirty) { diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index 6f86e4d1ddb..78d6dcc9670 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -6950,7 +6950,7 @@ "protected boolean shouldRender(java.lang.String, java.lang.Object)", "protected boolean shouldRenderUtf8Value(java.lang.String, int)", "protected void renderFieldContents(java.lang.Object)", - "public void consume(java.lang.Object)", + "public void accept(java.lang.Object)", "public bridge synthetic void accept(java.lang.Object, java.lang.Object)" ], "fields": [] diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java index 89135128cba..31f8194b3b7 100644 --- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java +++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java @@ -642,11 +642,12 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> { if (field instanceof Inspectable && ! (field instanceof FeatureData)) { renderInspector(((Inspectable)field).inspect()); } else { - consume(field); + accept(field); } } - public void consume(Object field) throws IOException { + @Override + public void accept(Object field) throws IOException { if (field == null) { generator.writeNull(); } else if (field instanceof Boolean) { |