Update abi specs for 7.

14 files changed, 235 insertions, 1355 deletions

diff --git a/component/abi-spec.json b/component/abi-spec.json
index e71171c2a18..8e4442ea199 100644
--- a/component/abi-spec.json
+++ b/component/abi-spec.json
@@ -8,8 +8,8 @@
       "public"
     ],
     "methods": [
-      "protected void <init>(com.yahoo.component.ComponentId)",
       "protected void <init>()",
+      "protected void <init>(com.yahoo.component.ComponentId)",
       "public final void initId(com.yahoo.component.ComponentId)",
       "public final com.yahoo.component.ComponentId getId()",
       "public final boolean hasInitializedId()",
@@ -201,35 +201,6 @@
       "public static final com.yahoo.component.Version currentVersion"
     ]
   },
-  "com.yahoo.component.provider.ComponentClass$ComponentConstructor": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.reflect.Constructor)",
-      "public java.lang.reflect.Constructor getConstructor()",
-      "public boolean preferredTo(com.yahoo.component.provider.ComponentClass$ComponentConstructor)"
-    ],
-    "fields": [
-      "public final boolean isLegal",
-      "public final boolean hasComponentId"
-    ]
-  },
-  "com.yahoo.component.provider.ComponentClass": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.Class)",
-      "public com.yahoo.component.AbstractComponent createComponent(com.yahoo.component.ComponentId, java.util.Map, java.lang.String)",
-      "public com.yahoo.component.provider.ComponentClass$ComponentConstructor getPreferredConstructor()"
-    ],
-    "fields": []
-  },
   "com.yahoo.component.provider.ComponentRegistry": {
     "superClass": "java.lang.Object",
     "interfaces": [],
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 5c5ed0a5ece..c932958b58b 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -115,20 +115,16 @@
       "public abstract java.lang.String getServicesSource()",
       "public abstract java.util.Optional getDeployment()",
       "public abstract java.util.Optional getValidationOverrides()",
-      "public java.util.List getComponentsInfo(com.yahoo.config.provision.Version)",
-      "public java.util.List getComponentsInfo(com.yahoo.component.Version)",
+      "public abstract java.util.List getComponentsInfo(com.yahoo.component.Version)",
       "public abstract java.io.Reader getRankingExpression(java.lang.String)",
       "public static java.util.Map getBundleSdFiles(java.lang.String, java.util.jar.JarFile)",
       "public static java.lang.String getFileName(java.util.jar.JarEntry)",
       "public abstract com.yahoo.config.application.api.ApplicationMetaData getMetaData()",
       "public abstract java.io.File getFileReference(com.yahoo.path.Path)",
       "public void validateXML()",
-      "public void validateXML(java.util.Optional)",
       "public void validateXMLFor(java.util.Optional)",
       "public void writeMetaData()",
-      "public java.util.Map getProvisionInfoMap()",
       "public java.util.Optional getAllocatedHosts()",
-      "public java.util.Map getFileRegistryMap()",
       "public java.util.Map getFileRegistries()",
       "public abstract java.util.Collection getSearchDefinitions()",
       "public com.yahoo.config.application.api.ApplicationPackage preprocess(com.yahoo.config.provision.Zone, com.yahoo.config.application.api.DeployLogger)"
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 9d5c1a0d798..7b8207700a3 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -628,32 +628,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.config.provision.Version": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.Comparable"
-    ],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public com.yahoo.component.Version toVersion()",
-      "public java.lang.String toSerializedForm()",
-      "public static com.yahoo.config.provision.Version fromIntValues(int, int, int)",
-      "public static com.yahoo.config.provision.Version fromString(java.lang.String)",
-      "public static com.yahoo.config.provision.Version from(com.yahoo.component.Version)",
-      "public java.lang.String toString()",
-      "public int getMajor()",
-      "public int getMinor()",
-      "public int getMicro()",
-      "public int hashCode()",
-      "public boolean equals(java.lang.Object)",
-      "public int compareTo(com.yahoo.config.provision.Version)",
-      "public bridge synthetic int compareTo(java.lang.Object)"
-    ],
-    "fields": []
-  },
   "com.yahoo.config.provision.Zone": {
     "superClass": "java.lang.Object",
     "interfaces": [],
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index 8c8c241a5dd..dc13bd1807d 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -595,7 +595,6 @@
     ],
     "fields": [
       "public static final java.lang.String CONTENT_TYPE",
-      "public static final java.lang.String DATE",
       "protected final java.util.logging.Logger log"
     ]
   },
@@ -671,21 +670,6 @@
       "public final int code"
     ]
   },
