Update ABI spec format, and update all specs

1 files changed, 2678 insertions, 2678 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 93e8ce16b6f..17b95162709 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -1,41 +1,41 @@
 {
-  "com.yahoo.data.JsonProducer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.data.JsonProducer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract java.lang.StringBuilder writeJson(java.lang.StringBuilder)",
       "public java.lang.String toJson()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.data.XmlProducer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.data.XmlProducer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract java.lang.StringBuilder writeXML(java.lang.StringBuilder)",
       "public java.lang.String toXML()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.AnnotateStringFieldPart": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.hitfield.AnnotateStringFieldPart" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.prelude.hitfield.FieldPart"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, int)",
       "public boolean isFinal()",
       "public boolean isToken()",
@@ -43,43 +43,43 @@
       "public void setContent(java.lang.String)",
       "public java.lang.String toString()"
     ],
-    "fields": [
+    "fields" : [
       "public static final char RAW_ANNOTATE_BEGIN_CHAR",
       "public static final char RAW_ANNOTATE_SEPARATOR_CHAR",
       "public static final char RAW_ANNOTATE_END_CHAR"
     ]
   },
-  "com.yahoo.prelude.hitfield.BoldCloseFieldPart": {
-    "superClass": "com.yahoo.prelude.hitfield.MarkupFieldPart",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.hitfield.BoldCloseFieldPart" : {
+    "superClass" : "com.yahoo.prelude.hitfield.MarkupFieldPart",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.BoldOpenFieldPart": {
-    "superClass": "com.yahoo.prelude.hitfield.MarkupFieldPart",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.hitfield.BoldOpenFieldPart" : {
+    "superClass" : "com.yahoo.prelude.hitfield.MarkupFieldPart",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.FieldIterator": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.hitfield.FieldIterator" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.util.ListIterator"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.List, com.yahoo.prelude.hitfield.HitField)",
       "public void add(com.yahoo.prelude.hitfield.FieldPart)",
       "public boolean hasNext()",
@@ -95,31 +95,31 @@
       "public bridge synthetic java.lang.Object previous()",
       "public bridge synthetic java.lang.Object next()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.FieldPart": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.hitfield.FieldPart" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract boolean isFinal()",
       "public abstract boolean isToken()",
       "public abstract java.lang.String getContent()",
       "public abstract java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.HitField": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.hitfield.HitField" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, java.lang.String)",
       "public void <init>(java.lang.String, com.yahoo.prelude.hitfield.XMLString)",
       "public void <init>(java.lang.String, java.lang.String, boolean)",
@@ -141,17 +141,17 @@
       "public java.lang.Object getOriginal()",
       "public void setOriginal(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.ImmutableFieldPart": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.hitfield.ImmutableFieldPart" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.prelude.hitfield.FieldPart"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, boolean)",
       "public void <init>(java.lang.String, java.lang.String, boolean)",
       "public boolean isFinal()",
@@ -160,17 +160,17 @@
       "public java.lang.String getInitContent()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.JSONString": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.hitfield.JSONString" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.data.access.Inspectable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.data.access.Inspector)",
       "public com.yahoo.data.access.Inspector inspect()",
       "public void <init>(java.lang.String)",
@@ -179,17 +179,17 @@
       "public java.lang.String getContent()",
       "public java.lang.String renderFromInspector()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.MarkupFieldPart": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.hitfield.MarkupFieldPart" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.prelude.hitfield.FieldPart"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public boolean isFinal()",
       "public boolean isToken()",
@@ -197,54 +197,54 @@
       "public java.lang.String getContent()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.RawBase64": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.hitfield.RawBase64" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(byte[])",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.RawData": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.hitfield.RawData" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(byte[])",
       "public byte[] getInternalData()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.SeparatorFieldPart": {
-    "superClass": "com.yahoo.prelude.hitfield.MarkupFieldPart",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.hitfield.SeparatorFieldPart" : {
+    "superClass" : "com.yahoo.prelude.hitfield.MarkupFieldPart",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.StringFieldPart": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.hitfield.StringFieldPart" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.prelude.hitfield.FieldPart"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, boolean)",
       "public boolean isFinal()",
       "public boolean isToken()",
@@ -253,17 +253,17 @@
       "public java.lang.String getInitContent()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.TokenFieldIterator": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.hitfield.TokenFieldIterator" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.util.ListIterator"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.List, com.yahoo.prelude.hitfield.HitField)",
       "public void add(com.yahoo.prelude.hitfield.FieldPart)",
       "public boolean hasNext()",
