summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
diff options
context:
space:
mode:
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java')
-rw-r--r--container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java24
1 files changed, 12 insertions, 12 deletions
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 521c454467f..030efbc649d 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
@@ -76,7 +76,7 @@ import static com.fasterxml.jackson.databind.SerializationFeature.FLUSH_AFTER_WR
// NOTE: The JSON format is a public API. If new elements are added be sure to update the reference doc.
public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
- private static final CompoundName WRAP_ALL_MAPS = new CompoundName("renderer.json.wrapAllMaps");
+ private static final CompoundName WRAP_ALL_MAPS = new CompoundName("renderer.json.recognizeDeepMaps");
private static final CompoundName DEBUG_RENDERING_KEY = new CompoundName("renderer.json.debug");
private static final CompoundName JSON_CALLBACK = new CompoundName("jsoncallback");
private static final CompoundName TENSOR_FORMAT = new CompoundName("format.tensors");
@@ -126,7 +126,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
private FieldConsumer fieldConsumer;
private Deque<Integer> renderedChildren;
private boolean debugRendering;
- private boolean wrapAllMaps;
+ private boolean recognizeDeepMaps;
private LongSupplier timeSource;
private OutputStream stream;
@@ -161,7 +161,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
public void init() {
super.init();
debugRendering = false;
- wrapAllMaps = false;
+ recognizeDeepMaps = false;
setGenerator(null, debugRendering);
renderedChildren = null;
timeSource = System::currentTimeMillis;
@@ -172,7 +172,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
public void beginResponse(OutputStream stream) throws IOException {
beginJsonCallback(stream);
debugRendering = getDebugRendering(getResult().getQuery());
- wrapAllMaps = getWrapAllMaps(getResult().getQuery());
+ recognizeDeepMaps = getWrapAllMaps(getResult().getQuery());
tensorShortFormRendering = getTensorShortFormRendering(getResult().getQuery());
setGenerator(generatorFactory.createGenerator(stream, JsonEncoding.UTF8), debugRendering);
renderedChildren = new ArrayDeque<>();
@@ -522,15 +522,15 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
private void setGenerator(JsonGenerator generator, boolean debugRendering) {
this.generator = generator;
- this.fieldConsumer = generator == null ? null : createFieldConsumer(generator, debugRendering, wrapAllMaps);
+ this.fieldConsumer = generator == null ? null : createFieldConsumer(generator, debugRendering, recognizeDeepMaps);
}
protected FieldConsumer createFieldConsumer(JsonGenerator generator, boolean debugRendering) {
- return createFieldConsumer(generator, debugRendering, this.wrapAllMaps);
+ return createFieldConsumer(generator, debugRendering, this.recognizeDeepMaps);
}
- private FieldConsumer createFieldConsumer(JsonGenerator generator, boolean debugRendering, boolean wrapAllMaps) {
- return new FieldConsumer(generator, debugRendering, tensorShortFormRendering, wrapAllMaps);
+ private FieldConsumer createFieldConsumer(JsonGenerator generator, boolean debugRendering, boolean recognizeDeepMaps) {
+ return new FieldConsumer(generator, debugRendering, tensorShortFormRendering, recognizeDeepMaps);
}
/**
@@ -549,7 +549,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
private final JsonGenerator generator;
private final boolean debugRendering;
- private final boolean wrapAllMaps;
+ private final boolean recognizeDeepMaps;
private final boolean tensorShortForm;
private MutableBoolean hasFieldsField;
@@ -560,11 +560,11 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
public FieldConsumer(JsonGenerator generator, boolean debugRendering, boolean tensorShortForm) {
this(generator, debugRendering, tensorShortForm, false);
}
- public FieldConsumer(JsonGenerator generator, boolean debugRendering, boolean tensorShortForm, boolean wrapAllMaps) {
+ public FieldConsumer(JsonGenerator generator, boolean debugRendering, boolean tensorShortForm, boolean recognizeDeepMaps) {
this.generator = generator;
this.debugRendering = debugRendering;
this.tensorShortForm = tensorShortForm;
- this.wrapAllMaps = wrapAllMaps;
+ this.recognizeDeepMaps = recognizeDeepMaps;
}
/**
@@ -694,7 +694,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
}
private void renderInspector(Inspector data) throws IOException {
- Inspector asMap = wrapAllMaps ? deepWrapAsMap(data) : wrapAsMap(data);
+ Inspector asMap = recognizeDeepMaps ? deepWrapAsMap(data) : wrapAsMap(data);
if (asMap != null) {
System.err.println("maybe converted: "+asMap);
renderInspectorDirect(asMap);