-  "com.yahoo.container.protect.FreezeDetector": {
-    "superClass": "com.yahoo.component.AbstractComponent",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.container.core.DiagnosticsConfig)",
-      "public void register(com.yahoo.concurrent.ThreadLocalDirectory)",
-      "public boolean isBreakdown()",
-      "public void unRegister(com.yahoo.concurrent.ThreadLocalDirectory)",
-      "public void deconstruct()"
-    ],
-    "fields": []
-  },
   "com.yahoo.container.protect.ProcessTerminator": {
     "superClass": "java.lang.Object",
     "interfaces": [],
@@ -699,40 +683,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.container.protect.TimeoutCollector": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.concurrent.ThreadLocalDirectory$Updater"
-    ],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public com.yahoo.container.protect.TimeoutRate createGenerationInstance(com.yahoo.container.protect.TimeoutRate)",
-      "public com.yahoo.container.protect.TimeoutRate update(com.yahoo.container.protect.TimeoutRate, java.lang.Boolean)",
-      "public bridge synthetic java.lang.Object update(java.lang.Object, java.lang.Object)",
-      "public bridge synthetic java.lang.Object createGenerationInstance(java.lang.Object)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.container.protect.TimeoutRate": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void addQuery(java.lang.Boolean)",
-      "public void merge(com.yahoo.container.protect.TimeoutRate)",
-      "public double timeoutFraction()",
-      "public int getTotal()"
-    ],
-    "fields": []
-  },
   "com.yahoo.processing.handler.AbstractProcessingHandler": {
     "superClass": "com.yahoo.container.jdisc.LoggingRequestHandler",
     "interfaces": [],
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 829c86711ef..e37836a5f06 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -1653,347 +1653,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.prelude.templates.Context": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "abstract"
-    ],
-    "methods": [
-      "public void setXmlEscape(boolean)",
-      "public boolean getXmlEscape()",
-      "public abstract java.lang.Object put(java.lang.String, java.lang.Object)",
-      "public abstract java.lang.Object get(java.lang.String)",
-      "public abstract java.lang.Object remove(java.lang.Object)",
-      "public void setBoldOpenTag(java.lang.String)",
-      "public void setBoldCloseTag(java.lang.String)",
-      "public void setSeparatorTag(java.lang.String)",
-      "protected java.lang.Object normalizeValue(java.lang.Object)",
-      "public java.lang.String getBoldOpenTag()",
-      "public java.lang.String getBoldCloseTag()",
-      "public java.lang.String getSeparatorTag()",
-      "public abstract java.util.Collection getKeys()",
-      "public boolean isUtf8Output()",
-      "public void setUtf8Output(boolean)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.prelude.templates.DefaultTemplateSet": {
-    "superClass": "com.yahoo.prelude.templates.UserTemplate",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "protected void <init>(java.lang.String)",
-      "public void <init>()",
-      "public com.yahoo.text.XMLWriter wrapWriter(java.io.Writer)",
-      "public void header(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "public void footer(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "public void hit(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "public void hitFooter(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "public void error(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "public void noHits(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "protected static void renderCoverageAttributes(com.yahoo.search.result.Coverage, com.yahoo.text.XMLWriter)",
-      "protected void renderHitAttributes(com.yahoo.search.result.Hit, com.yahoo.text.XMLWriter)",
-      "protected void renderHitGroup(com.yahoo.search.result.HitGroup, com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "protected void renderGroup(com.yahoo.search.result.HitGroup, com.yahoo.text.XMLWriter)",
-      "protected void renderHitGroupOfTypeGroupHit(com.yahoo.prelude.templates.Context, com.yahoo.search.result.HitGroup, com.yahoo.text.XMLWriter)",
-      "protected void renderId(com.yahoo.net.URI, com.yahoo.text.XMLWriter)",
-      "protected void renderHitFields(com.yahoo.prelude.templates.Context, com.yahoo.search.result.Hit, com.yahoo.text.XMLWriter)",
-      "protected void renderField(com.yahoo.prelude.templates.Context, com.yahoo.search.result.Hit, java.util.Map$Entry, com.yahoo.text.XMLWriter)",
-      "protected void renderFieldContent(com.yahoo.prelude.templates.Context, com.yahoo.search.result.Hit, java.lang.String, com.yahoo.text.XMLWriter)",
-      "protected boolean shouldRenderField(com.yahoo.search.result.Hit, java.lang.String)",
-      "public bridge synthetic void noHits(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic void error(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic void hitFooter(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic void hit(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic void footer(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic void header(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic java.io.Writer wrapWriter(java.io.Writer)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.prelude.templates.FormattingOptions": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void formatFieldAsAttribute(java.lang.String, java.lang.String)",
-      "public java.util.Set fieldsAsAttributes()",
-      "public java.lang.String getAttributeName(java.lang.String)",
-      "public void formatFieldWithSubtype(java.lang.String, java.lang.String, java.lang.String, java.lang.String)",
-      "public com.yahoo.prelude.templates.FormattingOptions$SubtypeField getSubtype(java.lang.String)",
-      "public void formatFieldWithSubtype(java.lang.String, java.lang.String, java.lang.String)",
-      "public com.yahoo.prelude.templates.FormattingOptions$SubtypeFieldWithPrefix getSubtypeWithPrefix(java.lang.String)",
-      "public boolean shouldRenderField(java.lang.String)",
-      "public void setFieldToRender(java.lang.String)",
-      "public void setFieldNotToRender(java.lang.String)"
-    ],
-    "fields": [
-      "public static final java.lang.String DEFAULT_TYPE_ATTRIBUTE_NAME"
-    ]
-  },
-  "com.yahoo.prelude.templates.GenericTemplateSet": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.lang.String, java.lang.String)",
-      "public java.lang.String getName()",
-      "public java.lang.String getMimeType()",
-      "public java.lang.String getEncoding()",
-      "public final java.lang.String getRequestedEncoding(com.yahoo.search.Query)",
-      "public com.yahoo.prelude.templates.Template getTemplate(java.lang.String)",
-      "public void setTemplate(java.lang.String, com.yahoo.prelude.templates.Template)",
-      "public void setTemplateNotNull(java.lang.String, com.yahoo.prelude.templates.Template)",
-      "public void setHighlightTags(java.lang.String, java.lang.String, java.lang.String)",
-      "public java.lang.String getBoldOpenTag()",
-      "public java.lang.String getBoldCloseTag()",
-      "public java.lang.String getSeparatorTag()",
-      "public void setSummaryClass(java.lang.String)",
-      "public java.lang.String getSummaryClass()"
-    ],
-    "fields": [
-      "public static final java.lang.String DEFAULT_MIMETYPE",
-      "public static final java.lang.String DEFAULT_ENCODING"
-    ]
-  },
-  "com.yahoo.prelude.templates.HitContext": {
-    "superClass": "com.yahoo.prelude.templates.Context",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.search.result.Hit, com.yahoo.prelude.templates.Context)",
-      "public java.lang.Object put(java.lang.String, java.lang.Object)",
-      "public java.lang.Object get(java.lang.String)",
-      "public java.lang.Object remove(java.lang.Object)",
-      "public java.util.Collection getKeys()",
-      "public void setBoldOpenTag(java.lang.String)",
-      "public void setBoldCloseTag(java.lang.String)",
-      "public void setSeparatorTag(java.lang.String)",
-      "public java.lang.String getBoldOpenTag()",
-      "public java.lang.String getBoldCloseTag()",
-      "public java.lang.String getSeparatorTag()",
-      "public boolean isUtf8Output()",
-      "public void setUtf8Output(boolean)",
-      "public void setXmlEscape(boolean)",
-      "public boolean getXmlEscape()",
-      "protected java.lang.Object normalizeValue(java.lang.Object)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.prelude.templates.LogExceptionUserTemplateDelegator": {
-    "superClass": "com.yahoo.prelude.templates.UserTemplate",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.prelude.templates.UserTemplate)",
-      "public com.yahoo.prelude.templates.Context createContext()",
-      "public java.io.Writer wrapWriter(java.io.Writer)",
-      "public boolean isDefaultTemplateSet()",
-      "public java.lang.String getSummaryClass()",
-      "public java.lang.String getBoldOpenTag()",
-      "public java.lang.String getBoldCloseTag()",
-      "public java.lang.String getSeparatorTag()",
-      "public void setSummaryClass(java.lang.String)",
-      "public void setHighlightTags(java.lang.String, java.lang.String, java.lang.String)",
-      "public java.lang.String getName()",
-      "public java.lang.String getMimeType()",
-      "public java.lang.String getEncoding()",
-      "public com.yahoo.prelude.templates.Template getTemplate(java.lang.String)",
-      "public void setTemplate(java.lang.String, com.yahoo.prelude.templates.Template)",
-      "public void setTemplateNotNull(java.lang.String, com.yahoo.prelude.templates.Template)",
-      "public void header(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void footer(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void hit(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void hitFooter(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void error(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void noHits(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void queryContext(com.yahoo.prelude.templates.Context, java.io.Writer)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.prelude.templates.MapContext": {
-    "superClass": "com.yahoo.prelude.templates.Context",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public java.lang.Object get(java.lang.String)",
-      "public java.lang.Object put(java.lang.String, java.lang.Object)",
-      "public java.lang.Object remove(java.lang.Object)",
-      "public java.util.Collection getKeys()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.prelude.templates.PageTemplateSet": {
-    "superClass": "com.yahoo.prelude.templates.TiledTemplateSet",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public com.yahoo.text.XMLWriter wrapWriter(java.io.Writer)",
-      "public void header(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "public void footer(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "protected void renderSection(com.yahoo.search.result.HitGroup, com.yahoo.text.XMLWriter)",
-      "public void hit(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "public void hitFooter(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "public java.lang.String toString()",
-      "public bridge synthetic void hitFooter(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic void hit(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic void footer(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic void header(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic java.io.Writer wrapWriter(java.io.Writer)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.prelude.templates.SearchRendererAdaptor": {
-    "superClass": "com.yahoo.search.rendering.Renderer",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.prelude.templates.UserTemplate)",
-      "public void init()",
-      "public static void callRender(java.io.OutputStream, com.yahoo.search.Result)",
-      "public java.lang.String getEncoding()",
-      "public java.lang.String getMimeType()",
-      "public java.lang.String getDefaultSummaryClass()",
-      "public void render(java.io.Writer, com.yahoo.search.Result)",
-      "public java.io.Writer wrapWriter(java.io.Writer)",
-      "public void beginResult(java.io.Writer, com.yahoo.search.Result)",
-      "public void endResult(java.io.Writer, com.yahoo.search.Result)",
-      "public void error(java.io.Writer, java.util.Collection)",
-      "public void emptyResult(java.io.Writer, com.yahoo.search.Result)",
-      "public void queryContext(java.io.Writer, com.yahoo.search.query.context.QueryContext)",
-      "public void renderHit(java.io.Writer, com.yahoo.search.result.Hit, int)",
-      "public static boolean simpleRenderDefaultErrorHit(java.io.Writer, com.yahoo.search.result.ErrorHit)",
-      "public static void renderMessageDefaultErrorHit(com.yahoo.text.XMLWriter, com.yahoo.processing.request.ErrorMessage)",
-      "public boolean simpleRenderErrorHit(java.io.Writer, com.yahoo.search.result.ErrorHit)",
-      "public static void rendererErrorHitMessageMessage(com.yahoo.text.XMLWriter, com.yahoo.search.result.ErrorHit, com.yahoo.processing.request.ErrorMessage)",
-      "public com.yahoo.prelude.templates.UserTemplate getAdaptee()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.prelude.templates.Template": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "abstract"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public abstract void render(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public abstract java.lang.String getName()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.prelude.templates.TemplateSet": {
-    "superClass": "com.yahoo.prelude.templates.UserTemplate",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.lang.String, java.lang.String)",
-      "public static com.yahoo.prelude.templates.UserTemplate getDefault()",
-      "public com.yahoo.prelude.templates.Template getHeader(com.yahoo.search.Result)",
-      "public void setHeader(com.yahoo.prelude.templates.Template)",
-      "public com.yahoo.prelude.templates.Template getFooter(com.yahoo.search.Result)",
-      "public void setFooter(com.yahoo.prelude.templates.Template)",
-      "public com.yahoo.prelude.templates.Template getNohits(com.yahoo.search.Result)",
-      "public com.yahoo.prelude.templates.Template getQueryContext(com.yahoo.search.Result)",
-      "public void setQueryContext(com.yahoo.prelude.templates.Template)",
-      "public void setNohits(com.yahoo.prelude.templates.Template)",
-      "public com.yahoo.prelude.templates.Template getError(com.yahoo.search.Result)",
-      "public void setError(com.yahoo.prelude.templates.Template)",
-      "public com.yahoo.prelude.templates.Template getHit(com.yahoo.search.result.Hit)",
-      "public void setHit(com.yahoo.prelude.templates.Template)",
-      "public com.yahoo.prelude.templates.Template getHitFooter(com.yahoo.search.result.Hit)",
-      "public java.lang.String toString()",
-      "public void header(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void footer(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void hit(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void error(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void hitFooter(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void noHits(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void queryContext(com.yahoo.prelude.templates.Context, java.io.Writer)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.prelude.templates.TiledTemplateSet": {
-    "superClass": "com.yahoo.prelude.templates.DefaultTemplateSet",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(java.lang.String)",
-      "public com.yahoo.text.XMLWriter wrapWriter(java.io.Writer)",
-      "public void header(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "protected void renderHitAttributes(com.yahoo.search.result.Hit, com.yahoo.text.XMLWriter)",
-      "protected void renderField(com.yahoo.prelude.templates.Context, com.yahoo.search.result.Hit, java.util.Map$Entry, com.yahoo.text.XMLWriter)",
-      "protected void renderHitFields(com.yahoo.prelude.templates.Context, com.yahoo.search.result.Hit, com.yahoo.text.XMLWriter)",
-      "protected boolean shouldRenderField(com.yahoo.search.result.Hit, java.lang.String)",
-      "public void hit(com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "protected void renderHitGroup(com.yahoo.search.result.HitGroup, com.yahoo.prelude.templates.Context, com.yahoo.text.XMLWriter)",
-      "protected void renderSection(com.yahoo.search.result.HitGroup, com.yahoo.text.XMLWriter)",
-      "protected void renderSectionContent(com.yahoo.search.result.HitGroup, com.yahoo.text.XMLWriter)",
-      "protected void renderProvider(com.yahoo.prelude.templates.Context, com.yahoo.search.result.Hit, com.yahoo.text.XMLWriter)",
-      "protected void renderProviderHitAttributes(com.yahoo.search.result.Hit, com.yahoo.text.XMLWriter)",
-      "protected void renderProviderHitFields(com.yahoo.prelude.templates.Context, com.yahoo.search.result.Hit, com.yahoo.text.XMLWriter)",
-      "protected void renderProviderField(com.yahoo.prelude.templates.Context, com.yahoo.search.result.Hit, java.util.Map$Entry, com.yahoo.text.XMLWriter)",
-      "public java.lang.String toString()",
-      "public bridge synthetic void hit(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic void header(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public bridge synthetic java.io.Writer wrapWriter(java.io.Writer)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.prelude.templates.UserTemplate": {
-    "superClass": "com.yahoo.prelude.templates.GenericTemplateSet",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "abstract"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, java.lang.String, java.lang.String)",
-      "public void <init>(java.lang.String)",
-      "public java.io.Writer wrapWriter(java.io.Writer)",
-      "public com.yahoo.prelude.templates.Context createContext()",
-      "public boolean isDefaultTemplateSet()",
-      "public abstract void header(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public abstract void footer(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public abstract void hit(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public abstract void hitFooter(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public abstract void error(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public abstract void noHits(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public void queryContext(com.yahoo.prelude.templates.Context, java.io.Writer)",
-      "public static void dumpAndXMLQuoteUTF8(com.yahoo.io.ByteWriter, byte[])",
-      "public static boolean dumpBytes(com.yahoo.io.ByteWriter, com.yahoo.prelude.fastsearch.FastHit, java.lang.String)"
-    ],
-    "fields": []
-  },
   "com.yahoo.search.Query$Type": {
     "superClass": "java.lang.Enum",
     "interfaces": [],
@@ -2044,7 +1703,6 @@
       "public long getStartTime()",
       "public long getDurationTime()",
       "public long getTimeLeft()",
-      "public boolean requestHasProperty(java.lang.String)",
       "public long getTimeout()",
       "public void setTimeout(long)",
       "public void setTimeout(java.lang.String)",
@@ -2061,8 +1719,6 @@
       "public void setHits(int)",
       "public void setOffset(int)",
       "public void setWindow(int, int)",
-      "public void setCompress(boolean)",
-      "public boolean getCompress()",
       "public java.lang.String toString()",
       "public java.lang.String toDetailString()",
       "public int encode(java.nio.ByteBuffer)",
@@ -2081,7 +1737,6 @@
       "public com.yahoo.search.query.Ranking getRanking()",
       "public com.yahoo.search.query.Model getModel()",
       "public com.yahoo.container.jdisc.HttpRequest getHttpRequest()",
-      "public com.yahoo.search.query.SessionId getSessionId(boolean)",
       "public com.yahoo.search.query.SessionId getSessionId()",
       "public com.yahoo.search.query.SessionId getSessionId(java.lang.String)",
       "public boolean hasEncodableProperties()",
@@ -2146,7 +1801,6 @@
       "public void setCoverage(com.yahoo.search.result.Coverage)",
       "public com.yahoo.search.result.Coverage getCoverage(boolean)",
       "public com.yahoo.collections.ListMap getHeaders(boolean)",
-      "public com.yahoo.search.result.Templating getTemplating()",
       "public bridge synthetic com.yahoo.component.provider.ListenableFreezableClass clone()",
       "public bridge synthetic com.yahoo.component.provider.FreezableClass clone()",
       "public bridge synthetic java.lang.Object clone()"
@@ -2209,7 +1863,6 @@
       "public"
     ],
     "methods": [
-      "public void <init>(com.yahoo.search.cluster.NodeManager, java.lang.String)",
       "public void <init>(com.yahoo.search.cluster.NodeManager)",
       "public com.yahoo.search.cluster.MonitorConfiguration getConfiguration()",
       "public void add(java.lang.Object, boolean)",
@@ -2445,10 +2098,8 @@
       "public java.util.TimeZone getTimeZone()",
       "public com.yahoo.search.grouping.GroupingRequest setTimeZone(java.util.TimeZone)",
       "public com.yahoo.search.grouping.result.RootGroup getResultGroup(com.yahoo.search.Result)",
-      "public com.yahoo.search.grouping.GroupingRequest setResultGroup(com.yahoo.search.grouping.result.RootGroup)",
       "public java.util.List continuations()",
       "public static com.yahoo.search.grouping.GroupingRequest newInstance(com.yahoo.search.Query)",
-      "public static java.util.List getRequests(com.yahoo.search.Query)",
       "public java.lang.String toString()"
     ],
     "fields": []
@@ -4138,19 +3789,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.search.grouping.request.YmumValue": {
-    "superClass": "com.yahoo.search.grouping.request.DocumentValue",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public com.yahoo.search.grouping.request.YmumValue copy()",
-      "public bridge synthetic com.yahoo.search.grouping.request.GroupingExpression copy()"
-    ],
-    "fields": []
-  },
   "com.yahoo.search.grouping.request.ZCurveXFunction": {
     "superClass": "com.yahoo.search.grouping.request.FunctionNode",
     "interfaces": [],
@@ -4449,8 +4087,6 @@
     ],
     "methods": [
       "public void <init>(com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.container.QrSearchersConfig, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.statistics.Statistics, com.yahoo.language.Linguistics, com.yahoo.jdisc.Metric, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.config.QueryProfilesConfig, com.yahoo.component.provider.ComponentRegistry, com.yahoo.container.core.ContainerHttpConfig)",
-      "public void <init>(com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.container.QrSearchersConfig, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.statistics.Statistics, com.yahoo.language.Linguistics, com.yahoo.jdisc.Metric, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.config.QueryProfilesConfig, com.yahoo.component.provider.ComponentRegistry)",
-      "public void <init>(com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.container.QrSearchersConfig, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.container.core.QrTemplatesConfig, com.yahoo.container.protect.FreezeDetector, com.yahoo.statistics.Statistics, com.yahoo.language.Linguistics, com.yahoo.jdisc.Metric, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.config.QueryProfilesConfig, com.yahoo.component.provider.ComponentRegistry)",
       "protected void destroy()",
       "public final com.yahoo.container.jdisc.HttpResponse handle(com.yahoo.container.jdisc.HttpRequest)",
       "public com.yahoo.search.Result searchAndFill(com.yahoo.search.Query, com.yahoo.component.chain.Chain, com.yahoo.search.searchchain.SearchChainRegistry)",
@@ -5249,7 +4885,6 @@
     "methods": [
       "public static com.yahoo.search.query.profile.types.QueryProfileType getArgumentType()",
       "public void <init>(com.yahoo.search.Query)",
-      "public void traceLanguage()",
       "public com.yahoo.language.Language getParsingLanguage()",
       "public com.yahoo.language.Language getParsingLanguage(java.lang.String)",
       "public com.yahoo.language.Language getLanguage()",
@@ -5289,9 +4924,7 @@
       "public com.yahoo.search.searchchain.Execution getExecution()",
       "public static com.yahoo.search.query.Model getFrom(com.yahoo.search.Query)",
       "public java.lang.String toString()",
-      "public void prepare(com.yahoo.search.query.Ranking)",
-      "public void setYTraceHeaderToNext(java.lang.String)",
-      "public java.lang.String getYTraceHeaderToNext()"
+      "public void prepare(com.yahoo.search.query.Ranking)"
     ],
     "fields": [
       "public static final java.lang.String MODEL",
@@ -5337,8 +4970,6 @@
       "public void setSummary(java.lang.String)",
       "public boolean getBolding()",
       "public void setBolding(boolean)",
-      "public boolean getReportCoverage()",
-      "public void setReportCoverage(boolean)",
       "public com.yahoo.component.ComponentSpecification getRenderer()",
       "public void setRenderer(com.yahoo.component.ComponentSpecification)",
       "public java.lang.String getFormat()",
@@ -5357,7 +4988,6 @@
       "public static final java.lang.String BOLDING",
       "public static final java.lang.String TIMING",
       "public static final java.lang.String SUMMARY",
-      "public static final java.lang.String REPORT_COVERAGE",
       "public static final java.lang.String SUMMARY_FIELDS",
       "public static final java.lang.String FORMAT"
     ]
@@ -5694,7 +5324,6 @@
     ],
     "methods": [
       "public java.lang.String toString()",
-      "public static com.yahoo.search.query.UniqueRequestId next()",
       "public static com.yahoo.search.query.UniqueRequestId next(java.lang.String)"
     ],
     "fields": []
@@ -6587,9 +6216,7 @@
       "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": [
-      "public static final com.yahoo.processing.request.CompoundName[] PER_SOURCE_QUERY_PROPERTIES"
-    ]
+    "fields": []
   },
   "com.yahoo.search.query.properties.QueryPropertyAliases": {
     "superClass": "com.yahoo.search.query.properties.PropertyAliases",
@@ -6830,7 +6457,7 @@
       "public static final java.lang.String ENABLE",
       "public static final java.lang.String FACTOR",
       "public static final java.lang.String TAILCOST",
-      "public java.lang.Boolean enable"
+      "public static final com.yahoo.processing.request.CompoundName enableProperty"
     ]
   },
   "com.yahoo.search.query.rewrite.QueryRewriteSearcher": {
@@ -7110,50 +6737,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.search.rendering.DefaultRenderer$RenderingVisitor": {
-    "superClass": "com.yahoo.yolean.trace.TraceVisitor",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "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": []
-  },
-  "com.yahoo.search.rendering.DefaultRenderer": {
-    "superClass": "com.yahoo.processing.rendering.AsynchronousSectionedRenderer",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(java.util.concurrent.Executor)",
-      "public void init()",
-      "public java.lang.String getEncoding()",
-      "public java.lang.String getMimeType()",
-      "public void error(com.yahoo.text.XMLWriter, com.yahoo.search.Result)",
-      "public void queryContext(com.yahoo.text.XMLWriter, com.yahoo.search.query.context.QueryContext, com.yahoo.search.Query)",
-      "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)",
-      "public void beginResponse(java.io.OutputStream)",
-      "public final java.lang.String getRequestedEncoding(com.yahoo.search.Query)",
-      "public void beginList(com.yahoo.processing.response.DataList)",
-      "public void data(com.yahoo.processing.response.Data)",
-      "public void endList(com.yahoo.processing.response.DataList)",
-      "public void endResponse()"
-    ],
-    "fields": [
-      "public static final java.lang.String DEFAULT_MIMETYPE",
-      "public static final java.lang.String DEFAULT_ENCODING"
-    ]
-  },
   "com.yahoo.search.rendering.JsonRenderer": {
     "superClass": "com.yahoo.processing.rendering.AsynchronousSectionedRenderer",
     "interfaces": [],
@@ -7216,6 +6799,7 @@
     ],
     "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"
     ]