@@ -279,58 +279,58 @@
       "public bridge synthetic java.lang.Object previous()",
       "public bridge synthetic java.lang.Object next()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.XMLString": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.hitfield.XMLString" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.data.XmlProducer"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String toString()",
       "public java.lang.StringBuilder writeXML(java.lang.StringBuilder)",
       "public java.lang.String toXML()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.hitfield.XmlRenderer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.hitfield.XmlRenderer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static java.lang.StringBuilder render(java.lang.StringBuilder, com.yahoo.data.access.Inspector)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.AndItem": {
-    "superClass": "com.yahoo.prelude.query.CompositeItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.AndItem" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
       "public java.lang.String getName()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.AndSegmentItem": {
-    "superClass": "com.yahoo.prelude.query.SegmentItem",
-    "interfaces": [
+  "com.yahoo.prelude.query.AndSegmentItem" : {
+    "superClass" : "com.yahoo.prelude.query.SegmentItem",
+    "interfaces" : [
       "com.yahoo.prelude.query.BlockItem"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, boolean, boolean)",
       "public void <init>(java.lang.String, java.lang.String, boolean, boolean)",
       "public void <init>(com.yahoo.prelude.query.PhraseSegmentItem)",
@@ -339,19 +339,19 @@
       "public java.lang.String getIndexName()",
       "public void setWeight(int)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.BlockItem": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.query.BlockItem" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.prelude.query.HasIndexItem"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract java.lang.String getRawWord()",
       "public abstract com.yahoo.prelude.query.Substring getOrigin()",
       "public abstract java.lang.String stringValue()",
@@ -360,15 +360,15 @@
       "public abstract boolean isWords()",
       "public abstract com.yahoo.prelude.query.SegmentingRule getSegmentingRule()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.BoolItem": {
-    "superClass": "com.yahoo.prelude.query.TermItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.BoolItem" : {
+    "superClass" : "com.yahoo.prelude.query.TermItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(boolean)",
       "public void <init>(boolean, java.lang.String)",
       "public void <init>(boolean, java.lang.String, boolean)",
@@ -388,18 +388,18 @@
       "public java.lang.String getIndexedString()",
       "public boolean isWords()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.CompositeIndexedItem": {
-    "superClass": "com.yahoo.prelude.query.CompositeTaggableItem",
-    "interfaces": [
+  "com.yahoo.prelude.query.CompositeIndexedItem" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeTaggableItem",
+    "interfaces" : [
       "com.yahoo.prelude.query.IndexedItem"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public java.lang.String getIndexName()",
       "protected void encodeThis(java.nio.ByteBuffer)",
@@ -410,16 +410,16 @@
       "public abstract java.lang.String getIndexedString()",
       "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.CompositeItem": {
-    "superClass": "com.yahoo.prelude.query.Item",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.CompositeItem" : {
+    "superClass" : "com.yahoo.prelude.query.Item",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void setIndexName(java.lang.String)",
       "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)",
@@ -450,18 +450,18 @@
       "public bridge synthetic com.yahoo.prelude.query.Item clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.CompositeTaggableItem": {
-    "superClass": "com.yahoo.prelude.query.CompositeItem",
-    "interfaces": [
+  "com.yahoo.prelude.query.CompositeTaggableItem" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeItem",
+    "interfaces" : [
       "com.yahoo.prelude.query.TaggableItem"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public int getUniqueID()",
       "public void setUniqueID(int)",
@@ -474,28 +474,28 @@
       "public double getSignificance()",
       "public boolean hasUniqueID()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.DotProductItem": {
-    "superClass": "com.yahoo.prelude.query.WeightedSetItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.DotProductItem" : {
+    "superClass" : "com.yahoo.prelude.query.WeightedSetItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String, java.util.Map)",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.EquivItem": {
-    "superClass": "com.yahoo.prelude.query.CompositeTaggableItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.EquivItem" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeTaggableItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(com.yahoo.prelude.query.Item)",
       "public void <init>(com.yahoo.prelude.query.Item, java.util.Collection)",
@@ -504,30 +504,30 @@
       "protected void adding(com.yahoo.prelude.query.Item)",
       "public static boolean acceptsChildrenOfType(com.yahoo.prelude.query.Item$ItemType)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.ExactStringItem": {
-    "superClass": "com.yahoo.prelude.query.WordItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.ExactStringItem" : {
+    "superClass" : "com.yahoo.prelude.query.WordItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String, boolean)",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
       "public java.lang.String getName()",
       "public java.lang.String stringValue()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.FalseItem": {
-    "superClass": "com.yahoo.prelude.query.Item",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.FalseItem" : {
+    "superClass" : "com.yahoo.prelude.query.Item",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void setIndexName(java.lang.String)",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
@@ -537,15 +537,15 @@
       "public int getTermCount()",
       "protected void appendBodyString(java.lang.StringBuilder)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.FuzzyItem": {
-    "superClass": "com.yahoo.prelude.query.TermItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.FuzzyItem" : {
+    "superClass" : "com.yahoo.prelude.query.TermItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, boolean, java.lang.String, int, int)",
       "public void setMaxEditDistance(int)",
       "public void setPrefixLength(int)",
@@ -565,18 +565,18 @@
       "protected void appendHeadingString(java.lang.StringBuilder)",
       "protected void encodeThis(java.nio.ByteBuffer)"
     ],
-    "fields": [
+    "fields" : [
       "public static int DEFAULT_MAX_EDIT_DISTANCE",
       "public static int DEFAULT_PREFIX_LENGTH"
     ]
   },
-  "com.yahoo.prelude.query.GeoLocationItem": {
-    "superClass": "com.yahoo.prelude.query.TermItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.GeoLocationItem" : {
+    "superClass" : "com.yahoo.prelude.query.TermItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.prelude.Location)",
       "public void <init>(com.yahoo.prelude.Location, java.lang.String)",
       "public com.yahoo.prelude.Location getLocation()",
@@ -596,31 +596,31 @@
       "public bridge synthetic com.yahoo.prelude.query.Item clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.HasIndexItem": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.HasIndexItem" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract java.lang.String getIndexName()",
       "public abstract int getNumWords()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.Highlight": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.query.Highlight" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void addHighlightTerm(java.lang.String, java.lang.String)",
       "public void addHighlightPhrase(java.lang.String, java.util.List)",
@@ -630,36 +630,36 @@
       "public void prepare()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String HIGHLIGHTTERMS"
     ]
   },
-  "com.yahoo.prelude.query.IndexedItem": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.query.IndexedItem" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.prelude.query.HasIndexItem"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract void setIndexName(java.lang.String)",
       "public abstract java.lang.String getIndexedString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.IndexedSegmentItem": {
-    "superClass": "com.yahoo.prelude.query.TaggableSegmentItem",
-    "interfaces": [
+  "com.yahoo.prelude.query.IndexedSegmentItem" : {
+    "superClass" : "com.yahoo.prelude.query.TaggableSegmentItem",
+    "interfaces" : [
       "com.yahoo.prelude.query.IndexedItem"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(java.lang.String, java.lang.String, boolean, boolean, com.yahoo.prelude.query.Substring)",
       "public java.lang.String getIndexName()",
       "protected void encodeThis(java.nio.ByteBuffer)",
@@ -670,15 +670,15 @@
       "public abstract java.lang.String getIndexedString()",
       "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.IntItem": {
-    "superClass": "com.yahoo.prelude.query.TermItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.IntItem" : {
+    "superClass" : "com.yahoo.prelude.query.TermItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(int, java.lang.String)",
       "public void <init>(long, java.lang.String)",
       "public void <init>(com.yahoo.prelude.query.Limit, com.yahoo.prelude.query.Limit, java.lang.String)",
@@ -709,39 +709,39 @@
       "public boolean isWords()",
       "public static com.yahoo.prelude.query.IntItem from(java.lang.String, com.yahoo.prelude.query.Limit, com.yahoo.prelude.query.Limit, int)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.Item$ItemCreator": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.Item$ItemCreator" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.prelude.query.Item$ItemCreator[] values()",
       "public static com.yahoo.prelude.query.Item$ItemCreator valueOf(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.prelude.query.Item$ItemCreator ORIG",
       "public static final enum com.yahoo.prelude.query.Item$ItemCreator FILTER",
       "public final int code"
     ]
   },
-  "com.yahoo.prelude.query.Item$ItemType": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.Item$ItemType" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.prelude.query.Item$ItemType[] values()",
       "public static com.yahoo.prelude.query.Item$ItemType valueOf(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.prelude.query.Item$ItemType OR",
       "public static final enum com.yahoo.prelude.query.Item$ItemType AND",
       "public static final enum com.yahoo.prelude.query.Item$ItemType NOT",
@@ -775,16 +775,16 @@
       "public final int code"
     ]
   },
-  "com.yahoo.prelude.query.Item": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.prelude.query.Item" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public abstract void setIndexName(java.lang.String)",
       "public final int getCode()",
@@ -833,7 +833,7 @@
       "public boolean isRoot()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final int DEFAULT_WEIGHT",
       "protected int uniqueID",
       "protected com.yahoo.prelude.query.Item connectedItem",
@@ -843,25 +843,25 @@
       "protected boolean explicitSignificance"
     ]
   },
-  "com.yahoo.prelude.query.ItemHelper": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.ItemHelper" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void getPositiveTerms(com.yahoo.prelude.query.Item, java.util.List)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.Limit": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.Limit" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.Number, boolean)",
       "public java.lang.Number number()",
       "public boolean isInclusive()",
@@ -874,18 +874,18 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.prelude.query.Limit NEGATIVE_INFINITY",
       "public static final com.yahoo.prelude.query.Limit POSITIVE_INFINITY"
     ]
   },
-  "com.yahoo.prelude.query.MarkerWordItem": {
-    "superClass": "com.yahoo.prelude.query.WordItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.MarkerWordItem" : {
+    "superClass" : "com.yahoo.prelude.query.WordItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public boolean isStartAnchor()",
       "public boolean isEndAnchor()",
       "protected java.lang.String getEncodedWord()",
@@ -897,15 +897,15 @@
       "public static com.yahoo.prelude.query.MarkerWordItem createEndOfHost(java.lang.String)",
       "public static com.yahoo.prelude.query.MarkerWordItem createEndOfHost()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.NearItem": {
-    "superClass": "com.yahoo.prelude.query.CompositeItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.NearItem" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(int)",
       "public void setDistance(int)",
@@ -918,18 +918,18 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": [
+    "fields" : [
       "protected int distance",
       "public static final int defaultDistance"
     ]
   },
-  "com.yahoo.prelude.query.NearestNeighborItem": {
-    "superClass": "com.yahoo.prelude.query.SimpleTaggableItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.NearestNeighborItem" : {
+    "superClass" : "com.yahoo.prelude.query.SimpleTaggableItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, java.lang.String)",
       "public int getTargetNumHits()",
       "public java.lang.String getIndexName()",
@@ -951,28 +951,28 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.NonReducibleCompositeItem": {
-    "superClass": "com.yahoo.prelude.query.CompositeItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.NonReducibleCompositeItem" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public java.util.Optional extractSingleChild()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.NotItem": {
-    "superClass": "com.yahoo.prelude.query.CompositeItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.NotItem" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
       "public java.lang.String getName()",
@@ -988,15 +988,15 @@
       "protected void appendBodyString(java.lang.StringBuilder)",
       "public int getTermCount()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.NullItem": {
-    "superClass": "com.yahoo.prelude.query.Item",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.NullItem" : {
+    "superClass" : "com.yahoo.prelude.query.Item",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void setIndexName(java.lang.String)",
       "public int encode(java.nio.ByteBuffer)",
@@ -1006,42 +1006,42 @@
       "public java.lang.String getName()",
       "public int getTermCount()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.ONearItem": {
-    "superClass": "com.yahoo.prelude.query.NearItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.ONearItem" : {
+    "superClass" : "com.yahoo.prelude.query.NearItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(int)",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
       "public java.lang.String getName()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.OrItem": {
-    "superClass": "com.yahoo.prelude.query.CompositeItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.OrItem" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
       "public java.lang.String getName()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.PhraseItem": {
-    "superClass": "com.yahoo.prelude.query.CompositeIndexedItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.PhraseItem" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeIndexedItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String[])",
@@ -1068,15 +1068,15 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.PhraseSegmentItem": {
-    "superClass": "com.yahoo.prelude.query.IndexedSegmentItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.PhraseSegmentItem" : {
+    "superClass" : "com.yahoo.prelude.query.IndexedSegmentItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.prelude.query.AndSegmentItem)",
       "public void <init>(java.lang.String, boolean, boolean)",
       "public void <init>(java.lang.String, java.lang.String, boolean, boolean)",
@@ -1101,15 +1101,15 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.PredicateQueryItem$Entry": {
-    "superClass": "com.yahoo.prelude.query.PredicateQueryItem$EntryBase",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.PredicateQueryItem$Entry" : {
+    "superClass" : "com.yahoo.prelude.query.PredicateQueryItem$EntryBase",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, java.lang.String)",
       "public void <init>(java.lang.String, java.lang.String, long)",
       "public java.lang.String getValue()",
@@ -1117,16 +1117,16 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.PredicateQueryItem$EntryBase": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.PredicateQueryItem$EntryBase" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, long)",
       "public java.lang.String getKey()",
       "public long getSubQueryBitmap()",
@@ -1134,15 +1134,15 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.PredicateQueryItem$RangeEntry": {
-    "superClass": "com.yahoo.prelude.query.PredicateQueryItem$EntryBase",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.PredicateQueryItem$RangeEntry" : {
+    "superClass" : "com.yahoo.prelude.query.PredicateQueryItem$EntryBase",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, long)",
       "public void <init>(java.lang.String, long, long)",
       "public long getValue()",
@@ -1150,15 +1150,15 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.PredicateQueryItem": {
-    "superClass": "com.yahoo.prelude.query.SimpleTaggableItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.PredicateQueryItem" : {
+    "superClass" : "com.yahoo.prelude.query.SimpleTaggableItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void setIndexName(java.lang.String)",
       "public java.lang.String getIndexName()",
@@ -1181,17 +1181,17 @@
       "public bridge synthetic com.yahoo.prelude.query.Item clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final long ALL_SUB_QUERIES"
     ]
   },
-  "com.yahoo.prelude.query.PrefixItem": {
-    "superClass": "com.yahoo.prelude.query.WordItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.PrefixItem" : {
+    "superClass" : "com.yahoo.prelude.query.WordItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String, boolean)",
       "public void <init>(java.lang.String, java.lang.String)",
@@ -1199,15 +1199,15 @@
       "public java.lang.String getName()",
       "public java.lang.String stringValue()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.PureWeightedInteger": {
-    "superClass": "com.yahoo.prelude.query.PureWeightedItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.PureWeightedInteger" : {
+    "superClass" : "com.yahoo.prelude.query.PureWeightedItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(long)",
       "public void <init>(long, int)",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
@@ -1219,16 +1219,16 @@
       "public int hashCode()",
       "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.PureWeightedItem": {
-    "superClass": "com.yahoo.prelude.query.Item",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.PureWeightedItem" : {
+    "superClass" : "com.yahoo.prelude.query.Item",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(int)",
       "public void setIndexName(java.lang.String)",
       "public java.lang.String getName()",
@@ -1236,15 +1236,15 @@
       "protected void appendBodyString(java.lang.StringBuilder)",
       "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.PureWeightedString": {
-    "superClass": "com.yahoo.prelude.query.PureWeightedItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.PureWeightedString" : {
+    "superClass" : "com.yahoo.prelude.query.PureWeightedItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String, int)",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
@@ -1256,44 +1256,44 @@
       "public int hashCode()",
       "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.QueryCanonicalizer$CanonicalizationResult": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.QueryCanonicalizer$CanonicalizationResult" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public java.util.Optional error()",
       "public static com.yahoo.prelude.query.QueryCanonicalizer$CanonicalizationResult error(java.lang.String)",
       "public static com.yahoo.prelude.query.QueryCanonicalizer$CanonicalizationResult success()",
       "public boolean isError()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.QueryCanonicalizer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.QueryCanonicalizer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static java.lang.String canonicalize(com.yahoo.search.Query)",
       "public static java.lang.String canonicalize(com.yahoo.search.query.QueryTree)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String queryCanonicalization"
     ]
   },
-  "com.yahoo.prelude.query.RangeItem": {
-    "superClass": "com.yahoo.prelude.query.IntItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.RangeItem" : {
+    "superClass" : "com.yahoo.prelude.query.IntItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.Number, java.lang.Number, java.lang.String)",
       "public void <init>(com.yahoo.prelude.query.Limit, com.yahoo.prelude.query.Limit, java.lang.String)",
       "public void <init>(java.lang.Number, java.lang.Number, java.lang.String, boolean)",
@@ -1303,28 +1303,28 @@
       "public final java.lang.Number getFrom()",
       "public final java.lang.Number getTo()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.RankItem": {
-    "superClass": "com.yahoo.prelude.query.CompositeItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.RankItem" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
       "public java.lang.String getName()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.RegExpItem": {
-    "superClass": "com.yahoo.prelude.query.TermItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.RegExpItem" : {
+    "superClass" : "com.yahoo.prelude.query.TermItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, boolean, java.lang.String)",
       "public java.lang.String stringValue()",
       "public boolean isStemmed()",
@@ -1336,20 +1336,20 @@
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
       "public java.lang.String getName()",
       "protected void encodeThis(java.nio.ByteBuffer)",
+      "public java.util.regex.Pattern getRegexp()",
       "public java.lang.String toString()",
       "public int hashCode()",
-      "public boolean equals(java.lang.Object)",
-      "public java.util.regex.Pattern getRegexp()"
+      "public boolean equals(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.SameElementItem": {
-    "superClass": "com.yahoo.prelude.query.NonReducibleCompositeItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.SameElementItem" : {
+    "superClass" : "com.yahoo.prelude.query.NonReducibleCompositeItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "protected void encodeThis(java.nio.ByteBuffer)",
       "protected void appendHeadingString(java.lang.StringBuilder)",
@@ -1362,18 +1362,18 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.SegmentItem": {
-    "superClass": "com.yahoo.prelude.query.CompositeItem",
-    "interfaces": [
+  "com.yahoo.prelude.query.SegmentItem" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeItem",
+    "interfaces" : [
       "com.yahoo.prelude.query.BlockItem"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, java.lang.String, boolean, boolean)",
       "public void <init>(java.lang.String, java.lang.String, boolean, boolean, com.yahoo.prelude.query.Substring)",
       "public java.lang.String getRawWord()",
@@ -1402,36 +1402,36 @@
       "public bridge synthetic com.yahoo.prelude.query.Item clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.SegmentingRule": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.SegmentingRule" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.prelude.query.SegmentingRule[] values()",
       "public static com.yahoo.prelude.query.SegmentingRule valueOf(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.prelude.query.SegmentingRule LANGUAGE_DEFAULT",
       "public static final enum com.yahoo.prelude.query.SegmentingRule PHRASE",
       "public static final enum com.yahoo.prelude.query.SegmentingRule BOOLEAN_AND"
     ]
   },
-  "com.yahoo.prelude.query.SimpleIndexedItem": {
-    "superClass": "com.yahoo.prelude.query.SimpleTaggableItem",
-    "interfaces": [
+  "com.yahoo.prelude.query.SimpleIndexedItem" : {
+    "superClass" : "com.yahoo.prelude.query.SimpleTaggableItem",
+    "interfaces" : [
       "com.yahoo.prelude.query.IndexedItem"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public java.lang.String getIndexName()",
       "protected void encodeThis(java.nio.ByteBuffer)",
@@ -1442,18 +1442,18 @@
       "public abstract java.lang.String getIndexedString()",
       "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.SimpleTaggableItem": {
-    "superClass": "com.yahoo.prelude.query.Item",
-    "interfaces": [
+  "com.yahoo.prelude.query.SimpleTaggableItem" : {
+    "superClass" : "com.yahoo.prelude.query.Item",
+    "interfaces" : [
       "com.yahoo.prelude.query.TaggableItem"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public int getUniqueID()",
       "public void setUniqueID(int)",
@@ -1466,15 +1466,15 @@
       "public double getSignificance()",
       "public boolean hasUniqueID()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.Substring": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.Substring" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(int, int, java.lang.String)",
       "public java.lang.String getValue()",
@@ -1485,51 +1485,51 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": [
+    "fields" : [
       "public final int start",
       "public final int end",
       "public final java.lang.String string"
     ]
   },
-  "com.yahoo.prelude.query.SubstringItem": {
-    "superClass": "com.yahoo.prelude.query.WordItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.SubstringItem" : {
+    "superClass" : "com.yahoo.prelude.query.WordItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String, boolean)",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
       "public java.lang.String getName()",
       "public java.lang.String stringValue()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.SuffixItem": {
-    "superClass": "com.yahoo.prelude.query.WordItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.SuffixItem" : {
+    "superClass" : "com.yahoo.prelude.query.WordItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String, boolean)",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
       "public java.lang.String getName()",
       "public java.lang.String stringValue()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.TaggableItem": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.TaggableItem" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract int getUniqueID()",
       "public abstract void setUniqueID(int)",
       "public abstract boolean hasUniqueID()",
@@ -1541,18 +1541,18 @@
       "public abstract void setExplicitSignificance(boolean)",
       "public abstract double getSignificance()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.TaggableSegmentItem": {
-    "superClass": "com.yahoo.prelude.query.SegmentItem",
-    "interfaces": [
+  "com.yahoo.prelude.query.TaggableSegmentItem" : {
+    "superClass" : "com.yahoo.prelude.query.SegmentItem",
+    "interfaces" : [
       "com.yahoo.prelude.query.TaggableItem"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(java.lang.String, java.lang.String, boolean, boolean, com.yahoo.prelude.query.Substring)",
       "public int getUniqueID()",
       "public void setUniqueID(int)",
@@ -1565,18 +1565,18 @@
       "public double getSignificance()",
       "public boolean hasUniqueID()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.TermItem": {
-    "superClass": "com.yahoo.prelude.query.SimpleIndexedItem",
-    "interfaces": [
+  "com.yahoo.prelude.query.TermItem" : {
+    "superClass" : "com.yahoo.prelude.query.SimpleIndexedItem",
+    "interfaces" : [
       "com.yahoo.prelude.query.BlockItem"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String, boolean)",
@@ -1599,15 +1599,15 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.TermType": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.TermType" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public java.lang.String getName()",
       "public java.lang.Class getItemClass()",
       "public boolean hasItemClass(java.lang.Class)",
@@ -1618,7 +1618,7 @@
       "public int hashCode()",
       "public java.lang.String toString()"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.prelude.query.TermType RANK",
       "public static final com.yahoo.prelude.query.TermType AND",
       "public static final com.yahoo.prelude.query.TermType OR",
@@ -1629,40 +1629,40 @@
       "public final java.lang.String name"
     ]
   },
-  "com.yahoo.prelude.query.ToolBox$QueryVisitor": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.ToolBox$QueryVisitor" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public abstract boolean visit(com.yahoo.prelude.query.Item)",
       "public abstract void onExit()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.ToolBox": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.ToolBox" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static void visit(com.yahoo.prelude.query.ToolBox$QueryVisitor, com.yahoo.prelude.query.Item)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.TrueItem": {
-    "superClass": "com.yahoo.prelude.query.Item",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.TrueItem" : {
+    "superClass" : "com.yahoo.prelude.query.Item",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void setIndexName(java.lang.String)",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
@@ -1672,15 +1672,15 @@
       "public int getTermCount()",
       "protected void appendBodyString(java.lang.StringBuilder)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.UriItem": {
-    "superClass": "com.yahoo.prelude.query.PhraseItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.UriItem" : {
+    "superClass" : "com.yahoo.prelude.query.PhraseItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.lang.String)",
       "public void addStartAnchorItem()",
@@ -1696,15 +1696,15 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.WandItem": {
-    "superClass": "com.yahoo.prelude.query.WeightedSetItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.WandItem" : {
+    "superClass" : "com.yahoo.prelude.query.WeightedSetItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, int)",
       "public void <init>(java.lang.String, int, java.util.Map)",
       "public void setScoreThreshold(double)",
@@ -1719,16 +1719,16 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.WeakAndItem": {
-    "superClass": "com.yahoo.prelude.query.NonReducibleCompositeItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.WeakAndItem" : {
+    "superClass" : "com.yahoo.prelude.query.NonReducibleCompositeItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(int)",
       "public void <init>(java.lang.String, int)",
@@ -1742,17 +1742,17 @@
       "public int hashCode()",
       "public boolean equals(java.lang.Object)"
     ],
-    "fields": [
+    "fields" : [
       "public static final int defaultN"
     ]
   },
-  "com.yahoo.prelude.query.WeightedSetItem": {
-    "superClass": "com.yahoo.prelude.query.SimpleTaggableItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.WeightedSetItem" : {
+    "superClass" : "com.yahoo.prelude.query.SimpleTaggableItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String, java.util.Map)",
       "public java.lang.Integer addToken(long, int)",
@@ -1777,33 +1777,33 @@
       "public bridge synthetic com.yahoo.prelude.query.Item clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.WordAlternativesItem$Alternative": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.WordAlternativesItem$Alternative" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, double)",
       "public java.lang.String toString()",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": [
+    "fields" : [
       "public final java.lang.String word",
       "public final double exactness"
     ]
   },
-  "com.yahoo.prelude.query.WordAlternativesItem": {
-    "superClass": "com.yahoo.prelude.query.TermItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.WordAlternativesItem" : {
+    "superClass" : "com.yahoo.prelude.query.TermItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, boolean, com.yahoo.prelude.query.Substring, java.util.Collection)",
       "public void setAlternatives(java.util.Collection)",
       "public java.lang.String stringValue()",
@@ -1824,15 +1824,15 @@
       "public bridge synthetic com.yahoo.prelude.query.Item clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.prelude.query.WordItem": {
-    "superClass": "com.yahoo.prelude.query.TermItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.prelude.query.WordItem" : {
+    "superClass" : "com.yahoo.prelude.query.TermItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String, java.lang.String)",
       "public void <init>(java.lang.String, boolean)",
@@ -1866,15 +1866,15 @@
       "public void setWords(boolean)",
       "public void disclose(com.yahoo.prelude.query.textualrepresentation.Discloser)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.Query$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.Query$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.Query$Builder setRequest(java.lang.String)",
       "public com.yahoo.search.Query$Builder setRequest(com.yahoo.container.jdisc.HttpRequest)",
@@ -1893,24 +1893,24 @@
       "public com.yahoo.search.schema.SchemaInfo getSchemaInfo()",
       "public com.yahoo.search.Query build()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.Query$Type": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.Query$Type" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.Query$Type[] values()",
       "public static com.yahoo.search.Query$Type valueOf(java.lang.String)",
       "public static com.yahoo.search.Query$Type getType(java.lang.String)",
       "public int asInt()",
       "public java.lang.String toString()"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.search.Query$Type ALL",
       "public static final enum com.yahoo.search.Query$Type ANY",
       "public static final enum com.yahoo.search.Query$Type PHRASE",
@@ -1923,15 +1923,15 @@
       "public static final enum com.yahoo.search.Query$Type TOKENIZE"
     ]
   },
-  "com.yahoo.search.Query": {
-    "superClass": "com.yahoo.processing.Request",
-    "interfaces": [
+  "com.yahoo.search.Query" : {
+    "superClass" : "com.yahoo.processing.Request",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()",
       "public static void addNativeQueryProfileTypesTo(com.yahoo.search.query.profile.types.QueryProfileTypeRegistry)",
       "public void <init>()",
@@ -1993,7 +1993,7 @@
       "public bridge synthetic com.yahoo.component.provider.FreezableClass clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public com.yahoo.search.query.Trace trace",
       "public static final com.yahoo.processing.request.CompoundName OFFSET",
       "public static final com.yahoo.processing.request.CompoundName HITS",
@@ -2007,16 +2007,16 @@
       "public static final java.util.List nativeProperties"
     ]
   },
-  "com.yahoo.search.Result": {
-    "superClass": "com.yahoo.processing.Response",
-    "interfaces": [
+  "com.yahoo.search.Result" : {
+    "superClass" : "com.yahoo.processing.Response",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.Query)",
       "public void <init>(com.yahoo.search.Query, com.yahoo.search.result.HitGroup)",
       "public void <init>(com.yahoo.search.Query, com.yahoo.search.result.ErrorMessage)",
@@ -2053,16 +2053,16 @@
       "public bridge synthetic com.yahoo.component.provider.FreezableClass clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.Searcher": {
-    "superClass": "com.yahoo.processing.Processor",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.Searcher" : {
+    "superClass" : "com.yahoo.processing.Processor",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(com.yahoo.component.ComponentId)",
       "public abstract com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)",
@@ -2072,16 +2072,16 @@
       "protected java.util.logging.Logger getLogger()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.cluster.BaseNodeMonitor": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.cluster.BaseNodeMonitor" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(boolean)",
       "public java.lang.Object getNode()",
       "public boolean isWorking()",
@@ -2091,7 +2091,7 @@
       "protected abstract void setWorking(boolean, java.lang.String)",
       "public boolean isInternal()"
     ],
-    "fields": [
+    "fields" : [
       "protected static java.util.logging.Logger log",
       "protected java.lang.Object node",
       "protected boolean isWorking",
@@ -2102,13 +2102,13 @@
       "protected com.yahoo.search.cluster.MonitorConfiguration configuration"
     ]
   },
-  "com.yahoo.search.cluster.ClusterMonitor": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.cluster.ClusterMonitor" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.cluster.NodeManager, boolean)",
       "public void start()",
       "public com.yahoo.search.cluster.MonitorConfiguration getConfiguration()",
@@ -2121,18 +2121,18 @@
       "public java.util.List nodeMonitors()",
       "public void shutdown()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.cluster.ClusterSearcher": {
-    "superClass": "com.yahoo.search.cluster.PingableSearcher",
-    "interfaces": [
+  "com.yahoo.search.cluster.ClusterSearcher" : {
+    "superClass" : "com.yahoo.search.cluster.PingableSearcher",
+    "interfaces" : [
       "com.yahoo.search.cluster.NodeManager"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.ComponentId, java.util.List, boolean)",
       "public void <init>(com.yahoo.component.ComponentId, java.util.List, com.yahoo.search.cluster.Hasher, boolean)",
       "protected void <init>(com.yahoo.component.ComponentId, java.util.List, com.yahoo.search.cluster.Hasher, boolean, boolean)",
@@ -2155,103 +2155,103 @@
       "protected varargs void log(java.util.logging.Level, java.lang.Object[])",
       "public void deconstruct()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.cluster.Hasher$NodeFactor": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.cluster.Hasher$NodeFactor" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.Object, int)",
       "public final java.lang.Object getNode()",
       "public final int getLoad()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.cluster.Hasher$NodeList": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.cluster.Hasher$NodeList" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.cluster.Hasher$NodeFactor[])",
       "public int getNodeCount()",
       "public java.lang.Object select(int, int)",
       "public boolean hasNode(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.cluster.Hasher": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.cluster.Hasher" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void add(java.lang.Object)",
       "public synchronized void add(java.lang.Object, int)",
       "public synchronized void remove(java.lang.Object)",
       "public com.yahoo.search.cluster.Hasher$NodeList getNodes()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.cluster.MonitorConfiguration": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.cluster.MonitorConfiguration" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public long getCheckInterval()",
       "public long getRequestTimeout()",
       "public long getFailLimit()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.cluster.NodeManager": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.cluster.NodeManager" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public java.lang.String name()",
       "public abstract void working(java.lang.Object)",
       "public abstract void failed(java.lang.Object)",
       "public abstract void ping(com.yahoo.search.cluster.ClusterMonitor, java.lang.Object, java.util.concurrent.Executor)",
       "public void pingIterationCompleted()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.cluster.PingableSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.cluster.PingableSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(com.yahoo.component.ComponentId)",
       "public com.yahoo.prelude.Pong ping(com.yahoo.prelude.Ping, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.cluster.TrafficNodeMonitor": {
-    "superClass": "com.yahoo.search.cluster.BaseNodeMonitor",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.cluster.TrafficNodeMonitor" : {
+    "superClass" : "com.yahoo.search.cluster.BaseNodeMonitor",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.Object, com.yahoo.search.cluster.MonitorConfiguration, boolean)",
       "public java.lang.Object getNode()",
       "public void failed(com.yahoo.search.result.ErrorMessage)",
@@ -2259,16 +2259,16 @@
       "public java.lang.Boolean isKnownWorking()",
       "protected synchronized void setWorking(boolean, java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.federation.selection.FederationTarget": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.federation.selection.FederationTarget" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.chain.Chain, com.yahoo.search.searchchain.model.federation.FederationOptions, java.lang.Object)",
       "public com.yahoo.component.chain.Chain getChain()",
       "public com.yahoo.search.searchchain.model.federation.FederationOptions getFederationOptions()",
@@ -2276,54 +2276,54 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.federation.selection.TargetSelector": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.federation.selection.TargetSelector" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract java.util.Collection getTargets(com.yahoo.search.Query, com.yahoo.processing.execution.chain.ChainRegistry)",
       "public abstract void modifyTargetQuery(com.yahoo.search.federation.selection.FederationTarget, com.yahoo.search.Query)",
       "public abstract void modifyTargetResult(com.yahoo.search.federation.selection.FederationTarget, com.yahoo.search.Result)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.Continuation": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.Continuation" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.grouping.Continuation fromString(java.lang.String)",
       "public abstract com.yahoo.search.grouping.Continuation copy()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String NEXT_PAGE",
       "public static final java.lang.String PREV_PAGE",
       "public static final java.lang.String THIS_PAGE"
     ]
   },
-  "com.yahoo.search.grouping.GroupingQueryParser": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.GroupingQueryParser" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)",
       "public static void validate(com.yahoo.search.Query)",
       "public static void createGroupingRequestIn(com.yahoo.search.Query, com.yahoo.search.grouping.request.GroupingOperation, java.util.List)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String SELECT_PARAMETER_PARSING",
       "public static final com.yahoo.processing.request.CompoundName PARAM_CONTINUE",
       "public static final com.yahoo.processing.request.CompoundName PARAM_REQUEST",
@@ -2334,13 +2334,13 @@
       "public static final com.yahoo.processing.request.CompoundName GROUPING_GLOBAL_MAX_GROUPS"
     ]
   },
-  "com.yahoo.search.grouping.GroupingRequest": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.GroupingRequest" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public com.yahoo.search.grouping.GroupingRequest copy(com.yahoo.search.query.Select)",
       "public int getRequestId()",
       "public com.yahoo.search.grouping.request.GroupingOperation getRootOperation()",
@@ -2359,143 +2359,143 @@
       "public static com.yahoo.search.grouping.GroupingRequest newInstance(com.yahoo.search.Query)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.GroupingValidator": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.GroupingValidator" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.container.QrSearchersConfig, com.yahoo.search.config.ClusterConfig, com.yahoo.vespa.config.search.AttributesConfig)",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String GROUPING_VALIDATED",
       "public static final com.yahoo.processing.request.CompoundName PARAM_ENABLED"
     ]
   },
-  "com.yahoo.search.grouping.UnavailableAttributeException": {
-    "superClass": "java.lang.RuntimeException",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.UnavailableAttributeException" : {
+    "superClass" : "java.lang.RuntimeException",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, java.lang.String)",
       "public java.lang.String getClusterName()",
       "public java.lang.String getAttributeName()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.UniqueGroupingSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.UniqueGroupingSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.processing.request.CompoundName PARAM_UNIQUE"
     ]
   },
-  "com.yahoo.search.grouping.request.AddFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.AddFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.AddFunction copy()",
       "public static com.yahoo.search.grouping.request.AddFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.AggregatorNode": {
-    "superClass": "com.yahoo.search.grouping.request.GroupingExpression",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.AggregatorNode" : {
+    "superClass" : "com.yahoo.search.grouping.request.GroupingExpression",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(java.lang.String, java.lang.String, java.lang.Integer)",
       "protected void <init>(java.lang.String, java.lang.String, java.lang.Integer, com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.GroupingExpression getExpression()",
       "public void resolveLevel(int)",
       "public void visit(com.yahoo.search.grouping.request.ExpressionVisitor)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.AllOperation": {
-    "superClass": "com.yahoo.search.grouping.request.GroupingOperation",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.AllOperation" : {
+    "superClass" : "com.yahoo.search.grouping.request.GroupingOperation",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.grouping.request.AllOperation copy(com.yahoo.search.grouping.request.GroupingOperation)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingOperation copy(com.yahoo.search.grouping.request.GroupingOperation)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.AndFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.AndFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.AndFunction copy()",
       "public static com.yahoo.search.grouping.request.AndFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ArrayAtLookup": {
-    "superClass": "com.yahoo.search.grouping.request.DocumentValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.ArrayAtLookup" : {
+    "superClass" : "com.yahoo.search.grouping.request.DocumentValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.ArrayAtLookup copy()",
       "public java.lang.String getAttributeName()",
       "public com.yahoo.search.grouping.request.GroupingExpression getIndexArgument()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.AttributeFunction": {
-    "superClass": "com.yahoo.search.grouping.request.DocumentValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.AttributeFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.DocumentValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public com.yahoo.search.grouping.request.AttributeFunction copy()",
       "public java.lang.String getAttributeName()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.AttributeMapLookupValue": {
-    "superClass": "com.yahoo.search.grouping.request.AttributeValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.AttributeMapLookupValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.AttributeValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.grouping.request.AttributeMapLookupValue fromKey(java.lang.String, java.lang.String, java.lang.String)",
       "public static com.yahoo.search.grouping.request.AttributeMapLookupValue fromKeySourceAttribute(java.lang.String, java.lang.String, java.lang.String)",
       "public com.yahoo.search.grouping.request.AttributeMapLookupValue copy()",
@@ -2507,85 +2507,85 @@
       "public bridge synthetic com.yahoo.search.grouping.request.AttributeValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.AttributeValue": {
-    "superClass": "com.yahoo.search.grouping.request.DocumentValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.AttributeValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.DocumentValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public com.yahoo.search.grouping.request.AttributeValue copy()",
       "public java.lang.String getAttributeName()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.AvgAggregator": {
-    "superClass": "com.yahoo.search.grouping.request.AggregatorNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.AvgAggregator" : {
+    "superClass" : "com.yahoo.search.grouping.request.AggregatorNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.AvgAggregator copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.AvgFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.AvgFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.AvgFunction copy()",
       "public static com.yahoo.search.grouping.request.AvgFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.BooleanValue": {
-    "superClass": "com.yahoo.search.grouping.request.ConstantValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.BooleanValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.ConstantValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.Boolean)",
       "public com.yahoo.search.grouping.request.BooleanValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.ConstantValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.BucketResolver": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.BucketResolver" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.grouping.request.BucketResolver push(com.yahoo.search.grouping.request.ConstantValue, boolean)",
       "public com.yahoo.search.grouping.request.PredefinedFunction resolve(com.yahoo.search.grouping.request.GroupingExpression)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.BucketValue": {
-    "superClass": "com.yahoo.search.grouping.request.GroupingExpression",
-    "interfaces": [
+  "com.yahoo.search.grouping.request.BucketValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.GroupingExpression",
+    "interfaces" : [
       "java.lang.Comparable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(java.lang.String, java.lang.Integer, com.yahoo.search.grouping.request.ConstantValue, com.yahoo.search.grouping.request.ConstantValue)",
       "public com.yahoo.search.grouping.request.BucketValue copy()",
       "public com.yahoo.search.grouping.request.ConstantValue getFrom()",
@@ -2596,179 +2596,179 @@
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()",
       "public bridge synthetic int compareTo(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.CatFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.CatFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.CatFunction copy()",
       "public static com.yahoo.search.grouping.request.CatFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ConstantValue": {
-    "superClass": "com.yahoo.search.grouping.request.GroupingExpression",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.ConstantValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.GroupingExpression",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(java.lang.String, java.lang.Integer, java.lang.Comparable)",
       "public abstract com.yahoo.search.grouping.request.ConstantValue copy()",
       "public java.lang.Comparable getValue()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ConstantValueComparator": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.grouping.request.ConstantValueComparator" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.util.Comparator"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public int compare(com.yahoo.search.grouping.request.ConstantValue, com.yahoo.search.grouping.request.ConstantValue)",
       "public bridge synthetic int compare(java.lang.Object, java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.CountAggregator": {
-    "superClass": "com.yahoo.search.grouping.request.AggregatorNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.CountAggregator" : {
+    "superClass" : "com.yahoo.search.grouping.request.AggregatorNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.grouping.request.CountAggregator copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.DateFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.DateFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.DateFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.DayOfMonthFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.DayOfMonthFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.DayOfMonthFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.DayOfWeekFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.DayOfWeekFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.DayOfWeekFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.DayOfYearFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.DayOfYearFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.DayOfYearFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.DebugWaitFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.DebugWaitFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.DoubleValue, com.yahoo.search.grouping.request.BooleanValue)",
       "public com.yahoo.search.grouping.request.DebugWaitFunction copy()",
       "public double getWaitTime()",
       "public boolean getBusyWait()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.DivFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.DivFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.DivFunction copy()",
       "public static com.yahoo.search.grouping.request.DivFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.DocIdNsSpecificValue": {
-    "superClass": "com.yahoo.search.grouping.request.DocumentValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.DocIdNsSpecificValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.DocumentValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.grouping.request.DocIdNsSpecificValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.DocumentValue": {
-    "superClass": "com.yahoo.search.grouping.request.GroupingExpression",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.DocumentValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.GroupingExpression",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(java.lang.String, java.lang.String, java.lang.Integer)",
       "public void resolveLevel(int)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.DoubleBucket": {
-    "superClass": "com.yahoo.search.grouping.request.BucketValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.DoubleBucket" : {
+    "superClass" : "com.yahoo.search.grouping.request.BucketValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.grouping.request.DoubleValue nextValue(com.yahoo.search.grouping.request.DoubleValue)",
       "public void <init>(double, double)",
       "public void <init>(com.yahoo.search.grouping.request.ConstantValue, com.yahoo.search.grouping.request.ConstantValue)",
@@ -2776,15 +2776,15 @@
       "public bridge synthetic com.yahoo.search.grouping.request.BucketValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.DoublePredefined": {
-    "superClass": "com.yahoo.search.grouping.request.PredefinedFunction",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.DoublePredefined" : {
+    "superClass" : "com.yahoo.search.grouping.request.PredefinedFunction",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.DoubleBucket, com.yahoo.search.grouping.request.DoubleBucket[])",
       "public com.yahoo.search.grouping.request.DoublePredefined copy()",
       "public com.yahoo.search.grouping.request.DoubleBucket getBucket(int)",
@@ -2792,73 +2792,73 @@
       "public bridge synthetic com.yahoo.search.grouping.request.BucketValue getBucket(int)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.DoubleValue": {
-    "superClass": "com.yahoo.search.grouping.request.ConstantValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.DoubleValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.ConstantValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(double)",
       "public com.yahoo.search.grouping.request.DoubleValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.ConstantValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.EachOperation": {
-    "superClass": "com.yahoo.search.grouping.request.GroupingOperation",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.EachOperation" : {
+    "superClass" : "com.yahoo.search.grouping.request.GroupingOperation",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.grouping.request.EachOperation copy(com.yahoo.search.grouping.request.GroupingOperation)",
       "public void resolveLevel(int)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingOperation copy(com.yahoo.search.grouping.request.GroupingOperation)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ExpressionVisitor": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.ExpressionVisitor" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract void visitExpression(com.yahoo.search.grouping.request.GroupingExpression)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.FixedWidthFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.FixedWidthFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression, java.lang.Number)",
       "public com.yahoo.search.grouping.request.FixedWidthFunction copy()",
       "public java.lang.Number getWidth()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.FunctionNode": {
-    "superClass": "com.yahoo.search.grouping.request.GroupingExpression",
-    "interfaces": [
+  "com.yahoo.search.grouping.request.FunctionNode" : {
+    "superClass" : "com.yahoo.search.grouping.request.GroupingExpression",
+    "interfaces" : [
       "java.lang.Iterable"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(java.lang.String, java.lang.String, java.lang.Integer, java.util.List)",
       "public int getNumArgs()",
       "public com.yahoo.search.grouping.request.GroupingExpression getArg(int)",
@@ -2870,16 +2870,16 @@
       "protected static varargs java.util.List asList(java.lang.Object, java.lang.Object, java.lang.Object[])",
       "protected static java.util.List asList(java.util.List, java.util.List)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.GroupingExpression": {
-    "superClass": "com.yahoo.search.grouping.request.GroupingNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.GroupingExpression" : {
+    "superClass" : "com.yahoo.search.grouping.request.GroupingNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(java.lang.String, java.lang.String, java.lang.Integer)",
       "public abstract com.yahoo.search.grouping.request.GroupingExpression copy()",
       "public void resolveLevel(int)",
@@ -2891,32 +2891,32 @@
       "public com.yahoo.search.grouping.request.GroupingExpression setLabel(java.lang.String)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingNode setLabel(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.GroupingNode": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.GroupingNode" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(java.lang.String, java.lang.String)",
       "public java.lang.String getLabel()",
       "protected java.lang.String getImage()",
       "public com.yahoo.search.grouping.request.GroupingNode setLabel(java.lang.String)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.GroupingOperation": {
-    "superClass": "com.yahoo.search.grouping.request.GroupingNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.GroupingOperation" : {
+    "superClass" : "com.yahoo.search.grouping.request.GroupingNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(java.lang.String, java.lang.String)",
       "protected void <init>(com.yahoo.search.grouping.request.GroupingOperation, java.lang.String, java.lang.String, java.util.List, java.util.List, java.util.List, java.util.Map, java.util.Set, com.yahoo.search.grouping.request.GroupingExpression, java.lang.String, boolean, double, int, int, int)",
       "public abstract com.yahoo.search.grouping.request.GroupingOperation copy(com.yahoo.search.grouping.request.GroupingOperation)",
@@ -2966,76 +2966,76 @@
       "public static java.util.List fromStringAsList(java.lang.String)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingNode setLabel(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final int UNLIMITED_MAX"
     ]
   },
-  "com.yahoo.search.grouping.request.HourOfDayFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.HourOfDayFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.HourOfDayFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.Infinite": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.grouping.request.Infinite" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Comparable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(boolean)",
       "public java.lang.String toString()",
       "public int compareTo(java.lang.Object)",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.InfiniteValue": {
-    "superClass": "com.yahoo.search.grouping.request.ConstantValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.InfiniteValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.ConstantValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.Infinite)",
       "public com.yahoo.search.grouping.request.InfiniteValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.ConstantValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.InterpolatedLookup": {
-    "superClass": "com.yahoo.search.grouping.request.DocumentValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.InterpolatedLookup" : {
+    "superClass" : "com.yahoo.search.grouping.request.DocumentValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.InterpolatedLookup copy()",
       "public java.lang.String getAttributeName()",
       "public com.yahoo.search.grouping.request.GroupingExpression getLookupArgument()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.LongBucket": {
-    "superClass": "com.yahoo.search.grouping.request.BucketValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.LongBucket" : {
+    "superClass" : "com.yahoo.search.grouping.request.BucketValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.grouping.request.LongValue nextValue(com.yahoo.search.grouping.request.LongValue)",
       "public void <init>(long, long)",
       "public void <init>(com.yahoo.search.grouping.request.ConstantValue, com.yahoo.search.grouping.request.ConstantValue)",
@@ -3043,15 +3043,15 @@
       "public bridge synthetic com.yahoo.search.grouping.request.BucketValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.LongPredefined": {
-    "superClass": "com.yahoo.search.grouping.request.PredefinedFunction",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.LongPredefined" : {
+    "superClass" : "com.yahoo.search.grouping.request.PredefinedFunction",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.LongBucket, com.yahoo.search.grouping.request.LongBucket[])",
       "public com.yahoo.search.grouping.request.LongPredefined copy()",
       "public com.yahoo.search.grouping.request.LongBucket getBucket(int)",
@@ -3059,178 +3059,178 @@
       "public bridge synthetic com.yahoo.search.grouping.request.BucketValue getBucket(int)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.LongValue": {
-    "superClass": "com.yahoo.search.grouping.request.ConstantValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.LongValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.ConstantValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(long)",
       "public com.yahoo.search.grouping.request.LongValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.ConstantValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathACosFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathACosFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathACosFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathACosHFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathACosHFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathACosHFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathASinFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathASinFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathASinFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathASinHFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathASinHFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathASinHFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathATanFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathATanFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathATanFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathATanHFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathATanHFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathATanHFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathCbrtFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathCbrtFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathCbrtFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathCosFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathCosFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathCosFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathCosHFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathCosHFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathCosHFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathExpFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathExpFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathExpFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathFloorFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathFloorFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathFloorFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathFunctions$Function": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathFunctions$Function" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.grouping.request.MathFunctions$Function[] values()",
       "public static com.yahoo.search.grouping.request.MathFunctions$Function valueOf(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.search.grouping.request.MathFunctions$Function EXP",
       "public static final enum com.yahoo.search.grouping.request.MathFunctions$Function POW",
       "public static final enum com.yahoo.search.grouping.request.MathFunctions$Function LOG",
@@ -3254,97 +3254,97 @@
       "public static final enum com.yahoo.search.grouping.request.MathFunctions$Function FLOOR"
     ]
   },
-  "com.yahoo.search.grouping.request.MathFunctions": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathFunctions" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.grouping.request.FunctionNode newInstance(com.yahoo.search.grouping.request.MathFunctions$Function, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathHypotFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathHypotFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathHypotFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathLog10Function": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathLog10Function" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathLog10Function copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathLog1pFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathLog1pFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathLog1pFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathLogFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathLogFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathLogFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathPowFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathPowFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathPowFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathResolver$Type": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathResolver$Type" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.grouping.request.MathResolver$Type[] values()",
       "public static com.yahoo.search.grouping.request.MathResolver$Type valueOf(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.search.grouping.request.MathResolver$Type ADD",
       "public static final enum com.yahoo.search.grouping.request.MathResolver$Type SUB",
       "public static final enum com.yahoo.search.grouping.request.MathResolver$Type DIV",
@@ -3352,281 +3352,281 @@
       "public static final enum com.yahoo.search.grouping.request.MathResolver$Type MUL"
     ]
   },
-  "com.yahoo.search.grouping.request.MathResolver": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathResolver" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void push(com.yahoo.search.grouping.request.MathResolver$Type, com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.GroupingExpression resolve()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathSinFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathSinFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathSinFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathSinHFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathSinHFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathSinHFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathSqrtFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathSqrtFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathSqrtFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathTanFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathTanFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathTanFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MathTanHFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MathTanHFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MathTanHFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MaxAggregator": {
-    "superClass": "com.yahoo.search.grouping.request.AggregatorNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MaxAggregator" : {
+    "superClass" : "com.yahoo.search.grouping.request.AggregatorNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MaxAggregator copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MaxFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MaxFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.MaxFunction copy()",
       "public static com.yahoo.search.grouping.request.MaxFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.Md5Function": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.Md5Function" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression, int)",
       "public com.yahoo.search.grouping.request.Md5Function copy()",
       "public int getNumBits()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MinAggregator": {
-    "superClass": "com.yahoo.search.grouping.request.AggregatorNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MinAggregator" : {
+    "superClass" : "com.yahoo.search.grouping.request.AggregatorNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MinAggregator copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MinFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MinFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.MinFunction copy()",
       "public static com.yahoo.search.grouping.request.MinFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MinuteOfHourFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MinuteOfHourFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MinuteOfHourFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ModFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.ModFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.ModFunction copy()",
       "public static com.yahoo.search.grouping.request.ModFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MonthOfYearFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MonthOfYearFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.MonthOfYearFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.MulFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.MulFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.MulFunction copy()",
       "public static com.yahoo.search.grouping.request.MulFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.NegFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.NegFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.NegFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.NormalizeSubjectFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.NormalizeSubjectFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.NormalizeSubjectFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.NowFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.NowFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.grouping.request.NowFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.OrFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.OrFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.OrFunction copy()",
       "public static com.yahoo.search.grouping.request.OrFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.PredefinedFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.PredefinedFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(java.lang.String, java.lang.Integer, com.yahoo.search.grouping.request.GroupingExpression, java.util.List)",
       "public int getNumBuckets()",
       "public com.yahoo.search.grouping.request.BucketValue getBucket(int)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.RawBucket": {
-    "superClass": "com.yahoo.search.grouping.request.BucketValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.RawBucket" : {
+    "superClass" : "com.yahoo.search.grouping.request.BucketValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.grouping.request.RawValue nextValue(com.yahoo.search.grouping.request.RawValue)",
       "public void <init>(com.yahoo.search.grouping.request.RawBuffer, com.yahoo.search.grouping.request.RawBuffer)",
       "public void <init>(com.yahoo.search.grouping.request.ConstantValue, com.yahoo.search.grouping.request.ConstantValue)",
@@ -3634,18 +3634,18 @@
       "public bridge synthetic com.yahoo.search.grouping.request.BucketValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.RawBuffer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.grouping.request.RawBuffer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Comparable",
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.util.ArrayList)",
       "public void <init>(byte[])",
@@ -3660,15 +3660,15 @@
       "public bridge synthetic java.lang.Object clone()",
       "public bridge synthetic int compareTo(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.RawPredefined": {
-    "superClass": "com.yahoo.search.grouping.request.PredefinedFunction",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.RawPredefined" : {
+    "superClass" : "com.yahoo.search.grouping.request.PredefinedFunction",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.RawBucket, com.yahoo.search.grouping.request.RawBucket[])",
       "public com.yahoo.search.grouping.request.RawPredefined copy()",
       "public com.yahoo.search.grouping.request.RawBucket getBucket(int)",
@@ -3676,134 +3676,134 @@
       "public bridge synthetic com.yahoo.search.grouping.request.BucketValue getBucket(int)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.RawValue": {
-    "superClass": "com.yahoo.search.grouping.request.ConstantValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.RawValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.ConstantValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.RawBuffer)",
       "public com.yahoo.search.grouping.request.RawValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.ConstantValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.RelevanceValue": {
-    "superClass": "com.yahoo.search.grouping.request.DocumentValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.RelevanceValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.DocumentValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.grouping.request.RelevanceValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ReverseFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.ReverseFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.ReverseFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.SecondOfMinuteFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.SecondOfMinuteFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.SecondOfMinuteFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.SizeFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.SizeFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.SizeFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.SortFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.SortFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.SortFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.StandardDeviationAggregator": {
-    "superClass": "com.yahoo.search.grouping.request.AggregatorNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.StandardDeviationAggregator" : {
+    "superClass" : "com.yahoo.search.grouping.request.AggregatorNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.StandardDeviationAggregator copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.StrCatFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.StrCatFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.StrCatFunction copy()",
       "public static com.yahoo.search.grouping.request.StrCatFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.StrLenFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.StrLenFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.StrLenFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.StringBucket": {
-    "superClass": "com.yahoo.search.grouping.request.BucketValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.StringBucket" : {
+    "superClass" : "com.yahoo.search.grouping.request.BucketValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.grouping.request.StringValue nextValue(com.yahoo.search.grouping.request.StringValue)",
       "public void <init>(java.lang.String)",
       "public void <init>(com.yahoo.search.grouping.request.StringValue)",
@@ -3814,15 +3814,15 @@
       "public bridge synthetic com.yahoo.search.grouping.request.BucketValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.StringPredefined": {
-    "superClass": "com.yahoo.search.grouping.request.PredefinedFunction",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.StringPredefined" : {
+    "superClass" : "com.yahoo.search.grouping.request.PredefinedFunction",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.StringBucket, com.yahoo.search.grouping.request.StringBucket[])",
       "public com.yahoo.search.grouping.request.StringPredefined copy()",
       "public com.yahoo.search.grouping.request.StringBucket getBucket(int)",
@@ -3830,77 +3830,77 @@
       "public bridge synthetic com.yahoo.search.grouping.request.BucketValue getBucket(int)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.StringValue": {
-    "superClass": "com.yahoo.search.grouping.request.ConstantValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.StringValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.ConstantValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public com.yahoo.search.grouping.request.StringValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.ConstantValue copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.SubFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.SubFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.SubFunction copy()",
       "public static com.yahoo.search.grouping.request.SubFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.SumAggregator": {
-    "superClass": "com.yahoo.search.grouping.request.AggregatorNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.SumAggregator" : {
+    "superClass" : "com.yahoo.search.grouping.request.AggregatorNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.SumAggregator copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.SummaryValue": {
-    "superClass": "com.yahoo.search.grouping.request.DocumentValue",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.SummaryValue" : {
+    "superClass" : "com.yahoo.search.grouping.request.DocumentValue",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.lang.String)",
       "public com.yahoo.search.grouping.request.SummaryValue copy()",
       "public java.lang.String getSummaryName()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.TimeFunctions$Type": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.TimeFunctions$Type" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.grouping.request.TimeFunctions$Type[] values()",
       "public static com.yahoo.search.grouping.request.TimeFunctions$Type valueOf(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.search.grouping.request.TimeFunctions$Type DATE",
       "public static final enum com.yahoo.search.grouping.request.TimeFunctions$Type DAY_OF_MONTH",
       "public static final enum com.yahoo.search.grouping.request.TimeFunctions$Type DAY_OF_WEEK",
@@ -3912,14 +3912,14 @@
       "public static final enum com.yahoo.search.grouping.request.TimeFunctions$Type YEAR"
     ]
   },
-  "com.yahoo.search.grouping.request.TimeFunctions": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.TimeFunctions" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.grouping.request.FunctionNode newInstance(com.yahoo.search.grouping.request.TimeFunctions$Type, com.yahoo.search.grouping.request.GroupingExpression)",
       "public static com.yahoo.search.grouping.request.DateFunction newDate(com.yahoo.search.grouping.request.GroupingExpression)",
@@ -3932,67 +3932,67 @@
       "public static com.yahoo.search.grouping.request.SecondOfMinuteFunction newSecondOfMinute(com.yahoo.search.grouping.request.GroupingExpression)",
       "public static com.yahoo.search.grouping.request.YearFunction newYear(com.yahoo.search.grouping.request.GroupingExpression)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ToDoubleFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.ToDoubleFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.ToDoubleFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ToLongFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.ToLongFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.ToLongFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ToRawFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.ToRawFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.ToRawFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ToStringFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.ToStringFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.ToStringFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.UcaFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.UcaFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression, java.lang.String)",
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression, java.lang.String, java.lang.String)",
       "public com.yahoo.search.grouping.request.UcaFunction copy()",
@@ -4000,347 +4000,347 @@
       "public java.lang.String getStrength()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.XorAggregator": {
-    "superClass": "com.yahoo.search.grouping.request.AggregatorNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.XorAggregator" : {
+    "superClass" : "com.yahoo.search.grouping.request.AggregatorNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.XorAggregator copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.XorBitFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.XorBitFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression, int)",
       "public com.yahoo.search.grouping.request.XorBitFunction copy()",
       "public int getNumBits()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.XorFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.XorFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public varargs void <init>(com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression, com.yahoo.search.grouping.request.GroupingExpression[])",
       "public com.yahoo.search.grouping.request.XorFunction copy()",
       "public static com.yahoo.search.grouping.request.XorFunction newInstance(java.util.List)",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.YearFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.YearFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.YearFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ZCurveXFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.ZCurveXFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.ZCurveXFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.request.ZCurveYFunction": {
-    "superClass": "com.yahoo.search.grouping.request.FunctionNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.request.ZCurveYFunction" : {
+    "superClass" : "com.yahoo.search.grouping.request.FunctionNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.request.GroupingExpression)",
       "public com.yahoo.search.grouping.request.ZCurveYFunction copy()",
       "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.AbstractList": {
-    "superClass": "com.yahoo.search.result.HitGroup",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.AbstractList" : {
+    "superClass" : "com.yahoo.search.result.HitGroup",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, java.lang.String)",
       "public java.lang.String getLabel()",
       "public java.util.Map continuations()",
       "public void close()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.BoolId": {
-    "superClass": "com.yahoo.search.grouping.result.ValueGroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.BoolId" : {
+    "superClass" : "com.yahoo.search.grouping.result.ValueGroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.Boolean)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.BucketGroupId": {
-    "superClass": "com.yahoo.search.grouping.result.GroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.BucketGroupId" : {
+    "superClass" : "com.yahoo.search.grouping.result.GroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, java.lang.Object, java.lang.Object)",
       "public void <init>(java.lang.String, java.lang.Object, java.lang.String, java.lang.Object, java.lang.String)",
       "public java.lang.Object getFrom()",
       "public java.lang.Object getTo()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.DoubleBucketId": {
-    "superClass": "com.yahoo.search.grouping.result.BucketGroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.DoubleBucketId" : {
+    "superClass" : "com.yahoo.search.grouping.result.BucketGroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.Double, java.lang.Double)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.DoubleId": {
-    "superClass": "com.yahoo.search.grouping.result.ValueGroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.DoubleId" : {
+    "superClass" : "com.yahoo.search.grouping.result.ValueGroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.Double)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.FlatteningSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.FlatteningSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.Group": {
-    "superClass": "com.yahoo.search.result.HitGroup",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.Group" : {
+    "superClass" : "com.yahoo.search.result.HitGroup",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.grouping.result.GroupId, com.yahoo.search.result.Relevance)",
       "public com.yahoo.search.grouping.result.GroupId getGroupId()",
       "public com.yahoo.search.grouping.result.HitList getHitList(java.lang.String)",
       "public com.yahoo.search.grouping.result.GroupList getGroupList(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.GroupId": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.GroupId" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected varargs void <init>(java.lang.String, java.lang.Object[])",
       "public java.lang.String getTypeName()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.GroupList": {
-    "superClass": "com.yahoo.search.grouping.result.AbstractList",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.GroupList" : {
+    "superClass" : "com.yahoo.search.grouping.result.AbstractList",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.HitList": {
-    "superClass": "com.yahoo.search.grouping.result.AbstractList",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.HitList" : {
+    "superClass" : "com.yahoo.search.grouping.result.AbstractList",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.HitRenderer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.HitRenderer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static boolean renderHeader(com.yahoo.search.result.HitGroup, com.yahoo.text.XMLWriter)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.LongBucketId": {
-    "superClass": "com.yahoo.search.grouping.result.BucketGroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.LongBucketId" : {
+    "superClass" : "com.yahoo.search.grouping.result.BucketGroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.Long, java.lang.Long)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.LongId": {
-    "superClass": "com.yahoo.search.grouping.result.ValueGroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.LongId" : {
+    "superClass" : "com.yahoo.search.grouping.result.ValueGroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.Long)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.NullId": {
-    "superClass": "com.yahoo.search.grouping.result.GroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.NullId" : {
+    "superClass" : "com.yahoo.search.grouping.result.GroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.RawBucketId": {
-    "superClass": "com.yahoo.search.grouping.result.BucketGroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.RawBucketId" : {
+    "superClass" : "com.yahoo.search.grouping.result.BucketGroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(byte[], byte[])"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.RawId": {
-    "superClass": "com.yahoo.search.grouping.result.ValueGroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.RawId" : {
+    "superClass" : "com.yahoo.search.grouping.result.ValueGroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(byte[])"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.RootGroup": {
-    "superClass": "com.yahoo.search.grouping.result.Group",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.RootGroup" : {
+    "superClass" : "com.yahoo.search.grouping.result.Group",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(int, com.yahoo.search.grouping.Continuation)",
       "public com.yahoo.search.grouping.Continuation continuation()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.RootId": {
-    "superClass": "com.yahoo.search.grouping.result.GroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.RootId" : {
+    "superClass" : "com.yahoo.search.grouping.result.GroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(int)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.StringBucketId": {
-    "superClass": "com.yahoo.search.grouping.result.BucketGroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.StringBucketId" : {
+    "superClass" : "com.yahoo.search.grouping.result.BucketGroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.StringId": {
-    "superClass": "com.yahoo.search.grouping.result.ValueGroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.StringId" : {
+    "superClass" : "com.yahoo.search.grouping.result.ValueGroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.grouping.result.ValueGroupId": {
-    "superClass": "com.yahoo.search.grouping.result.GroupId",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.grouping.result.ValueGroupId" : {
+    "superClass" : "com.yahoo.search.grouping.result.GroupId",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, java.lang.Object)",
       "public void <init>(java.lang.String, java.lang.Object, java.lang.String)",
       "public java.lang.Object getValue()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.handler.HttpSearchResponse": {
-    "superClass": "com.yahoo.container.jdisc.ExtendedResponse",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.handler.HttpSearchResponse" : {
+    "superClass" : "com.yahoo.container.jdisc.ExtendedResponse",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(int, com.yahoo.search.Result, com.yahoo.search.Query, com.yahoo.processing.rendering.Renderer)",
       "public java.util.concurrent.CompletableFuture asyncRender(java.io.OutputStream)",
       "public static java.util.concurrent.CompletableFuture asyncRender(com.yahoo.search.Result, com.yahoo.search.Query, com.yahoo.processing.rendering.Renderer, java.io.OutputStream)",
@@ -4356,15 +4356,15 @@
       "public com.yahoo.search.Result getResult()",
       "public java.lang.Iterable getLogValues()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.handler.SearchHandler": {
-    "superClass": "com.yahoo.container.jdisc.LoggingRequestHandler",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.handler.SearchHandler" : {
+    "superClass" : "com.yahoo.container.jdisc.LoggingRequestHandler",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.jdisc.Metric, com.yahoo.container.handler.threadpool.ContainerThreadPool, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, com.yahoo.container.core.ContainerHttpConfig, com.yahoo.component.provider.ComponentRegistry, com.yahoo.search.searchchain.ExecutionFactory, ai.vespa.cloud.ZoneInfo)",
       "public final com.yahoo.container.jdisc.HttpResponse handle(com.yahoo.container.jdisc.HttpRequest)",
       "public java.util.Optional getRequestType()",
@@ -4374,32 +4374,32 @@
       "public void createRequestMapping(com.yahoo.slime.Inspector, java.util.Map, java.lang.String)",
       "public com.yahoo.container.jdisc.RequestHandlerSpec requestHandlerSpec()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String defaultSearchChainName"
     ]
   },
-  "com.yahoo.search.handler.SearchResponse": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.handler.SearchResponse" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.container.handler.Timing createTiming(com.yahoo.search.Query, com.yahoo.search.Result)",
       "public static com.yahoo.container.logging.HitCounts createHitCounts(com.yahoo.search.Query, com.yahoo.search.Result)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.handler.SearchWithRendererHandlerConfig$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.handler.SearchWithRendererHandlerConfig$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.config.ConfigInstance$Builder"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(com.yahoo.search.handler.SearchWithRendererHandlerConfig)",
       "public com.yahoo.search.handler.SearchWithRendererHandlerConfig$Builder rendererId(java.lang.String)",
@@ -4411,68 +4411,68 @@
       "public final void setApplyOnRestart(boolean)",
       "public com.yahoo.search.handler.SearchWithRendererHandlerConfig build()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.handler.SearchWithRendererHandlerConfig$Producer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.handler.SearchWithRendererHandlerConfig$Producer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.config.ConfigInstance$Producer"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract void getConfig(com.yahoo.search.handler.SearchWithRendererHandlerConfig$Builder)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.handler.SearchWithRendererHandlerConfig": {
-    "superClass": "com.yahoo.config.ConfigInstance",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.handler.SearchWithRendererHandlerConfig" : {
+    "superClass" : "com.yahoo.config.ConfigInstance",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
       "public void <init>(com.yahoo.search.handler.SearchWithRendererHandlerConfig$Builder)",
       "public java.lang.String rendererId()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
-  "com.yahoo.search.intent.model.Intent": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.intent.model.Intent" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getId()",
       "public int hashCode()",
       "public boolean equals(java.lang.Object)",
       "public java.lang.String toString()"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.search.intent.model.Intent Default"
     ]
   },
-  "com.yahoo.search.intent.model.IntentModel": {
-    "superClass": "com.yahoo.search.intent.model.ParentNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.intent.model.IntentModel" : {
+    "superClass" : "com.yahoo.search.intent.model.ParentNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.util.List)",
       "public varargs void <init>(com.yahoo.text.interpretation.Interpretation[])",
@@ -4482,32 +4482,32 @@
       "public static com.yahoo.search.intent.model.IntentModel getFrom(com.yahoo.search.Query)",
       "public void setTo(com.yahoo.search.Query)"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.processing.request.CompoundName intentModelStringName",
       "public static final com.yahoo.processing.request.CompoundName intentModelObjectName"
     ]
   },
-  "com.yahoo.search.intent.model.IntentNode": {
-    "superClass": "com.yahoo.search.intent.model.ParentNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.intent.model.IntentNode" : {
+    "superClass" : "com.yahoo.search.intent.model.ParentNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.intent.model.Intent, double)",
       "public com.yahoo.search.intent.model.Intent getIntent()",
       "public void setIntent(com.yahoo.search.intent.model.Intent)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.intent.model.InterpretationNode": {
-    "superClass": "com.yahoo.search.intent.model.ParentNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.intent.model.InterpretationNode" : {
+    "superClass" : "com.yahoo.search.intent.model.ParentNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.text.interpretation.Interpretation)",
       "public com.yahoo.text.interpretation.Interpretation getInterpretation()",
       "public void setInterpretation(com.yahoo.text.interpretation.Interpretation)",
@@ -4515,18 +4515,18 @@
       "public void setScore(double)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.intent.model.Node": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.intent.model.Node" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Comparable"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(double)",
       "public double getScore()",
       "public void setScore(double)",
@@ -4536,61 +4536,61 @@
       "public int hashCode()",
       "public bridge synthetic int compareTo(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.intent.model.ParentNode": {
-    "superClass": "com.yahoo.search.intent.model.Node",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.intent.model.ParentNode" : {
+    "superClass" : "com.yahoo.search.intent.model.Node",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(double)",
       "public java.util.List children()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.intent.model.Source": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.intent.model.Source" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getId()",
       "public int hashCode()",
       "public boolean equals(java.lang.Object)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.intent.model.SourceNode": {
-    "superClass": "com.yahoo.search.intent.model.Node",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.intent.model.SourceNode" : {
+    "superClass" : "com.yahoo.search.intent.model.Node",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.intent.model.Source, double)",
       "public void setSource(com.yahoo.search.intent.model.Source)",
       "public com.yahoo.search.intent.model.Source getSource()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.PageTemplate": {
-    "superClass": "com.yahoo.component.provider.FreezableComponent",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.PageTemplate" : {
+    "superClass" : "com.yahoo.component.provider.FreezableComponent",
+    "interfaces" : [
       "com.yahoo.search.pagetemplates.model.PageElement"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.ComponentId)",
       "public void setSection(com.yahoo.search.pagetemplates.model.Section)",
       "public com.yahoo.search.pagetemplates.model.Section getSection()",
@@ -4599,47 +4599,47 @@
       "public void accept(com.yahoo.search.pagetemplates.model.PageTemplateVisitor)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.PageTemplateRegistry": {
-    "superClass": "com.yahoo.component.provider.ComponentRegistry",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.PageTemplateRegistry" : {
+    "superClass" : "com.yahoo.component.provider.ComponentRegistry",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void register(com.yahoo.search.pagetemplates.PageTemplate)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.PageTemplateSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.PageTemplateSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.pagetemplates.PageTemplatesConfig, com.yahoo.component.provider.ComponentRegistry)",
       "public varargs void <init>(com.yahoo.search.pagetemplates.PageTemplateRegistry, com.yahoo.search.pagetemplates.engine.Resolver[])",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.processing.request.CompoundName pagePageTemplateListName",
       "public static final com.yahoo.processing.request.CompoundName pageIdListName",
       "public static final com.yahoo.processing.request.CompoundName pageIdName",
       "public static final com.yahoo.processing.request.CompoundName pageResolverName"
     ]
   },
-  "com.yahoo.search.pagetemplates.PageTemplatesConfig$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.PageTemplatesConfig$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.config.ConfigInstance$Builder"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(com.yahoo.search.pagetemplates.PageTemplatesConfig)",
       "public com.yahoo.search.pagetemplates.PageTemplatesConfig$Builder page(java.lang.String)",
@@ -4652,33 +4652,33 @@
       "public final void setApplyOnRestart(boolean)",
       "public com.yahoo.search.pagetemplates.PageTemplatesConfig build()"
     ],
-    "fields": [
+    "fields" : [
       "public java.util.List page"
     ]
   },
-  "com.yahoo.search.pagetemplates.PageTemplatesConfig$Producer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.PageTemplatesConfig$Producer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.config.ConfigInstance$Producer"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract void getConfig(com.yahoo.search.pagetemplates.PageTemplatesConfig$Builder)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.PageTemplatesConfig": {
-    "superClass": "com.yahoo.config.ConfigInstance",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.PageTemplatesConfig" : {
+    "superClass" : "com.yahoo.config.ConfigInstance",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
@@ -4686,22 +4686,22 @@
       "public java.util.List page()",
       "public java.lang.String page(int)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
-  "com.yahoo.search.pagetemplates.ResolversConfig$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.ResolversConfig$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.config.ConfigInstance$Builder"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(com.yahoo.search.pagetemplates.ResolversConfig)",
       "public com.yahoo.search.pagetemplates.ResolversConfig$Builder component(com.yahoo.search.pagetemplates.ResolversConfig$Component$Builder)",
@@ -4715,19 +4715,19 @@
       "public final void setApplyOnRestart(boolean)",
       "public com.yahoo.search.pagetemplates.ResolversConfig build()"
     ],
-    "fields": [
+    "fields" : [
       "public java.util.List component"
     ]
   },
-  "com.yahoo.search.pagetemplates.ResolversConfig$Component$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.ResolversConfig$Component$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.config.ConfigBuilder"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(com.yahoo.search.pagetemplates.ResolversConfig$Component)",
       "public com.yahoo.search.pagetemplates.ResolversConfig$Component$Builder id(java.lang.String)",
@@ -4736,47 +4736,47 @@
       "public com.yahoo.search.pagetemplates.ResolversConfig$Component$Builder bundle(java.lang.String)",
       "public com.yahoo.search.pagetemplates.ResolversConfig$Component build()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.ResolversConfig$Component": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.ResolversConfig$Component" : {
+    "superClass" : "com.yahoo.config.InnerNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.pagetemplates.ResolversConfig$Component$Builder)",
       "public java.lang.String id()",
       "public java.lang.String configId()",
       "public java.lang.String classId()",
       "public java.lang.String bundle()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.ResolversConfig$Producer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.ResolversConfig$Producer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.config.ConfigInstance$Producer"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract void getConfig(com.yahoo.search.pagetemplates.ResolversConfig$Builder)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.ResolversConfig": {
-    "superClass": "com.yahoo.config.ConfigInstance",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.ResolversConfig" : {
+    "superClass" : "com.yahoo.config.ConfigInstance",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
@@ -4784,58 +4784,58 @@
       "public java.util.List component()",
       "public com.yahoo.search.pagetemplates.ResolversConfig$Component component(int)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
-  "com.yahoo.search.pagetemplates.config.PageTemplateConfigurer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.config.PageTemplateConfigurer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.pagetemplates.PageTemplateRegistry toRegistry(com.yahoo.search.pagetemplates.PageTemplatesConfig)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.config.PageTemplateXMLReader": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.config.PageTemplateXMLReader" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.pagetemplates.PageTemplateRegistry read(java.lang.String)",
       "public com.yahoo.search.pagetemplates.PageTemplate readFile(java.lang.String)",
       "public com.yahoo.search.pagetemplates.PageTemplateRegistry read(java.util.List, boolean)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.engine.Organizer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.engine.Organizer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void organize(com.yahoo.search.pagetemplates.model.Choice, com.yahoo.search.pagetemplates.engine.Resolution, com.yahoo.search.Result)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.engine.Resolution": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.engine.Resolution" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void addChoiceResolution(com.yahoo.search.pagetemplates.model.Choice, int)",
       "public void addMapChoiceResolution(com.yahoo.search.pagetemplates.model.MapChoice, java.util.Map)",
@@ -4843,16 +4843,16 @@
       "public java.util.Map getResolution(com.yahoo.search.pagetemplates.model.MapChoice)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.engine.Resolver": {
-    "superClass": "com.yahoo.component.AbstractComponent",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.engine.Resolver" : {
+    "superClass" : "com.yahoo.component.AbstractComponent",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(com.yahoo.component.ComponentId)",
       "protected void <init>()",
@@ -4860,77 +4860,77 @@
       "public void resolve(com.yahoo.search.pagetemplates.model.Choice, com.yahoo.search.Query, com.yahoo.search.Result, com.yahoo.search.pagetemplates.engine.Resolution)",
       "public void resolve(com.yahoo.search.pagetemplates.model.MapChoice, com.yahoo.search.Query, com.yahoo.search.Result, com.yahoo.search.pagetemplates.engine.Resolution)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver": {
-    "superClass": "com.yahoo.search.pagetemplates.engine.Resolver",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver" : {
+    "superClass" : "com.yahoo.search.pagetemplates.engine.Resolver",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "protected void <init>(java.lang.String)",
       "public void resolve(com.yahoo.search.pagetemplates.model.Choice, com.yahoo.search.Query, com.yahoo.search.Result, com.yahoo.search.pagetemplates.engine.Resolution)",
       "public void resolve(com.yahoo.search.pagetemplates.model.MapChoice, com.yahoo.search.Query, com.yahoo.search.Result, com.yahoo.search.pagetemplates.engine.Resolution)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String nativeId"
     ]
   },
-  "com.yahoo.search.pagetemplates.engine.resolvers.RandomResolver": {
-    "superClass": "com.yahoo.search.pagetemplates.engine.Resolver",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.engine.resolvers.RandomResolver" : {
+    "superClass" : "com.yahoo.search.pagetemplates.engine.Resolver",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "protected void <init>(java.lang.String)",
       "public void resolve(com.yahoo.search.pagetemplates.model.Choice, com.yahoo.search.Query, com.yahoo.search.Result, com.yahoo.search.pagetemplates.engine.Resolution)",
       "public void resolve(com.yahoo.search.pagetemplates.model.MapChoice, com.yahoo.search.Query, com.yahoo.search.Result, com.yahoo.search.pagetemplates.engine.Resolution)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String nativeId"
     ]
   },
-  "com.yahoo.search.pagetemplates.engine.resolvers.ResolverRegistry": {
-    "superClass": "com.yahoo.component.provider.ComponentRegistry",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.engine.resolvers.ResolverRegistry" : {
+    "superClass" : "com.yahoo.component.provider.ComponentRegistry",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.List)",
       "public com.yahoo.search.pagetemplates.engine.Resolver defaultResolver()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.model.AbstractChoice": {
-    "superClass": "com.yahoo.component.provider.FreezableClass",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.model.AbstractChoice" : {
+    "superClass" : "com.yahoo.component.provider.FreezableClass",
+    "interfaces" : [
       "com.yahoo.search.pagetemplates.model.PageElement"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public java.lang.String getMethod()",
       "public void setMethod(java.lang.String)",
       "public abstract boolean isChoiceBetween(java.lang.Class)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.model.Choice": {
-    "superClass": "com.yahoo.search.pagetemplates.model.AbstractChoice",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.model.Choice" : {
+    "superClass" : "com.yahoo.search.pagetemplates.model.AbstractChoice",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.pagetemplates.model.Choice createSingleton(com.yahoo.search.pagetemplates.model.PageElement)",
       "public static com.yahoo.search.pagetemplates.model.Choice createSingletons(java.util.List)",
@@ -4944,15 +4944,15 @@
       "public void accept(com.yahoo.search.pagetemplates.model.PageTemplateVisitor)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.model.Layout": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.model.Layout" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getName()",
       "public int hashCode()",
@@ -4960,18 +4960,18 @@
       "public static com.yahoo.search.pagetemplates.model.Layout fromString(java.lang.String)",
       "public java.lang.String toString()"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.search.pagetemplates.model.Layout column",
       "public static final com.yahoo.search.pagetemplates.model.Layout row"
     ]
   },
-  "com.yahoo.search.pagetemplates.model.MapChoice": {
-    "superClass": "com.yahoo.search.pagetemplates.model.AbstractChoice",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.model.MapChoice" : {
+    "superClass" : "com.yahoo.search.pagetemplates.model.AbstractChoice",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public boolean isChoiceBetween(java.lang.Class)",
       "public java.util.List placeholderIds()",
@@ -4980,30 +4980,30 @@
       "public void accept(com.yahoo.search.pagetemplates.model.PageTemplateVisitor)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.model.PageElement": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.model.PageElement" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.component.provider.Freezable"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract void accept(com.yahoo.search.pagetemplates.model.PageTemplateVisitor)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.model.PageTemplateVisitor": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.model.PageTemplateVisitor" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void visit(com.yahoo.search.pagetemplates.PageTemplate)",
       "public void visit(com.yahoo.search.pagetemplates.model.Source)",
@@ -5013,17 +5013,17 @@
       "public void visit(com.yahoo.search.pagetemplates.model.MapChoice)",
       "public void visit(com.yahoo.search.pagetemplates.model.Placeholder)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.model.Placeholder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.model.Placeholder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.search.pagetemplates.model.PageElement"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getId()",
       "public com.yahoo.search.pagetemplates.model.MapChoice getValueContainer()",
@@ -5033,18 +5033,18 @@
       "public java.lang.String toString()",
       "public boolean isFrozen()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.model.Renderer": {
-    "superClass": "com.yahoo.component.provider.FreezableClass",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.model.Renderer" : {
+    "superClass" : "com.yahoo.component.provider.FreezableClass",
+    "interfaces" : [
       "com.yahoo.search.pagetemplates.model.PageElement"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getName()",
       "public final void setName(java.lang.String)",
@@ -5055,17 +5055,17 @@
       "public void accept(com.yahoo.search.pagetemplates.model.PageTemplateVisitor)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.model.Section": {
-    "superClass": "com.yahoo.component.provider.FreezableClass",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.model.Section" : {
+    "superClass" : "com.yahoo.component.provider.FreezableClass",
+    "interfaces" : [
       "com.yahoo.search.pagetemplates.model.PageElement"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.lang.String)",
       "public java.lang.String getId()",
@@ -5085,17 +5085,17 @@
       "public void accept(com.yahoo.search.pagetemplates.model.PageTemplateVisitor)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.pagetemplates.model.Source": {
-    "superClass": "com.yahoo.component.provider.FreezableClass",
-    "interfaces": [
+  "com.yahoo.search.pagetemplates.model.Source" : {
+    "superClass" : "com.yahoo.component.provider.FreezableClass",
+    "interfaces" : [
       "com.yahoo.search.pagetemplates.model.PageElement"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getName()",
       "public final void setName(java.lang.String)",
@@ -5109,17 +5109,17 @@
       "public boolean equals(java.lang.Object)",
       "public java.lang.String toString()"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.search.pagetemplates.model.Source any"
     ]
   },
-  "com.yahoo.search.pagetemplates.result.PageTemplatesXmlRenderer": {
-    "superClass": "com.yahoo.processing.rendering.AsynchronousSectionedRenderer",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.result.PageTemplatesXmlRenderer" : {
+    "superClass" : "com.yahoo.processing.rendering.AsynchronousSectionedRenderer",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.util.concurrent.Executor)",
       "public void init()",
@@ -5135,18 +5135,18 @@
       "public void endList(com.yahoo.processing.response.DataList)",
       "public void endResponse()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String DEFAULT_MIMETYPE",
       "public static final java.lang.String DEFAULT_ENCODING"
     ]
   },
-  "com.yahoo.search.pagetemplates.result.SectionHitGroup": {
-    "superClass": "com.yahoo.search.result.HitGroup",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.pagetemplates.result.SectionHitGroup" : {
+    "superClass" : "com.yahoo.search.result.HitGroup",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getDisplayId()",
       "public java.util.List sources()",
@@ -5155,17 +5155,17 @@
       "public void setLeaf(boolean)",
       "public void close()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.Model": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.Model" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()",
       "public void <init>(com.yahoo.search.Query)",
       "public com.yahoo.language.Language getParsingLanguage()",
@@ -5210,7 +5210,7 @@
       "public void prepare(com.yahoo.search.query.Ranking)",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String MODEL",
       "public static final java.lang.String PROGRAM",
       "public static final java.lang.String QUERY_STRING",
@@ -5226,27 +5226,27 @@
       "public static final com.yahoo.processing.request.CompoundName ESTIMATE"
     ]
   },
-  "com.yahoo.search.query.ParameterParser": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.ParameterParser" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static java.lang.Long asMilliSeconds(java.lang.Object, java.lang.Long)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.Presentation": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.Presentation" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()",
       "public void <init>(com.yahoo.search.Query)",
       "public com.yahoo.prelude.query.Highlight getHighlight()",
@@ -5271,7 +5271,7 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String PRESENTATION",
       "public static final java.lang.String BOLDING",
       "public static final java.lang.String TIMING",
@@ -5281,14 +5281,14 @@
       "public static final java.lang.String FORMAT"
     ]
   },
-  "com.yahoo.search.query.Properties": {
-    "superClass": "com.yahoo.processing.request.Properties",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.Properties" : {
+    "superClass" : "com.yahoo.processing.request.Properties",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.query.Properties chained()",
       "public com.yahoo.search.query.Properties clone()",
@@ -5299,15 +5299,15 @@
       "public bridge synthetic com.yahoo.processing.request.Properties chained()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.QueryTree": {
-    "superClass": "com.yahoo.prelude.query.CompositeItem",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.QueryTree" : {
+    "superClass" : "com.yahoo.prelude.query.CompositeItem",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.prelude.query.Item)",
       "public void setIndexName(java.lang.String)",
       "public com.yahoo.prelude.query.Item$ItemType getItemType()",
@@ -5329,17 +5329,17 @@
       "public bridge synthetic com.yahoo.prelude.query.Item clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.Ranking": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.Ranking" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()",
       "public void <init>(com.yahoo.search.Query)",
       "public boolean hasRankProfile()",
@@ -5374,7 +5374,7 @@
       "public int hashCode()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.processing.request.CompoundName RANKFEATURES",
       "public static final java.lang.String RANKING",
       "public static final java.lang.String LOCATION",
@@ -5392,15 +5392,15 @@
       "public static final java.lang.String PROPERTIES"
     ]
   },
-  "com.yahoo.search.query.Select": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.Select" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()",
       "public void <init>(com.yahoo.search.Query)",
       "public void <init>(java.lang.String, java.lang.String, com.yahoo.search.Query)",
@@ -5415,51 +5415,51 @@
       "public java.lang.Object clone()",
       "public com.yahoo.search.query.Select cloneFor(com.yahoo.search.Query)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String SELECT",
       "public static final java.lang.String WHERE",
       "public static final java.lang.String GROUPING"
     ]
   },
-  "com.yahoo.search.query.SelectParser": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.SelectParser" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.search.query.parser.Parser"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.parser.ParserEnvironment)",
       "public com.yahoo.search.query.QueryTree parse(com.yahoo.search.query.parser.Parsable)",
       "public java.util.List getGroupingSteps(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.SessionId": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.SessionId" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.UniqueRequestId, java.lang.String)",
       "public java.lang.String toString()",
       "public com.yahoo.text.Utf8String asUtf8String()",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.Sorting$AttributeSorter": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.Sorting$AttributeSorter" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getName()",
       "public void setName(java.lang.String)",
@@ -5471,17 +5471,17 @@
       "public int compare(java.lang.Comparable, java.lang.Comparable)",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.Sorting$FieldOrder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.Sorting$FieldOrder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.Sorting$AttributeSorter, com.yahoo.search.query.Sorting$Order)",
       "public java.lang.String getFieldName()",
       "public com.yahoo.search.query.Sorting$AttributeSorter getSorter()",
@@ -5494,66 +5494,66 @@
       "public com.yahoo.search.query.Sorting$FieldOrder clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.Sorting$LowerCaseSorter": {
-    "superClass": "com.yahoo.search.query.Sorting$AttributeSorter",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.Sorting$LowerCaseSorter" : {
+    "superClass" : "com.yahoo.search.query.Sorting$AttributeSorter",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String toSerialForm()",
       "public int hashCode()",
       "public boolean equals(java.lang.Object)",
       "public int compare(java.lang.Comparable, java.lang.Comparable)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.Sorting$Order": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.Sorting$Order" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.Sorting$Order[] values()",
       "public static com.yahoo.search.query.Sorting$Order valueOf(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.search.query.Sorting$Order ASCENDING",
       "public static final enum com.yahoo.search.query.Sorting$Order DESCENDING",
       "public static final enum com.yahoo.search.query.Sorting$Order UNDEFINED"
     ]
   },
-  "com.yahoo.search.query.Sorting$RawSorter": {
-    "superClass": "com.yahoo.search.query.Sorting$AttributeSorter",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.Sorting$RawSorter" : {
+    "superClass" : "com.yahoo.search.query.Sorting$AttributeSorter",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public boolean equals(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.Sorting$UcaSorter$Strength": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.Sorting$UcaSorter$Strength" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.Sorting$UcaSorter$Strength[] values()",
       "public static com.yahoo.search.query.Sorting$UcaSorter$Strength valueOf(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.search.query.Sorting$UcaSorter$Strength PRIMARY",
       "public static final enum com.yahoo.search.query.Sorting$UcaSorter$Strength SECONDARY",
       "public static final enum com.yahoo.search.query.Sorting$UcaSorter$Strength TERTIARY",
@@ -5562,13 +5562,13 @@
       "public static final enum com.yahoo.search.query.Sorting$UcaSorter$Strength UNDEFINED"
     ]
   },
-  "com.yahoo.search.query.Sorting$UcaSorter": {
-    "superClass": "com.yahoo.search.query.Sorting$AttributeSorter",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.Sorting$UcaSorter" : {
+    "superClass" : "com.yahoo.search.query.Sorting$AttributeSorter",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, java.lang.String, com.yahoo.search.query.Sorting$UcaSorter$Strength)",
       "public void <init>(java.lang.String)",
       "public void setLocale(java.lang.String, com.yahoo.search.query.Sorting$UcaSorter$Strength)",
@@ -5583,17 +5583,17 @@
       "public bridge synthetic com.yahoo.search.query.Sorting$AttributeSorter clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.Sorting": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.Sorting" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.util.List)",
       "public void <init>(java.lang.String)",
@@ -5607,7 +5607,7 @@
       "public int encode(java.nio.ByteBuffer)",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String STRENGTH_IDENTICAL",
       "public static final java.lang.String STRENGTH_QUATERNARY",
       "public static final java.lang.String STRENGTH_TERTIARY",
@@ -5618,15 +5618,15 @@
       "public static final java.lang.String LOWERCASE"
     ]
   },
-  "com.yahoo.search.query.Trace": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.Trace" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()",
       "public void <init>(com.yahoo.search.Query)",
       "public int getLevel()",
@@ -5652,7 +5652,7 @@
       "public java.lang.String toString()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String TRACE",
       "public static final java.lang.String LEVEL",
       "public static final java.lang.String EXPLAIN_LEVEL",
@@ -5661,27 +5661,27 @@
       "public static final java.lang.String QUERY"
     ]
   },
-  "com.yahoo.search.query.UniqueRequestId": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.UniqueRequestId" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public java.lang.String toString()",
       "public static com.yahoo.search.query.UniqueRequestId next(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.context.QueryContext": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.context.QueryContext" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(int, com.yahoo.search.Query)",
       "public void trace(java.lang.String, int)",
       "public void trace(java.lang.Object, int)",
@@ -5696,18 +5696,18 @@
       "public com.yahoo.search.query.context.QueryContext clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String ID"
     ]
   },
-  "com.yahoo.search.query.parser.Parsable": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.parser.Parsable" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public java.lang.String getQuery()",
       "public com.yahoo.search.query.parser.Parsable setQuery(java.lang.String)",
@@ -5731,29 +5731,29 @@
       "public com.yahoo.search.query.Select getSelect()",
       "public static com.yahoo.search.query.parser.Parsable fromQueryModel(com.yahoo.search.query.Model)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.parser.Parser": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.parser.Parser" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract com.yahoo.search.query.QueryTree parse(com.yahoo.search.query.parser.Parsable)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.parser.ParserEnvironment": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.parser.ParserEnvironment" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.prelude.IndexFacts getIndexFacts()",
       "public com.yahoo.search.query.parser.ParserEnvironment setIndexFacts(com.yahoo.prelude.IndexFacts)",
@@ -5764,29 +5764,29 @@
       "public static com.yahoo.search.query.parser.ParserEnvironment fromExecutionContext(com.yahoo.search.searchchain.Execution$Context)",
       "public static com.yahoo.search.query.parser.ParserEnvironment fromParserEnvironment(com.yahoo.search.query.parser.ParserEnvironment)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.parser.ParserFactory": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.parser.ParserFactory" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.parser.Parser newInstance(com.yahoo.search.Query$Type, com.yahoo.search.query.parser.ParserEnvironment)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.BackedOverridableQueryProfile": {
-    "superClass": "com.yahoo.search.query.profile.OverridableQueryProfile",
-    "interfaces": [
+  "com.yahoo.search.query.profile.BackedOverridableQueryProfile" : {
+    "superClass" : "com.yahoo.search.query.profile.OverridableQueryProfile",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.profile.QueryProfile)",
       "public java.lang.String getSource()",
       "public synchronized void freeze()",
@@ -5809,30 +5809,30 @@
       "public bridge synthetic com.yahoo.component.AbstractComponent clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.CompoundNameChildCache": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.CompoundNameChildCache" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.processing.request.CompoundName append(com.yahoo.processing.request.CompoundName, java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.CopyOnWriteContent": {
-    "superClass": "com.yahoo.component.provider.FreezableClass",
-    "interfaces": [
+  "com.yahoo.search.query.profile.CopyOnWriteContent" : {
+    "superClass" : "com.yahoo.component.provider.FreezableClass",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void freeze()",
       "public com.yahoo.search.query.profile.CopyOnWriteContent clone()",
@@ -5843,15 +5843,15 @@
       "public bridge synthetic com.yahoo.component.provider.FreezableClass clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.DimensionBinding": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.DimensionBinding" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.profile.DimensionBinding createFrom(java.util.Map)",
       "public static com.yahoo.search.query.profile.DimensionBinding createFrom(java.util.List, java.util.Map)",
       "public static com.yahoo.search.query.profile.DimensionBinding createFrom(java.util.List, com.yahoo.search.query.profile.DimensionValues)",
@@ -5866,20 +5866,20 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.search.query.profile.DimensionBinding nullBinding",
       "public static final com.yahoo.search.query.profile.DimensionBinding invalidBinding"
     ]
   },
-  "com.yahoo.search.query.profile.DimensionValues": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.profile.DimensionValues" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Comparable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.profile.DimensionValues createFrom(java.lang.String[])",
       "public boolean matches(com.yahoo.search.query.profile.DimensionValues)",
       "public int compareTo(com.yahoo.search.query.profile.DimensionValues)",
@@ -5894,42 +5894,42 @@
       "public java.lang.String[] getValues()",
       "public bridge synthetic int compareTo(java.lang.Object)"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.search.query.profile.DimensionValues empty"
     ]
   },
-  "com.yahoo.search.query.profile.DumpTool": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.DumpTool" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public varargs java.lang.String resolveAndDump(java.lang.String[])",
       "public static varargs void main(java.lang.String[])"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.ModelObjectMap": {
-    "superClass": "com.yahoo.search.query.properties.PropertyMap",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.ModelObjectMap" : {
+    "superClass" : "com.yahoo.search.query.properties.PropertyMap",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "protected boolean shouldSet(com.yahoo.processing.request.CompoundName, java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.OverridableQueryProfile": {
-    "superClass": "com.yahoo.search.query.profile.QueryProfile",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.OverridableQueryProfile" : {
+    "superClass" : "com.yahoo.search.query.profile.QueryProfile",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(com.yahoo.search.query.profile.QueryProfileRegistry)",
       "protected void <init>(java.lang.String, com.yahoo.search.query.profile.QueryProfileRegistry)",
       "protected java.lang.Object checkAndConvertAssignment(java.lang.String, java.lang.Object, com.yahoo.search.query.profile.QueryProfileRegistry)",
@@ -5941,17 +5941,17 @@
       "public bridge synthetic com.yahoo.component.AbstractComponent clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.QueryProfile": {
-    "superClass": "com.yahoo.component.provider.FreezableSimpleComponent",
-    "interfaces": [
+  "com.yahoo.search.query.profile.QueryProfile" : {
+    "superClass" : "com.yahoo.component.provider.FreezableSimpleComponent",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.ComponentId)",
       "public void <init>(java.lang.String)",
       "public void <init>(com.yahoo.component.ComponentId, java.lang.String)",
@@ -6013,30 +6013,30 @@
       "public bridge synthetic com.yahoo.component.AbstractComponent clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public final com.yahoo.search.query.profile.QueryProfileRegistry owner"
     ]
   },
-  "com.yahoo.search.query.profile.QueryProfileCompiler": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.QueryProfileCompiler" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry compile(com.yahoo.search.query.profile.QueryProfileRegistry)",
       "public static com.yahoo.search.query.profile.compiled.CompiledQueryProfile compile(com.yahoo.search.query.profile.QueryProfile, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.QueryProfileProperties": {
-    "superClass": "com.yahoo.search.query.Properties",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.QueryProfileProperties" : {
+    "superClass" : "com.yahoo.search.query.Properties",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.profile.compiled.CompiledQueryProfile)",
       "public void <init>(com.yahoo.search.query.profile.compiled.CompiledQueryProfile, com.yahoo.language.process.Embedder)",
       "public void <init>(com.yahoo.search.query.profile.compiled.CompiledQueryProfile, java.util.Map)",
@@ -6053,15 +6053,15 @@
       "public bridge synthetic com.yahoo.processing.request.Properties clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.QueryProfileRegistry": {
-    "superClass": "com.yahoo.component.provider.ComponentRegistry",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.QueryProfileRegistry" : {
+    "superClass" : "com.yahoo.component.provider.ComponentRegistry",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void register(com.yahoo.search.query.profile.QueryProfile)",
       "public com.yahoo.search.query.profile.types.QueryProfileType getType(java.lang.String)",
@@ -6071,18 +6071,18 @@
       "public com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry compile()",
       "public com.yahoo.component.ComponentId createAnonymousId(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.QueryProfileVariant": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.profile.QueryProfileVariant" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable",
       "java.lang.Comparable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.profile.DimensionValues, com.yahoo.search.query.profile.QueryProfile)",
       "public com.yahoo.search.query.profile.DimensionValues getDimensionValues()",
       "public java.util.Map values()",
@@ -6100,18 +6100,18 @@
       "public bridge synthetic java.lang.Object clone()",
       "public bridge synthetic int compareTo(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.QueryProfileVariants$FieldValue": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.profile.QueryProfileVariants$FieldValue" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Comparable",
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.profile.DimensionValues, java.lang.Object)",
       "public com.yahoo.search.query.profile.DimensionValues getDimensionValues()",
       "public java.lang.Object getValue()",
@@ -6124,18 +6124,18 @@
       "public bridge synthetic java.lang.Object clone()",
       "public bridge synthetic int compareTo(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.QueryProfileVariants$FieldValues": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.profile.QueryProfileVariants$FieldValues" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.component.provider.Freezable",
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void freeze()",
       "public boolean isFrozen()",
@@ -6150,18 +6150,18 @@
       "public com.yahoo.search.query.profile.QueryProfileVariants$FieldValues clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.QueryProfileVariants": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.profile.QueryProfileVariants" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.component.provider.Freezable",
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String[], com.yahoo.search.query.profile.QueryProfile)",
       "public void <init>(java.util.List, com.yahoo.search.query.profile.QueryProfile)",
       "public void freeze()",
@@ -6181,71 +6181,71 @@
       "public java.lang.String toString()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.SubstituteString$Component": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.SubstituteString$Component" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "protected abstract java.lang.String getValue(java.util.Map, com.yahoo.processing.request.Properties)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.SubstituteString$PropertyComponent": {
-    "superClass": "com.yahoo.search.query.profile.SubstituteString$Component",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.SubstituteString$PropertyComponent" : {
+    "superClass" : "com.yahoo.search.query.profile.SubstituteString$Component",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getValue(java.util.Map, com.yahoo.processing.request.Properties)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.SubstituteString$RelativePropertyComponent": {
-    "superClass": "com.yahoo.search.query.profile.SubstituteString$Component",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.SubstituteString$RelativePropertyComponent" : {
+    "superClass" : "com.yahoo.search.query.profile.SubstituteString$Component",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getValue(java.util.Map, com.yahoo.processing.request.Properties)",
       "public java.lang.String fieldName()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.SubstituteString$StringComponent": {
-    "superClass": "com.yahoo.search.query.profile.SubstituteString$Component",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.SubstituteString$StringComponent" : {
+    "superClass" : "com.yahoo.search.query.profile.SubstituteString$Component",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getValue(java.util.Map, com.yahoo.processing.request.Properties)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.SubstituteString": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.SubstituteString" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.profile.SubstituteString create(java.lang.String)",
       "public void <init>(java.util.List, java.lang.String)",
       "public boolean hasRelative()",
@@ -6256,17 +6256,17 @@
       "public boolean equals(java.lang.Object)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.compiled.Binding": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.profile.compiled.Binding" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Comparable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.profile.compiled.Binding createFrom(com.yahoo.search.query.profile.DimensionBinding)",
       "public boolean generalizes(com.yahoo.search.query.profile.compiled.Binding)",
       "public boolean isNull()",
@@ -6277,19 +6277,19 @@
       "public int compareTo(com.yahoo.search.query.profile.compiled.Binding)",
       "public bridge synthetic int compareTo(java.lang.Object)"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.search.query.profile.compiled.Binding nullBinding"
     ]
   },
-  "com.yahoo.search.query.profile.compiled.CompiledQueryProfile": {
-    "superClass": "com.yahoo.component.AbstractComponent",
-    "interfaces": [
+  "com.yahoo.search.query.profile.compiled.CompiledQueryProfile" : {
+    "superClass" : "com.yahoo.component.AbstractComponent",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.ComponentId, com.yahoo.search.query.profile.types.QueryProfileType, com.yahoo.search.query.profile.compiled.DimensionalMap, com.yahoo.search.query.profile.compiled.DimensionalMap, com.yahoo.search.query.profile.compiled.DimensionalMap, com.yahoo.search.query.profile.compiled.DimensionalMap, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry)",
       "public com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry getRegistry()",
       "public com.yahoo.search.query.profile.types.QueryProfileType getType()",
@@ -6313,15 +6313,15 @@
       "public bridge synthetic com.yahoo.component.AbstractComponent clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry": {
-    "superClass": "com.yahoo.component.provider.ComponentRegistry",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry" : {
+    "superClass" : "com.yahoo.component.provider.ComponentRegistry",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.profile.config.QueryProfilesConfig, java.util.concurrent.Executor)",
       "public void <init>()",
       "public void <init>(com.yahoo.search.query.profile.types.QueryProfileTypeRegistry)",
@@ -6330,70 +6330,70 @@
       "public com.yahoo.search.query.profile.compiled.CompiledQueryProfile findQueryProfile(java.lang.String)",
       "public static com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry fromConfig(com.yahoo.search.query.profile.config.QueryProfilesConfig)"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry empty"
     ]
   },
-  "com.yahoo.search.query.profile.compiled.DimensionalMap$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.compiled.DimensionalMap$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void put(com.yahoo.processing.request.CompoundName, com.yahoo.search.query.profile.compiled.Binding, java.lang.Object)",
       "public com.yahoo.search.query.profile.compiled.DimensionalMap build()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.compiled.DimensionalMap": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.compiled.DimensionalMap" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map)",
       "public java.util.Set entrySet()",
       "public boolean isEmpty()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.compiled.DimensionalValue$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.compiled.DimensionalValue$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public java.lang.Object valueFor(com.yahoo.search.query.profile.compiled.Binding)",
       "public void add(java.lang.Object, com.yahoo.search.query.profile.compiled.Binding)",
       "public com.yahoo.search.query.profile.compiled.DimensionalValue build(java.util.Map)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.compiled.DimensionalValue": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.compiled.DimensionalValue" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public java.lang.Object get(java.util.Map)",
       "public boolean isEmpty()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.compiled.ValueWithSource": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.compiled.ValueWithSource" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.Object, java.lang.String, boolean, boolean, com.yahoo.search.query.profile.types.QueryProfileType, com.yahoo.search.query.profile.DimensionValues)",
       "public java.lang.Object value()",
       "public java.lang.String source()",
@@ -6408,31 +6408,31 @@
       "public boolean equals(java.lang.Object)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.types.ConversionContext": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.types.ConversionContext" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, com.yahoo.language.process.Embedder, java.util.Map)",
       "public void <init>(java.lang.String, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, java.util.Map, java.util.Map)",
       "public java.lang.String destination()",
       "public static com.yahoo.search.query.profile.types.ConversionContext empty()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.types.FieldDescription": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.profile.types.FieldDescription" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Comparable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, com.yahoo.search.query.profile.types.FieldType)",
       "public void <init>(java.lang.String, java.lang.String)",
       "public void <init>(java.lang.String, com.yahoo.search.query.profile.types.FieldType, boolean)",
@@ -6455,16 +6455,16 @@
       "public java.lang.String toString()",
       "public bridge synthetic int compareTo(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.types.FieldType": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.types.FieldType" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public abstract java.lang.Class getValueClass()",
       "public abstract java.lang.String stringValue()",
@@ -6476,7 +6476,7 @@
       "public static com.yahoo.search.query.profile.types.FieldType fromString(java.lang.String, com.yahoo.search.query.profile.types.QueryProfileTypeRegistry)",
       "public static boolean isLegalFieldValue(java.lang.Object)"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.search.query.profile.types.PrimitiveFieldType stringType",
       "public static final com.yahoo.search.query.profile.types.PrimitiveFieldType integerType",
       "public static final com.yahoo.search.query.profile.types.PrimitiveFieldType longType",
@@ -6487,13 +6487,13 @@
       "public static final com.yahoo.search.query.profile.types.QueryProfileFieldType genericQueryProfileType"
     ]
   },
-  "com.yahoo.search.query.profile.types.PrimitiveFieldType": {
-    "superClass": "com.yahoo.search.query.profile.types.FieldType",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.types.PrimitiveFieldType" : {
+    "superClass" : "com.yahoo.search.query.profile.types.FieldType",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public java.lang.Class getValueClass()",
       "public java.lang.String stringValue()",
       "public java.lang.String toString()",
@@ -6503,15 +6503,15 @@
       "public int hashCode()",
       "public boolean equals(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.types.QueryFieldType": {
-    "superClass": "com.yahoo.search.query.profile.types.FieldType",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.types.QueryFieldType" : {
+    "superClass" : "com.yahoo.search.query.profile.types.FieldType",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public java.lang.Class getValueClass()",
       "public java.lang.String stringValue()",
@@ -6520,15 +6520,15 @@
       "public java.lang.Object convertFrom(java.lang.Object, com.yahoo.search.query.profile.QueryProfileRegistry)",
       "public java.lang.Object convertFrom(java.lang.Object, com.yahoo.search.query.profile.types.ConversionContext)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.types.QueryProfileFieldType": {
-    "superClass": "com.yahoo.search.query.profile.types.FieldType",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.types.QueryProfileFieldType" : {
+    "superClass" : "com.yahoo.search.query.profile.types.FieldType",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.profile.types.QueryProfileFieldType fromString(java.lang.String, com.yahoo.search.query.profile.types.QueryProfileTypeRegistry)",
       "public void <init>()",
       "public void <init>(com.yahoo.search.query.profile.types.QueryProfileType)",
@@ -6544,15 +6544,15 @@
       "public bridge synthetic java.lang.Object convertFrom(java.lang.Object, com.yahoo.search.query.profile.types.ConversionContext)",
       "public bridge synthetic java.lang.Object convertFrom(java.lang.Object, com.yahoo.search.query.profile.QueryProfileRegistry)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.types.QueryProfileType": {
-    "superClass": "com.yahoo.component.provider.FreezableSimpleComponent",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.types.QueryProfileType" : {
+    "superClass" : "com.yahoo.component.provider.FreezableSimpleComponent",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(com.yahoo.component.ComponentId)",
       "public com.yahoo.search.query.profile.types.QueryProfileType unfrozen()",
@@ -6584,15 +6584,15 @@
       "public boolean equals(java.lang.Object)",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.types.QueryProfileTypeRegistry": {
-    "superClass": "com.yahoo.component.provider.ComponentRegistry",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.types.QueryProfileTypeRegistry" : {
+    "superClass" : "com.yahoo.component.provider.ComponentRegistry",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void register(com.yahoo.search.query.profile.types.QueryProfileType)",
       "public boolean hasApplicationTypes()",
@@ -6600,15 +6600,15 @@
       "public static com.yahoo.search.query.profile.types.QueryProfileTypeRegistry emptyFrozen()",
       "public com.yahoo.component.ComponentId createAnonymousId(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.profile.types.TensorFieldType": {
-    "superClass": "com.yahoo.search.query.profile.types.FieldType",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.profile.types.TensorFieldType" : {
+    "superClass" : "com.yahoo.search.query.profile.types.FieldType",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.tensor.TensorType)",
       "public com.yahoo.tensor.TensorType asTensorType()",
       "public java.lang.Class getValueClass()",
@@ -6619,61 +6619,61 @@
       "public java.lang.Object convertFrom(java.lang.Object, com.yahoo.search.query.profile.types.ConversionContext)",
       "public static com.yahoo.search.query.profile.types.TensorFieldType fromTypeString(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.properties.CloneHelper": {
-    "superClass": "com.yahoo.processing.request.CloneHelper",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.properties.CloneHelper" : {
+    "superClass" : "com.yahoo.processing.request.CloneHelper",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "protected java.lang.Object objectClone(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.properties.DefaultProperties": {
-    "superClass": "com.yahoo.search.query.Properties",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.properties.DefaultProperties" : {
+    "superClass" : "com.yahoo.search.query.Properties",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
       "public static void requireNotPresentIn(java.util.Map)"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.processing.request.CompoundName MAX_OFFSET",
       "public static final com.yahoo.processing.request.CompoundName MAX_HITS",
       "public static final com.yahoo.processing.request.CompoundName MAX_QUERY_ITEMS",
       "public static final com.yahoo.search.query.profile.types.QueryProfileType argumentType"
     ]
   },
-  "com.yahoo.search.query.properties.PropertyAliases": {
-    "superClass": "com.yahoo.search.query.Properties",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.properties.PropertyAliases" : {
+    "superClass" : "com.yahoo.search.query.Properties",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.Map)",
       "protected com.yahoo.processing.request.CompoundName unalias(com.yahoo.processing.request.CompoundName)",
       "public java.util.Map listProperties(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
       "public java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
       "public void set(com.yahoo.processing.request.CompoundName, java.lang.Object, java.util.Map)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.properties.PropertyMap": {
-    "superClass": "com.yahoo.search.query.Properties",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.properties.PropertyMap" : {
+    "superClass" : "com.yahoo.search.query.Properties",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void set(com.yahoo.processing.request.CompoundName, java.lang.Object, java.util.Map)",
       "protected boolean shouldSet(com.yahoo.processing.request.CompoundName, java.lang.Object)",
@@ -6686,15 +6686,15 @@
       "public bridge synthetic com.yahoo.processing.request.Properties clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.properties.QueryProperties": {
-    "superClass": "com.yahoo.search.query.Properties",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.properties.QueryProperties" : {
+    "superClass" : "com.yahoo.search.query.Properties",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.Query, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, java.util.Map)",
       "public void setParentQuery(com.yahoo.search.Query)",
       "public java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
@@ -6702,54 +6702,54 @@
       "public java.util.Map listProperties(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
       "public final com.yahoo.search.Query getParentQuery()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.properties.QueryPropertyAliases": {
-    "superClass": "com.yahoo.search.query.properties.PropertyAliases",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.properties.QueryPropertyAliases" : {
+    "superClass" : "com.yahoo.search.query.properties.PropertyAliases",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.Map)",
       "protected com.yahoo.processing.request.CompoundName unalias(com.yahoo.processing.request.CompoundName)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.properties.RankProfileInputProperties": {
-    "superClass": "com.yahoo.search.query.Properties",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.properties.RankProfileInputProperties" : {
+    "superClass" : "com.yahoo.search.query.Properties",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.schema.SchemaInfo, com.yahoo.search.Query, java.util.Map)",
       "public void set(com.yahoo.processing.request.CompoundName, java.lang.Object, java.util.Map)",
       "public void requireSettable(com.yahoo.processing.request.CompoundName, java.lang.Object, java.util.Map)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.properties.RequestContextProperties": {
-    "superClass": "com.yahoo.search.query.Properties",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.properties.RequestContextProperties" : {
+    "superClass" : "com.yahoo.search.query.Properties",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.Map)",
       "public java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
       "public void set(com.yahoo.processing.request.CompoundName, java.lang.Object, java.util.Map)",
       "public java.util.Map listProperties(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.properties.SubProperties": {
-    "superClass": "com.yahoo.search.query.Properties",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.properties.SubProperties" : {
+    "superClass" : "com.yahoo.search.query.Properties",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, com.yahoo.processing.request.Properties)",
       "public void <init>(com.yahoo.processing.request.CompoundName, com.yahoo.processing.request.Properties)",
       "public java.lang.Object get(com.yahoo.processing.request.CompoundName, java.util.Map, com.yahoo.processing.request.Properties)",
@@ -6758,34 +6758,34 @@
       "public com.yahoo.processing.request.CompoundName getPathPrefixCompound()",
       "public java.lang.String getPathPrefix()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.ranking.Diversity$CutoffStrategy": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.ranking.Diversity$CutoffStrategy" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.query.ranking.Diversity$CutoffStrategy[] values()",
       "public static com.yahoo.search.query.ranking.Diversity$CutoffStrategy valueOf(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.search.query.ranking.Diversity$CutoffStrategy loose",
       "public static final enum com.yahoo.search.query.ranking.Diversity$CutoffStrategy strict"
     ]
   },
-  "com.yahoo.search.query.ranking.Diversity": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.ranking.Diversity" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()",
       "public void setAttribute(java.lang.String)",
@@ -6802,7 +6802,7 @@
       "public boolean equals(java.lang.Object)",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String ATTRIBUTE",
       "public static final java.lang.String MINGROUPS",
       "public static final java.lang.String CUTOFF",
@@ -6810,15 +6810,15 @@
       "public static final java.lang.String STRATEGY"
     ]
   },
-  "com.yahoo.search.query.ranking.MatchPhase": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.ranking.MatchPhase" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()",
       "public void setAttribute(java.lang.String)",
@@ -6837,22 +6837,22 @@
       "public com.yahoo.search.query.ranking.MatchPhase clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String ATTRIBUTE",
       "public static final java.lang.String ASCENDING",
       "public static final java.lang.String MAX_HITS",
       "public static final java.lang.String MAX_FILTER_COVERAGE"
     ]
   },
-  "com.yahoo.search.query.ranking.Matching": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.ranking.Matching" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()",
       "public java.lang.Double getTermwiseLimit()",
@@ -6873,7 +6873,7 @@
       "public int hashCode()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String TERMWISELIMIT",
       "public static final java.lang.String NUMTHREADSPERSEARCH",
       "public static final java.lang.String NUMSEARCHPARTITIIONS",
@@ -6883,15 +6883,15 @@
       "public java.lang.Double termwiseLimit"
     ]
   },
-  "com.yahoo.search.query.ranking.RankFeatures": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.ranking.RankFeatures" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.Ranking)",
       "public void put(java.lang.String, double)",
       "public void put(java.lang.String, com.yahoo.tensor.Tensor)",
@@ -6912,17 +6912,17 @@
       "public static boolean isFeatureName(java.lang.String)",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.ranking.RankProperties": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.ranking.RankProperties" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void put(java.lang.String, java.lang.String)",
       "public void put(java.lang.String, java.lang.Object)",
@@ -6937,17 +6937,17 @@
       "public java.lang.String toString()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.ranking.SoftTimeout": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.ranking.SoftTimeout" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()",
       "public void setEnable(boolean)",
@@ -6962,21 +6962,21 @@
       "public boolean equals(java.lang.Object)",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String ENABLE",
       "public static final java.lang.String FACTOR",
       "public static final java.lang.String TAILCOST",
       "public static final com.yahoo.processing.request.CompoundName enableProperty"
     ]
   },
-  "com.yahoo.search.query.rewrite.QueryRewriteSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.rewrite.QueryRewriteSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(com.yahoo.component.ComponentId, com.yahoo.filedistribution.fileacquirer.FileAcquirer, com.yahoo.search.query.rewrite.RewritesConfig)",
       "protected void <init>(com.yahoo.search.query.rewrite.RewritesConfig, java.util.HashMap)",
       "protected void <init>(com.yahoo.component.ComponentId)",
@@ -6990,21 +6990,21 @@
       "protected java.lang.String getQPConfig(com.yahoo.search.Query, java.lang.String)",
       "protected java.lang.String getRewriteFromFSA(com.yahoo.search.Query, java.lang.String, java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "protected final java.util.logging.Logger logger",
       "protected java.util.HashMap rewriterDicts"
     ]
   },
-  "com.yahoo.search.query.rewrite.RewriterConstants": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.rewrite.RewriterConstants" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String ORIGINAL_AS_UNIT",
       "public static final java.lang.String ORIGINAL_AS_UNIT_EQUIV",
       "public static final java.lang.String REWRITES_AS_EQUIV",
@@ -7021,13 +7021,13 @@
       "public static final java.lang.String DEFAULT_DICT_DIR"
     ]
   },
-  "com.yahoo.search.query.rewrite.RewriterFeatures": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.rewrite.RewriterFeatures" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.Query addUnitToOriginalQuery(com.yahoo.search.Query, java.lang.String, boolean)",
       "public static com.yahoo.search.Query addRewritesAsEquiv(com.yahoo.search.Query, java.lang.String, java.lang.String, boolean, int)",
@@ -7037,15 +7037,15 @@
       "public static com.yahoo.search.Query addExpansions(com.yahoo.search.Query, java.util.Set, java.lang.String, int, boolean, boolean)",
       "public static java.lang.String convertMatchToString(com.yahoo.prelude.querytransform.PhraseMatcher$Phrase)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.rewrite.RewriterUtils": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.rewrite.RewriterUtils" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.fsa.FSA loadFSA(java.io.File, com.yahoo.search.Query)",
       "public static com.yahoo.fsa.FSA loadFSA(java.lang.String, com.yahoo.search.Query)",
@@ -7062,17 +7062,17 @@
       "public static void error(java.util.logging.Logger, java.lang.String)",
       "public static void error(java.util.logging.Logger, com.yahoo.search.Query, java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.rewrite.RewritesConfig$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.rewrite.RewritesConfig$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.config.ConfigInstance$Builder"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(com.yahoo.search.query.rewrite.RewritesConfig)",
       "public com.yahoo.search.query.rewrite.RewritesConfig$Builder fsaDict(com.yahoo.search.query.rewrite.RewritesConfig$FsaDict$Builder)",
@@ -7086,64 +7086,64 @@
       "public final void setApplyOnRestart(boolean)",
       "public com.yahoo.search.query.rewrite.RewritesConfig build()"
     ],
-    "fields": [
+    "fields" : [
       "public java.util.List fsaDict"
     ]
   },
-  "com.yahoo.search.query.rewrite.RewritesConfig$FsaDict$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.rewrite.RewritesConfig$FsaDict$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.config.ConfigBuilder"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(com.yahoo.search.query.rewrite.RewritesConfig$FsaDict)",
       "public com.yahoo.search.query.rewrite.RewritesConfig$FsaDict$Builder name(java.lang.String)",
       "public com.yahoo.search.query.rewrite.RewritesConfig$FsaDict$Builder path(java.lang.String)",
       "public com.yahoo.search.query.rewrite.RewritesConfig$FsaDict build()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.rewrite.RewritesConfig$FsaDict": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.rewrite.RewritesConfig$FsaDict" : {
+    "superClass" : "com.yahoo.config.InnerNode",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.rewrite.RewritesConfig$FsaDict$Builder)",
       "public java.lang.String name()",
       "public com.yahoo.config.FileReference path()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.rewrite.RewritesConfig$Producer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.query.rewrite.RewritesConfig$Producer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.config.ConfigInstance$Producer"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract void getConfig(com.yahoo.search.query.rewrite.RewritesConfig$Builder)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.query.rewrite.RewritesConfig": {
-    "superClass": "com.yahoo.config.ConfigInstance",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.rewrite.RewritesConfig" : {
+    "superClass" : "com.yahoo.config.ConfigInstance",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
@@ -7151,35 +7151,35 @@
       "public java.util.List fsaDict()",
       "public com.yahoo.search.query.rewrite.RewritesConfig$FsaDict fsaDict(int)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
-  "com.yahoo.search.query.rewrite.SearchChainDispatcherSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.rewrite.SearchChainDispatcherSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.ComponentId)",
       "public void <init>()",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": [
+    "fields" : [
       "protected final java.util.logging.Logger logger"
     ]
   },
-  "com.yahoo.search.query.rewrite.rewriters.GenericExpansionRewriter": {
-    "superClass": "com.yahoo.search.query.rewrite.QueryRewriteSearcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.rewrite.rewriters.GenericExpansionRewriter" : {
+    "superClass" : "com.yahoo.search.query.rewrite.QueryRewriteSearcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.ComponentId, com.yahoo.filedistribution.fileacquirer.FileAcquirer, com.yahoo.search.query.rewrite.RewritesConfig)",
       "public void <init>(com.yahoo.search.query.rewrite.RewritesConfig, java.util.HashMap)",
       "public boolean configure(com.yahoo.filedistribution.fileacquirer.FileAcquirer, com.yahoo.search.query.rewrite.RewritesConfig, java.util.HashMap)",
@@ -7188,19 +7188,19 @@
       "public java.lang.String getRewriterName()",
       "public java.util.HashMap getDefaultFSAs()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String REWRITER_NAME",
       "public static final java.lang.String GENERIC_EXPAND_DICT",
       "public static final java.lang.String GENERIC_EXPAND_DICT_FILENAME"
     ]
   },
-  "com.yahoo.search.query.rewrite.rewriters.MisspellRewriter": {
-    "superClass": "com.yahoo.search.query.rewrite.QueryRewriteSearcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.rewrite.rewriters.MisspellRewriter" : {
+    "superClass" : "com.yahoo.search.query.rewrite.QueryRewriteSearcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.ComponentId)",
       "public void <init>()",
       "public boolean configure(com.yahoo.filedistribution.fileacquirer.FileAcquirer, com.yahoo.search.query.rewrite.RewritesConfig, java.util.HashMap)",
@@ -7209,17 +7209,17 @@
       "public java.lang.String getRewriterName()",
       "public java.util.HashMap getDefaultFSAs()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String REWRITER_NAME"
     ]
   },
-  "com.yahoo.search.query.rewrite.rewriters.NameRewriter": {
-    "superClass": "com.yahoo.search.query.rewrite.QueryRewriteSearcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.rewrite.rewriters.NameRewriter" : {
+    "superClass" : "com.yahoo.search.query.rewrite.QueryRewriteSearcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.ComponentId, com.yahoo.filedistribution.fileacquirer.FileAcquirer, com.yahoo.search.query.rewrite.RewritesConfig)",
       "public void <init>(com.yahoo.search.query.rewrite.RewritesConfig, java.util.HashMap)",
       "public boolean configure(com.yahoo.filedistribution.fileacquirer.FileAcquirer, com.yahoo.search.query.rewrite.RewritesConfig, java.util.HashMap)",
@@ -7228,35 +7228,35 @@
       "public java.lang.String getRewriterName()",
       "public java.util.HashMap getDefaultFSAs()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String REWRITER_NAME",
       "public static final java.lang.String NAME_ENTITY_EXPAND_DICT",
       "public static final java.lang.String NAME_ENTITY_EXPAND_DICT_FILENAME"
     ]
   },
-  "com.yahoo.search.query.textserialize.TextSerialize": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.query.textserialize.TextSerialize" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.prelude.query.Item parse(java.lang.String)",
       "public static java.lang.String serialize(com.yahoo.prelude.query.Item)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.rendering.JsonRenderer$FieldConsumer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.rendering.JsonRenderer$FieldConsumer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.search.result.Hit$RawUtf8Consumer",
       "com.yahoo.container.logging.TraceRenderer$FieldConsumer"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>(boolean, boolean, boolean)",
       "public void accept(java.lang.String, java.lang.Object)",
       "public void accept(java.lang.String, byte[], int, int)",
@@ -7266,15 +7266,15 @@
       "public void accept(java.lang.Object)",
       "public bridge synthetic void accept(java.lang.Object, java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.rendering.JsonRenderer": {
-    "superClass": "com.yahoo.processing.rendering.AsynchronousSectionedRenderer",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.rendering.JsonRenderer" : {
+    "superClass" : "com.yahoo.processing.rendering.AsynchronousSectionedRenderer",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.util.concurrent.Executor)",
       "public void init()",
@@ -7299,16 +7299,16 @@
       "public java.lang.String getMimeType()",
       "protected com.yahoo.search.rendering.JsonRenderer$FieldConsumer createFieldConsumer(boolean)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.rendering.Renderer": {
-    "superClass": "com.yahoo.processing.rendering.Renderer",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.rendering.Renderer" : {
+    "superClass" : "com.yahoo.processing.rendering.Renderer",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public final java.util.concurrent.CompletableFuture renderResponse(java.io.OutputStream, com.yahoo.search.Result, com.yahoo.processing.execution.Execution, com.yahoo.processing.Request)",
       "protected abstract void render(java.io.Writer, com.yahoo.search.Result)",
@@ -7321,37 +7321,37 @@
       "public bridge synthetic com.yahoo.component.AbstractComponent clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.rendering.RendererRegistry": {
-    "superClass": "com.yahoo.component.provider.ComponentRegistry",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.rendering.RendererRegistry" : {
+    "superClass" : "com.yahoo.component.provider.ComponentRegistry",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.concurrent.Executor)",
       "public void <init>(java.util.Collection, java.util.concurrent.Executor)",
       "public void deconstruct()",
       "public com.yahoo.processing.rendering.Renderer getDefaultRenderer()",
       "public com.yahoo.processing.rendering.Renderer getRenderer(com.yahoo.component.ComponentSpecification)"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.component.ComponentId xmlRendererId",
       "public static final com.yahoo.component.ComponentId pageRendererId",
       "public static final com.yahoo.component.ComponentId jsonRendererId",
       "public static final com.yahoo.component.ComponentId defaultRendererId"
     ]
   },
-  "com.yahoo.search.rendering.SectionedRenderer": {
-    "superClass": "com.yahoo.search.rendering.Renderer",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.rendering.SectionedRenderer" : {
+    "superClass" : "com.yahoo.search.rendering.Renderer",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public java.lang.Object wrapWriter(java.io.Writer)",
       "public abstract void beginResult(java.lang.Object, com.yahoo.search.Result)",
@@ -7371,31 +7371,31 @@
       "public void endHitList(java.lang.Object, com.yahoo.search.grouping.result.HitList)",
       "public final void render(java.io.Writer, com.yahoo.search.Result)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.rendering.SyncDefaultRenderer$RenderingVisitor": {
-    "superClass": "com.yahoo.yolean.trace.TraceVisitor",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.rendering.SyncDefaultRenderer$RenderingVisitor" : {
+    "superClass" : "com.yahoo.yolean.trace.TraceVisitor",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.text.XMLWriter, long)",
       "public void entering(com.yahoo.yolean.trace.TraceNode)",
       "public void leaving(com.yahoo.yolean.trace.TraceNode)",
       "public void visit(com.yahoo.yolean.trace.TraceNode)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.rendering.SyncDefaultRenderer": {
-    "superClass": "com.yahoo.search.rendering.Renderer",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.rendering.SyncDefaultRenderer" : {
+    "superClass" : "com.yahoo.search.rendering.Renderer",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void init()",
       "public java.lang.String getEncoding()",
@@ -7409,34 +7409,34 @@
       "public static boolean simpleRenderDefaultErrorHit(com.yahoo.text.XMLWriter, com.yahoo.search.result.ErrorHit)",
       "public static void renderMessageDefaultErrorHit(com.yahoo.text.XMLWriter, com.yahoo.search.result.ErrorMessage)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String DEFAULT_MIMETYPE",
       "public static final java.lang.String DEFAULT_ENCODING"
     ]
   },
-  "com.yahoo.search.rendering.XmlRenderer$RenderingVisitor": {
-    "superClass": "com.yahoo.yolean.trace.TraceVisitor",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.rendering.XmlRenderer$RenderingVisitor" : {
+    "superClass" : "com.yahoo.yolean.trace.TraceVisitor",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.text.XMLWriter, long)",
       "public void entering(com.yahoo.yolean.trace.TraceNode)",
       "public void leaving(com.yahoo.yolean.trace.TraceNode)",
       "public void visit(com.yahoo.yolean.trace.TraceNode)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.rendering.XmlRenderer": {
-    "superClass": "com.yahoo.processing.rendering.AsynchronousSectionedRenderer",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.rendering.XmlRenderer" : {
+    "superClass" : "com.yahoo.processing.rendering.AsynchronousSectionedRenderer",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.util.concurrent.Executor)",
       "public void init()",
@@ -7453,35 +7453,35 @@
       "public void endList(com.yahoo.processing.response.DataList)",
       "public void endResponse()"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String DEFAULT_MIMETYPE",
       "public static final java.lang.String DEFAULT_ENCODING"
     ]
   },
-  "com.yahoo.search.result.ChainableComparator": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.result.ChainableComparator" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.util.Comparator"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.Comparator)",
       "public java.util.Comparator getSecondaryComparator()",
       "public int compare(com.yahoo.search.result.Hit, com.yahoo.search.result.Hit)",
       "public bridge synthetic int compare(java.lang.Object, java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.Coverage": {
-    "superClass": "com.yahoo.container.handler.Coverage",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.result.Coverage" : {
+    "superClass" : "com.yahoo.container.handler.Coverage",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(long, long)",
       "public void <init>(long, long, int)",
       "public void <init>(long, long, int, int)",
@@ -7490,35 +7490,35 @@
       "public com.yahoo.search.result.Coverage setNodesTried(int)",
       "public bridge synthetic com.yahoo.container.handler.Coverage setNodesTried(int)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.DeepHitIterator": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.result.DeepHitIterator" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.util.Iterator"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.Iterator, boolean)",
       "public boolean hasNext()",
       "public com.yahoo.search.result.Hit next()",
       "public void remove()",
       "public bridge synthetic java.lang.Object next()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.DefaultErrorHit": {
-    "superClass": "com.yahoo.search.result.Hit",
-    "interfaces": [
+  "com.yahoo.search.result.DefaultErrorHit" : {
+    "superClass" : "com.yahoo.search.result.Hit",
+    "interfaces" : [
       "com.yahoo.search.result.ErrorHit",
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, com.yahoo.search.result.ErrorMessage)",
       "public void <init>(java.lang.String, java.util.List)",
       "public void setSource(java.lang.String)",
@@ -7535,19 +7535,19 @@
       "public bridge synthetic com.yahoo.component.provider.FreezableClass clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.ErrorHit": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.result.ErrorHit" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract void setSource(java.lang.String)",
       "public abstract void addError(com.yahoo.search.result.ErrorMessage)",
       "public abstract void addErrors(com.yahoo.search.result.ErrorHit)",
@@ -7557,15 +7557,15 @@
       "public abstract boolean hasOnlyErrorCode(int)",
       "public abstract java.lang.Object clone()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.ErrorMessage": {
-    "superClass": "com.yahoo.processing.request.ErrorMessage",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.result.ErrorMessage" : {
+    "superClass" : "com.yahoo.processing.request.ErrorMessage",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(int, java.lang.String)",
       "public void <init>(int, java.lang.String, java.lang.String)",
       "public void <init>(int, java.lang.String, java.lang.String, java.lang.Throwable)",
@@ -7602,22 +7602,22 @@
       "public bridge synthetic com.yahoo.processing.request.ErrorMessage clone()",
       "public bridge synthetic java.lang.Object clone()"
     ],
-    "fields": [
+    "fields" : [
       "public static final int NULL_QUERY",
       "public static final int timeoutCode",
       "public static final int emptyDocsumsCode"
     ]
   },
-  "com.yahoo.search.result.FeatureData": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.result.FeatureData" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.data.access.Inspectable",
       "com.yahoo.data.JsonProducer"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.data.access.Inspector)",
       "public static com.yahoo.search.result.FeatureData empty()",
       "public com.yahoo.data.access.Inspector inspect()",
@@ -7631,15 +7631,15 @@
       "public int hashCode()",
       "public boolean equals(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.FieldComparator": {
-    "superClass": "com.yahoo.search.result.ChainableComparator",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.result.FieldComparator" : {
+    "superClass" : "com.yahoo.search.result.ChainableComparator",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.Sorting)",
       "public void <init>(com.yahoo.search.query.Sorting, java.util.Comparator)",
       "public static com.yahoo.search.result.FieldComparator create(com.yahoo.search.query.Sorting)",
@@ -7648,34 +7648,34 @@
       "public java.lang.String toString()",
       "public bridge synthetic int compare(java.lang.Object, java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.Hit$RawUtf8Consumer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.result.Hit$RawUtf8Consumer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.util.function.BiConsumer"
     ],
-    "attributes": [
+    "attributes" : [
       "public",
       "interface",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public abstract void accept(java.lang.String, byte[], int, int)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.Hit": {
-    "superClass": "com.yahoo.component.provider.ListenableFreezableClass",
-    "interfaces": [
+  "com.yahoo.search.result.Hit" : {
+    "superClass" : "com.yahoo.component.provider.ListenableFreezableClass",
+    "interfaces" : [
       "com.yahoo.processing.response.Data",
       "java.lang.Comparable",
       "java.lang.Cloneable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "protected void <init>()",
       "protected void <init>(com.yahoo.search.result.Relevance)",
       "public void <init>(java.lang.String)",
@@ -7740,22 +7740,22 @@
       "public bridge synthetic java.lang.Object clone()",
       "public bridge synthetic int compareTo(java.lang.Object)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String RANKFEATURES_FIELD",
       "public static final java.lang.String SDDOCNAME_FIELD"
     ]
   },
-  "com.yahoo.search.result.HitGroup": {
-    "superClass": "com.yahoo.search.result.Hit",
-    "interfaces": [
+  "com.yahoo.search.result.HitGroup" : {
+    "superClass" : "com.yahoo.search.result.Hit",
+    "interfaces" : [
       "com.yahoo.processing.response.DataList",
       "java.lang.Cloneable",
       "java.lang.Iterable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String, double)",
@@ -7819,31 +7819,31 @@
       "public bridge synthetic com.yahoo.processing.response.Data get(int)",
       "public bridge synthetic com.yahoo.processing.response.Data add(com.yahoo.processing.response.Data)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.HitGroupsLastComparator": {
-    "superClass": "com.yahoo.search.result.ChainableComparator",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.result.HitGroupsLastComparator" : {
+    "superClass" : "com.yahoo.search.result.ChainableComparator",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.Comparator)",
       "public int compare(com.yahoo.search.result.Hit, com.yahoo.search.result.Hit)",
       "public java.lang.String toString()",
       "public bridge synthetic int compare(java.lang.Object, java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.HitIterator": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.result.HitIterator" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.util.Iterator"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.result.HitGroup, java.util.List)",
       "public void <init>(com.yahoo.search.Result, java.util.List)",
       "public boolean hasNext()",
@@ -7851,96 +7851,96 @@
       "public void remove()",
       "public bridge synthetic java.lang.Object next()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.HitOrderer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.result.HitOrderer" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public abstract void order(java.util.List)",
       "public java.util.Comparator getComparator()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.HitSortOrderer": {
-    "superClass": "com.yahoo.search.result.HitOrderer",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.result.HitSortOrderer" : {
+    "superClass" : "com.yahoo.search.result.HitOrderer",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.query.Sorting)",
       "public void <init>(java.util.Comparator)",
       "public void order(java.util.List)",
       "public java.util.Comparator getComparator()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.MetaHitsFirstComparator": {
-    "superClass": "com.yahoo.search.result.ChainableComparator",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.result.MetaHitsFirstComparator" : {
+    "superClass" : "com.yahoo.search.result.ChainableComparator",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.Comparator)",
       "public int compare(com.yahoo.search.result.Hit, com.yahoo.search.result.Hit)",
       "public java.lang.String toString()",
       "public bridge synthetic int compare(java.lang.Object, java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.NanNumber": {
-    "superClass": "java.lang.Number",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.result.NanNumber" : {
+    "superClass" : "java.lang.Number",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public double doubleValue()",
       "public float floatValue()",
       "public int intValue()",
       "public long longValue()",
       "public java.lang.String toString()"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.search.result.NanNumber NaN"
     ]
   },
-  "com.yahoo.search.result.PositionsData": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.result.PositionsData" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.data.access.Inspectable",
       "com.yahoo.data.JsonProducer",
       "com.yahoo.data.XmlProducer"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.data.access.Inspector)",
       "public com.yahoo.data.access.Inspector inspect()",
       "public java.lang.String toString()",
       "public java.lang.StringBuilder writeJson(java.lang.StringBuilder)",
       "public java.lang.StringBuilder writeXML(java.lang.StringBuilder)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.Relevance": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.result.Relevance" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "java.lang.Comparable"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(double)",
       "public void setScore(double)",
       "public double getScore()",
@@ -7950,19 +7950,19 @@
       "public int hashCode()",
       "public bridge synthetic int compareTo(java.lang.Object)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.result.StructuredData": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
+  "com.yahoo.search.result.StructuredData" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [
       "com.yahoo.data.access.Inspectable",
       "com.yahoo.data.JsonProducer",
       "com.yahoo.data.XmlProducer"
     ],
-    "attributes": [
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.data.access.Inspector)",
       "public com.yahoo.data.access.Inspector inspect()",
       "public java.lang.String toString()",
@@ -7970,39 +7970,39 @@
       "public java.lang.String toJson()",
       "public java.lang.StringBuilder writeJson(java.lang.StringBuilder)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.schema.DocumentSummary$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.schema.DocumentSummary$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public com.yahoo.search.schema.DocumentSummary$Builder addField(java.lang.String, java.lang.String)",
       "public com.yahoo.search.schema.DocumentSummary$Builder add(com.yahoo.search.schema.DocumentSummary$Field)",
       "public com.yahoo.search.schema.DocumentSummary$Builder setDynamic(boolean)",
       "public com.yahoo.search.schema.DocumentSummary build()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.schema.DocumentSummary$Field$Type": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.schema.DocumentSummary$Field$Type" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.schema.DocumentSummary$Field$Type[] values()",
       "public static com.yahoo.search.schema.DocumentSummary$Field$Type valueOf(java.lang.String)",
       "public java.lang.String asString()",
       "public java.lang.String toString()",
       "public static com.yahoo.search.schema.DocumentSummary$Field$Type fromString(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.search.schema.DocumentSummary$Field$Type bool",
       "public static final enum com.yahoo.search.schema.DocumentSummary$Field$Type byteType",
       "public static final enum com.yahoo.search.schema.DocumentSummary$Field$Type shortType",
@@ -8022,13 +8022,13 @@
       "public static final enum com.yahoo.search.schema.DocumentSummary$Field$Type tensor"
     ]
   },
-  "com.yahoo.search.schema.DocumentSummary$Field": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.schema.DocumentSummary$Field" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, java.lang.String)",
       "public void <init>(java.lang.String, com.yahoo.search.schema.DocumentSummary$Field$Type)",
       "public java.lang.String name()",
@@ -8037,15 +8037,15 @@
       "public int hashCode()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.schema.DocumentSummary": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.schema.DocumentSummary" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public java.lang.String name()",
       "public java.util.Map fields()",
       "public boolean isDynamic()",
@@ -8053,30 +8053,30 @@
       "public int hashCode()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.schema.RankProfile$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.schema.RankProfile$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public com.yahoo.search.schema.RankProfile$Builder setHasSummaryFeatures(boolean)",
       "public com.yahoo.search.schema.RankProfile$Builder setHasRankFeatures(boolean)",
       "public com.yahoo.search.schema.RankProfile$Builder addInput(java.lang.String, com.yahoo.tensor.TensorType)",
       "public com.yahoo.search.schema.RankProfile build()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.schema.RankProfile": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.schema.RankProfile" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public java.lang.String name()",
       "public boolean hasSummaryFeatures()",
       "public boolean hasRankFeatures()",
@@ -8085,29 +8085,29 @@
       "public int hashCode()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.schema.Schema$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.schema.Schema$Builder" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public com.yahoo.search.schema.Schema$Builder add(com.yahoo.search.schema.RankProfile)",
       "public com.yahoo.search.schema.Schema$Builder add(com.yahoo.search.schema.DocumentSummary)",
       "public com.yahoo.search.schema.Schema build()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.schema.Schema": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.schema.Schema" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public java.lang.String name()",
       "public java.util.Map rankProfiles()",
       "public java.util.Map documentSummaries()",
@@ -8115,26 +8115,26 @@
       "public int hashCode()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.schema.SchemaInfo$Session": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.schema.SchemaInfo$Session" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public com.yahoo.tensor.TensorType rankProfileInput(java.lang.String, java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.schema.SchemaInfo": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.schema.SchemaInfo" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.config.IndexInfoConfig, com.yahoo.search.config.SchemaInfoConfig, com.yahoo.container.QrSearchersConfig)",
       "public void <init>(java.util.List, java.util.Map)",
       "public java.util.Map schemas()",
@@ -8143,15 +8143,15 @@
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchchain.AsyncExecution": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchchain.AsyncExecution" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.chain.Chain, com.yahoo.search.searchchain.Execution)",
       "public void <init>(com.yahoo.component.chain.Chain, com.yahoo.search.searchchain.Execution$Context)",
       "public void <init>(com.yahoo.search.searchchain.Execution)",
@@ -8160,16 +8160,16 @@
       "public com.yahoo.search.searchchain.FutureResult fill(com.yahoo.search.Result, java.lang.String)",
       "public static java.util.List waitForAll(java.util.Collection, long)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchchain.Execution$Context": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchchain.Execution$Context" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.searchchain.SearchChainRegistry, com.yahoo.prelude.IndexFacts, com.yahoo.search.schema.SchemaInfo, com.yahoo.language.process.SpecialTokenRegistry, com.yahoo.search.rendering.RendererRegistry, com.yahoo.language.Linguistics, java.util.concurrent.Executor)",
       "public static com.yahoo.search.searchchain.Execution$Context createContextStub()",
       "public static com.yahoo.search.searchchain.Execution$Context createContextStub(com.yahoo.search.searchchain.SearchChainRegistry)",
@@ -8199,15 +8199,15 @@
       "public void setLinguistics(com.yahoo.language.Linguistics)",
       "public java.util.concurrent.Executor executor()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchchain.Execution": {
-    "superClass": "com.yahoo.processing.execution.Execution",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchchain.Execution" : {
+    "superClass" : "com.yahoo.processing.execution.Execution",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.searchchain.Execution)",
       "public void <init>(com.yahoo.search.searchchain.Execution$Context)",
       "public void <init>(com.yahoo.component.chain.Chain, com.yahoo.search.searchchain.Execution$Context)",
@@ -8227,15 +8227,15 @@
       "public com.yahoo.search.searchchain.Execution$Context context()",
       "public com.yahoo.search.statistics.TimeTracker timer()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchchain.ExecutionFactory": {
-    "superClass": "com.yahoo.component.AbstractComponent",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchchain.ExecutionFactory" : {
+    "superClass" : "com.yahoo.component.AbstractComponent",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.search.config.SchemaInfoConfig, com.yahoo.container.QrSearchersConfig, com.yahoo.component.provider.ComponentRegistry, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.language.Linguistics, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor)",
       "public void <init>(com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.search.schema.SchemaInfo, com.yahoo.container.QrSearchersConfig, com.yahoo.component.provider.ComponentRegistry, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.language.Linguistics, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor)",
       "public com.yahoo.search.searchchain.Execution newExecution(com.yahoo.component.chain.Chain)",
@@ -8246,42 +8246,42 @@
       "public void deconstruct()",
       "public static com.yahoo.search.searchchain.ExecutionFactory empty()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchchain.ForkingSearcher$CommentedSearchChain": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchchain.ForkingSearcher$CommentedSearchChain" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String, com.yahoo.component.chain.Chain)"
     ],
-    "fields": [
+    "fields" : [
       "public final java.lang.String comment",
       "public final com.yahoo.component.chain.Chain searchChain"
     ]
   },
-  "com.yahoo.search.searchchain.ForkingSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchchain.ForkingSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "abstract"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public abstract java.util.Collection getSearchChainsForwarded(com.yahoo.search.searchchain.SearchChainRegistry)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchchain.FutureResult": {
-    "superClass": "java.util.concurrent.FutureTask",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchchain.FutureResult" : {
+    "superClass" : "java.util.concurrent.FutureTask",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.util.concurrent.Callable, com.yahoo.search.searchchain.Execution, com.yahoo.search.Query)",
       "public com.yahoo.search.Result get()",
       "public com.yahoo.search.Result get(long, java.util.concurrent.TimeUnit)",
@@ -8292,17 +8292,17 @@
       "public bridge synthetic java.lang.Object get(long, java.util.concurrent.TimeUnit)",
       "public bridge synthetic java.lang.Object get()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchchain.PhaseNames": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchchain.PhaseNames" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [],
-    "fields": [
+    "methods" : [ ],
+    "fields" : [
       "public static final java.lang.String RAW_QUERY",
       "public static final java.lang.String TRANSFORMED_QUERY",
       "public static final java.lang.String BLENDED_RESULT",
@@ -8310,13 +8310,13 @@
       "public static final java.lang.String BACKEND"
     ]
   },
-  "com.yahoo.search.searchchain.SearchChain": {
-    "superClass": "com.yahoo.component.chain.Chain",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchchain.SearchChain" : {
+    "superClass" : "com.yahoo.component.chain.Chain",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.ComponentId)",
       "public varargs void <init>(com.yahoo.component.ComponentId, com.yahoo.search.Searcher[])",
       "public void <init>(com.yahoo.component.ComponentId, java.util.Collection)",
@@ -8325,15 +8325,15 @@
       "public java.util.List searchers()",
       "public java.lang.String toString()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchchain.SearchChainRegistry": {
-    "superClass": "com.yahoo.processing.execution.chain.ChainRegistry",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchchain.SearchChainRegistry" : {
+    "superClass" : "com.yahoo.processing.execution.chain.ChainRegistry",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void freeze()",
       "public void <init>()",
       "public void <init>(com.yahoo.component.provider.ComponentRegistry)",
@@ -8349,95 +8349,95 @@
       "public bridge synthetic java.lang.Object getComponent(com.yahoo.component.ComponentId)",
       "public bridge synthetic java.lang.Object getComponent(java.lang.String)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchchain.SearcherRegistry": {
-    "superClass": "com.yahoo.component.provider.ComponentRegistry",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchchain.SearcherRegistry" : {
+    "superClass" : "com.yahoo.component.provider.ComponentRegistry",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void register(com.yahoo.search.Searcher)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchers.CacheControlSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchers.CacheControlSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String CACHE_CONTROL_HEADER"
     ]
   },
-  "com.yahoo.search.searchers.ConnectionControlSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchers.ConnectionControlSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public static com.yahoo.search.searchers.ConnectionControlSearcher createTestInstance(java.util.function.LongSupplier)",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchers.ContainerLatencySearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchers.ContainerLatencySearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.metrics.simple.MetricReceiver)",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchers.InputCheckingSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchers.InputCheckingSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.metrics.simple.MetricReceiver)",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchers.QueryValidator": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchers.QueryValidator" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchers.RateLimitingSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchers.RateLimitingSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.search.config.RateLimitingConfig, com.yahoo.cloud.config.ClusterInfoConfig, com.yahoo.metrics.simple.MetricReceiver)",
       "public void <init>(com.yahoo.search.config.RateLimitingConfig, com.yahoo.cloud.config.ClusterInfoConfig, com.yahoo.metrics.simple.MetricReceiver, java.time.Clock)",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": [
+    "fields" : [
       "public static final java.lang.String RATE_LIMITING",
       "public static final com.yahoo.processing.request.CompoundName idKey",
       "public static final com.yahoo.processing.request.CompoundName costKey",
@@ -8446,49 +8446,49 @@
       "public static final com.yahoo.processing.request.CompoundName dryRunKey"
     ]
   },
-  "com.yahoo.search.searchers.ValidateFuzzySearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchers.ValidateFuzzySearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.vespa.config.search.AttributesConfig)",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchers.ValidateMatchPhaseSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchers.ValidateMatchPhaseSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.vespa.config.search.AttributesConfig)",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.searchers.ValidateNearestNeighborSearcher": {
-    "superClass": "com.yahoo.search.Searcher",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.searchers.ValidateNearestNeighborSearcher" : {
+    "superClass" : "com.yahoo.search.Searcher",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.vespa.config.search.AttributesConfig)",
       "public com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.statistics.ElapsedTime": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.statistics.ElapsedTime" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>()",
       "public void add(com.yahoo.search.statistics.TimeTracker)",
       "public long weightedFillTime()",
@@ -8505,34 +8505,34 @@
       "public boolean hasDetailedData()",
       "public java.lang.String detailedReport()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.search.statistics.TimeTracker$Activity": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.statistics.TimeTracker$Activity" : {
+    "superClass" : "java.lang.Enum",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final",
       "enum"
     ],
-    "methods": [
+    "methods" : [
       "public static com.yahoo.search.statistics.TimeTracker$Activity[] values()",
       "public static com.yahoo.search.statistics.TimeTracker$Activity valueOf(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "public static final enum com.yahoo.search.statistics.TimeTracker$Activity PING",
       "public static final enum com.yahoo.search.statistics.TimeTracker$Activity SEARCH",
       "public static final enum com.yahoo.search.statistics.TimeTracker$Activity FILL"
     ]
   },
-  "com.yahoo.search.statistics.TimeTracker": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.search.statistics.TimeTracker" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public",
       "final"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(com.yahoo.component.chain.Chain)",
       "public void <init>(com.yahoo.component.chain.Chain, int)",
       "public long fillTime()",
@@ -8549,29 +8549,29 @@
       "public long searchTime()",
       "public long totalTime()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.text.interpretation.AnnotationClass": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.text.interpretation.AnnotationClass" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getClazz()",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()"
     ],
-    "fields": []
+    "fields" : [ ]
   },
-  "com.yahoo.text.interpretation.Annotations": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.text.interpretation.Annotations" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void put(java.lang.String, java.lang.Object)",
       "public java.util.Map getMap()",
       "public void <init>(com.yahoo.text.interpretation.Span)",
@@ -8583,17 +8583,17 @@
       "public java.lang.Integer getInteger(java.lang.String)",
       "public java.lang.Boolean getBoolean(java.lang.String)"
     ],
-    "fields": [
+    "fields" : [
       "protected java.util.Map annotations"
     ]
   },
-  "com.yahoo.text.interpretation.Interpretation": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.text.interpretation.Interpretation" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public void <init>(java.lang.String, double)",
       "public void <init>(com.yahoo.text.interpretation.Modification)",
@@ -8626,32 +8626,32 @@
       "public java.util.List getTermSpans(java.lang.String)",
       "public java.lang.String toString()"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.text.interpretation.AnnotationClass INTERPRETATION_CLASS"
     ]
   },
-  "com.yahoo.text.interpretation.Modification": {
-    "superClass": "java.util.HashMap",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.text.interpretation.Modification" : {
+    "superClass" : "java.util.HashMap",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public void <init>(java.lang.String)",
       "public java.lang.String getText()",
       "public com.yahoo.text.interpretation.Annotations getAnnotation()"
     ],
-    "fields": [
+    "fields" : [
       "public static final com.yahoo.text.interpretation.AnnotationClass MODIFICATION_CLASS"
     ]
   },
-  "com.yahoo.text.interpretation.Span": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
+  "com.yahoo.text.interpretation.Span" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
       "public"
     ],
-    "methods": [
+    "methods" : [
       "public java.lang.String getText()",
       "public java.lang.String toString()",
       "public com.yahoo.text.interpretation.Annotations annotate(com.yahoo.text.interpretation.AnnotationClass)",
@@ -8668,6 +8668,6 @@
       "public int getFrom()",
       "public int getTo()"
     ],
-    "fields": []
+    "fields" : [ ]
   }
 }
\ No newline at end of file