@@ -7361,8 +6945,6 @@
       "public void <init>(long, long)",
       "public void <init>(long, long, int)",
       "public void <init>(long, long, int, int)",
-      "public void <init>(long, int, boolean)",
-      "public void <init>(long, int, boolean, int)",
       "public com.yahoo.search.result.Coverage setSoonActive(long)",
       "public com.yahoo.search.result.Coverage setDegradedReason(int)",
       "public com.yahoo.search.result.Coverage setNodesTried(int)",
@@ -7400,7 +6982,6 @@
       "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)",
-      "public com.yahoo.search.result.ErrorMessage getMainError()",
       "public void addError(com.yahoo.search.result.ErrorMessage)",
       "public void addErrors(com.yahoo.search.result.ErrorHit)",
       "public java.util.Iterator errorIterator()",
@@ -7428,7 +7009,6 @@
     ],
     "methods": [
       "public abstract void setSource(java.lang.String)",
-      "public abstract com.yahoo.search.result.ErrorMessage getMainError()",
       "public abstract void addError(com.yahoo.search.result.ErrorMessage)",
       "public abstract void addErrors(com.yahoo.search.result.ErrorHit)",
       "public abstract java.util.Iterator errorIterator()",
@@ -7587,30 +7167,17 @@
       "public java.lang.Object removeField(java.lang.String)",
       "protected boolean hasField(java.lang.String)",
       "protected boolean hasFields()",
-      "public void changeFieldKey(java.lang.String, java.lang.String)",
-      "public com.yahoo.prelude.hitfield.HitField buildHitField(java.lang.String)",
       "public com.yahoo.prelude.hitfield.HitField buildHitField(java.lang.String, boolean)",
-      "public com.yahoo.prelude.hitfield.HitField buildHitField(java.lang.String, boolean, boolean)",
       "public java.util.Set types()",
-      "public java.lang.String getTypeString()",
-      "public int getAddNumber()",
-      "public void setAddNumber(int)",
       "public boolean isMeta()",
       "public void setMeta(boolean)",
       "public boolean isAuxiliary()",
       "public void setAuxiliary(boolean)",
-      "public int getSourceNumber()",
-      "public void setSourceNumber(int)",
       "public com.yahoo.search.Query getQuery()",
       "public com.yahoo.processing.Request request()",
       "public final void setQuery(com.yahoo.search.Query)",
-      "public java.lang.String getFieldXML(java.lang.String)",
-      "public java.lang.String getUnboldedField(java.lang.String, boolean)",
       "public void setSearcherSpecificMetaData(com.yahoo.search.Searcher, java.lang.Object)",
       "public java.lang.Object getSearcherSpecificMetaData(com.yahoo.search.Searcher)",
-      "protected final void setFilledInternal(java.util.Set)",
-      "protected final java.util.Set getFilledInternal()",
-      "public static java.lang.String stripCharacter(char, java.lang.String)",
       "protected void close()",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()",
@@ -7662,7 +7229,6 @@
       "public com.yahoo.search.result.Hit remove(java.lang.String)",
       "public com.yahoo.search.result.Hit remove(com.yahoo.net.URI)",
       "public com.yahoo.search.result.Hit remove(int)",
-      "public void setError(com.yahoo.search.result.ErrorMessage)",
       "public void addError(com.yahoo.search.result.ErrorMessage)",
       "public com.yahoo.search.result.ErrorHit getErrorHit()",
       "public com.yahoo.search.result.DefaultErrorHit removeErrorHit()",
@@ -7853,31 +7419,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.search.result.Templating": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.search.Result)",
-      "public int getFirstHitNo()",
-      "public long getNextFirstHitNo()",
-      "public long getNextLastHitNo()",
-      "public int getLastHitNo()",
-      "public int getPrevFirstHitNo()",
-      "public int getPrevLastHitNo()",
-      "public java.lang.String getNextResultURL()",
-      "public java.lang.String getPreviousResultURL()",
-      "public java.lang.String getCurrentResultURL()",
-      "public com.yahoo.prelude.templates.UserTemplate getTemplates()",
-      "public void setTemplates(com.yahoo.prelude.templates.UserTemplate)",
-      "public com.yahoo.processing.rendering.Renderer getRenderer()",
-      "public void setRenderer(com.yahoo.processing.rendering.Renderer)",
-      "public boolean usesDefaultTemplate()"
-    ],
-    "fields": []
-  },
   "com.yahoo.search.searchchain.AsyncExecution": {
     "superClass": "java.lang.Object",
     "interfaces": [],
diff --git a/docproc/abi-spec.json b/docproc/abi-spec.json
index bc76aefb958..65ca886efaf 100644
--- a/docproc/abi-spec.json
+++ b/docproc/abi-spec.json
@@ -11,7 +11,7 @@
       "public abstract java.util.Map documentTypes()",
       "public abstract java.util.Map structTypes()",
       "public abstract java.util.Map annotationTypes()",
-      "public com.yahoo.document.Document getDocumentCopy(java.lang.String, com.yahoo.document.datatypes.StructuredFieldValue, com.yahoo.document.DocumentId)"
+      "public abstract com.yahoo.document.Document getDocumentCopy(java.lang.String, com.yahoo.document.datatypes.StructuredFieldValue, com.yahoo.document.DocumentId)"
     ],
     "fields": []
   },
@@ -269,7 +269,6 @@
     "methods": [
       "public void <init>()",
       "public static com.yahoo.docproc.Processing of(com.yahoo.document.DocumentOperation)",
-      "public static com.yahoo.docproc.Processing fromDocumentOperation(com.yahoo.document.DocumentOperation)",
       "public void <init>(java.lang.String, com.yahoo.document.DocumentOperation, com.yahoo.docproc.CallStack)",
       "public static com.yahoo.docproc.Processing createProcessingFromDocumentOperations(java.lang.String, java.util.List, com.yahoo.docproc.CallStack)",
       "public com.yahoo.component.provider.ComponentRegistry getDocprocServiceRegistry()",
@@ -312,7 +311,6 @@
     ],
     "methods": [
       "public void <init>()",
-      "public void process(com.yahoo.document.Document)",
       "public void process(com.yahoo.document.DocumentPut)",
       "public void process(com.yahoo.document.DocumentUpdate)",
       "public void process(com.yahoo.document.DocumentRemove)",
diff --git a/document/abi-spec.json b/document/abi-spec.json
index 79e0cdc34d0..c5a88ac9a41 100644
--- a/document/abi-spec.json
+++ b/document/abi-spec.json
@@ -295,8 +295,6 @@
       "public java.lang.Long getLastModified()",
       "public void setLastModified(java.lang.Long)",
       "public void onSerialize(com.yahoo.vespa.objects.Serializer)",
-      "public void serializeHeader(com.yahoo.vespa.objects.Serializer)",
-      "public void serializeBody(com.yahoo.vespa.objects.Serializer)",
       "public com.yahoo.document.DocumentType getDataType()",
       "public int getFieldCount()",
       "public void serialize(com.yahoo.document.serialization.DocumentWriter)",
@@ -508,7 +506,6 @@
       "public com.yahoo.document.DocumentType getDocumentType(java.lang.String)",
       "public final com.yahoo.document.Document createDocument(com.yahoo.io.GrowableByteBuffer)",
       "public com.yahoo.document.Document createDocument(com.yahoo.document.serialization.DocumentDeserializer)",
-      "public com.yahoo.document.Document createDocument(com.yahoo.io.GrowableByteBuffer, com.yahoo.io.GrowableByteBuffer)",
       "public java.util.Collection getDataTypes()",
       "public java.util.Map getDocumentTypes()",
       "public java.util.Iterator documentTypeIterator()",
@@ -553,14 +550,10 @@
       "public void setId(com.yahoo.document.DocumentId)",
       "public com.yahoo.document.DocumentUpdate applyTo(com.yahoo.document.Document)",
       "public com.yahoo.document.DocumentUpdate prune(com.yahoo.document.Document)",
-      "public java.util.List getFieldUpdates()",
       "public java.util.Collection fieldUpdates()",
-      "public java.util.List getFieldPathUpdates()",
       "public java.util.Collection fieldPathUpdates()",
       "public com.yahoo.document.DocumentType getDocumentType()",
       "public void setDocumentType(com.yahoo.document.DocumentType)",
-      "public com.yahoo.document.update.FieldUpdate getFieldUpdate(int)",
-      "public com.yahoo.document.update.FieldUpdate setFieldUpdate(int, com.yahoo.document.update.FieldUpdate)",
       "public com.yahoo.document.update.FieldUpdate getFieldUpdate(com.yahoo.document.Field)",
       "public void clearFieldUpdates()",
       "public com.yahoo.document.update.FieldUpdate getFieldUpdate(java.lang.String)",
@@ -571,7 +564,6 @@
       "public com.yahoo.document.DocumentUpdate addFieldUpdate(com.yahoo.document.update.FieldUpdate)",
       "public com.yahoo.document.DocumentUpdate addFieldPathUpdate(com.yahoo.document.fieldpathupdate.FieldPathUpdate)",
       "public void addAll(com.yahoo.document.DocumentUpdate)",
-      "public com.yahoo.document.update.FieldUpdate removeFieldUpdate(int)",
       "public com.yahoo.document.update.FieldUpdate removeFieldUpdate(com.yahoo.document.Field)",
       "public com.yahoo.document.update.FieldUpdate removeFieldUpdate(java.lang.String)",
       "public com.yahoo.document.DocumentType getType()",
@@ -3227,7 +3219,7 @@
       "public void setNewValues(com.yahoo.document.datatypes.Array)",
       "public com.yahoo.document.datatypes.Array getNewValues()",
       "public com.yahoo.document.datatypes.FieldPathIteratorHandler getIteratorHandler(com.yahoo.document.Document)",
-      "public void serialize(com.yahoo.document.serialization.VespaDocumentSerializerHead)",
+      "public void serialize(com.yahoo.document.serialization.VespaDocumentSerializer6)",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()",
       "public java.lang.String toString()"
@@ -3253,7 +3245,7 @@
       "public void setRemoveIfZero(boolean)",
       "public void setCreateMissingPath(boolean)",
       "public boolean isArithmetic()",
-      "public void serialize(com.yahoo.document.serialization.VespaDocumentSerializerHead)",
+      "public void serialize(com.yahoo.document.serialization.VespaDocumentSerializer6)",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()",
       "public java.lang.String toString()",
@@ -3307,7 +3299,7 @@
       "public com.yahoo.document.select.DocumentSelector getWhereClause()",
       "public java.lang.String getOriginalWhereClause()",
       "public void applyTo(com.yahoo.document.Document)",
-      "public void serialize(com.yahoo.document.serialization.VespaDocumentSerializerHead)",
+      "public void serialize(com.yahoo.document.serialization.VespaDocumentSerializer6)",
       "public static com.yahoo.document.fieldpathupdate.FieldPathUpdate create(com.yahoo.document.fieldpathupdate.FieldPathUpdate$Type, com.yahoo.document.DocumentType, com.yahoo.document.serialization.DocumentUpdateReader)",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()",
@@ -3608,211 +3600,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.document.select.BucketSelector": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.document.BucketIdFactory)",
-      "public com.yahoo.document.select.BucketSet getBucketList(java.lang.String)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.document.select.BucketSet": {
-    "superClass": "java.util.HashSet",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.document.BucketId)",
-      "public void <init>(com.yahoo.document.select.BucketSet)",
-      "public com.yahoo.document.select.BucketSet intersection(com.yahoo.document.select.BucketSet)",
-      "public com.yahoo.document.select.BucketSet union(com.yahoo.document.select.BucketSet)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.document.select.Context": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.document.DocumentOperation)",
-      "public com.yahoo.document.DocumentOperation getDocumentOperation()",
-      "public void setDocumentOperation(com.yahoo.document.DocumentOperation)",
-      "public java.util.Map getVariables()",
-      "public void setVariables(java.util.Map)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.document.select.DocumentSelector": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String)",
-      "public com.yahoo.document.select.Result accepts(com.yahoo.document.DocumentOperation)",
-      "public com.yahoo.document.select.Result accepts(com.yahoo.document.select.Context)",
-      "public com.yahoo.document.select.ResultList getMatchingResultList(com.yahoo.document.DocumentOperation)",
-      "public com.yahoo.document.select.ResultList getMatchingResultList(com.yahoo.document.select.Context)",
-      "public java.lang.String toString()",
-      "public com.yahoo.document.select.OrderingSpecification getOrdering(int)",
-      "public void visit(com.yahoo.document.select.Visitor)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.document.select.NowCheckVisitor": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.document.select.Visitor"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public boolean requiresConversion()",
-      "public void visit(com.yahoo.document.select.rule.ArithmeticNode)",
-      "public void visit(com.yahoo.document.select.rule.AttributeNode)",
-      "public void visit(com.yahoo.document.select.rule.ComparisonNode)",
-      "public void visit(com.yahoo.document.select.rule.DocumentNode)",
-      "public void visit(com.yahoo.document.select.rule.EmbracedNode)",
-      "public void visit(com.yahoo.document.select.rule.IdNode)",
-      "public void visit(com.yahoo.document.select.rule.LiteralNode)",
-      "public void visit(com.yahoo.document.select.rule.LogicNode)",
-      "public void visit(com.yahoo.document.select.rule.NegationNode)",
-      "public void visit(com.yahoo.document.select.rule.NowNode)",
-      "public void visit(com.yahoo.document.select.rule.SearchColumnNode)",
-      "public void visit(com.yahoo.document.select.rule.VariableNode)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.document.select.OrderingSpecification": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(int)",
-      "public void <init>(int, long, short, short)",
-      "public int getOrder()",
-      "public long getOrderingStart()",
-      "public short getWidthBits()",
-      "public short getDivisionBits()",
-      "public boolean equals(java.lang.Object)",
-      "public int hashCode()",
-      "public java.lang.String toString()"
-    ],
-    "fields": [
-      "public static int ASCENDING",
-      "public static int DESCENDING",
-      "public final int order",
-      "public final long orderingStart",
-      "public final short widthBits",
-      "public final short divisionBits"
-    ]
-  },
-  "com.yahoo.document.select.Result": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.document.select.Result[] values()",
-      "public static com.yahoo.document.select.Result valueOf(java.lang.String)",
-      "public java.lang.String toString()",
-      "public static com.yahoo.document.select.Result invert(com.yahoo.document.select.Result)",
-      "public static com.yahoo.document.select.Result toResult(java.lang.Object)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.document.select.Result TRUE",
-      "public static final enum com.yahoo.document.select.Result FALSE",
-      "public static final enum com.yahoo.document.select.Result INVALID"
-    ]
-  },
-  "com.yahoo.document.select.ResultList$ResultPair": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public com.yahoo.document.datatypes.FieldPathIteratorHandler$VariableMap getVariables()",
-      "public com.yahoo.document.select.Result getResult()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.document.select.ResultList$VariableValue": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.document.datatypes.FieldPathIteratorHandler$VariableMap, java.lang.Object)",
-      "public com.yahoo.document.datatypes.FieldPathIteratorHandler$VariableMap getVariables()",
-      "public java.lang.Object getValue()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.document.select.ResultList": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.document.select.Result)",
-      "public void add(com.yahoo.document.datatypes.FieldPathIteratorHandler$VariableMap, com.yahoo.document.select.Result)",
-      "public java.util.List getResults()",
-      "public static com.yahoo.document.select.ResultList fromBoolean(boolean)",
-      "public com.yahoo.document.select.Result toResult()",
-      "public com.yahoo.document.select.ResultList combineAND(com.yahoo.document.select.ResultList)",
-      "public com.yahoo.document.select.ResultList combineOR(com.yahoo.document.select.ResultList)",
-      "public static com.yahoo.document.select.ResultList toResultList(java.lang.Object)",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.document.select.Visitor": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void visit(com.yahoo.document.select.rule.ArithmeticNode)",
-      "public abstract void visit(com.yahoo.document.select.rule.AttributeNode)",
-      "public abstract void visit(com.yahoo.document.select.rule.ComparisonNode)",
-      "public abstract void visit(com.yahoo.document.select.rule.DocumentNode)",
-      "public abstract void visit(com.yahoo.document.select.rule.EmbracedNode)",
-      "public abstract void visit(com.yahoo.document.select.rule.IdNode)",
-      "public abstract void visit(com.yahoo.document.select.rule.LiteralNode)",
-      "public abstract void visit(com.yahoo.document.select.rule.LogicNode)",
-      "public abstract void visit(com.yahoo.document.select.rule.NegationNode)",
-      "public abstract void visit(com.yahoo.document.select.rule.NowNode)",
-      "public abstract void visit(com.yahoo.document.select.rule.SearchColumnNode)",
-      "public abstract void visit(com.yahoo.document.select.rule.VariableNode)"
-    ],
-    "fields": []
-  },
   "com.yahoo.document.select.convert.NowQueryExpression": {
     "superClass": "java.lang.Object",
     "interfaces": [],
@@ -4598,8 +4385,8 @@
     "methods": [
       "public void <init>()",
       "public static com.yahoo.document.serialization.DocumentDeserializer createHead(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer)",
-      "public static com.yahoo.document.serialization.DocumentDeserializer create42(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer)",
-      "public static com.yahoo.document.serialization.DocumentDeserializer create42(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer, com.yahoo.io.GrowableByteBuffer)"
+      "public static com.yahoo.document.serialization.DocumentDeserializer create6(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer)",
+      "public static com.yahoo.document.serialization.DocumentDeserializer create42(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer)"
     ],
     "fields": []
   },
@@ -4646,8 +4433,9 @@
     "methods": [
       "public void <init>()",
       "public static com.yahoo.document.serialization.DocumentSerializer createHead(com.yahoo.io.GrowableByteBuffer)",
+      "public static com.yahoo.document.serialization.DocumentSerializer create6(com.yahoo.io.GrowableByteBuffer)",
+      "public static com.yahoo.document.serialization.DocumentSerializer create6()",
       "public static com.yahoo.document.serialization.DocumentSerializer create42(com.yahoo.io.GrowableByteBuffer)",
-      "public static com.yahoo.document.serialization.DocumentSerializer create42(com.yahoo.io.GrowableByteBuffer, boolean)",
       "public static com.yahoo.document.serialization.DocumentSerializer create42()"
     ],
     "fields": []
@@ -4866,7 +4654,54 @@
     "fields": []
   },
   "com.yahoo.document.serialization.VespaDocumentDeserializer42": {
-    "superClass": "com.yahoo.document.serialization.VespaDocumentSerializer42",
+    "superClass": "com.yahoo.vespa.objects.BufferSerializer",
+    "interfaces": [
+      "com.yahoo.document.serialization.DocumentDeserializer"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public final com.yahoo.document.DocumentTypeManager getDocumentTypeManager()",
+      "public void read(com.yahoo.document.Document)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.Document)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.FieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Array)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.MapFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.CollectionFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.ByteFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.DoubleFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.FloatFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.IntegerFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.LongFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Raw)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.PredicateFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.StringFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.TensorFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.ReferenceFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Struct)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.StructuredFieldValue)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.WeightedSet)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.annotation.AnnotationReference)",
+      "public void read(com.yahoo.document.DocumentUpdate)",
+      "public void read(com.yahoo.document.fieldpathupdate.FieldPathUpdate)",
+      "public void read(com.yahoo.document.fieldpathupdate.AssignFieldPathUpdate)",
+      "public void read(com.yahoo.document.fieldpathupdate.RemoveFieldPathUpdate)",
+      "public void read(com.yahoo.document.fieldpathupdate.AddFieldPathUpdate)",
+      "public com.yahoo.document.update.ValueUpdate getValueUpdate(com.yahoo.document.DataType, com.yahoo.document.DataType)",
+      "public void read(com.yahoo.document.update.FieldUpdate)",
+      "public com.yahoo.document.DocumentId readDocumentId()",
+      "public com.yahoo.document.DocumentType readDocumentType()",
+      "public void read(com.yahoo.document.annotation.SpanTree)",
+      "public void read(com.yahoo.document.annotation.Annotation)",
+      "public void read(com.yahoo.document.annotation.Span)",
+      "public void read(com.yahoo.document.annotation.SpanList)",
+      "public void read(com.yahoo.document.annotation.AlternateSpanList)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.document.serialization.VespaDocumentDeserializer6": {
+    "superClass": "com.yahoo.vespa.objects.BufferSerializer",
     "interfaces": [
       "com.yahoo.document.serialization.DocumentDeserializer"
     ],
@@ -4914,15 +4749,13 @@
     "fields": []
   },
   "com.yahoo.document.serialization.VespaDocumentDeserializerHead": {
-    "superClass": "com.yahoo.document.serialization.VespaDocumentDeserializer42",
+    "superClass": "com.yahoo.document.serialization.VespaDocumentDeserializer6",
     "interfaces": [],
     "attributes": [
       "public"
     ],
     "methods": [
-      "public void <init>(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer)",
-      "public void read(com.yahoo.document.DocumentUpdate)",
-      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.BoolFieldValue)"
+      "public void <init>(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer)"
     ],
     "fields": []
   },
@@ -4935,7 +4768,6 @@
       "public"
     ],
     "methods": [
-      "public void setHeaderOnly(boolean)",
       "public void write(com.yahoo.document.Document)",
       "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.Document)",
       "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.FieldValue)",
@@ -4977,19 +4809,66 @@
     ],
     "fields": []
   },
-  "com.yahoo.document.serialization.VespaDocumentSerializerHead": {
-    "superClass": "com.yahoo.document.serialization.VespaDocumentSerializer42",
-    "interfaces": [],
+  "com.yahoo.document.serialization.VespaDocumentSerializer6": {
+    "superClass": "com.yahoo.vespa.objects.BufferSerializer",
+    "interfaces": [
+      "com.yahoo.document.serialization.DocumentSerializer"
+    ],
     "attributes": [
       "public"
     ],
     "methods": [
-      "public void <init>(com.yahoo.io.GrowableByteBuffer)",
+      "public void write(com.yahoo.document.Document)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.Document)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.FieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Array)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.MapFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.ByteFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.CollectionFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.DoubleFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.FloatFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.IntegerFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.LongFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Raw)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.PredicateFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.StringFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.TensorFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.ReferenceFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.Struct)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.StructuredFieldValue)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.WeightedSet)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.annotation.AnnotationReference)",
+      "public void write(com.yahoo.document.DocumentId)",
+      "public void write(com.yahoo.document.DocumentType)",
+      "public void write(com.yahoo.document.annotation.Annotation)",
+      "public void write(com.yahoo.document.annotation.SpanTree)",
+      "public void write(com.yahoo.document.annotation.SpanNode)",
+      "public void write(com.yahoo.document.annotation.Span)",
+      "public void write(com.yahoo.document.annotation.SpanList)",
+      "public void write(com.yahoo.document.annotation.AlternateSpanList)",
       "public void write(com.yahoo.document.DocumentUpdate)",
       "public void write(com.yahoo.document.fieldpathupdate.FieldPathUpdate)",
       "public void write(com.yahoo.document.fieldpathupdate.AssignFieldPathUpdate)",
       "public void write(com.yahoo.document.fieldpathupdate.AddFieldPathUpdate)",
-      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.ByteFieldValue)"
+      "public void write(com.yahoo.document.update.FieldUpdate)",
+      "public void write(com.yahoo.document.update.AddValueUpdate, com.yahoo.document.DataType)",
+      "public void write(com.yahoo.document.update.MapValueUpdate, com.yahoo.document.DataType)",
+      "public void write(com.yahoo.document.update.ArithmeticValueUpdate)",
+      "public void write(com.yahoo.document.update.AssignValueUpdate, com.yahoo.document.DataType)",
+      "public void write(com.yahoo.document.update.RemoveValueUpdate, com.yahoo.document.DataType)",
+      "public void write(com.yahoo.document.update.ClearValueUpdate, com.yahoo.document.DataType)",
+      "public static long getSerializedSize(com.yahoo.document.Document)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.document.serialization.VespaDocumentSerializerHead": {
+    "superClass": "com.yahoo.document.serialization.VespaDocumentSerializer6",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.io.GrowableByteBuffer)"
     ],
     "fields": []
   },
@@ -5359,4 +5238,4 @@
       "protected com.yahoo.document.update.ValueUpdate$ValueUpdateClassID valueUpdateClassID"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json
index 9f1384570d2..e1cdc6747e3 100644
--- a/documentapi/abi-spec.json
+++ b/documentapi/abi-spec.json
@@ -37,13 +37,14 @@
     ],
     "methods": [
       "public abstract com.yahoo.documentapi.Result put(com.yahoo.document.Document)",
-      "public abstract com.yahoo.documentapi.Result put(com.yahoo.document.Document, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
+      "public com.yahoo.documentapi.Result put(com.yahoo.document.Document, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public abstract com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId)",
-      "public abstract com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, boolean, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
+      "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, boolean, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
+      "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public abstract com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentId)",
-      "public abstract com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentId, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
+      "public com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentId, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public abstract com.yahoo.documentapi.Result update(com.yahoo.document.DocumentUpdate)",
-      "public abstract com.yahoo.documentapi.Result update(com.yahoo.document.DocumentUpdate, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
+      "public com.yahoo.documentapi.Result update(com.yahoo.document.DocumentUpdate, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public abstract double getCurrentWindowSize()"
     ],
     "fields": []
@@ -132,15 +133,15 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.DocumentListVisitorResponse": {
+  "com.yahoo.documentapi.DocumentOpVisitorResponse": {
     "superClass": "com.yahoo.documentapi.VisitorResponse",
     "interfaces": [],
     "attributes": [
       "public"
     ],
     "methods": [
-      "public void <init>(com.yahoo.vdslib.DocumentList, com.yahoo.documentapi.AckToken)",
-      "public com.yahoo.vdslib.DocumentList getDocumentList()"
+      "public void <init>(com.yahoo.document.DocumentOperation, com.yahoo.documentapi.AckToken)",
+      "public com.yahoo.document.DocumentOperation getDocumentOperation()"
     ],
     "fields": []
   },
@@ -415,7 +416,6 @@
       "public boolean isSuccess()",
       "public java.lang.Error getError()",
       "public long getRequestId()",
-      "public com.yahoo.documentapi.Result$ResultType getType()",
       "public com.yahoo.documentapi.Result$ResultType type()"
     ],
     "fields": []
@@ -496,7 +496,6 @@
       "public"
     ],
     "methods": [
-      "public void <init>()",
       "public java.util.Optional defaultTimeout()"
     ],
     "fields": []
@@ -513,11 +512,11 @@
     ],
     "methods": [
       "public abstract void put(com.yahoo.document.DocumentPut)",
-      "public abstract void put(com.yahoo.document.DocumentPut, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
-      "public abstract com.yahoo.document.Document get(com.yahoo.document.DocumentId)",
-      "public abstract com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.lang.String, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
-      "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.time.Duration)",
-      "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.lang.String, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority, java.time.Duration)",
+      "public void put(com.yahoo.document.DocumentPut, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
+      "public com.yahoo.document.Document get(com.yahoo.document.DocumentId)",
+      "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.lang.String, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
+      "public abstract com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.time.Duration)",
+      "public abstract com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.lang.String, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority, java.time.Duration)",
       "public abstract boolean remove(com.yahoo.document.DocumentRemove)",
       "public abstract boolean remove(com.yahoo.document.DocumentRemove, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public abstract boolean update(com.yahoo.document.DocumentUpdate)",
@@ -672,7 +671,6 @@
       "public void <init>()",
       "public void reset()",
       "public void onMessage(com.yahoo.messagebus.Message, com.yahoo.documentapi.AckToken)",
-      "public void onDocuments(com.yahoo.vdslib.DocumentList, com.yahoo.documentapi.AckToken)",
       "public com.yahoo.documentapi.VisitorResponse getNext()",
       "public com.yahoo.documentapi.VisitorResponse getNext(int)"
     ],
@@ -931,6 +929,7 @@
       "public com.yahoo.documentapi.Result put(com.yahoo.document.Document, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId)",
       "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, boolean, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
+      "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentId)",
       "public com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentId, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public com.yahoo.documentapi.Result update(com.yahoo.document.DocumentUpdate)",
@@ -970,8 +969,8 @@
       "public void <init>(com.yahoo.documentapi.local.LocalDocumentAccess)",
       "public void put(com.yahoo.document.DocumentPut)",
       "public void put(com.yahoo.document.DocumentPut, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
-      "public com.yahoo.document.Document get(com.yahoo.document.DocumentId)",
-      "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.lang.String, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
+      "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.time.Duration)",
+      "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.lang.String, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority, java.time.Duration)",
       "public boolean remove(com.yahoo.document.DocumentRemove)",
       "public boolean remove(com.yahoo.document.DocumentRemove, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public boolean update(com.yahoo.document.DocumentUpdate)",
@@ -996,6 +995,7 @@
       "public com.yahoo.documentapi.Result put(com.yahoo.document.Document, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId)",
       "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, boolean, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
+      "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentId)",
       "public com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentId, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
       "public com.yahoo.documentapi.Result update(com.yahoo.document.DocumentUpdate)",
@@ -2405,8 +2405,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$CreateVisitorMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$CreateVisitorMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2420,8 +2420,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$CreateVisitorReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$CreateVisitorReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2433,8 +2433,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DestroyVisitorMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DestroyVisitorMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2446,8 +2446,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DestroyVisitorReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DestroyVisitorReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2459,8 +2459,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentIgnoredReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentIgnoredReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2472,8 +2472,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentListMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentListMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2485,8 +2485,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentListReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentListReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2498,7 +2498,7 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory": {
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory": {
     "superClass": "com.yahoo.documentapi.messagebus.protocol.AbstractRoutableFactory",
     "interfaces": [],
     "attributes": [
@@ -2514,7 +2514,7 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory": {
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory": {
     "superClass": "com.yahoo.documentapi.messagebus.protocol.AbstractRoutableFactory",
     "interfaces": [],
     "attributes": [
@@ -2530,8 +2530,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentSummaryMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentSummaryMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2543,8 +2543,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentSummaryReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentSummaryReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2556,8 +2556,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$EmptyBucketsMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$EmptyBucketsMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2569,8 +2569,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$EmptyBucketsReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$EmptyBucketsReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2582,8 +2582,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$GetBucketListMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$GetBucketListMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2597,8 +2597,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$GetBucketListReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$GetBucketListReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2610,8 +2610,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$GetBucketStateMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$GetBucketStateMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2623,8 +2623,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$GetBucketStateReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$GetBucketStateReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2636,8 +2636,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$GetDocumentMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$GetDocumentMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2649,8 +2649,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$GetDocumentReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$GetDocumentReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2662,8 +2662,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$MapVisitorMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$MapVisitorMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2675,8 +2675,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$MapVisitorReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$MapVisitorReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2688,8 +2688,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$PutDocumentMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$PutDocumentMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2702,8 +2702,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$PutDocumentReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$PutDocumentReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2715,8 +2715,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$QueryResultMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$QueryResultMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2728,8 +2728,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$QueryResultReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$QueryResultReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2741,8 +2741,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$RemoveDocumentMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$RemoveDocumentMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2755,8 +2755,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$RemoveDocumentReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$RemoveDocumentReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2768,8 +2768,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$RemoveLocationMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$RemoveLocationMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2781,8 +2781,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$RemoveLocationReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$RemoveLocationReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2794,8 +2794,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$SearchResultMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$SearchResultMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2807,8 +2807,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$SearchResultReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$SearchResultReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2820,8 +2820,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$StatBucketMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$StatBucketMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2835,8 +2835,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$StatBucketReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$StatBucketReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2848,8 +2848,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$UpdateDocumentMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$UpdateDocumentMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2862,8 +2862,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$UpdateDocumentReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$UpdateDocumentReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2875,8 +2875,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$VisitorInfoMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentMessageFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$VisitorInfoMessageFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2888,8 +2888,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$VisitorInfoReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$VisitorInfoReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2901,8 +2901,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$WrongDistributionReplyFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$DocumentReplyFactory",
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$WrongDistributionReplyFactory": {
+    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
     "interfaces": [],
     "attributes": [
       "public"
@@ -2914,7 +2914,7 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52": {
+  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60": {
     "superClass": "java.lang.Object",
     "interfaces": [],
     "attributes": [
@@ -2926,56 +2926,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$CreateVisitorMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$CreateVisitorMessageFactory",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "protected java.lang.String decodeBucketSpace(com.yahoo.vespa.objects.Deserializer)",
-      "protected boolean encodeBucketSpace(java.lang.String, com.yahoo.document.serialization.DocumentSerializer)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$GetBucketListMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$GetBucketListMessageFactory",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "protected java.lang.String decodeBucketSpace(com.yahoo.vespa.objects.Deserializer)",
-      "protected boolean encodeBucketSpace(java.lang.String, com.yahoo.document.serialization.DocumentSerializer)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$StatBucketMessageFactory": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52$StatBucketMessageFactory",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "protected java.lang.String decodeBucketSpace(com.yahoo.vespa.objects.Deserializer)",
-      "protected boolean encodeBucketSpace(java.lang.String, com.yahoo.document.serialization.DocumentSerializer)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60": {
-    "superClass": "com.yahoo.documentapi.messagebus.protocol.RoutableFactories52",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()"
-    ],
-    "fields": []
-  },
   "com.yahoo.documentapi.messagebus.protocol.RoutableFactory": {
     "superClass": "java.lang.Object",
     "interfaces": [],
diff --git a/jdisc_http_service/abi-spec.json b/jdisc_http_service/abi-spec.json
index 8fe945267ec..099b009fba5 100644
--- a/jdisc_http_service/abi-spec.json
+++ b/jdisc_http_service/abi-spec.json
@@ -33,7 +33,6 @@
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder responseHeaderSize(int)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder acceptQueueSize(int)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder reuseAddress(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Builder soLingerTime(double)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder idleTimeout(double)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder stopTimeout(double)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Builder tcpKeepAliveEnabled(boolean)",
@@ -82,33 +81,9 @@
       "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder certificateFile(java.lang.String)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder caCertificateFile(java.lang.String)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder clientAuth(com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder keyDbKey(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder excludeProtocol(com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeProtocol$Builder)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder excludeProtocol(java.util.List)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder includeProtocol(com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeProtocol$Builder)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder includeProtocol(java.util.List)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder excludeCipherSuite(com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeCipherSuite$Builder)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder excludeCipherSuite(java.util.List)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder includeCipherSuite(com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeCipherSuite$Builder)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder includeCipherSuite(java.util.List)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder keyStoreType(com.yahoo.jdisc.http.ConnectorConfig$Ssl$KeyStoreType$Enum)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder keyStorePath(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder pemKeyStore(com.yahoo.jdisc.http.ConnectorConfig$Ssl$PemKeyStore$Builder)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder trustStoreType(com.yahoo.jdisc.http.ConnectorConfig$Ssl$TrustStoreType$Enum)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder trustStorePath(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder useTrustStorePassword(boolean)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder sslKeyManagerFactoryAlgorithm(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder protocol(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$Builder prng(java.lang.String)",
       "public com.yahoo.jdisc.http.ConnectorConfig$Ssl build()"
     ],
-    "fields": [
-      "public java.util.List excludeProtocol",
-      "public java.util.List includeProtocol",
-      "public java.util.List excludeCipherSuite",
-      "public java.util.List includeCipherSuite",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$PemKeyStore$Builder pemKeyStore"
-    ]
+    "fields": []
   },
   "com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum": {
     "superClass": "java.lang.Enum",
@@ -145,217 +120,6 @@
       "public static final com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum NEED_AUTH"
     ]
   },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeCipherSuite$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeCipherSuite)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeCipherSuite$Builder name(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeCipherSuite build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeCipherSuite": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeCipherSuite$Builder)",
-      "public java.lang.String name()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeProtocol$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeProtocol)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeProtocol$Builder name(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeProtocol build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeProtocol": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeProtocol$Builder)",
-      "public java.lang.String name()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeCipherSuite$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeCipherSuite)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeCipherSuite$Builder name(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeCipherSuite build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeCipherSuite": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeCipherSuite$Builder)",
-      "public java.lang.String name()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeProtocol$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeProtocol)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeProtocol$Builder name(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeProtocol build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeProtocol": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeProtocol$Builder)",
-      "public java.lang.String name()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$KeyStoreType$Enum": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.jdisc.http.ConnectorConfig$Ssl$KeyStoreType$Enum[] values()",
-      "public static com.yahoo.jdisc.http.ConnectorConfig$Ssl$KeyStoreType$Enum valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.jdisc.http.ConnectorConfig$Ssl$KeyStoreType$Enum JKS",
-      "public static final enum com.yahoo.jdisc.http.ConnectorConfig$Ssl$KeyStoreType$Enum PEM"
-    ]
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$KeyStoreType": {
-    "superClass": "com.yahoo.config.EnumNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$KeyStoreType$Enum)"
-    ],
-    "fields": [
-      "public static final com.yahoo.jdisc.http.ConnectorConfig$Ssl$KeyStoreType$Enum JKS",
-      "public static final com.yahoo.jdisc.http.ConnectorConfig$Ssl$KeyStoreType$Enum PEM"
-    ]
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$PemKeyStore$Builder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.ConfigBuilder"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$PemKeyStore)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$PemKeyStore$Builder keyPath(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$PemKeyStore$Builder certificatePath(java.lang.String)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$PemKeyStore build()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$PemKeyStore": {
-    "superClass": "com.yahoo.config.InnerNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$PemKeyStore$Builder)",
-      "public java.lang.String keyPath()",
-      "public java.lang.String certificatePath()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$TrustStoreType$Enum": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.jdisc.http.ConnectorConfig$Ssl$TrustStoreType$Enum[] values()",
-      "public static com.yahoo.jdisc.http.ConnectorConfig$Ssl$TrustStoreType$Enum valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.jdisc.http.ConnectorConfig$Ssl$TrustStoreType$Enum JKS"
-    ]
-  },
-  "com.yahoo.jdisc.http.ConnectorConfig$Ssl$TrustStoreType": {
-    "superClass": "com.yahoo.config.EnumNode",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Ssl$TrustStoreType$Enum)"
-    ],
-    "fields": [
-      "public static final com.yahoo.jdisc.http.ConnectorConfig$Ssl$TrustStoreType$Enum JKS"
-    ]
-  },
   "com.yahoo.jdisc.http.ConnectorConfig$Ssl": {
     "superClass": "com.yahoo.config.InnerNode",
     "interfaces": [],
@@ -369,25 +133,7 @@
       "public java.lang.String privateKeyFile()",
       "public java.lang.String certificateFile()",
       "public java.lang.String caCertificateFile()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum clientAuth()",
-      "public java.lang.String keyDbKey()",
-      "public java.util.List excludeProtocol()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeProtocol excludeProtocol(int)",
-      "public java.util.List includeProtocol()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeProtocol includeProtocol(int)",
-      "public java.util.List excludeCipherSuite()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$ExcludeCipherSuite excludeCipherSuite(int)",
-      "public java.util.List includeCipherSuite()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$IncludeCipherSuite includeCipherSuite(int)",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$KeyStoreType$Enum keyStoreType()",
-      "public java.lang.String keyStorePath()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$PemKeyStore pemKeyStore()",
-      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$TrustStoreType$Enum trustStoreType()",
-      "public java.lang.String trustStorePath()",
-      "public boolean useTrustStorePassword()",
-      "public java.lang.String sslKeyManagerFactoryAlgorithm()",
-      "public java.lang.String protocol()",
-      "public java.lang.String prng()"
+      "public com.yahoo.jdisc.http.ConnectorConfig$Ssl$ClientAuth$Enum clientAuth()"
     ],
     "fields": []
   },
@@ -449,7 +195,6 @@
       "public int responseHeaderSize()",
       "public int acceptQueueSize()",
       "public boolean reuseAddress()",
-      "public double soLingerTime()",
       "public double idleTimeout()",
       "public double stopTimeout()",
       "public boolean tcpKeepAliveEnabled()",
@@ -483,31 +228,20 @@
       "public com.yahoo.jdisc.http.Cookie setDomain(java.lang.String)",
       "public java.lang.String getPath()",
       "public com.yahoo.jdisc.http.Cookie setPath(java.lang.String)",
-      "public java.lang.String getComment()",
-      "public com.yahoo.jdisc.http.Cookie setComment(java.lang.String)",
-      "public java.lang.String getCommentURL()",
-      "public com.yahoo.jdisc.http.Cookie setCommentURL(java.lang.String)",
-      "public java.lang.String getCommentUrl()",
-      "public com.yahoo.jdisc.http.Cookie setCommentUrl(java.lang.String)",
       "public int getMaxAge(java.util.concurrent.TimeUnit)",
       "public com.yahoo.jdisc.http.Cookie setMaxAge(int, java.util.concurrent.TimeUnit)",
-      "public int getVersion()",
-      "public com.yahoo.jdisc.http.Cookie setVersion(int)",
       "public boolean isSecure()",
       "public com.yahoo.jdisc.http.Cookie setSecure(boolean)",
       "public boolean isHttpOnly()",
       "public com.yahoo.jdisc.http.Cookie setHttpOnly(boolean)",
-      "public boolean isDiscard()",
-      "public com.yahoo.jdisc.http.Cookie setDiscard(boolean)",
-      "public java.util.Set ports()",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()",
       "public java.lang.String toString()",
       "public static java.lang.String toCookieHeader(java.lang.Iterable)",
       "public static java.util.List fromCookieHeader(java.lang.String)",
-      "public static java.lang.String toSetCookieHeader(java.lang.Iterable)",
+      "public static java.util.List toSetCookieHeaders(java.lang.Iterable)",
       "public static java.util.List toSetCookieHeaderAll(java.lang.Iterable)",
-      "public static java.util.List fromSetCookieHeader(java.lang.String)"
+      "public static com.yahoo.jdisc.http.Cookie fromSetCookieHeader(java.lang.String)"
     ],
     "fields": []
   },
@@ -1168,21 +902,17 @@
     "methods": [
       "protected void <init>(com.yahoo.jdisc.http.Cookie)",
       "public static com.yahoo.jdisc.http.filter.JDiscCookieWrapper wrap(com.yahoo.jdisc.http.Cookie)",
-      "public java.lang.String getComment()",
       "public java.lang.String getDomain()",
       "public int getMaxAge()",
       "public java.lang.String getName()",
       "public java.lang.String getPath()",
       "public boolean getSecure()",
       "public java.lang.String getValue()",
-      "public int getVersion()",
-      "public void setComment(java.lang.String)",
       "public void setDomain(java.lang.String)",
       "public void setMaxAge(int)",
       "public void setPath(java.lang.String)",
       "public void setSecure(boolean)",
       "public void setValue(java.lang.String)",
-      "public void setVersion(int)",
       "public com.yahoo.jdisc.http.Cookie getCookie()"
     ],
     "fields": []
@@ -1398,5 +1128,19 @@
       "public abstract org.eclipse.jetty.util.ssl.SslContextFactory getInstance(java.lang.String, int)"
     ],
     "fields": []
+  },
+  "com.yahoo.jdisc.http.ssl.ThrowingSslContextFactoryProvider": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.jdisc.http.ssl.SslContextFactoryProvider"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public org.eclipse.jetty.util.ssl.SslContextFactory getInstance(java.lang.String, int)"
+    ],
+    "fields": []
   }
 }
\ No newline at end of file
diff --git a/linguistics/abi-spec.json b/linguistics/abi-spec.json
index df8d008ec42..d56e56e23b5 100644
--- a/linguistics/abi-spec.json
+++ b/linguistics/abi-spec.json
@@ -210,12 +210,9 @@
       "public abstract com.yahoo.language.process.Segmenter getSegmenter()",
       "public abstract com.yahoo.language.detect.Detector getDetector()",
       "public abstract com.yahoo.language.process.GramSplitter getGramSplitter()",
-      "public abstract com.yahoo.language.process.CharacterClasses getCharacterClasses()",
-      "public abstract com.yahoo.collections.Tuple2 getVersion(com.yahoo.language.Linguistics$Component)"
+      "public abstract com.yahoo.language.process.CharacterClasses getCharacterClasses()"
     ],
-    "fields": [
-      "public static final com.yahoo.language.Linguistics SIMPLE"
-    ]
+    "fields": []
   },
   "com.yahoo.language.LinguisticsCase": {
     "superClass": "java.lang.Object",
@@ -460,9 +457,7 @@
     ],
     "methods": [
       "public static com.yahoo.language.process.StemMode[] values()",
-      "public static com.yahoo.language.process.StemMode valueOf(java.lang.String)",
-      "public int getValue()",
-      "public static com.yahoo.language.process.StemMode valueOf(int)"
+      "public static com.yahoo.language.process.StemMode valueOf(java.lang.String)"
     ],
     "fields": [
       "public static final enum com.yahoo.language.process.StemMode NONE",
diff --git a/searchlib/abi-spec.json b/searchlib/abi-spec.json
index 39bf1603e58..79c633b9617 100644
--- a/searchlib/abi-spec.json
+++ b/searchlib/abi-spec.json
@@ -1294,7 +1294,6 @@
       "public final boolean equals(java.lang.Object)",
       "public final java.lang.String toString()",
       "public abstract java.lang.StringBuilder toString(java.lang.StringBuilder, com.yahoo.searchlib.rankingexpression.rule.SerializationContext, java.util.Deque, com.yahoo.searchlib.rankingexpression.rule.CompositeNode)",
-      "public java.lang.String toString(com.yahoo.searchlib.rankingexpression.rule.SerializationContext, java.util.Deque, com.yahoo.searchlib.rankingexpression.rule.CompositeNode)",
       "public abstract com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
       "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value evaluate(com.yahoo.searchlib.rankingexpression.evaluation.Context)"
     ],
diff --git a/vespa-hadoop/abi-spec.json b/vespa-hadoop/abi-spec.json
index 40c624d2577..c6174aca970 100644
--- a/vespa-hadoop/abi-spec.json
+++ b/vespa-hadoop/abi-spec.json
@@ -36,8 +36,8 @@
       "public"
     ],
     "methods": [
-      "protected void <init>(com.yahoo.component.ComponentId)",
       "protected void <init>()",
+      "protected void <init>(com.yahoo.component.ComponentId)",
       "public final void initId(com.yahoo.component.ComponentId)",
       "public final com.yahoo.component.ComponentId getId()",
       "public final boolean hasInitializedId()",
@@ -229,35 +229,6 @@
       "public static final com.yahoo.component.Version currentVersion"
     ]
   },
-  "com.yahoo.component.provider.ComponentClass$ComponentConstructor": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.reflect.Constructor)",
-      "public java.lang.reflect.Constructor getConstructor()",
-      "public boolean preferredTo(com.yahoo.component.provider.ComponentClass$ComponentConstructor)"
-    ],
-    "fields": [
-      "public final boolean isLegal",
-      "public final boolean hasComponentId"
-    ]
-  },
-  "com.yahoo.component.provider.ComponentClass": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.Class)",
-      "public com.yahoo.component.AbstractComponent createComponent(com.yahoo.component.ComponentId, java.util.Map, java.lang.String)",
-      "public com.yahoo.component.provider.ComponentClass$ComponentConstructor getPreferredConstructor()"
-    ],
-    "fields": []
-  },
   "com.yahoo.component.provider.ComponentRegistry": {
     "superClass": "java.lang.Object",
     "interfaces": [],
@@ -711,6 +682,7 @@
       "public java.lang.String getName()",
       "public java.io.Reader getReader()",
       "public java.lang.String toString()",
+      "public static java.io.Reader nullReader()",
       "public int read(java.nio.CharBuffer)",
       "public int read()",
       "public int read(char[])",
@@ -721,6 +693,7 @@
       "public void mark(int)",
       "public void reset()",
       "public void close()",
+      "public long transferTo(java.io.Writer)",
       "public static void closeAll(java.util.List)"
     ],
     "fields": []
@@ -2880,35 +2853,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.text.DoubleFormatter": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public static java.lang.StringBuilder fmt(java.lang.StringBuilder, double)",
-      "public static java.lang.String stringValue(double)",
-      "public static void append(java.lang.StringBuilder, double)",
-      "public static void append(java.lang.StringBuilder, int)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.text.DoubleParser": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public static double parse(java.lang.String)"
-    ],
-    "fields": []
-  },
   "com.yahoo.text.ForwardWriter": {
     "superClass": "com.yahoo.text.GenericWriter",
     "interfaces": [],
@@ -3034,19 +2978,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.text.LanguageHacks": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public static boolean isCJK(java.lang.String)",
-      "public static boolean yellDesegments(java.lang.String)"
-    ],
-    "fields": []
-  },
   "com.yahoo.text.Lowercase": {
     "superClass": "java.lang.Object",
     "interfaces": [],
@@ -3589,7 +3520,6 @@
       "public void <init>(com.yahoo.vespa.http.client.config.Endpoint)",
       "public com.yahoo.vespa.http.client.config.Endpoint getEndpoint()",
       "public boolean isSuccess()",
-      "public boolean isTransient()",
       "public com.yahoo.vespa.http.client.Result$ResultType getResultType()",
       "public java.lang.Exception getException()",
       "public java.lang.String getTraceMessage()",
@@ -3628,7 +3558,6 @@
       "public java.lang.CharSequence getDocumentDataAsCharSequence()",
       "public java.lang.Object getContext()",
       "public boolean isSuccess()",
-      "public boolean isTransient()",
       "public java.util.List getDetails()",
       "public boolean hasLocalTrace()",
       "public java.lang.String toString()"
@@ -3773,7 +3702,6 @@
       "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setUseCompression(boolean)",
       "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setMaxRetries(int)",
       "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setDryRun(boolean)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setEnableV3Protocol(boolean)",
       "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setMinTimeBetweenRetries(long, java.util.concurrent.TimeUnit)",
       "public long getMinTimeBetweenRetriesMs()",
       "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setTraceLevel(int)",
@@ -3825,7 +3753,6 @@
       "public int getMaxRetries()",
       "public long getMinTimeBetweenRetriesMs()",
       "public boolean isDryRun()",
-      "public boolean isEnableV3Protocol()",
       "public int getTraceLevel()",
       "public int getTraceEveryXOperation()",
       "public boolean getPrintTraceToStdErr()"
diff --git a/vespa-http-client/abi-spec.json b/vespa-http-client/abi-spec.json
index 72ae6588d8f..22c8ce9b7fc 100644
--- a/vespa-http-client/abi-spec.json
+++ b/vespa-http-client/abi-spec.json
@@ -94,7 +94,6 @@
       "public void <init>(com.yahoo.vespa.http.client.config.Endpoint)",
       "public com.yahoo.vespa.http.client.config.Endpoint getEndpoint()",
       "public boolean isSuccess()",
-      "public boolean isTransient()",
       "public com.yahoo.vespa.http.client.Result$ResultType getResultType()",
       "public java.lang.Exception getException()",
       "public java.lang.String getTraceMessage()",
@@ -133,7 +132,6 @@
       "public java.lang.CharSequence getDocumentDataAsCharSequence()",
       "public java.lang.Object getContext()",
       "public boolean isSuccess()",
-      "public boolean isTransient()",
       "public java.util.List getDetails()",
       "public boolean hasLocalTrace()",
       "public java.lang.String toString()"
@@ -278,7 +276,6 @@
       "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setUseCompression(boolean)",
       "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setMaxRetries(int)",
       "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setDryRun(boolean)",
-      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setEnableV3Protocol(boolean)",
       "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setMinTimeBetweenRetries(long, java.util.concurrent.TimeUnit)",
       "public long getMinTimeBetweenRetriesMs()",
       "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setTraceLevel(int)",
@@ -330,7 +327,6 @@
       "public int getMaxRetries()",
       "public long getMinTimeBetweenRetriesMs()",
       "public boolean isDryRun()",
-      "public boolean isEnableV3Protocol()",
       "public int getTraceLevel()",
       "public int getTraceEveryXOperation()",
       "public boolean getPrintTraceToStdErr()"
diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json
index 48f2a4af4ad..70383e8aabf 100644
--- a/vespajlib/abi-spec.json
+++ b/vespajlib/abi-spec.json
@@ -324,6 +324,7 @@
       "public java.lang.String getName()",
       "public java.io.Reader getReader()",
       "public java.lang.String toString()",
+      "public static java.io.Reader nullReader()",
       "public int read(java.nio.CharBuffer)",
       "public int read()",
       "public int read(char[])",
@@ -334,6 +335,7 @@
       "public void mark(int)",
       "public void reset()",
       "public void close()",
+      "public long transferTo(java.io.Writer)",
       "public static void closeAll(java.util.List)"
     ],
     "fields": []
@@ -2458,35 +2460,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.text.DoubleFormatter": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public static java.lang.StringBuilder fmt(java.lang.StringBuilder, double)",
-      "public static java.lang.String stringValue(double)",
-      "public static void append(java.lang.StringBuilder, double)",
-      "public static void append(java.lang.StringBuilder, int)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.text.DoubleParser": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public static double parse(java.lang.String)"
-    ],
-    "fields": []
-  },
   "com.yahoo.text.ForwardWriter": {
     "superClass": "com.yahoo.text.GenericWriter",
     "interfaces": [],
@@ -2612,19 +2585,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.text.LanguageHacks": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public static boolean isCJK(java.lang.String)",
-      "public static boolean yellDesegments(java.lang.String)"
-    ],
-    "fields": []
-  },
   "com.yahoo.text.Lowercase": {
     "superClass": "java.lang.Object",
     "interfaces": [],