Revert "Bratseth/remove dependencies" (#8885)

25 files changed, 4794 insertions, 210 deletions

diff --git a/testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java b/testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java
index 829ad206e4e..e7496b759cc 100644
--- a/testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java
+++ b/testutil/src/main/java/com/yahoo/test/json/JsonTestHelper.java
@@ -15,7 +15,6 @@ import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs;
  * @author Vegard Sjonfjell
  */
 public class JsonTestHelper {
-
     private static final ObjectMapper mapper = new ObjectMapper();
 
     /**
diff --git a/vespa-hadoop/abi-spec.json b/vespa-hadoop/abi-spec.json
index 9e26dfeeb6e..9da12b3508b 100644
--- a/vespa-hadoop/abi-spec.json
+++ b/vespa-hadoop/abi-spec.json
@@ -1 +1,4149 @@
-{}
\ No newline at end of file
+{
+  "com.yahoo.api.annotations.PackageMarker": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.annotation.Annotation"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract",
+      "annotation"
+    ],
+    "methods": [],
+    "fields": []
+  },
+  "com.yahoo.api.annotations.PublicApi": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.annotation.Annotation"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract",
+      "annotation"
+    ],
+    "methods": [],
+    "fields": []
+  },
+  "com.yahoo.component.AbstractComponent": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.component.Component"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "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()",
+      "public final java.lang.String getIdString()",
+      "public java.lang.String getClassName()",
+      "public java.lang.String toString()",
+      "public com.yahoo.component.AbstractComponent clone()",
+      "public int compareTo(com.yahoo.component.Component)",
+      "public void deconstruct()",
+      "public final boolean isDeconstructable()",
+      "protected boolean setIsDeconstructable()",
+      "public bridge synthetic java.lang.Object clone()",
+      "public bridge synthetic int compareTo(java.lang.Object)"
+    ],
+    "fields": [
+      "protected final boolean isDeconstructable"
+    ]
+  },
+  "com.yahoo.component.Component": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Comparable"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void initId(com.yahoo.component.ComponentId)",
+      "public abstract com.yahoo.component.ComponentId getId()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.ComponentId": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Comparable"
+    ],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String, com.yahoo.component.Version, com.yahoo.component.ComponentId)",
+      "public void <init>(java.lang.String, com.yahoo.component.Version)",
+      "public void <init>(java.lang.String)",
+      "public com.yahoo.component.ComponentId nestInNamespace(com.yahoo.component.ComponentId)",
+      "public java.lang.String getName()",
+      "public com.yahoo.component.Version getVersion()",
+      "public com.yahoo.component.ComponentId getNamespace()",
+      "public java.lang.String stringValue()",
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
+      "public com.yahoo.component.ComponentSpecification toSpecification()",
+      "public int compareTo(com.yahoo.component.ComponentId)",
+      "public static com.yahoo.component.ComponentId createAnonymousComponentId(java.lang.String)",
+      "public boolean isAnonymous()",
+      "public com.yahoo.component.ComponentId withoutNamespace()",
+      "public static com.yahoo.component.ComponentId fromString(java.lang.String)",
+      "public java.lang.String toFileName()",
+      "public static com.yahoo.component.ComponentId fromFileName(java.lang.String)",
+      "public bridge synthetic int compareTo(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.ComponentSpecification": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public static com.yahoo.component.ComponentSpecification fromString(java.lang.String)",
+      "public void <init>(java.lang.String, com.yahoo.component.VersionSpecification, com.yahoo.component.ComponentId)",
+      "public void <init>(java.lang.String, com.yahoo.component.VersionSpecification)",
+      "public void <init>(java.lang.String)",
+      "public com.yahoo.component.ComponentSpecification nestInNamespace(com.yahoo.component.ComponentId)",
+      "public com.yahoo.component.ComponentId getNamespace()",
+      "public java.lang.String getName()",
+      "public com.yahoo.component.VersionSpecification getVersionSpecification()",
+      "public java.lang.String stringValue()",
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
+      "public com.yahoo.component.ComponentId toId()",
+      "public boolean matches(com.yahoo.component.ComponentId)",
+      "public com.yahoo.component.ComponentSpecification intersect(com.yahoo.component.ComponentSpecification)",
+      "public com.yahoo.component.ComponentSpecification withoutNamespace()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.Version": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Comparable"
+    ],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(int)",
+      "public void <init>(int, int)",
+      "public void <init>(int, int, int)",
+      "public void <init>(int, int, int, java.lang.String)",
+      "public void <init>(java.lang.String)",
+      "public void <init>(com.yahoo.text.Utf8Array)",
+      "public static com.yahoo.component.Version fromString(java.lang.String)",
+      "public java.lang.String toFullString()",
+      "public int getMajor()",
+      "public int getMinor()",
+      "public int getMicro()",
+      "public java.lang.String getQualifier()",
+      "public java.lang.String toString()",
+      "public int hashCode()",
+      "public boolean isEmpty()",
+      "public boolean equals(java.lang.Object)",
+      "public int compareTo(com.yahoo.component.Version)",
+      "public boolean isBefore(com.yahoo.component.Version)",
+      "public boolean isAfter(com.yahoo.component.Version)",
+      "public com.yahoo.component.VersionSpecification toSpecification()",
+      "public bridge synthetic int compareTo(java.lang.Object)"
+    ],
+    "fields": [
+      "public static final com.yahoo.component.Version emptyVersion"
+    ]
+  },
+  "com.yahoo.component.VersionSpecification": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Comparable"
+    ],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(java.lang.Integer)",
+      "public void <init>(java.lang.Integer, java.lang.Integer)",
+      "public void <init>(java.lang.Integer, java.lang.Integer, java.lang.Integer)",
+      "public void <init>(java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.String)",
+      "public void <init>(java.lang.String)",
+      "public static com.yahoo.component.VersionSpecification fromString(java.lang.String)",
+      "public int getMajor()",
+      "public int getMinor()",
+      "public int getMicro()",
+      "public java.lang.String getQualifier()",
+      "public java.lang.Integer getSpecifiedMajor()",
+      "public java.lang.Integer getSpecifiedMinor()",
+      "public java.lang.Integer getSpecifiedMicro()",
+      "public java.lang.String getSpecifiedQualifier()",
+      "public java.lang.String toString()",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)",
+      "public boolean isEmpty()",
+      "public com.yahoo.component.Version lowestMatchingVersion()",
+      "public boolean matches(com.yahoo.component.Version)",
+      "public int compareTo(com.yahoo.component.VersionSpecification)",
+      "public com.yahoo.component.VersionSpecification intersect(com.yahoo.component.VersionSpecification)",
+      "public bridge synthetic int compareTo(java.lang.Object)"
+    ],
+    "fields": [
+      "public static final com.yahoo.component.VersionSpecification emptyVersionSpecification"
+    ]
+  },
+  "com.yahoo.component.Vtag": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()"
+    ],
+    "fields": [
+      "public static final java.lang.String V_TAG_SYSTEM",
+      "public static final java.lang.String V_TAG_PKG",
+      "public static final java.lang.String V_TAG_DATE",
+      "public static final java.lang.String V_TAG_BUILDER",
+      "public static final java.lang.String V_TAG",
+      "public static final java.lang.String V_TAG_SYSTEM_REV",
+      "public static final java.lang.String V_TAG_COMPONENT",
+      "public static final java.lang.String V_TAG_ARCH",
+      "public static final com.yahoo.component.Version currentVersion"
+    ]
+  },
+  "com.yahoo.component.provider.ComponentRegistry": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public synchronized void freeze()",
+      "public final boolean isFrozen()",
+      "public void register(com.yahoo.component.ComponentId, java.lang.Object)",
+      "public java.lang.Object unregister(com.yahoo.component.ComponentId)",
+      "public java.lang.Object getComponent(java.lang.String)",
+      "public java.lang.Object getComponent(com.yahoo.component.ComponentId)",
+      "public java.lang.Object getComponent(com.yahoo.component.ComponentSpecification)",
+      "protected static com.yahoo.component.Version findBestMatch(com.yahoo.component.VersionSpecification, java.util.Set)",
+      "public java.util.List allComponents()",
+      "public java.util.Map allComponentsById()",
+      "public int getComponentCount()",
+      "public static com.yahoo.component.provider.ComponentRegistry singleton(com.yahoo.component.ComponentId, java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.provider.Freezable": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void freeze()",
+      "public abstract boolean isFrozen()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.provider.FreezableClass": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.component.provider.Freezable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public synchronized void freeze()",
+      "public final boolean isFrozen()",
+      "protected void ensureNotFrozen()",
+      "public com.yahoo.component.provider.FreezableClass clone()",
+      "public bridge synthetic java.lang.Object clone()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.provider.FreezableComponent": {
+    "superClass": "com.yahoo.component.AbstractComponent",
+    "interfaces": [
+      "com.yahoo.component.provider.Freezable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "protected void <init>(com.yahoo.component.ComponentId)",
+      "protected void <init>()",
+      "public synchronized void freeze()",
+      "public final boolean isFrozen()",
+      "protected void ensureNotFrozen()",
+      "public com.yahoo.component.provider.FreezableComponent clone()",
+      "public bridge synthetic com.yahoo.component.AbstractComponent clone()",
+      "public bridge synthetic java.lang.Object clone()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.provider.FreezableSimpleComponent": {
+    "superClass": "com.yahoo.component.AbstractComponent",
+    "interfaces": [
+      "com.yahoo.component.provider.Freezable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "protected void <init>(com.yahoo.component.ComponentId)",
+      "protected void <init>()",
+      "public synchronized void freeze()",
+      "public final boolean isFrozen()",
+      "protected void ensureNotFrozen()",
+      "public com.yahoo.component.provider.FreezableSimpleComponent clone()",
+      "public bridge synthetic com.yahoo.component.AbstractComponent clone()",
+      "public bridge synthetic java.lang.Object clone()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.provider.ListenableFreezable": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.component.provider.Freezable"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void addFreezeListener(java.lang.Runnable, java.util.concurrent.Executor)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.component.provider.ListenableFreezableClass": {
+    "superClass": "com.yahoo.component.provider.FreezableClass",
+    "interfaces": [
+      "com.yahoo.component.provider.ListenableFreezable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public synchronized void freeze()",
+      "public void addFreezeListener(java.lang.Runnable, java.util.concurrent.Executor)",
+      "public com.yahoo.component.provider.ListenableFreezableClass clone()",
+      "public bridge synthetic com.yahoo.component.provider.FreezableClass clone()",
+      "public bridge synthetic java.lang.Object clone()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.ArrayTraverser": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void entry(int, com.yahoo.data.access.Inspector)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.Inspectable": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract com.yahoo.data.access.Inspector inspect()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.Inspector": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.data.access.Inspectable"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract boolean valid()",
+      "public abstract com.yahoo.data.access.Type type()",
+      "public abstract int entryCount()",
+      "public abstract int fieldCount()",
+      "public abstract boolean asBool()",
+      "public abstract long asLong()",
+      "public abstract double asDouble()",
+      "public abstract java.lang.String asString()",
+      "public abstract byte[] asUtf8()",
+      "public abstract byte[] asData()",
+      "public abstract boolean asBool(boolean)",
+      "public abstract long asLong(long)",
+      "public abstract double asDouble(double)",
+      "public abstract java.lang.String asString(java.lang.String)",
+      "public abstract byte[] asUtf8(byte[])",
+      "public abstract byte[] asData(byte[])",
+      "public abstract void traverse(com.yahoo.data.access.ArrayTraverser)",
+      "public abstract void traverse(com.yahoo.data.access.ObjectTraverser)",
+      "public abstract com.yahoo.data.access.Inspector entry(int)",
+      "public abstract com.yahoo.data.access.Inspector field(java.lang.String)",
+      "public abstract java.lang.Iterable entries()",
+      "public abstract java.lang.Iterable fields()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.ObjectTraverser": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void field(java.lang.String, com.yahoo.data.access.Inspector)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.Type": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.data.access.Type[] values()",
+      "public static com.yahoo.data.access.Type valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.data.access.Type EMPTY",
+      "public static final enum com.yahoo.data.access.Type BOOL",
+      "public static final enum com.yahoo.data.access.Type LONG",
+      "public static final enum com.yahoo.data.access.Type DOUBLE",
+      "public static final enum com.yahoo.data.access.Type STRING",
+      "public static final enum com.yahoo.data.access.Type DATA",
+      "public static final enum com.yahoo.data.access.Type ARRAY",
+      "public static final enum com.yahoo.data.access.Type OBJECT"
+    ]
+  },
+  "com.yahoo.data.access.simple.JsonRender$StringEncoder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.data.access.ArrayTraverser",
+      "com.yahoo.data.access.ObjectTraverser"
+    ],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(java.lang.StringBuilder, boolean)",
+      "public void encode(com.yahoo.data.access.Inspector)",
+      "public void entry(int, com.yahoo.data.access.Inspector)",
+      "public void field(java.lang.String, com.yahoo.data.access.Inspector)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.simple.JsonRender": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static java.lang.StringBuilder render(com.yahoo.data.access.Inspectable, java.lang.StringBuilder, boolean)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.simple.Value$ArrayValue": {
+    "superClass": "com.yahoo.data.access.simple.Value",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public boolean valid()",
+      "public com.yahoo.data.access.Type type()",
+      "public int entryCount()",
+      "public com.yahoo.data.access.Inspector entry(int)",
+      "public void traverse(com.yahoo.data.access.ArrayTraverser)",
+      "public java.lang.Iterable entries()",
+      "public com.yahoo.data.access.simple.Value$ArrayValue add(com.yahoo.data.access.Inspector)",
+      "public com.yahoo.data.access.simple.Value$ArrayValue add(java.lang.String)",
+      "public com.yahoo.data.access.simple.Value$ArrayValue add(long)",
+      "public com.yahoo.data.access.simple.Value$ArrayValue add(int)",
+      "public com.yahoo.data.access.simple.Value$ArrayValue add(double)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.simple.Value$BoolValue": {
+    "superClass": "com.yahoo.data.access.simple.Value",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(boolean)",
+      "public boolean valid()",
+      "public com.yahoo.data.access.Type type()",
+      "public boolean asBool()",
+      "public boolean asBool(boolean)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.simple.Value$DataValue": {
+    "superClass": "com.yahoo.data.access.simple.Value",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(byte[])",
+      "public boolean valid()",
+      "public com.yahoo.data.access.Type type()",
+      "public byte[] asData()",
+      "public byte[] asData(byte[])"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.simple.Value$DoubleValue": {
+    "superClass": "com.yahoo.data.access.simple.Value",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(double)",
+      "public boolean valid()",
+      "public com.yahoo.data.access.Type type()",
+      "public double asDouble()",
+      "public long asLong()",
+      "public double asDouble(double)",
+      "public long asLong(long)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.simple.Value$EmptyValue": {
+    "superClass": "com.yahoo.data.access.simple.Value",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public boolean valid()",
+      "public boolean asBool()",
+      "public long asLong()",
+      "public double asDouble()",
+      "public java.lang.String asString()",
+      "public byte[] asUtf8()",
+      "public byte[] asData()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.simple.Value$LongValue": {
+    "superClass": "com.yahoo.data.access.simple.Value",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(long)",
+      "public boolean valid()",
+      "public com.yahoo.data.access.Type type()",
+      "public long asLong()",
+      "public double asDouble()",
+      "public long asLong(long)",
+      "public double asDouble(double)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.simple.Value$ObjectValue": {
+    "superClass": "com.yahoo.data.access.simple.Value",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public boolean valid()",
+      "public com.yahoo.data.access.Type type()",
+      "public int fieldCount()",
+      "public com.yahoo.data.access.Inspector field(java.lang.String)",
+      "public void traverse(com.yahoo.data.access.ObjectTraverser)",
+      "public java.lang.Iterable fields()",
+      "public com.yahoo.data.access.simple.Value$ObjectValue put(java.lang.String, com.yahoo.data.access.Inspector)",
+      "public com.yahoo.data.access.simple.Value$ObjectValue put(java.lang.String, java.lang.String)",
+      "public com.yahoo.data.access.simple.Value$ObjectValue put(java.lang.String, long)",
+      "public com.yahoo.data.access.simple.Value$ObjectValue put(java.lang.String, int)",
+      "public com.yahoo.data.access.simple.Value$ObjectValue put(java.lang.String, double)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.simple.Value$StringValue": {
+    "superClass": "com.yahoo.data.access.simple.Value",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(byte[])",
+      "public boolean valid()",
+      "public com.yahoo.data.access.Type type()",
+      "public java.lang.String asString()",
+      "public java.lang.String asString(java.lang.String)",
+      "public byte[] asUtf8()",
+      "public byte[] asUtf8(byte[])"
+    ],
+    "fields": []
+  },
+  "com.yahoo.data.access.simple.Value": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.data.access.Inspector"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static com.yahoo.data.access.Inspector empty()",
+      "public static com.yahoo.data.access.Inspector invalid()",
+      "public com.yahoo.data.access.Inspector inspect()",
+      "public boolean valid()",
+      "public com.yahoo.data.access.Type type()",
+      "public int entryCount()",
+      "public int fieldCount()",
+      "public boolean asBool()",
+      "public long asLong()",
+      "public double asDouble()",
+      "public java.lang.String asString()",
+      "public byte[] asUtf8()",
+      "public byte[] asData()",
+      "public boolean asBool(boolean)",
+      "public long asLong(long)",
+      "public double asDouble(double)",
+      "public java.lang.String asString(java.lang.String)",
+      "public byte[] asUtf8(byte[])",
+      "public byte[] asData(byte[])",
+      "public void traverse(com.yahoo.data.access.ArrayTraverser)",
+      "public void traverse(com.yahoo.data.access.ObjectTraverser)",
+      "public com.yahoo.data.access.Inspector entry(int)",
+      "public com.yahoo.data.access.Inspector field(java.lang.String)",
+      "public java.lang.Iterable entries()",
+      "public java.lang.Iterable fields()",
+      "public java.lang.StringBuilder writeJson(java.lang.StringBuilder)",
+      "public java.lang.String toJson()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.io.reader.NamedReader": {
+    "superClass": "java.io.Reader",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String, java.io.Reader)",
+      "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[])",
+      "public int read(char[], int, int)",
+      "public long skip(long)",
+      "public boolean ready()",
+      "public boolean markSupported()",
+      "public void mark(int)",
+      "public void reset()",
+      "public void close()",
+      "public long transferTo(java.io.Writer)",
+      "public static void closeAll(java.util.List)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.net.HostName": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static synchronized java.lang.String getLocalhost()",
+      "public static void setHostNameForTestingOnly(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.net.URI$Token": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public com.yahoo.net.URI$URLContext getContext()",
+      "public java.lang.String getToken()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.net.URI$URLContext": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.net.URI$URLContext[] values()",
+      "public static com.yahoo.net.URI$URLContext valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.net.URI$URLContext URL_SCHEME",
+      "public static final enum com.yahoo.net.URI$URLContext URL_HOST",
+      "public static final enum com.yahoo.net.URI$URLContext URL_DOMAIN",
+      "public static final enum com.yahoo.net.URI$URLContext URL_MAINTLD",
+      "public static final enum com.yahoo.net.URI$URLContext URL_PORT",
+      "public static final enum com.yahoo.net.URI$URLContext URL_PATH",
+      "public static final enum com.yahoo.net.URI$URLContext URL_FILENAME",
+      "public static final enum com.yahoo.net.URI$URLContext URL_EXTENSION",
+      "public static final enum com.yahoo.net.URI$URLContext URL_PARAMS",
+      "public static final enum com.yahoo.net.URI$URLContext URL_QUERY",
+      "public static final enum com.yahoo.net.URI$URLContext URL_FRAGMENT",
+      "public final int id",
+      "public final java.lang.String name"
+    ]
+  },
+  "com.yahoo.net.URI": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Cloneable",
+      "java.io.Serializable",
+      "java.lang.Comparable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(java.lang.String, boolean)",
+      "public void <init>(java.lang.String, boolean, boolean)",
+      "public void <init>(java.lang.String, java.lang.String, int, java.lang.String)",
+      "public boolean isValid()",
+      "public java.lang.String getScheme()",
+      "public boolean isOpaque()",
+      "public java.lang.String getHost()",
+      "public int getPort()",
+      "public java.lang.String getRest()",
+      "public java.lang.String getDomain()",
+      "public java.lang.String getMainTld()",
+      "public java.lang.String getPath()",
+      "public java.lang.String getFilename()",
+      "public java.lang.String getExtension()",
+      "public java.lang.String getQuery()",
+      "public java.lang.String getFragment()",
+      "public java.lang.String getParams()",
+      "public static java.lang.String[] tokenize(java.lang.String)",
+      "public java.util.List tokenize()",
+      "public java.lang.String getInvalidExplanation()",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)",
+      "public int compareTo(com.yahoo.net.URI)",
+      "public java.lang.Object clone()",
+      "public com.yahoo.net.URI setScheme(java.lang.String)",
+      "public com.yahoo.net.URI setHost(java.lang.String)",
+      "public com.yahoo.net.URI setPort(int)",
+      "public com.yahoo.net.URI setRest(java.lang.String)",
+      "public com.yahoo.net.URI addParameter(java.lang.String, java.lang.String)",
+      "public java.lang.String stringValue()",
+      "public java.lang.String toString()",
+      "public int getDepth()",
+      "public bridge synthetic int compareTo(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.net.UriTools": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public static java.lang.String rawRequest(java.net.URI)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.net.Url": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String)",
+      "public static com.yahoo.net.Url fromString(java.lang.String)",
+      "public int getSchemeBegin()",
+      "public int getSchemeEnd()",
+      "public int getUserInfoBegin()",
+      "public int getUserInfoEnd()",
+      "public int getPasswordBegin()",
+      "public int getPasswordEnd()",
+      "public int getHostBegin()",
+      "public int getHostEnd()",
+      "public int getPortBegin()",
+      "public int getPortEnd()",
+      "public int getPathBegin()",
+      "public int getPathEnd()",
+      "public int getQueryBegin()",
+      "public int getQueryEnd()",
+      "public int getFragmentBegin()",
+      "public int getFragmentEnd()",
+      "public java.lang.String getScheme()",
+      "public java.lang.String getUserInfo()",
+      "public java.lang.String getPassword()",
+      "public java.lang.String getHost()",
+      "public java.lang.Integer getPort()",
+      "public java.lang.String getPortString()",
+      "public java.lang.String getPath()",
+      "public java.lang.String getQuery()",
+      "public java.lang.String getFragment()",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.net.UrlToken$Type": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.net.UrlToken$Type[] values()",
+      "public static com.yahoo.net.UrlToken$Type valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.net.UrlToken$Type SCHEME",
+      "public static final enum com.yahoo.net.UrlToken$Type USERINFO",
+      "public static final enum com.yahoo.net.UrlToken$Type PASSWORD",
+      "public static final enum com.yahoo.net.UrlToken$Type HOST",
+      "public static final enum com.yahoo.net.UrlToken$Type PORT",
+      "public static final enum com.yahoo.net.UrlToken$Type PATH",
+      "public static final enum com.yahoo.net.UrlToken$Type QUERY",
+      "public static final enum com.yahoo.net.UrlToken$Type FRAGMENT"
+    ]
+  },
+  "com.yahoo.net.UrlToken": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.net.UrlToken$Type, int, java.lang.String, java.lang.String)",
+      "public com.yahoo.net.UrlToken$Type getType()",
+      "public int getOffset()",
+      "public int getLength()",
+      "public java.lang.String getOrig()",
+      "public java.lang.String getTerm()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.net.UrlTokenizer": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(com.yahoo.net.Url)",
+      "public java.util.List tokenize()",
+      "public static void addTokens(java.util.List, com.yahoo.net.UrlToken$Type, int, java.lang.String, boolean)"
+    ],
+    "fields": [
+      "public static final java.lang.String TERM_STARTHOST",
+      "public static final java.lang.String TERM_ENDHOST"
+    ]
+  },
+  "com.yahoo.osgi.annotation.ExportPackage": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.annotation.Annotation"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract",
+      "annotation"
+    ],
+    "methods": [
+      "public abstract com.yahoo.osgi.annotation.Version version()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.osgi.annotation.Version": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.annotation.Annotation"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract",
+      "annotation"
+    ],
+    "methods": [
+      "public abstract int major()",
+      "public abstract int minor()",
+      "public abstract int micro()",
+      "public abstract java.lang.String qualifier()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.path.Path": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public boolean isChildOf(com.yahoo.path.Path)",
+      "public com.yahoo.path.Path append(java.lang.String)",
+      "public com.yahoo.path.Path append(com.yahoo.path.Path)",
+      "public java.lang.String getName()",
+      "public java.lang.String getRelative()",
+      "public com.yahoo.path.Path getParentPath()",
+      "public com.yahoo.path.Path getChildPath()",
+      "public java.lang.String last()",
+      "public com.yahoo.path.Path withLast(java.lang.String)",
+      "public java.lang.String getAbsolute()",
+      "public boolean isRoot()",
+      "public java.util.Iterator iterator()",
+      "public java.util.List elements()",
+      "public java.lang.String toString()",
+      "public static com.yahoo.path.Path fromString(java.lang.String)",
+      "public static com.yahoo.path.Path fromString(java.lang.String, java.lang.String)",
+      "public static com.yahoo.path.Path createRoot()",
+      "public static com.yahoo.path.Path createRoot(java.lang.String)",
+      "public java.io.File toFile()",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.protect.ClassValidator": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static java.util.List unmaskedMethods(java.lang.Class, java.lang.Class)",
+      "public static java.util.List unmaskedMethodsFromSuperclass(java.lang.Class)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.protect.ErrorMessage": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(int, java.lang.String)",
+      "public void <init>(int, java.lang.String, java.lang.String)",
+      "public void <init>(int, java.lang.String, java.lang.String, java.lang.Throwable)",
+      "public int getCode()",
+      "public java.lang.String getMessage()",
+      "public java.lang.String getDetailedMessage()",
+      "public void setCause(java.lang.Throwable)",
+      "public java.lang.Throwable getCause()",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)",
+      "public java.lang.String toString()"
+    ],
+    "fields": [
+      "protected int code",
+      "protected java.lang.String message",
+      "protected java.lang.String detailedMessage",
+      "protected java.lang.Throwable cause"
+    ]
+  },
+  "com.yahoo.protect.Process$ShutdownError": {
+    "superClass": "java.lang.Error",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.protect.Process": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static void logAndDie(java.lang.String)",
+      "public static void logAndDie(java.lang.String, boolean)",
+      "public static void logAndDie(java.lang.String, java.lang.Throwable)",
+      "public static void logAndDie(java.lang.String, java.lang.Throwable, boolean)",
+      "public static void dumpThreads()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.protect.Validator": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static void ensureNotNull(java.lang.String, java.lang.Object)",
+      "public static void ensureNonEmpty(java.lang.String, java.lang.String)",
+      "public static void ensureNotInitialized(java.lang.String, java.lang.Object, java.lang.Object)",
+      "public static void ensureInRange(java.lang.String, int, int, int)",
+      "public static void ensureSmaller(java.lang.String, int, java.lang.String, int)",
+      "public static void ensureSmaller(java.lang.String, java.lang.Comparable, java.lang.String, java.lang.Comparable)",
+      "public static void ensure(java.lang.String, boolean)",
+      "public static varargs void ensure(boolean, java.lang.Object[])",
+      "public static void ensureInstanceOf(java.lang.String, java.lang.Object, java.lang.Class)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.DimensionSizes$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(int)",
+      "public com.yahoo.tensor.DimensionSizes$Builder set(int, long)",
+      "public long size(int)",
+      "public int dimensions()",
+      "public com.yahoo.tensor.DimensionSizes build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.DimensionSizes": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public long size(int)",
+      "public int dimensions()",
+      "public long totalSize()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.IndexedTensor$BoundBuilder": {
+    "superClass": "com.yahoo.tensor.IndexedTensor$Builder",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public varargs com.yahoo.tensor.IndexedTensor$BoundBuilder cell(double, long[])",
+      "public com.yahoo.tensor.Tensor$Builder$CellBuilder cell()",
+      "public com.yahoo.tensor.IndexedTensor$Builder cell(com.yahoo.tensor.TensorAddress, double)",
+      "public com.yahoo.tensor.IndexedTensor build()",
+      "public com.yahoo.tensor.IndexedTensor$Builder cell(com.yahoo.tensor.Tensor$Cell, double)",
+      "public void cellByDirectIndex(long, double)",
+      "public bridge synthetic com.yahoo.tensor.IndexedTensor$Builder cell(double, long[])",
+      "public bridge synthetic com.yahoo.tensor.Tensor build()",
+      "public bridge synthetic com.yahoo.tensor.Tensor$Builder cell(com.yahoo.tensor.Tensor$Cell, double)",
+      "public bridge synthetic com.yahoo.tensor.Tensor$Builder cell(double, long[])",
+      "public bridge synthetic com.yahoo.tensor.Tensor$Builder cell(com.yahoo.tensor.TensorAddress, double)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.IndexedTensor$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.tensor.Tensor$Builder"
+    ],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public static com.yahoo.tensor.IndexedTensor$Builder of(com.yahoo.tensor.TensorType)",
+      "public static com.yahoo.tensor.IndexedTensor$Builder of(com.yahoo.tensor.TensorType, com.yahoo.tensor.DimensionSizes)",
+      "public varargs abstract com.yahoo.tensor.IndexedTensor$Builder cell(double, long[])",
+      "public com.yahoo.tensor.TensorType type()",
+      "public abstract com.yahoo.tensor.IndexedTensor build()",
+      "public bridge synthetic com.yahoo.tensor.Tensor build()",
+      "public bridge synthetic com.yahoo.tensor.Tensor$Builder cell(double, long[])"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.IndexedTensor$Indexes": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public static com.yahoo.tensor.IndexedTensor$Indexes of(com.yahoo.tensor.DimensionSizes)",
+      "public long[] indexesCopy()",
+      "public long[] indexesForReading()",
+      "public java.util.List toList()",
+      "public java.lang.String toString()",
+      "public abstract long size()",
+      "public abstract void next()"
+    ],
+    "fields": [
+      "protected final long[] indexes"
+    ]
+  },
+  "com.yahoo.tensor.IndexedTensor$SubspaceIterator": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.Iterator"
+    ],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public long size()",
+      "public com.yahoo.tensor.TensorAddress address()",
+      "public void reset()",
+      "public boolean hasNext()",
+      "public com.yahoo.tensor.Tensor$Cell next()",
+      "public bridge synthetic java.lang.Object next()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.IndexedTensor": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.tensor.Tensor"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public long size()",
+      "public java.util.Iterator cellIterator()",
+      "public com.yahoo.tensor.IndexedTensor$SubspaceIterator cellIterator(com.yahoo.tensor.PartialAddress, com.yahoo.tensor.DimensionSizes)",
+      "public java.util.Iterator valueIterator()",
+      "public java.util.Iterator subspaceIterator(java.util.Set, com.yahoo.tensor.DimensionSizes)",
+      "public java.util.Iterator subspaceIterator(java.util.Set)",
+      "public varargs double get(long[])",
+      "public double get(com.yahoo.tensor.TensorAddress)",
+      "public double get(long)",
+      "public com.yahoo.tensor.TensorType type()",
+      "public com.yahoo.tensor.IndexedTensor withType(com.yahoo.tensor.TensorType)",
+      "public com.yahoo.tensor.DimensionSizes dimensionSizes()",
+      "public java.util.Map cells()",
+      "public com.yahoo.tensor.Tensor merge(java.util.function.DoubleBinaryOperator, java.util.Map)",
+      "public com.yahoo.tensor.Tensor remove(java.util.Set)",
+      "public int hashCode()",
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public bridge synthetic com.yahoo.tensor.Tensor withType(com.yahoo.tensor.TensorType)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.MappedTensor$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.tensor.Tensor$Builder"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public static com.yahoo.tensor.MappedTensor$Builder of(com.yahoo.tensor.TensorType)",
+      "public com.yahoo.tensor.Tensor$Builder$CellBuilder cell()",
+      "public com.yahoo.tensor.TensorType type()",
+      "public com.yahoo.tensor.MappedTensor$Builder cell(com.yahoo.tensor.TensorAddress, double)",
+      "public varargs com.yahoo.tensor.MappedTensor$Builder cell(double, long[])",
+      "public com.yahoo.tensor.MappedTensor build()",
+      "public bridge synthetic com.yahoo.tensor.Tensor build()",
+      "public bridge synthetic com.yahoo.tensor.Tensor$Builder cell(double, long[])",
+      "public bridge synthetic com.yahoo.tensor.Tensor$Builder cell(com.yahoo.tensor.TensorAddress, double)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.MappedTensor": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.tensor.Tensor"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public com.yahoo.tensor.TensorType type()",
+      "public long size()",
+      "public double get(com.yahoo.tensor.TensorAddress)",
+      "public java.util.Iterator cellIterator()",
+      "public java.util.Iterator valueIterator()",
+      "public java.util.Map cells()",
+      "public com.yahoo.tensor.Tensor withType(com.yahoo.tensor.TensorType)",
+      "public com.yahoo.tensor.Tensor merge(java.util.function.DoubleBinaryOperator, java.util.Map)",
+      "public com.yahoo.tensor.Tensor remove(java.util.Set)",
+      "public int hashCode()",
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.MixedTensor$BoundBuilder": {
+    "superClass": "com.yahoo.tensor.MixedTensor$Builder",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public long denseSubspaceSize()",
+      "public com.yahoo.tensor.Tensor$Builder cell(com.yahoo.tensor.TensorAddress, double)",
+      "public com.yahoo.tensor.Tensor$Builder block(com.yahoo.tensor.TensorAddress, double[])",
+      "public com.yahoo.tensor.MixedTensor build()",
+      "public bridge synthetic com.yahoo.tensor.Tensor build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.MixedTensor$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.tensor.Tensor$Builder"
+    ],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public static com.yahoo.tensor.MixedTensor$Builder of(com.yahoo.tensor.TensorType)",
+      "public com.yahoo.tensor.TensorType type()",
+      "public varargs com.yahoo.tensor.Tensor$Builder cell(double, long[])",
+      "public com.yahoo.tensor.Tensor$Builder$CellBuilder cell()",
+      "public abstract com.yahoo.tensor.MixedTensor build()",
+      "public bridge synthetic com.yahoo.tensor.Tensor build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.MixedTensor$Index$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.TensorType)",
+      "public void put(com.yahoo.tensor.TensorAddress, long)",
+      "public com.yahoo.tensor.MixedTensor$Index build()",
+      "public com.yahoo.tensor.MixedTensor$Index index()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.MixedTensor$UnboundBuilder": {
+    "superClass": "com.yahoo.tensor.MixedTensor$Builder",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public com.yahoo.tensor.Tensor$Builder cell(com.yahoo.tensor.TensorAddress, double)",
+      "public com.yahoo.tensor.MixedTensor build()",
+      "public void trackBounds(com.yahoo.tensor.TensorAddress)",
+      "public com.yahoo.tensor.TensorType createBoundType()",
+      "public bridge synthetic com.yahoo.tensor.Tensor build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.MixedTensor": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.tensor.Tensor"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public com.yahoo.tensor.TensorType type()",
+      "public long size()",
+      "public double get(com.yahoo.tensor.TensorAddress)",
+      "public java.util.Iterator cellIterator()",
+      "public java.util.Iterator valueIterator()",
+      "public java.util.Map cells()",
+      "public com.yahoo.tensor.Tensor withType(com.yahoo.tensor.TensorType)",
+      "public com.yahoo.tensor.Tensor merge(java.util.function.DoubleBinaryOperator, java.util.Map)",
+      "public com.yahoo.tensor.Tensor remove(java.util.Set)",
+      "public int hashCode()",
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public long denseSubspaceSize()",
+      "public static com.yahoo.tensor.TensorType createPartialType(java.util.List)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.PartialAddress$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(int)",
+      "public void add(java.lang.String, long)",
+      "public com.yahoo.tensor.PartialAddress build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.PartialAddress": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [],
+    "fields": []
+  },
+  "com.yahoo.tensor.Tensor$Builder$CellBuilder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public com.yahoo.tensor.Tensor$Builder$CellBuilder label(java.lang.String, java.lang.String)",
+      "public com.yahoo.tensor.Tensor$Builder$CellBuilder label(java.lang.String, long)",
+      "public com.yahoo.tensor.Tensor$Builder value(double)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.Tensor$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public static com.yahoo.tensor.Tensor$Builder of(com.yahoo.tensor.TensorType)",
+      "public static com.yahoo.tensor.Tensor$Builder of(com.yahoo.tensor.TensorType, com.yahoo.tensor.DimensionSizes)",
+      "public abstract com.yahoo.tensor.TensorType type()",
+      "public abstract com.yahoo.tensor.Tensor$Builder$CellBuilder cell()",
+      "public abstract com.yahoo.tensor.Tensor$Builder cell(com.yahoo.tensor.TensorAddress, double)",
+      "public varargs abstract com.yahoo.tensor.Tensor$Builder cell(double, long[])",
+      "public com.yahoo.tensor.Tensor$Builder cell(com.yahoo.tensor.Tensor$Cell, double)",
+      "public abstract com.yahoo.tensor.Tensor build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.Tensor$Cell": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.Map$Entry"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public com.yahoo.tensor.TensorAddress getKey()",
+      "public java.lang.Double getValue()",
+      "public java.lang.Double setValue(java.lang.Double)",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
+      "public bridge synthetic java.lang.Object setValue(java.lang.Object)",
+      "public bridge synthetic java.lang.Object getValue()",
+      "public bridge synthetic java.lang.Object getKey()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.Tensor": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract com.yahoo.tensor.TensorType type()",
+      "public boolean isEmpty()",
+      "public abstract long size()",
+      "public abstract double get(com.yahoo.tensor.TensorAddress)",
+      "public abstract java.util.Iterator cellIterator()",
+      "public abstract java.util.Iterator valueIterator()",
+      "public abstract java.util.Map cells()",
+      "public double asDouble()",
+      "public abstract com.yahoo.tensor.Tensor withType(com.yahoo.tensor.TensorType)",
+      "public com.yahoo.tensor.Tensor modify(java.util.function.DoubleBinaryOperator, java.util.Map)",
+      "public abstract com.yahoo.tensor.Tensor merge(java.util.function.DoubleBinaryOperator, java.util.Map)",
+      "public abstract com.yahoo.tensor.Tensor remove(java.util.Set)",
+      "public com.yahoo.tensor.Tensor map(java.util.function.DoubleUnaryOperator)",
+      "public varargs com.yahoo.tensor.Tensor reduce(com.yahoo.tensor.functions.Reduce$Aggregator, java.lang.String[])",
+      "public com.yahoo.tensor.Tensor reduce(com.yahoo.tensor.functions.Reduce$Aggregator, java.util.List)",
+      "public com.yahoo.tensor.Tensor join(com.yahoo.tensor.Tensor, java.util.function.DoubleBinaryOperator)",
+      "public com.yahoo.tensor.Tensor rename(java.lang.String, java.lang.String)",
+      "public com.yahoo.tensor.Tensor concat(double, java.lang.String)",
+      "public com.yahoo.tensor.Tensor concat(com.yahoo.tensor.Tensor, java.lang.String)",
+      "public com.yahoo.tensor.Tensor rename(java.util.List, java.util.List)",
+      "public static com.yahoo.tensor.Tensor generate(com.yahoo.tensor.TensorType, java.util.function.Function)",
+      "public com.yahoo.tensor.Tensor l1Normalize(java.lang.String)",
+      "public com.yahoo.tensor.Tensor l2Normalize(java.lang.String)",
+      "public com.yahoo.tensor.Tensor matmul(com.yahoo.tensor.Tensor, java.lang.String)",
+      "public com.yahoo.tensor.Tensor softmax(java.lang.String)",
+      "public com.yahoo.tensor.Tensor xwPlusB(com.yahoo.tensor.Tensor, com.yahoo.tensor.Tensor, java.lang.String)",
+      "public com.yahoo.tensor.Tensor argmax(java.lang.String)",
+      "public com.yahoo.tensor.Tensor argmin(java.lang.String)",
+      "public static com.yahoo.tensor.Tensor diag(com.yahoo.tensor.TensorType)",
+      "public static com.yahoo.tensor.Tensor random(com.yahoo.tensor.TensorType)",
+      "public static com.yahoo.tensor.Tensor range(com.yahoo.tensor.TensorType)",
+      "public com.yahoo.tensor.Tensor multiply(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor add(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor divide(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor subtract(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor max(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor min(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor atan2(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor pow(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor fmod(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor ldexp(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor larger(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor largerOrEqual(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor smaller(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor smallerOrEqual(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor equal(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor notEqual(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor approxEqual(com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.Tensor avg()",
+      "public com.yahoo.tensor.Tensor avg(java.lang.String)",
+      "public com.yahoo.tensor.Tensor avg(java.util.List)",
+      "public com.yahoo.tensor.Tensor count()",
+      "public com.yahoo.tensor.Tensor count(java.lang.String)",
+      "public com.yahoo.tensor.Tensor count(java.util.List)",
+      "public com.yahoo.tensor.Tensor max()",
+      "public com.yahoo.tensor.Tensor max(java.lang.String)",
+      "public com.yahoo.tensor.Tensor max(java.util.List)",
+      "public com.yahoo.tensor.Tensor min()",
+      "public com.yahoo.tensor.Tensor min(java.lang.String)",
+      "public com.yahoo.tensor.Tensor min(java.util.List)",
+      "public com.yahoo.tensor.Tensor prod()",
+      "public com.yahoo.tensor.Tensor prod(java.lang.String)",
+      "public com.yahoo.tensor.Tensor prod(java.util.List)",
+      "public com.yahoo.tensor.Tensor sum()",
+      "public com.yahoo.tensor.Tensor sum(java.lang.String)",
+      "public com.yahoo.tensor.Tensor sum(java.util.List)",
+      "public abstract java.lang.String toString()",
+      "public static java.lang.String toStandardString(com.yahoo.tensor.Tensor)",
+      "public static java.lang.String contentToString(com.yahoo.tensor.Tensor)",
+      "public abstract boolean equals(java.lang.Object)",
+      "public static boolean equals(com.yahoo.tensor.Tensor, com.yahoo.tensor.Tensor)",
+      "public static boolean approxEquals(double, double, double)",
+      "public static boolean approxEquals(double, double)",
+      "public static com.yahoo.tensor.Tensor from(com.yahoo.tensor.TensorType, java.lang.String)",
+      "public static com.yahoo.tensor.Tensor from(java.lang.String, java.lang.String)",
+      "public static com.yahoo.tensor.Tensor from(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.TensorAddress$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.TensorType)",
+      "public com.yahoo.tensor.TensorAddress$Builder add(java.lang.String, java.lang.String)",
+      "public com.yahoo.tensor.TensorAddress$Builder copy()",
+      "public com.yahoo.tensor.TensorAddress build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.TensorAddress": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Comparable"
+    ],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static com.yahoo.tensor.TensorAddress of(java.lang.String[])",
+      "public static varargs com.yahoo.tensor.TensorAddress of(long[])",
+      "public abstract int size()",
+      "public abstract java.lang.String label(int)",
+      "public abstract long numericLabel(int)",
+      "public abstract com.yahoo.tensor.TensorAddress withLabel(int, long)",
+      "public final boolean isEmpty()",
+      "public int compareTo(com.yahoo.tensor.TensorAddress)",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)",
+      "public final java.lang.String toString(com.yahoo.tensor.TensorType)",
+      "public bridge synthetic int compareTo(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.TensorType$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public varargs void <init>(com.yahoo.tensor.TensorType[])",
+      "public void <init>(java.lang.Iterable)",
+      "public int rank()",
+      "public com.yahoo.tensor.TensorType$Builder set(com.yahoo.tensor.TensorType$Dimension)",
+      "public com.yahoo.tensor.TensorType$Builder indexed(java.lang.String, long)",
+      "public com.yahoo.tensor.TensorType$Builder indexed(java.lang.String)",
+      "public com.yahoo.tensor.TensorType$Builder mapped(java.lang.String)",
+      "public com.yahoo.tensor.TensorType$Builder dimension(com.yahoo.tensor.TensorType$Dimension)",
+      "public java.util.Optional getDimension(java.lang.String)",
+      "public com.yahoo.tensor.TensorType$Builder dimension(java.lang.String, com.yahoo.tensor.TensorType$Dimension$Type)",
+      "public com.yahoo.tensor.TensorType build()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.TensorType$Dimension$Type": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.tensor.TensorType$Dimension$Type[] values()",
+      "public static com.yahoo.tensor.TensorType$Dimension$Type valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.tensor.TensorType$Dimension$Type indexedBound",
+      "public static final enum com.yahoo.tensor.TensorType$Dimension$Type indexedUnbound",
+      "public static final enum com.yahoo.tensor.TensorType$Dimension$Type mapped"
+    ]
+  },
+  "com.yahoo.tensor.TensorType$Dimension": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Comparable"
+    ],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public final java.lang.String name()",
+      "public abstract java.util.Optional size()",
+      "public abstract com.yahoo.tensor.TensorType$Dimension$Type type()",
+      "public abstract com.yahoo.tensor.TensorType$Dimension withName(java.lang.String)",
+      "public boolean isIndexed()",
+      "public abstract java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
+      "public int compareTo(com.yahoo.tensor.TensorType$Dimension)",
+      "public static com.yahoo.tensor.TensorType$Dimension indexed(java.lang.String, long)",
+      "public static com.yahoo.tensor.TensorType$Dimension indexed(java.lang.String)",
+      "public static com.yahoo.tensor.TensorType$Dimension mapped(java.lang.String)",
+      "public bridge synthetic int compareTo(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.TensorType$IndexedBoundDimension": {
+    "superClass": "com.yahoo.tensor.TensorType$Dimension",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public java.util.Optional size()",
+      "public com.yahoo.tensor.TensorType$Dimension$Type type()",
+      "public com.yahoo.tensor.TensorType$IndexedBoundDimension withName(java.lang.String)",
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
+      "public bridge synthetic com.yahoo.tensor.TensorType$Dimension withName(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.TensorType$IndexedUnboundDimension": {
+    "superClass": "com.yahoo.tensor.TensorType$Dimension",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public java.util.Optional size()",
+      "public com.yahoo.tensor.TensorType$Dimension$Type type()",
+      "public com.yahoo.tensor.TensorType$IndexedUnboundDimension withName(java.lang.String)",
+      "public java.lang.String toString()",
+      "public bridge synthetic com.yahoo.tensor.TensorType$Dimension withName(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.TensorType$MappedDimension": {
+    "superClass": "com.yahoo.tensor.TensorType$Dimension",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public java.util.Optional size()",
+      "public com.yahoo.tensor.TensorType$Dimension$Type type()",
+      "public com.yahoo.tensor.TensorType$MappedDimension withName(java.lang.String)",
+      "public java.lang.String toString()",
+      "public bridge synthetic com.yahoo.tensor.TensorType$Dimension withName(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.TensorType": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public static com.yahoo.tensor.TensorType fromSpec(java.lang.String)",
+      "public int rank()",
+      "public java.util.List dimensions()",
+      "public java.util.Set dimensionNames()",
+      "public java.util.Optional dimension(java.lang.String)",
+      "public java.util.Optional indexOfDimension(java.lang.String)",
+      "public java.util.Optional sizeOfDimension(java.lang.String)",
+      "public boolean isAssignableTo(com.yahoo.tensor.TensorType)",
+      "public boolean isConvertibleTo(com.yahoo.tensor.TensorType)",
+      "public boolean isRenamableTo(com.yahoo.tensor.TensorType)",
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public boolean mathematicallyEquals(com.yahoo.tensor.TensorType)",
+      "public java.util.Optional dimensionwiseGeneralizationWith(com.yahoo.tensor.TensorType)",
+      "public int hashCode()"
+    ],
+    "fields": [
+      "public static final com.yahoo.tensor.TensorType empty"
+    ]
+  },
+  "com.yahoo.tensor.TensorTypeParser": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static com.yahoo.tensor.TensorType fromSpec(java.lang.String)",
+      "public static java.util.List dimensionsFromSpec(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.evaluation.EvaluationContext": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.tensor.evaluation.TypeContext"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract com.yahoo.tensor.Tensor getTensor(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.evaluation.MapEvaluationContext": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.tensor.evaluation.EvaluationContext"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void put(java.lang.String, com.yahoo.tensor.Tensor)",
+      "public com.yahoo.tensor.TensorType getType(java.lang.String)",
+      "public com.yahoo.tensor.TensorType getType(com.yahoo.tensor.evaluation.TypeContext$Name)",
+      "public com.yahoo.tensor.Tensor getTensor(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.evaluation.TypeContext$Name": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public java.lang.String name()",
+      "public java.lang.String toString()",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.evaluation.TypeContext": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract com.yahoo.tensor.TensorType getType(com.yahoo.tensor.evaluation.TypeContext$Name)",
+      "public abstract com.yahoo.tensor.TensorType getType(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.evaluation.VariableTensor": {
+    "superClass": "com.yahoo.tensor.functions.PrimitiveTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(java.lang.String, com.yahoo.tensor.TensorType)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
+      "public com.yahoo.tensor.Tensor evaluate(com.yahoo.tensor.evaluation.EvaluationContext)",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Argmax": {
+    "superClass": "com.yahoo.tensor.functions.CompositeTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, java.lang.String)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Argmin": {
+    "superClass": "com.yahoo.tensor.functions.CompositeTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, java.lang.String)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.CompositeTensorFunction": {
+    "superClass": "com.yahoo.tensor.functions.TensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public final com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
+      "public com.yahoo.tensor.Tensor evaluate(com.yahoo.tensor.evaluation.EvaluationContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Concat": {
+    "superClass": "com.yahoo.tensor.functions.PrimitiveTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, com.yahoo.tensor.functions.TensorFunction, java.lang.String)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)",
+      "public com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
+      "public com.yahoo.tensor.Tensor evaluate(com.yahoo.tensor.evaluation.EvaluationContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ConstantTensor": {
+    "superClass": "com.yahoo.tensor.functions.PrimitiveTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(com.yahoo.tensor.Tensor)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
+      "public com.yahoo.tensor.Tensor evaluate(com.yahoo.tensor.evaluation.EvaluationContext)",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Diag": {
+    "superClass": "com.yahoo.tensor.functions.CompositeTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.TensorType)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Generate": {
+    "superClass": "com.yahoo.tensor.functions.PrimitiveTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.TensorType, java.util.function.Function)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
+      "public com.yahoo.tensor.Tensor evaluate(com.yahoo.tensor.evaluation.EvaluationContext)",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Join": {
+    "superClass": "com.yahoo.tensor.functions.PrimitiveTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, com.yahoo.tensor.functions.TensorFunction, java.util.function.DoubleBinaryOperator)",
+      "public static com.yahoo.tensor.TensorType outputType(com.yahoo.tensor.TensorType, com.yahoo.tensor.TensorType)",
+      "public java.util.function.DoubleBinaryOperator combinator()",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)",
+      "public com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
+      "public com.yahoo.tensor.Tensor evaluate(com.yahoo.tensor.evaluation.EvaluationContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.L1Normalize": {
+    "superClass": "com.yahoo.tensor.functions.CompositeTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, java.lang.String)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.L2Normalize": {
+    "superClass": "com.yahoo.tensor.functions.CompositeTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, java.lang.String)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Map": {
+    "superClass": "com.yahoo.tensor.functions.PrimitiveTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, java.util.function.DoubleUnaryOperator)",
+      "public static com.yahoo.tensor.TensorType outputType(com.yahoo.tensor.TensorType)",
+      "public com.yahoo.tensor.functions.TensorFunction argument()",
+      "public java.util.function.DoubleUnaryOperator mapper()",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
+      "public com.yahoo.tensor.Tensor evaluate(com.yahoo.tensor.evaluation.EvaluationContext)",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Matmul": {
+    "superClass": "com.yahoo.tensor.functions.CompositeTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, com.yahoo.tensor.functions.TensorFunction, java.lang.String)",
+      "public static com.yahoo.tensor.TensorType outputType(com.yahoo.tensor.TensorType, com.yahoo.tensor.TensorType, java.lang.String)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.PrimitiveTensorFunction": {
+    "superClass": "com.yahoo.tensor.functions.TensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Random": {
+    "superClass": "com.yahoo.tensor.functions.CompositeTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.TensorType)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Range": {
+    "superClass": "com.yahoo.tensor.functions.CompositeTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.TensorType)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Reduce$Aggregator": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.tensor.functions.Reduce$Aggregator[] values()",
+      "public static com.yahoo.tensor.functions.Reduce$Aggregator valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.tensor.functions.Reduce$Aggregator avg",
+      "public static final enum com.yahoo.tensor.functions.Reduce$Aggregator count",
+      "public static final enum com.yahoo.tensor.functions.Reduce$Aggregator prod",
+      "public static final enum com.yahoo.tensor.functions.Reduce$Aggregator sum",
+      "public static final enum com.yahoo.tensor.functions.Reduce$Aggregator max",
+      "public static final enum com.yahoo.tensor.functions.Reduce$Aggregator min"
+    ]
+  },
+  "com.yahoo.tensor.functions.Reduce": {
+    "superClass": "com.yahoo.tensor.functions.PrimitiveTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, com.yahoo.tensor.functions.Reduce$Aggregator)",
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, com.yahoo.tensor.functions.Reduce$Aggregator, java.lang.String)",
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, com.yahoo.tensor.functions.Reduce$Aggregator, java.util.List)",
+      "public static com.yahoo.tensor.TensorType outputType(com.yahoo.tensor.TensorType, java.util.List)",
+      "public com.yahoo.tensor.functions.TensorFunction argument()",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)",
+      "public com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
+      "public com.yahoo.tensor.Tensor evaluate(com.yahoo.tensor.evaluation.EvaluationContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ReduceJoin": {
+    "superClass": "com.yahoo.tensor.functions.CompositeTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.Reduce, com.yahoo.tensor.functions.Join)",
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, com.yahoo.tensor.functions.TensorFunction, java.util.function.DoubleBinaryOperator, com.yahoo.tensor.functions.Reduce$Aggregator, java.util.List)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public final com.yahoo.tensor.Tensor evaluate(com.yahoo.tensor.evaluation.EvaluationContext)",
+      "public boolean canOptimize(com.yahoo.tensor.Tensor, com.yahoo.tensor.Tensor)",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Rename": {
+    "superClass": "com.yahoo.tensor.functions.PrimitiveTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, java.lang.String, java.lang.String)",
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, java.util.List, java.util.List)",
+      "public java.util.List fromDimensions()",
+      "public java.util.List toDimensions()",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
+      "public com.yahoo.tensor.Tensor evaluate(com.yahoo.tensor.evaluation.EvaluationContext)",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Abs": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Acos": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Add": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Asin": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Atan": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Ceil": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Cos": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Divide": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Elu": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Equal": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$EqualElements": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.Function"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public java.lang.Double apply(java.util.List)",
+      "public java.lang.String toString()",
+      "public bridge synthetic java.lang.Object apply(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Exp": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Floor": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Greater": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Less": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Log": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Max": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Mean": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Min": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Multiply": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Neg": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Pow": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Random": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.Function"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public java.lang.Double apply(java.util.List)",
+      "public java.lang.String toString()",
+      "public bridge synthetic java.lang.Object apply(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Reciprocal": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Relu": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Rsqrt": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Selu": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Sigmoid": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Sin": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Sqrt": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Square": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$SquaredDifference": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Subtract": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleBinaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double, double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$SumElements": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.Function"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public java.lang.Double apply(java.util.List)",
+      "public java.lang.String toString()",
+      "public bridge synthetic java.lang.Object apply(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Tan": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions$Tanh": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.util.function.DoubleUnaryOperator"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public double applyAsDouble(double)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ScalarFunctions": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static java.util.function.DoubleBinaryOperator add()",
+      "public static java.util.function.DoubleBinaryOperator divide()",
+      "public static java.util.function.DoubleBinaryOperator equal()",
+      "public static java.util.function.DoubleBinaryOperator greater()",
+      "public static java.util.function.DoubleBinaryOperator less()",
+      "public static java.util.function.DoubleBinaryOperator max()",
+      "public static java.util.function.DoubleBinaryOperator min()",
+      "public static java.util.function.DoubleBinaryOperator mean()",
+      "public static java.util.function.DoubleBinaryOperator multiply()",
+      "public static java.util.function.DoubleBinaryOperator pow()",
+      "public static java.util.function.DoubleBinaryOperator squareddifference()",
+      "public static java.util.function.DoubleBinaryOperator subtract()",
+      "public static java.util.function.DoubleUnaryOperator abs()",
+      "public static java.util.function.DoubleUnaryOperator acos()",
+      "public static java.util.function.DoubleUnaryOperator asin()",
+      "public static java.util.function.DoubleUnaryOperator atan()",
+      "public static java.util.function.DoubleUnaryOperator ceil()",
+      "public static java.util.function.DoubleUnaryOperator cos()",
+      "public static java.util.function.DoubleUnaryOperator elu()",
+      "public static java.util.function.DoubleUnaryOperator exp()",
+      "public static java.util.function.DoubleUnaryOperator floor()",
+      "public static java.util.function.DoubleUnaryOperator log()",
+      "public static java.util.function.DoubleUnaryOperator neg()",
+      "public static java.util.function.DoubleUnaryOperator reciprocal()",
+      "public static java.util.function.DoubleUnaryOperator relu()",
+      "public static java.util.function.DoubleUnaryOperator rsqrt()",
+      "public static java.util.function.DoubleUnaryOperator selu()",
+      "public static java.util.function.DoubleUnaryOperator sin()",
+      "public static java.util.function.DoubleUnaryOperator sigmoid()",
+      "public static java.util.function.DoubleUnaryOperator sqrt()",
+      "public static java.util.function.DoubleUnaryOperator square()",
+      "public static java.util.function.DoubleUnaryOperator tan()",
+      "public static java.util.function.DoubleUnaryOperator tanh()",
+      "public static java.util.function.Function random()",
+      "public static java.util.function.Function equal(java.util.List)",
+      "public static java.util.function.Function sum(java.util.List)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.Softmax": {
+    "superClass": "com.yahoo.tensor.functions.CompositeTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, java.lang.String)",
+      "public static com.yahoo.tensor.TensorType outputType(com.yahoo.tensor.TensorType, java.lang.String)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.TensorFunction": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public abstract java.util.List arguments()",
+      "public abstract com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public abstract com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public abstract com.yahoo.tensor.Tensor evaluate(com.yahoo.tensor.evaluation.EvaluationContext)",
+      "public abstract com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
+      "public final com.yahoo.tensor.Tensor evaluate()",
+      "public abstract java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.ToStringContext": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public static com.yahoo.tensor.functions.ToStringContext empty()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.tensor.functions.XwPlusB": {
+    "superClass": "com.yahoo.tensor.functions.CompositeTensorFunction",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.functions.TensorFunction, com.yahoo.tensor.functions.TensorFunction, com.yahoo.tensor.functions.TensorFunction, java.lang.String)",
+      "public java.util.List arguments()",
+      "public com.yahoo.tensor.functions.TensorFunction withArguments(java.util.List)",
+      "public com.yahoo.tensor.functions.PrimitiveTensorFunction toPrimitive()",
+      "public java.lang.String toString(com.yahoo.tensor.functions.ToStringContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.AbstractUtf8Array": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.Comparable"
+    ],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public final void writeTo(java.nio.ByteBuffer)",
+      "public byte getByte(int)",
+      "public abstract int getByteLength()",
+      "public java.nio.ByteBuffer wrap()",
+      "protected abstract byte[] getBytes()",
+      "public boolean isEmpty()",
+      "protected abstract int getByteOffset()",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)",
+      "public java.lang.String toString()",
+      "public int compareTo(com.yahoo.text.AbstractUtf8Array)",
+      "public com.yahoo.text.Utf8Array ascii7BitLowerCase()",
+      "public bridge synthetic int compareTo(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.Ascii$Decoder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public java.lang.String decode(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.Ascii$Encoder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public java.lang.String encode(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.Ascii": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static varargs java.lang.String encode(java.lang.String, java.nio.charset.Charset, int[])",
+      "public static java.lang.String decode(java.lang.String, java.nio.charset.Charset)",
+      "public static varargs com.yahoo.text.Ascii$Encoder newEncoder(java.nio.charset.Charset, int[])",
+      "public static com.yahoo.text.Ascii$Decoder newDecoder(java.nio.charset.Charset)"
+    ],
+    "fields": [
+      "public static final char ESCAPE_CHAR"
+    ]
+  },
+  "com.yahoo.text.BooleanParser": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static boolean parseBoolean(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.CaseInsensitiveIdentifier": {
+    "superClass": "com.yahoo.text.Identifier",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(byte[])",
+      "public void <init>(com.yahoo.text.AbstractUtf8Array)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.DataTypeIdentifier": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(com.yahoo.text.AbstractUtf8Array)",
+      "public void <init>(byte[])",
+      "public static com.yahoo.text.DataTypeIdentifier createArrayDataTypeIdentifier(com.yahoo.text.DataTypeIdentifier)",
+      "public static com.yahoo.text.DataTypeIdentifier createAnnotationReferenceDataTypeIdentifier(com.yahoo.text.DataTypeIdentifier)",
+      "public static com.yahoo.text.DataTypeIdentifier createMapDataTypeIdentifier(com.yahoo.text.DataTypeIdentifier, com.yahoo.text.DataTypeIdentifier)",
+      "public static com.yahoo.text.DataTypeIdentifier createWeightedSetTypeIdentifier(com.yahoo.text.DataTypeIdentifier, boolean, boolean)",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)",
+      "public java.lang.String toString()",
+      "public final com.yahoo.text.Utf8String getUtf8()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.ForwardWriter": {
+    "superClass": "com.yahoo.text.GenericWriter",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.text.GenericWriter)",
+      "public void write(char[], int, int)",
+      "public com.yahoo.text.GenericWriter write(com.yahoo.text.AbstractUtf8Array)",
+      "public void write(java.lang.String)",
+      "public com.yahoo.text.GenericWriter write(java.lang.CharSequence)",
+      "public com.yahoo.text.GenericWriter write(double)",
+      "public com.yahoo.text.GenericWriter write(float)",
+      "public com.yahoo.text.GenericWriter write(long)",
+      "public void write(int)",
+      "public com.yahoo.text.GenericWriter write(short)",
+      "public com.yahoo.text.GenericWriter write(char)",
+      "public com.yahoo.text.GenericWriter write(byte)",
+      "public com.yahoo.text.GenericWriter write(boolean)",
+      "public void flush()",
+      "public void close()",
+      "public com.yahoo.text.GenericWriter getWriter()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.GenericWriter": {
+    "superClass": "java.io.Writer",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public com.yahoo.text.GenericWriter write(char)",
+      "public com.yahoo.text.GenericWriter write(java.lang.CharSequence)",
+      "public com.yahoo.text.GenericWriter write(long)",
+      "public com.yahoo.text.GenericWriter write(short)",
+      "public com.yahoo.text.GenericWriter write(byte)",
+      "public com.yahoo.text.GenericWriter write(double)",
+      "public com.yahoo.text.GenericWriter write(float)",
+      "public com.yahoo.text.GenericWriter write(boolean)",
+      "public com.yahoo.text.GenericWriter write(com.yahoo.text.AbstractUtf8Array)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.HTML": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static java.lang.String htmlescape(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.Identifier": {
+    "superClass": "com.yahoo.text.Utf8Array",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(com.yahoo.text.AbstractUtf8Array)",
+      "public void <init>(byte[])"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.JSON": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public static java.lang.String encode(java.util.Map)",
+      "public static java.lang.String escape(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.JSONWriter": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(java.io.OutputStream)",
+      "public com.yahoo.text.JSONWriter beginField(java.lang.String)",
+      "public com.yahoo.text.JSONWriter endField()",
+      "public com.yahoo.text.JSONWriter beginArrayValue()",
+      "public com.yahoo.text.JSONWriter endArrayValue()",
+      "public com.yahoo.text.JSONWriter beginObject()",
+      "public com.yahoo.text.JSONWriter endObject()",
+      "public com.yahoo.text.JSONWriter beginArray()",
+      "public com.yahoo.text.JSONWriter endArray()",
+      "public com.yahoo.text.JSONWriter value(java.lang.String)",
+      "public com.yahoo.text.JSONWriter value(java.lang.Number)",
+      "public com.yahoo.text.JSONWriter value(boolean)",
+      "public com.yahoo.text.JSONWriter value()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.JavaWriterWriter": {
+    "superClass": "com.yahoo.text.GenericWriter",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(java.io.Writer)",
+      "public void write(char[], int, int)",
+      "public void flush()",
+      "public void close()",
+      "public final java.io.Writer getWriter()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.Lowercase": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static java.lang.String toLowerCase(java.lang.String)",
+      "public static java.lang.String toUpperCase(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.LowercaseIdentifier": {
+    "superClass": "com.yahoo.text.Identifier",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(com.yahoo.text.AbstractUtf8Array)",
+      "public void <init>(byte[])"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.MapParser": {
+    "superClass": "com.yahoo.text.SimpleMapParser",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public java.util.Map parseToMap(java.lang.String)",
+      "public java.util.Map parse(java.lang.String, java.util.Map)",
+      "protected void handleKeyValue(java.lang.String, java.lang.String)",
+      "protected abstract java.lang.Object parseValue(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.PositionedString": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public java.lang.String string()",
+      "public int position()",
+      "public void setPosition(int)",
+      "public void consume(char)",
+      "public void consumeSpaces()",
+      "public boolean consumeOptional(char)",
+      "public boolean peek(char)",
+      "public int indexOf(char)",
+      "public void skip(int)",
+      "public java.lang.String consumeTo(char)",
+      "public java.lang.String consumeToPosition(int)",
+      "public java.lang.String substring(int)",
+      "public java.lang.String substring()",
+      "public java.lang.String at()",
+      "public java.lang.String at(int)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.SimpleMapParser": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void parse(java.lang.String)",
+      "protected int findEndOfKey()",
+      "protected int findEndOfValue()",
+      "protected void consumeValue(java.lang.String)",
+      "public com.yahoo.text.PositionedString string()",
+      "protected abstract void handleKeyValue(java.lang.String, java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.StringUtilities": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static java.lang.String escape(java.lang.String)",
+      "public static java.lang.String escape(java.lang.String, char)",
+      "public static java.lang.String unescape(java.lang.String)",
+      "public static java.lang.String implode(java.lang.String[], java.lang.String)",
+      "public static java.lang.String implodeMultiline(java.util.List)",
+      "public static java.lang.String truncateSequencesIfNecessary(java.lang.String, int)",
+      "public static java.lang.String stripSuffix(java.lang.String, java.lang.String)",
+      "public static java.lang.String quote(java.lang.Object)",
+      "public static java.util.Set split(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.Text": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public static boolean isTextCharacter(int)",
+      "public static java.util.OptionalInt validateTextString(java.lang.String)",
+      "public static boolean isDisplayable(int)",
+      "public static java.lang.String stripInvalidCharacters(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.Utf8": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static java.nio.charset.Charset getCharset()",
+      "public static java.lang.String toStringStd(byte[])",
+      "public static java.lang.String toString(byte[], int, int)",
+      "public static java.lang.String toString(java.nio.ByteBuffer)",
+      "public static byte[] toBytesStd(java.lang.String)",
+      "public static byte[] toAsciiBytes(long)",
+      "public static byte[] toAsciiBytes(boolean)",
+      "public static byte[] toBytes(java.lang.String)",
+      "public static java.lang.String toString(byte[])",
+      "public static byte[] toBytes(java.lang.String, int, int)",
+      "public static int toBytes(java.lang.String, int, int, byte[], int)",
+      "public static void toBytes(java.lang.String, int, int, java.nio.ByteBuffer, java.nio.charset.CharsetEncoder)",
+      "public static java.nio.charset.CharsetEncoder getNewEncoder()",
+      "public static int byteCount(java.lang.CharSequence)",
+      "public static int byteCount(java.lang.CharSequence, int, int)",
+      "public static int unitCount(byte[])",
+      "public static int unitCount(byte[], int, int)",
+      "public static int unitCount(byte)",
+      "public static int totalBytes(byte)",
+      "public static int[] calculateBytePositions(java.lang.CharSequence)",
+      "public static int[] calculateStringPositions(byte[])",
+      "public static byte[] encode(int)",
+      "public static int encode(int, byte[], int)",
+      "public static void encode(int, java.nio.ByteBuffer)",
+      "public static int encode(int, java.io.OutputStream)",
+      "public static int codePointAsUtf8Length(int)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.Utf8Array": {
+    "superClass": "com.yahoo.text.AbstractUtf8Array",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(byte[])",
+      "public void <init>(byte[], int, int)",
+      "public void <init>(java.nio.ByteBuffer, int)",
+      "public byte[] getBytes()",
+      "public int getByteLength()",
+      "protected int getByteOffset()"
+    ],
+    "fields": [
+      "protected final byte[] utf8"
+    ]
+  },
+  "com.yahoo.text.Utf8PartialArray": {
+    "superClass": "com.yahoo.text.Utf8Array",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(byte[], int, int)",
+      "public int getByteLength()",
+      "protected int getByteOffset()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.Utf8String": {
+    "superClass": "com.yahoo.text.Utf8Array",
+    "interfaces": [
+      "java.lang.CharSequence"
+    ],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public void <init>(com.yahoo.text.AbstractUtf8Array)",
+      "public char charAt(int)",
+      "public int length()",
+      "public java.lang.CharSequence subSequence(int, int)",
+      "public boolean equals(java.lang.Object)",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.XML": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static java.lang.String xmlEscape(java.lang.String)",
+      "public static java.lang.String xmlEscape(java.lang.String, boolean)",
+      "public static java.lang.String xmlEscape(java.lang.String, boolean, char)",
+      "public static java.lang.String xmlEscape(java.lang.String, boolean, boolean)",
+      "public static java.lang.String xmlEscape(java.lang.String, boolean, boolean, char)",
+      "public static java.lang.String xmlEscape(java.lang.String, boolean, java.lang.StringBuilder)",
+      "public static java.lang.String xmlEscape(java.lang.String, boolean, boolean, java.lang.StringBuilder)",
+      "public static java.lang.String xmlEscape(java.lang.String, boolean, boolean, java.lang.StringBuilder, int)",
+      "public static org.w3c.dom.Document getDocument(java.io.File)",
+      "public static org.w3c.dom.Document getDocument(java.io.Reader)",
+      "public static org.w3c.dom.Document getDocument(java.lang.String)",
+      "public static javax.xml.parsers.DocumentBuilder getDocumentBuilder()",
+      "public static javax.xml.parsers.DocumentBuilder getDocumentBuilder(java.lang.String, java.lang.ClassLoader)",
+      "public static java.util.List getChildren(org.w3c.dom.Element)",
+      "public static java.util.List getChildren(org.w3c.dom.Element, java.lang.String)",
+      "public static java.lang.String getValue(org.w3c.dom.Element)",
+      "public static org.w3c.dom.Element getChild(org.w3c.dom.Element, java.lang.String)",
+      "public static java.lang.String getNodePath(org.w3c.dom.Node, java.lang.String)",
+      "public static boolean isName(java.lang.CharSequence)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.text.XMLWriter": {
+    "superClass": "com.yahoo.text.ForwardWriter",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.io.Writer)",
+      "public void <init>(java.io.Writer, boolean)",
+      "public void <init>(java.io.Writer, int)",
+      "public void <init>(java.io.Writer, int, boolean)",
+      "public void <init>(java.io.Writer, int, int)",
+      "public void <init>(java.io.Writer, int, int, boolean)",
+      "public static com.yahoo.text.XMLWriter from(java.io.Writer, int, int)",
+      "public static com.yahoo.text.XMLWriter from(java.io.Writer)",
+      "public java.io.Writer getWrapped()",
+      "public void xmlHeader(java.lang.String)",
+      "public com.yahoo.text.XMLWriter openTag(java.lang.String)",
+      "public com.yahoo.text.XMLWriter openTag(com.yahoo.text.Utf8String)",
+      "public com.yahoo.text.XMLWriter closeTag()",
+      "public com.yahoo.text.XMLWriter closeStartTag()",
+      "public com.yahoo.text.XMLWriter forceAttribute(com.yahoo.text.Utf8String, java.lang.Object)",
+      "public com.yahoo.text.XMLWriter forceAttribute(java.lang.String, java.lang.Object)",
+      "public com.yahoo.text.XMLWriter attribute(com.yahoo.text.Utf8String, com.yahoo.text.AbstractUtf8Array)",
+      "public com.yahoo.text.XMLWriter attribute(com.yahoo.text.Utf8String, java.lang.Number)",
+      "public com.yahoo.text.XMLWriter attribute(com.yahoo.text.Utf8String, long)",
+      "public com.yahoo.text.XMLWriter attribute(com.yahoo.text.Utf8String, double)",
+      "public com.yahoo.text.XMLWriter attribute(com.yahoo.text.Utf8String, boolean)",
+      "public com.yahoo.text.XMLWriter attribute(com.yahoo.text.Utf8String, java.lang.String)",
+      "public com.yahoo.text.XMLWriter attribute(java.lang.String, java.lang.Object)",
+      "public com.yahoo.text.XMLWriter content(java.lang.Object, boolean)",
+      "public com.yahoo.text.XMLWriter escapedContent(java.lang.String, boolean)",
+      "public com.yahoo.text.XMLWriter escapedAsciiContent(java.lang.String, boolean)",
+      "public java.util.List openTags()",
+      "public boolean isIn(com.yahoo.text.Utf8String)",
+      "public boolean isIn(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.hadoop.mapreduce.VespaOutputCommitter": {
+    "superClass": "org.apache.hadoop.mapreduce.OutputCommitter",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void setupJob(org.apache.hadoop.mapreduce.JobContext)",
+      "public void setupTask(org.apache.hadoop.mapreduce.TaskAttemptContext)",
+      "public boolean needsTaskCommit(org.apache.hadoop.mapreduce.TaskAttemptContext)",
+      "public void commitTask(org.apache.hadoop.mapreduce.TaskAttemptContext)",
+      "public void abortTask(org.apache.hadoop.mapreduce.TaskAttemptContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.hadoop.mapreduce.VespaOutputFormat": {
+    "superClass": "org.apache.hadoop.mapreduce.OutputFormat",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(java.util.Properties)",
+      "public org.apache.hadoop.mapreduce.RecordWriter getRecordWriter(org.apache.hadoop.mapreduce.TaskAttemptContext)",
+      "public org.apache.hadoop.mapreduce.OutputCommitter getOutputCommitter(org.apache.hadoop.mapreduce.TaskAttemptContext)",
+      "public void checkOutputSpecs(org.apache.hadoop.mapreduce.JobContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.hadoop.mapreduce.VespaRecordWriter": {
+    "superClass": "org.apache.hadoop.mapreduce.RecordWriter",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void write(java.lang.Object, java.lang.Object)",
+      "public void close(org.apache.hadoop.mapreduce.TaskAttemptContext)",
+      "protected com.yahoo.vespa.http.client.config.ConnectionParams$Builder configureConnectionParams()",
+      "protected com.yahoo.vespa.http.client.config.FeedParams$Builder configureFeedParams()",
+      "protected com.yahoo.vespa.http.client.config.SessionParams$Builder configureSessionParams()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.hadoop.mapreduce.VespaSimpleJsonInputFormat$VespaJsonRecordReader": {
+    "superClass": "org.apache.hadoop.mapreduce.RecordReader",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void initialize(org.apache.hadoop.mapreduce.InputSplit, org.apache.hadoop.mapreduce.TaskAttemptContext)",
+      "public boolean nextKeyValue()",
+      "public org.apache.hadoop.io.Text getCurrentKey()",
+      "public org.apache.hadoop.io.NullWritable getCurrentValue()",
+      "public float getProgress()",
+      "public void close()",
+      "public bridge synthetic java.lang.Object getCurrentValue()",
+      "public bridge synthetic java.lang.Object getCurrentKey()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.hadoop.mapreduce.VespaSimpleJsonInputFormat": {
+    "superClass": "org.apache.hadoop.mapreduce.lib.input.FileInputFormat",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public org.apache.hadoop.mapreduce.RecordReader createRecordReader(org.apache.hadoop.mapreduce.InputSplit, org.apache.hadoop.mapreduce.TaskAttemptContext)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.hadoop.pig.VespaDocumentOperation$Operation": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.vespa.hadoop.pig.VespaDocumentOperation$Operation[] values()",
+      "public static com.yahoo.vespa.hadoop.pig.VespaDocumentOperation$Operation valueOf(java.lang.String)",
+      "public java.lang.String toString()",
+      "public static com.yahoo.vespa.hadoop.pig.VespaDocumentOperation$Operation fromString(java.lang.String)",
+      "public static boolean valid(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.vespa.hadoop.pig.VespaDocumentOperation$Operation DOCUMENT",
+      "public static final enum com.yahoo.vespa.hadoop.pig.VespaDocumentOperation$Operation PUT",
+      "public static final enum com.yahoo.vespa.hadoop.pig.VespaDocumentOperation$Operation ID",
+      "public static final enum com.yahoo.vespa.hadoop.pig.VespaDocumentOperation$Operation REMOVE",
+      "public static final enum com.yahoo.vespa.hadoop.pig.VespaDocumentOperation$Operation UPDATE"
+    ]
+  },
+  "com.yahoo.vespa.hadoop.pig.VespaDocumentOperation": {
+    "superClass": "org.apache.pig.EvalFunc",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public varargs void <init>(java.lang.String[])",
+      "public java.lang.String exec(org.apache.pig.data.Tuple)",
+      "public static java.lang.String create(com.yahoo.vespa.hadoop.pig.VespaDocumentOperation$Operation, java.lang.String, java.util.Map, java.util.Properties)",
+      "public bridge synthetic java.lang.Object exec(org.apache.pig.data.Tuple)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.hadoop.pig.VespaQuery": {
+    "superClass": "org.apache.pig.EvalFunc",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public varargs void <init>(java.lang.String[])",
+      "public org.apache.pig.data.DataBag exec(org.apache.pig.data.Tuple)",
+      "public org.apache.pig.impl.logicalLayer.schema.Schema outputSchema(org.apache.pig.impl.logicalLayer.schema.Schema)",
+      "public bridge synthetic java.lang.Object exec(org.apache.pig.data.Tuple)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.hadoop.pig.VespaSimpleJsonLoader": {
+    "superClass": "org.apache.pig.LoadFunc",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void setLocation(java.lang.String, org.apache.hadoop.mapreduce.Job)",
+      "public org.apache.hadoop.mapreduce.InputFormat getInputFormat()",
+      "public void prepareToRead(org.apache.hadoop.mapreduce.RecordReader, org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.PigSplit)",
+      "public org.apache.pig.data.Tuple getNext()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.hadoop.pig.VespaStorage": {
+    "superClass": "org.apache.pig.StoreFunc",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public varargs void <init>(java.lang.String[])",
+      "public org.apache.hadoop.mapreduce.OutputFormat getOutputFormat()",
+      "public void setStoreLocation(java.lang.String, org.apache.hadoop.mapreduce.Job)",
+      "public void prepareToWrite(org.apache.hadoop.mapreduce.RecordWriter)",
+      "public void putNext(org.apache.pig.data.Tuple)",
+      "public void checkSchema(org.apache.pig.ResourceSchema)",
+      "public java.lang.String relToAbsPathForStoreLocation(java.lang.String, org.apache.hadoop.fs.Path)",
+      "public void setStoreFuncUDFContextSignature(java.lang.String)",
+      "public void cleanupOnFailure(java.lang.String, org.apache.hadoop.mapreduce.Job)",
+      "public void cleanupOnSuccess(java.lang.String, org.apache.hadoop.mapreduce.Job)",
+      "public static java.lang.String base64Serialize(java.lang.Object)",
+      "public static java.io.Serializable base64Deserialize(java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.FeedClient$ResultCallback": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void onCompletion(java.lang.String, com.yahoo.vespa.http.client.Result)",
+      "public void onEndpointException(com.yahoo.vespa.http.client.FeedEndpointException)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.FeedClient": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.AutoCloseable"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public void stream(java.lang.String, java.lang.CharSequence)",
+      "public void stream(java.lang.String, java.lang.CharSequence, java.lang.Object)",
+      "public abstract void stream(java.lang.String, java.lang.String, java.lang.CharSequence, java.lang.Object)",
+      "public abstract void close()",
+      "public abstract java.lang.String getStatsAsJson()",
+      "public static void feedJson(java.io.InputStream, com.yahoo.vespa.http.client.FeedClient, java.util.concurrent.atomic.AtomicInteger)",
+      "public static void feedXml(java.io.InputStream, com.yahoo.vespa.http.client.FeedClient, java.util.concurrent.atomic.AtomicInteger)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.FeedClientFactory": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static com.yahoo.vespa.http.client.FeedClient create(com.yahoo.vespa.http.client.config.SessionParams, com.yahoo.vespa.http.client.FeedClient$ResultCallback)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.FeedConnectException": {
+    "superClass": "com.yahoo.vespa.http.client.FeedEndpointException",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.Throwable, com.yahoo.vespa.http.client.config.Endpoint)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.FeedEndpointException": {
+    "superClass": "java.lang.RuntimeException",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "protected void <init>(java.lang.String, java.lang.Throwable, com.yahoo.vespa.http.client.config.Endpoint)",
+      "public com.yahoo.vespa.http.client.config.Endpoint getEndpoint()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.FeedProtocolException": {
+    "superClass": "com.yahoo.vespa.http.client.FeedEndpointException",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(int, java.lang.String, java.lang.Throwable, com.yahoo.vespa.http.client.config.Endpoint)",
+      "public int getHttpStatusCode()",
+      "public java.lang.String getHttpResponseMessage()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.Result$Detail": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.vespa.http.client.config.Endpoint, com.yahoo.vespa.http.client.Result$ResultType, java.lang.String, java.lang.Exception)",
+      "public void <init>(com.yahoo.vespa.http.client.config.Endpoint)",
+      "public com.yahoo.vespa.http.client.config.Endpoint getEndpoint()",
+      "public boolean isSuccess()",
+      "public com.yahoo.vespa.http.client.Result$ResultType getResultType()",
+      "public java.lang.Exception getException()",
+      "public java.lang.String getTraceMessage()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.Result$ResultType": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.vespa.http.client.Result$ResultType[] values()",
+      "public static com.yahoo.vespa.http.client.Result$ResultType valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.vespa.http.client.Result$ResultType OPERATION_EXECUTED",
+      "public static final enum com.yahoo.vespa.http.client.Result$ResultType TRANSITIVE_ERROR",
+      "public static final enum com.yahoo.vespa.http.client.Result$ResultType CONDITION_NOT_MET",
+      "public static final enum com.yahoo.vespa.http.client.Result$ResultType FATAL_ERROR"
+    ]
+  },
+  "com.yahoo.vespa.http.client.Result": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.vespa.http.client.core.Document, java.util.Collection, java.lang.StringBuilder)",
+      "public java.lang.String getDocumentId()",
+      "public java.lang.String getOperationId()",
+      "public java.lang.CharSequence getDocumentDataAsCharSequence()",
+      "public java.lang.Object getContext()",
+      "public boolean isSuccess()",
+      "public java.util.List getDetails()",
+      "public boolean hasLocalTrace()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.Session": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.AutoCloseable"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract java.io.OutputStream stream(java.lang.CharSequence)",
+      "public abstract java.util.concurrent.BlockingQueue results()",
+      "public abstract void close()",
+      "public abstract java.lang.String getStatsAsJson()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.SessionFactory": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static com.yahoo.vespa.http.client.Session create(com.yahoo.vespa.http.client.config.SessionParams)",
+      "public static com.yahoo.vespa.http.client.Session create(com.yahoo.vespa.http.client.config.Endpoint)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.SimpleLoggerResultCallback": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.vespa.http.client.FeedClient$ResultCallback"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "protected void println(java.lang.String)",
+      "public void <init>(java.util.concurrent.atomic.AtomicInteger, int)",
+      "public void printProgress()",
+      "protected com.yahoo.vespa.http.client.SimpleLoggerResultCallback$DocumentRate newSamplingPeriod(java.time.Instant)",
+      "public void onCompletion(java.lang.String, com.yahoo.vespa.http.client.Result)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.SyncFeedClient$SyncOperation": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String, java.lang.CharSequence)",
+      "public void <init>(java.lang.String, java.lang.CharSequence, java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.SyncFeedClient$SyncResult": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public java.util.List results()",
+      "public java.lang.Exception exception()",
+      "public boolean isSuccess()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.SyncFeedClient": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.AutoCloseable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.vespa.http.client.config.SessionParams)",
+      "public com.yahoo.vespa.http.client.SyncFeedClient$SyncResult stream(java.util.List)",
+      "public void close()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.Cluster$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public com.yahoo.vespa.http.client.config.Cluster$Builder addEndpoint(com.yahoo.vespa.http.client.config.Endpoint)",
+      "public com.yahoo.vespa.http.client.config.Cluster$Builder setRoute(java.lang.String)",
+      "public com.yahoo.vespa.http.client.config.Cluster build()",
+      "public java.lang.String getRoute()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.Cluster": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public java.util.List getEndpoints()",
+      "public java.lang.String getRoute()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.ConnectionParams$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setSslContext(javax.net.ssl.SSLContext)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setHostnameVerifier(javax.net.ssl.HostnameVerifier)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder addHeader(java.lang.String, java.lang.String)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder addDynamicHeader(java.lang.String, com.yahoo.vespa.http.client.config.ConnectionParams$HeaderProvider)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setNumPersistentConnectionsPerEndpoint(int)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setProxyHost(java.lang.String)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setProxyPort(int)",
+      "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 setMinTimeBetweenRetries(long, java.util.concurrent.TimeUnit)",
+      "public long getMinTimeBetweenRetriesMs()",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setTraceLevel(int)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setTraceEveryXOperation(int)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setPrintTraceToStdErr(boolean)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams build()",
+      "public int getNumPersistentConnectionsPerEndpoint()",
+      "public java.lang.String getProxyHost()",
+      "public boolean isDryRun()",
+      "public int getMaxRetries()",
+      "public int getTraceLevel()",
+      "public int getTraceEveryXOperation()",
+      "public boolean getPrintTraceToStdErr()",
+      "public int getProxyPort()",
+      "public javax.net.ssl.SSLContext getSslContext()",
+      "public javax.net.ssl.HostnameVerifier getHostnameVerifier()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.ConnectionParams$HeaderProvider": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract java.lang.String getHeaderValue()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.ConnectionParams": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public javax.net.ssl.SSLContext getSslContext()",
+      "public javax.net.ssl.HostnameVerifier getHostnameVerifier()",
+      "public java.util.Collection getHeaders()",
+      "public java.util.Map getDynamicHeaders()",
+      "public int getNumPersistentConnectionsPerEndpoint()",
+      "public java.lang.String getProxyHost()",
+      "public int getProxyPort()",
+      "public boolean getUseCompression()",
+      "public int getMaxRetries()",
+      "public long getMinTimeBetweenRetriesMs()",
+      "public boolean isDryRun()",
+      "public int getTraceLevel()",
+      "public int getTraceEveryXOperation()",
+      "public boolean getPrintTraceToStdErr()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.Endpoint": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.io.Serializable"
+    ],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public static com.yahoo.vespa.http.client.config.Endpoint create(java.lang.String)",
+      "public static com.yahoo.vespa.http.client.config.Endpoint create(java.lang.String, int, boolean)",
+      "public java.lang.String getHostname()",
+      "public int getPort()",
+      "public boolean isUseSsl()",
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.FeedParams$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder withSilentUpgrade(boolean)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setMaxSleepTimeMs(long)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setDenyIfBusyV3(boolean)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setDataFormat(com.yahoo.vespa.http.client.config.FeedParams$DataFormat)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setRoute(java.lang.String)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setServerTimeout(long, java.util.concurrent.TimeUnit)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setClientTimeout(long, java.util.concurrent.TimeUnit)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setMaxChunkSizeBytes(int)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setMaxInFlightRequests(int)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setLocalQueueTimeOut(long)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setPriority(java.lang.String)",
+      "public com.yahoo.vespa.http.client.config.FeedParams build()",
+      "public long getClientTimeout(java.util.concurrent.TimeUnit)",
+      "public long getServerTimeout(java.util.concurrent.TimeUnit)",
+      "public java.lang.String getRoute()",
+      "public com.yahoo.vespa.http.client.config.FeedParams$DataFormat getDataFormat()",
+      "public int getMaxChunkSizeBytes()",
+      "public int getmaxInFlightRequests()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.FeedParams$DataFormat": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.vespa.http.client.config.FeedParams$DataFormat[] values()",
+      "public static com.yahoo.vespa.http.client.config.FeedParams$DataFormat valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.vespa.http.client.config.FeedParams$DataFormat XML_UTF8",
+      "public static final enum com.yahoo.vespa.http.client.config.FeedParams$DataFormat JSON_UTF8"
+    ]
+  },
+  "com.yahoo.vespa.http.client.config.FeedParams": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public boolean getDenyIfBusyV3()",
+      "public long getMaxSleepTimeMs()",
+      "public boolean getSilentUpgrade()",
+      "public com.yahoo.vespa.http.client.config.FeedParams$DataFormat getDataFormat()",
+      "public java.lang.String getRoute()",
+      "public long getServerTimeout(java.util.concurrent.TimeUnit)",
+      "public long getClientTimeout(java.util.concurrent.TimeUnit)",
+      "public int getMaxChunkSizeBytes()",
+      "public java.lang.String getPriority()",
+      "public java.lang.String toUriParameters()",
+      "public int getMaxInFlightRequests()",
+      "public long getLocalQueueTimeOut()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.SessionParams$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder addCluster(com.yahoo.vespa.http.client.config.Cluster)",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setFeedParams(com.yahoo.vespa.http.client.config.FeedParams)",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setConnectionParams(com.yahoo.vespa.http.client.config.ConnectionParams)",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setErrorReporter(com.yahoo.vespa.http.client.config.SessionParams$ErrorReporter)",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setClientQueueSize(int)",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setThrottlerMinSize(int)",
+      "public com.yahoo.vespa.http.client.config.SessionParams build()",
+      "public com.yahoo.vespa.http.client.config.FeedParams getFeedParams()",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams getConnectionParams()",
+      "public int getClientQueueSize()",
+      "public int getThrottlerMinSize()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.SessionParams$ErrorReporter": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void onSessionError(com.yahoo.vespa.http.client.config.Endpoint, java.lang.String, java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.SessionParams": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public java.util.List getClusters()",
+      "public com.yahoo.vespa.http.client.config.FeedParams getFeedParams()",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams getConnectionParams()",
+      "public int getClientQueueSize()",
+      "public int getThrottlerMinSize()",
+      "public com.yahoo.vespa.http.client.config.SessionParams$ErrorReporter getErrorReport()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.objects.BufferSerializer": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.vespa.objects.Serializer",
+      "com.yahoo.vespa.objects.Deserializer"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.io.GrowableByteBuffer)",
+      "public void <init>(java.nio.ByteBuffer)",
+      "public void <init>(byte[])",
+      "public void <init>()",
+      "public static com.yahoo.vespa.objects.BufferSerializer wrap(byte[])",
+      "public final com.yahoo.io.GrowableByteBuffer getBuf()",
+      "protected final void setBuf(com.yahoo.io.GrowableByteBuffer)",
+      "public com.yahoo.vespa.objects.Serializer putByte(com.yahoo.vespa.objects.FieldBase, byte)",
+      "public com.yahoo.vespa.objects.Serializer putShort(com.yahoo.vespa.objects.FieldBase, short)",
+      "public com.yahoo.vespa.objects.Serializer putInt(com.yahoo.vespa.objects.FieldBase, int)",
+      "public com.yahoo.vespa.objects.Serializer putLong(com.yahoo.vespa.objects.FieldBase, long)",
+      "public com.yahoo.vespa.objects.Serializer putFloat(com.yahoo.vespa.objects.FieldBase, float)",
+      "public com.yahoo.vespa.objects.Serializer putDouble(com.yahoo.vespa.objects.FieldBase, double)",
+      "public com.yahoo.vespa.objects.Serializer put(com.yahoo.vespa.objects.FieldBase, byte[])",
+      "public com.yahoo.vespa.objects.Serializer put(com.yahoo.vespa.objects.FieldBase, java.lang.String)",
+      "public com.yahoo.vespa.objects.Serializer put(com.yahoo.vespa.objects.FieldBase, java.nio.ByteBuffer)",
+      "public com.yahoo.vespa.objects.Serializer putInt1_4Bytes(com.yahoo.vespa.objects.FieldBase, int)",
+      "public com.yahoo.vespa.objects.Serializer putInt2_4_8Bytes(com.yahoo.vespa.objects.FieldBase, long)",
+      "public int position()",
+      "public java.nio.ByteOrder order()",
+      "public void position(int)",
+      "public void order(java.nio.ByteOrder)",
+      "public void flip()",
+      "public byte getByte(com.yahoo.vespa.objects.FieldBase)",
+      "public short getShort(com.yahoo.vespa.objects.FieldBase)",
+      "public int getInt(com.yahoo.vespa.objects.FieldBase)",
+      "public long getLong(com.yahoo.vespa.objects.FieldBase)",
+      "public float getFloat(com.yahoo.vespa.objects.FieldBase)",
+      "public double getDouble(com.yahoo.vespa.objects.FieldBase)",
+      "public byte[] getBytes(com.yahoo.vespa.objects.FieldBase, int)",
+      "public java.lang.String getString(com.yahoo.vespa.objects.FieldBase)",
+      "public int getInt1_4Bytes(com.yahoo.vespa.objects.FieldBase)",
+      "public int getInt1_2_4Bytes(com.yahoo.vespa.objects.FieldBase)",
+      "public long getInt2_4_8Bytes(com.yahoo.vespa.objects.FieldBase)",
+      "public int remaining()",
+      "public static byte[] createUTF8CharArray(java.lang.String)"
+    ],
+    "fields": [
+      "protected com.yahoo.io.GrowableByteBuffer buf"
+    ]
+  },
+  "com.yahoo.vespa.objects.Deserializer": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract byte getByte(com.yahoo.vespa.objects.FieldBase)",
+      "public abstract short getShort(com.yahoo.vespa.objects.FieldBase)",
+      "public abstract int getInt(com.yahoo.vespa.objects.FieldBase)",
+      "public abstract long getLong(com.yahoo.vespa.objects.FieldBase)",
+      "public abstract float getFloat(com.yahoo.vespa.objects.FieldBase)",
+      "public abstract double getDouble(com.yahoo.vespa.objects.FieldBase)",
+      "public abstract byte[] getBytes(com.yahoo.vespa.objects.FieldBase, int)",
+      "public abstract java.lang.String getString(com.yahoo.vespa.objects.FieldBase)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.objects.FieldBase": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String)",
+      "public final java.lang.String getName()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.objects.Identifiable": {
+    "superClass": "com.yahoo.vespa.objects.Selectable",
+    "interfaces": [
+      "java.lang.Cloneable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public final int getClassId()",
+      "protected int onGetClassId()",
+      "public final com.yahoo.vespa.objects.Serializer serializeWithId(com.yahoo.vespa.objects.Serializer)",
+      "public final com.yahoo.vespa.objects.Serializer serialize(com.yahoo.vespa.objects.Serializer)",
+      "protected void onSerialize(com.yahoo.vespa.objects.Serializer)",
+      "public final com.yahoo.vespa.objects.Deserializer deserializeWithId(com.yahoo.vespa.objects.Deserializer)",
+      "public final com.yahoo.vespa.objects.Deserializer deserialize(com.yahoo.vespa.objects.Deserializer)",
+      "protected void onDeserialize(com.yahoo.vespa.objects.Deserializer)",
+      "public com.yahoo.vespa.objects.Identifiable clone()",
+      "public int hashCode()",
+      "public boolean equals(java.lang.Object)",
+      "public java.lang.String toString()",
+      "protected static int registerClass(int, java.lang.Class)",
+      "public static com.yahoo.vespa.objects.Identifiable create(com.yahoo.vespa.objects.Deserializer)",
+      "public static com.yahoo.vespa.objects.Identifiable createFromId(int)",
+      "protected static com.yahoo.vespa.objects.Serializer serializeOptional(com.yahoo.vespa.objects.Serializer, com.yahoo.vespa.objects.Identifiable)",
+      "protected static com.yahoo.vespa.objects.Identifiable deserializeOptional(com.yahoo.vespa.objects.Deserializer)",
+      "protected static boolean equals(java.lang.Object, java.lang.Object)",
+      "public void visitMembers(com.yahoo.vespa.objects.ObjectVisitor)",
+      "protected java.lang.String getUtf8(com.yahoo.vespa.objects.Deserializer)",
+      "protected void putUtf8(com.yahoo.vespa.objects.Serializer, java.lang.String)",
+      "public bridge synthetic java.lang.Object clone()"
+    ],
+    "fields": [
+      "public static int classId"
+    ]
+  },
+  "com.yahoo.vespa.objects.Ids": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [],
+    "fields": [
+      "public static final int document",
+      "public static final int searchlib",
+      "public static final int vespa_configmodel",
+      "public static final int annotation"
+    ]
+  },
+  "com.yahoo.vespa.objects.ObjectDumper": {
+    "superClass": "com.yahoo.vespa.objects.ObjectVisitor",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public void <init>(int)",
+      "public java.lang.String toString()",
+      "public void openStruct(java.lang.String, java.lang.String)",
+      "public void closeStruct()",
+      "public void visit(java.lang.String, java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.objects.ObjectOperation": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void execute(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.objects.ObjectPredicate": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract boolean check(java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.objects.ObjectVisitor": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public abstract void openStruct(java.lang.String, java.lang.String)",
+      "public abstract void closeStruct()",
+      "public abstract void visit(java.lang.String, java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.objects.Selectable": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public final void select(com.yahoo.vespa.objects.ObjectPredicate, com.yahoo.vespa.objects.ObjectOperation)",
+      "public void selectMembers(com.yahoo.vespa.objects.ObjectPredicate, com.yahoo.vespa.objects.ObjectOperation)",
+      "public static void select(com.yahoo.vespa.objects.Selectable, com.yahoo.vespa.objects.ObjectPredicate, com.yahoo.vespa.objects.ObjectOperation)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.objects.Serializer": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract com.yahoo.vespa.objects.Serializer putByte(com.yahoo.vespa.objects.FieldBase, byte)",
+      "public abstract com.yahoo.vespa.objects.Serializer putShort(com.yahoo.vespa.objects.FieldBase, short)",
+      "public abstract com.yahoo.vespa.objects.Serializer putInt(com.yahoo.vespa.objects.FieldBase, int)",
+      "public abstract com.yahoo.vespa.objects.Serializer putLong(com.yahoo.vespa.objects.FieldBase, long)",
+      "public abstract com.yahoo.vespa.objects.Serializer putFloat(com.yahoo.vespa.objects.FieldBase, float)",
+      "public abstract com.yahoo.vespa.objects.Serializer putDouble(com.yahoo.vespa.objects.FieldBase, double)",
+      "public abstract com.yahoo.vespa.objects.Serializer put(com.yahoo.vespa.objects.FieldBase, byte[])",
+      "public abstract com.yahoo.vespa.objects.Serializer put(com.yahoo.vespa.objects.FieldBase, java.nio.ByteBuffer)",
+      "public abstract com.yahoo.vespa.objects.Serializer put(com.yahoo.vespa.objects.FieldBase, java.lang.String)"
+    ],
+    "fields": []
+  }
+}
\ No newline at end of file
diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/package-info.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/package-info.java
index c39cac45cb6..8082d719624 100644
--- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/package-info.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/package-info.java
@@ -3,8 +3,10 @@
  * com.yahoo.vespa.hadoop.mapreduce contains classes and utilities
  * to enable feeding directly to Vespa endpoints from mapreduce.
  * It is a minimal layer over the Vespa HTTP client.
- *
- * NOTE: This is a PUBLIC API, but not annotated as such because this is not a bundle and
- *       we don't want to introduce Vespa dependencies.
- */
+ **/
+@ExportPackage
+@PublicApi
 package com.yahoo.vespa.hadoop.mapreduce;
+
+import com.yahoo.api.annotations.PublicApi;
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/package-info.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/package-info.java
index a3b0726a786..f7a24e0f6b6 100644
--- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/package-info.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/package-info.java
@@ -3,8 +3,10 @@
  * com.yahoo.vespa.hadoop contains classes and utilities
  * to enable feeding directly to Vespa endpoints from pig and mapreduce.
  * It is a minimal layer over the Vespa HTTP client.
- *
- * NOTE: This is a PUBLIC API, but not annotated as such because this is not a bundle and
- *       we don't want to introduce Vespa dependencies.
- */
+ **/
+@ExportPackage
+@PublicApi
 package com.yahoo.vespa.hadoop;
+
+import com.yahoo.api.annotations.PublicApi;
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/package-info.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/package-info.java
index dc82670bed1..5acc9c67485 100644
--- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/package-info.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/package-info.java
@@ -3,8 +3,10 @@
  * com.yahoo.vespa.hadoop.pig contains classes and utilities
  * to enable feeding directly to Vespa endpoints from pig.
  * It is a minimal layer over the Vespa HTTP client.
- *
- * NOTE: This is a PUBLIC API, but not annotated as such because this is not a bundle and
- *       we don't want to introduce Vespa dependencies.
- */
+ **/
+@ExportPackage
+@PublicApi
 package com.yahoo.vespa.hadoop.pig;
+
+import com.yahoo.api.annotations.PublicApi;
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/vespa-http-client/abi-spec.json b/vespa-http-client/abi-spec.json
index 9e26dfeeb6e..94c373ec5bd 100644
--- a/vespa-http-client/abi-spec.json
+++ b/vespa-http-client/abi-spec.json
@@ -1 +1,482 @@
-{}
\ No newline at end of file
+{
+  "com.yahoo.vespa.http.client.FeedClient$ResultCallback": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void onCompletion(java.lang.String, com.yahoo.vespa.http.client.Result)",
+      "public void onEndpointException(com.yahoo.vespa.http.client.FeedEndpointException)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.FeedClient": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.AutoCloseable"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public void stream(java.lang.String, java.lang.CharSequence)",
+      "public void stream(java.lang.String, java.lang.CharSequence, java.lang.Object)",
+      "public abstract void stream(java.lang.String, java.lang.String, java.lang.CharSequence, java.lang.Object)",
+      "public abstract void close()",
+      "public abstract java.lang.String getStatsAsJson()",
+      "public static void feedJson(java.io.InputStream, com.yahoo.vespa.http.client.FeedClient, java.util.concurrent.atomic.AtomicInteger)",
+      "public static void feedXml(java.io.InputStream, com.yahoo.vespa.http.client.FeedClient, java.util.concurrent.atomic.AtomicInteger)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.FeedClientFactory": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static com.yahoo.vespa.http.client.FeedClient create(com.yahoo.vespa.http.client.config.SessionParams, com.yahoo.vespa.http.client.FeedClient$ResultCallback)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.FeedConnectException": {
+    "superClass": "com.yahoo.vespa.http.client.FeedEndpointException",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.Throwable, com.yahoo.vespa.http.client.config.Endpoint)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.FeedEndpointException": {
+    "superClass": "java.lang.RuntimeException",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "abstract"
+    ],
+    "methods": [
+      "protected void <init>(java.lang.String, java.lang.Throwable, com.yahoo.vespa.http.client.config.Endpoint)",
+      "public com.yahoo.vespa.http.client.config.Endpoint getEndpoint()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.FeedProtocolException": {
+    "superClass": "com.yahoo.vespa.http.client.FeedEndpointException",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(int, java.lang.String, java.lang.Throwable, com.yahoo.vespa.http.client.config.Endpoint)",
+      "public int getHttpStatusCode()",
+      "public java.lang.String getHttpResponseMessage()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.Result$Detail": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.vespa.http.client.config.Endpoint, com.yahoo.vespa.http.client.Result$ResultType, java.lang.String, java.lang.Exception)",
+      "public void <init>(com.yahoo.vespa.http.client.config.Endpoint)",
+      "public com.yahoo.vespa.http.client.config.Endpoint getEndpoint()",
+      "public boolean isSuccess()",
+      "public com.yahoo.vespa.http.client.Result$ResultType getResultType()",
+      "public java.lang.Exception getException()",
+      "public java.lang.String getTraceMessage()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.Result$ResultType": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.vespa.http.client.Result$ResultType[] values()",
+      "public static com.yahoo.vespa.http.client.Result$ResultType valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.vespa.http.client.Result$ResultType OPERATION_EXECUTED",
+      "public static final enum com.yahoo.vespa.http.client.Result$ResultType TRANSITIVE_ERROR",
+      "public static final enum com.yahoo.vespa.http.client.Result$ResultType CONDITION_NOT_MET",
+      "public static final enum com.yahoo.vespa.http.client.Result$ResultType FATAL_ERROR"
+    ]
+  },
+  "com.yahoo.vespa.http.client.Result": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.vespa.http.client.core.Document, java.util.Collection, java.lang.StringBuilder)",
+      "public java.lang.String getDocumentId()",
+      "public java.lang.String getOperationId()",
+      "public java.lang.CharSequence getDocumentDataAsCharSequence()",
+      "public java.lang.Object getContext()",
+      "public boolean isSuccess()",
+      "public java.util.List getDetails()",
+      "public boolean hasLocalTrace()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.Session": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.AutoCloseable"
+    ],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract java.io.OutputStream stream(java.lang.CharSequence)",
+      "public abstract java.util.concurrent.BlockingQueue results()",
+      "public abstract void close()",
+      "public abstract java.lang.String getStatsAsJson()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.SessionFactory": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static com.yahoo.vespa.http.client.Session create(com.yahoo.vespa.http.client.config.SessionParams)",
+      "public static com.yahoo.vespa.http.client.Session create(com.yahoo.vespa.http.client.config.Endpoint)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.SimpleLoggerResultCallback": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "com.yahoo.vespa.http.client.FeedClient$ResultCallback"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "protected void println(java.lang.String)",
+      "public void <init>(java.util.concurrent.atomic.AtomicInteger, int)",
+      "public void printProgress()",
+      "protected com.yahoo.vespa.http.client.SimpleLoggerResultCallback$DocumentRate newSamplingPeriod(java.time.Instant)",
+      "public void onCompletion(java.lang.String, com.yahoo.vespa.http.client.Result)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.SyncFeedClient$SyncOperation": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.lang.String, java.lang.CharSequence)",
+      "public void <init>(java.lang.String, java.lang.CharSequence, java.lang.Object)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.SyncFeedClient$SyncResult": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public java.util.List results()",
+      "public java.lang.Exception exception()",
+      "public boolean isSuccess()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.SyncFeedClient": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.lang.AutoCloseable"
+    ],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.vespa.http.client.config.SessionParams)",
+      "public com.yahoo.vespa.http.client.SyncFeedClient$SyncResult stream(java.util.List)",
+      "public void close()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.Cluster$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public com.yahoo.vespa.http.client.config.Cluster$Builder addEndpoint(com.yahoo.vespa.http.client.config.Endpoint)",
+      "public com.yahoo.vespa.http.client.config.Cluster$Builder setRoute(java.lang.String)",
+      "public com.yahoo.vespa.http.client.config.Cluster build()",
+      "public java.lang.String getRoute()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.Cluster": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public java.util.List getEndpoints()",
+      "public java.lang.String getRoute()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.ConnectionParams$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setSslContext(javax.net.ssl.SSLContext)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setHostnameVerifier(javax.net.ssl.HostnameVerifier)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder addHeader(java.lang.String, java.lang.String)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder addDynamicHeader(java.lang.String, com.yahoo.vespa.http.client.config.ConnectionParams$HeaderProvider)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setNumPersistentConnectionsPerEndpoint(int)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setProxyHost(java.lang.String)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setProxyPort(int)",
+      "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 setMinTimeBetweenRetries(long, java.util.concurrent.TimeUnit)",
+      "public long getMinTimeBetweenRetriesMs()",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setTraceLevel(int)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setTraceEveryXOperation(int)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams$Builder setPrintTraceToStdErr(boolean)",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams build()",
+      "public int getNumPersistentConnectionsPerEndpoint()",
+      "public java.lang.String getProxyHost()",
+      "public boolean isDryRun()",
+      "public int getMaxRetries()",
+      "public int getTraceLevel()",
+      "public int getTraceEveryXOperation()",
+      "public boolean getPrintTraceToStdErr()",
+      "public int getProxyPort()",
+      "public javax.net.ssl.SSLContext getSslContext()",
+      "public javax.net.ssl.HostnameVerifier getHostnameVerifier()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.ConnectionParams$HeaderProvider": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract java.lang.String getHeaderValue()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.ConnectionParams": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public javax.net.ssl.SSLContext getSslContext()",
+      "public javax.net.ssl.HostnameVerifier getHostnameVerifier()",
+      "public java.util.Collection getHeaders()",
+      "public java.util.Map getDynamicHeaders()",
+      "public int getNumPersistentConnectionsPerEndpoint()",
+      "public java.lang.String getProxyHost()",
+      "public int getProxyPort()",
+      "public boolean getUseCompression()",
+      "public int getMaxRetries()",
+      "public long getMinTimeBetweenRetriesMs()",
+      "public boolean isDryRun()",
+      "public int getTraceLevel()",
+      "public int getTraceEveryXOperation()",
+      "public boolean getPrintTraceToStdErr()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.Endpoint": {
+    "superClass": "java.lang.Object",
+    "interfaces": [
+      "java.io.Serializable"
+    ],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public static com.yahoo.vespa.http.client.config.Endpoint create(java.lang.String)",
+      "public static com.yahoo.vespa.http.client.config.Endpoint create(java.lang.String, int, boolean)",
+      "public java.lang.String getHostname()",
+      "public int getPort()",
+      "public boolean isUseSsl()",
+      "public java.lang.String toString()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.FeedParams$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder withSilentUpgrade(boolean)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setMaxSleepTimeMs(long)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setDenyIfBusyV3(boolean)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setDataFormat(com.yahoo.vespa.http.client.config.FeedParams$DataFormat)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setRoute(java.lang.String)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setServerTimeout(long, java.util.concurrent.TimeUnit)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setClientTimeout(long, java.util.concurrent.TimeUnit)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setMaxChunkSizeBytes(int)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setMaxInFlightRequests(int)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setLocalQueueTimeOut(long)",
+      "public com.yahoo.vespa.http.client.config.FeedParams$Builder setPriority(java.lang.String)",
+      "public com.yahoo.vespa.http.client.config.FeedParams build()",
+      "public long getClientTimeout(java.util.concurrent.TimeUnit)",
+      "public long getServerTimeout(java.util.concurrent.TimeUnit)",
+      "public java.lang.String getRoute()",
+      "public com.yahoo.vespa.http.client.config.FeedParams$DataFormat getDataFormat()",
+      "public int getMaxChunkSizeBytes()",
+      "public int getmaxInFlightRequests()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.FeedParams$DataFormat": {
+    "superClass": "java.lang.Enum",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final",
+      "enum"
+    ],
+    "methods": [
+      "public static com.yahoo.vespa.http.client.config.FeedParams$DataFormat[] values()",
+      "public static com.yahoo.vespa.http.client.config.FeedParams$DataFormat valueOf(java.lang.String)"
+    ],
+    "fields": [
+      "public static final enum com.yahoo.vespa.http.client.config.FeedParams$DataFormat XML_UTF8",
+      "public static final enum com.yahoo.vespa.http.client.config.FeedParams$DataFormat JSON_UTF8"
+    ]
+  },
+  "com.yahoo.vespa.http.client.config.FeedParams": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public boolean getDenyIfBusyV3()",
+      "public long getMaxSleepTimeMs()",
+      "public boolean getSilentUpgrade()",
+      "public com.yahoo.vespa.http.client.config.FeedParams$DataFormat getDataFormat()",
+      "public java.lang.String getRoute()",
+      "public long getServerTimeout(java.util.concurrent.TimeUnit)",
+      "public long getClientTimeout(java.util.concurrent.TimeUnit)",
+      "public int getMaxChunkSizeBytes()",
+      "public java.lang.String getPriority()",
+      "public java.lang.String toUriParameters()",
+      "public int getMaxInFlightRequests()",
+      "public long getLocalQueueTimeOut()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.SessionParams$Builder": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder addCluster(com.yahoo.vespa.http.client.config.Cluster)",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setFeedParams(com.yahoo.vespa.http.client.config.FeedParams)",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setConnectionParams(com.yahoo.vespa.http.client.config.ConnectionParams)",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setErrorReporter(com.yahoo.vespa.http.client.config.SessionParams$ErrorReporter)",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setClientQueueSize(int)",
+      "public com.yahoo.vespa.http.client.config.SessionParams$Builder setThrottlerMinSize(int)",
+      "public com.yahoo.vespa.http.client.config.SessionParams build()",
+      "public com.yahoo.vespa.http.client.config.FeedParams getFeedParams()",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams getConnectionParams()",
+      "public int getClientQueueSize()",
+      "public int getThrottlerMinSize()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.SessionParams$ErrorReporter": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods": [
+      "public abstract void onSessionError(com.yahoo.vespa.http.client.config.Endpoint, java.lang.String, java.lang.String)"
+    ],
+    "fields": []
+  },
+  "com.yahoo.vespa.http.client.config.SessionParams": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public",
+      "final"
+    ],
+    "methods": [
+      "public java.util.List getClusters()",
+      "public com.yahoo.vespa.http.client.config.FeedParams getFeedParams()",
+      "public com.yahoo.vespa.http.client.config.ConnectionParams getConnectionParams()",
+      "public int getClientQueueSize()",
+      "public int getThrottlerMinSize()",
+      "public com.yahoo.vespa.http.client.config.SessionParams$ErrorReporter getErrorReport()"
+    ],
+    "fields": []
+  }
+}
\ No newline at end of file
diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml
index b42c4c32a08..f98b39c70b1 100644
--- a/vespa-http-client/pom.xml
+++ b/vespa-http-client/pom.xml
@@ -15,78 +15,77 @@
   <description>Independent external feeding API towards Vespa.</description>
 
   <dependencies>
-
-    <!-- NOTE: Adding dependencies here may break clients because this is used outside an OSGi container with
-               manually set up classpaths and possibly no access to the with-dependencies jar.
-
-               Vespa dependencies should not be added.
-    -->
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-xml</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+     <version>3.4</version>
     </dependency>
     <dependency>
-      <groupId>io.airlift</groupId>
-      <artifactId>airline</artifactId>
-      <version>0.6</version>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
-
-    <!-- Test dependencies -->
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.4</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.code.findbugs</groupId>
+      <groupId>com.yahoo.vespa</groupId>
       <artifactId>annotations</artifactId>
-      <scope>test</scope>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <scope>test</scope>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>vespajlib</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>uk.co.datumedge</groupId>
-      <artifactId>hamcrest-json</artifactId>
-      <scope>test</scope>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>component</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <scope>test</scope>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
-      <scope>test</scope>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.airlift</groupId>
+      <artifactId>airline</artifactId>
+      <version>0.6</version>
+    </dependency>
+    <dependency>
+        <groupId>com.yahoo.vespa</groupId>
+        <artifactId>testutil</artifactId>
+        <version>${project.version}</version>
+        <scope>test</scope>
     </dependency>
-
   </dependencies>
   <build>
     <plugins>
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java
index 433fee69e4e..e800fbea584 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java
@@ -14,10 +14,9 @@ import java.util.concurrent.atomic.AtomicInteger;
  *
  * A {@link FeedClientFactory} is provided to instantiate Sessions.
  *
- * See com.yahoo.text.Text.stripInvalidCharacters(String) to remove invalid characters from string fields before feeding
- *
  * @author dybis
  * @see FeedClientFactory
+ * @see com.yahoo.text.Text#stripInvalidCharacters(String) to remove invalid characters from string fields before feeding
  */
 public interface FeedClient extends AutoCloseable {
 
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/Result.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/Result.java
index 821e12b4140..92dd0715f06 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/Result.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/Result.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.http.client;
 import com.yahoo.vespa.http.client.config.Endpoint;
 import com.yahoo.vespa.http.client.core.Document;
 import com.yahoo.vespa.http.client.core.Exceptions;
+import net.jcip.annotations.Immutable;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -82,6 +83,7 @@ public class Result {
     /**
      * Information in a Result for a single operation sent to a single endpoint.
      */
+    @Immutable
     public static final class Detail {
 
         private final ResultType resultType;
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/Cluster.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/Cluster.java
index 4707cdb705c..557aeedb4c1 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/Cluster.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/Cluster.java
@@ -1,6 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.http.client.config;
 
+import net.jcip.annotations.Immutable;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -11,6 +13,7 @@ import java.util.List;
  *
  * @author Einar M R Rosenvinge
  */
+@Immutable
 public final class Cluster {
 
     /**
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java
index 3296cf13875..3747f37eb00 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.http.client.config;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
+import net.jcip.annotations.Immutable;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 
 import javax.net.ssl.HostnameVerifier;
@@ -25,6 +26,7 @@ import java.util.concurrent.TimeUnit;
  *
  * @author Einar M R Rosenvinge
  */
+@Immutable
 public final class ConnectionParams {
 
     /**
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/Endpoint.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/Endpoint.java
index 7ba6dd04a80..de7bfb5bb19 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/Endpoint.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/Endpoint.java
@@ -1,6 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.http.client.config;
 
+import net.jcip.annotations.Immutable;
+
 import java.io.Serializable;
 
 /**
@@ -9,6 +11,7 @@ import java.io.Serializable;
  *
  * @author Einar M R Rosenvinge
  */
+@Immutable
 public final class Endpoint implements Serializable {
 
     /**
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/FeedParams.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/FeedParams.java
index 30f1ad11d3a..4adf3912dbd 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/FeedParams.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/FeedParams.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.http.client.config;
 
 import com.google.common.annotations.Beta;
+import net.jcip.annotations.Immutable;
 
 import java.util.concurrent.TimeUnit;
 
@@ -12,6 +13,7 @@ import java.util.concurrent.TimeUnit;
 
  * @author Einar M R Rosenvinge
  */
+@Immutable
 public final class FeedParams {
 
     public boolean getDenyIfBusyV3() {
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/SessionParams.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/SessionParams.java
index daa6eecb823..eb3e8ec982b 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/SessionParams.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/SessionParams.java
@@ -1,6 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.http.client.config;
 
+import net.jcip.annotations.Immutable;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -16,6 +18,7 @@ import java.util.List;
  * @see com.yahoo.vespa.http.client.SessionFactory
  * @see Builder
  */
+@Immutable
 public final class SessionParams {
 
     /**
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/package-info.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/package-info.java
index 8300720e3ea..17789e890d6 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/package-info.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/package-info.java
@@ -1,8 +1,10 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
  * Settings for creating clients/sessions.
- *
- * NOTE: This is a PUBLIC API, but not annotated as such because this is not a bundle and
- *       we don't want to introduce Vespa dependencies.
  */
+@ExportPackage
+@PublicApi
 package com.yahoo.vespa.http.client.config;
+
+import com.yahoo.api.annotations.PublicApi;
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
index 4468355698f..fd228fb99c5 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.http.client.core.communication;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yahoo.component.Vtag;
 import com.yahoo.vespa.http.client.config.ConnectionParams;
 import com.yahoo.vespa.http.client.config.Endpoint;
 import com.yahoo.vespa.http.client.config.FeedParams;
@@ -411,8 +412,8 @@ class ApacheGatewayConnection implements GatewayConnection {
                 clientBuilder.setConnectionManager(connMgr);
 
             }
-            clientBuilder.setUserAgent(String.format("vespa-http-client (%s)", Vtag.currentVersion));
-            clientBuilder.setDefaultHeaders(List.of(new BasicHeader(Headers.CLIENT_VERSION, Vtag.currentVersion)));
+            clientBuilder.setUserAgent(String.format("vespa-http-client (%s)", Vtag.currentVersion.toFullString()));
+            clientBuilder.setDefaultHeaders(List.of(new BasicHeader(Headers.CLIENT_VERSION, Vtag.currentVersion.toFullString())));
             clientBuilder.setMaxConnPerRoute(1);
             clientBuilder.setMaxConnTotal(1);
             clientBuilder.disableContentCompression();
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/Vtag.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/Vtag.java
deleted file mode 100644
index f21a86dfc1b..00000000000
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/Vtag.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-package com.yahoo.vespa.http.client.core.communication;
-
-class Vtag {
-    static final String currentVersion = "7.0.0";
-}
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/package-info.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/package-info.java
index 211397476bd..56bd3e5cf99 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/package-info.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/package-info.java
@@ -1,2 +1,3 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+@com.yahoo.api.annotations.PackageMarker
 package com.yahoo.vespa.http.client.core;
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/package-info.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/package-info.java
index b14c2ffa4cc..bd828363702 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/package-info.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/package-info.java
@@ -5,8 +5,10 @@
  * is the central interface which is used to interact with a cluster.
  * Use {@link com.yahoo.vespa.http.client.SessionFactory} to
  * instantiate a {@link com.yahoo.vespa.http.client.Session}.
- *
- * NOTE: This is a PUBLIC API, but not annotated as such because this is not a bundle and
- *       we don't want to introduce Vespa dependencies.
- */
+ **/
+@ExportPackage
+@PublicApi
 package com.yahoo.vespa.http.client;
+
+import com.yahoo.api.annotations.PublicApi;
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/package-info.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/package-info.java
index 00012f0f52f..506273cc6cd 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/package-info.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/package-info.java
@@ -1,2 +1,3 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+@com.yahoo.api.annotations.PackageMarker
 package com.yahoo.vespa.http.client.runner;
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/JsonTestHelper.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/JsonTestHelper.java
deleted file mode 100644
index 0081497fb20..00000000000
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/JsonTestHelper.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.http.client;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Joiner;
-import org.hamcrest.MatcherAssert;
-
-import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs;
-
-import java.io.UncheckedIOException;
-
-public class JsonTestHelper {
-
-    private static final ObjectMapper mapper = new ObjectMapper();
-
-    /**
-     * Convenience method to input JSON without escaping double quotes and newlines
-     * Each parameter represents a line of JSON encoded data
-     * The lines are joined with newline and single quotes are replaced with double quotes
-     */
-    public static String inputJson(String... lines) {
-        return Joiner.on("\n").join(lines).replaceAll("'", "\"");
-    }
-
-    /** Structurally compare two JSON encoded strings */
-    public static void assertJsonEquals(String inputJson, String expectedJson) {
-        MatcherAssert.assertThat(inputJson, sameJSONAs(expectedJson));
-    }
-
-    /** Structurally compare a {@link JsonNode} and a JSON string. */
-    public static void assertJsonEquals(JsonNode left, String rightJson) {
-        try {
-            String leftJson = mapper.writeValueAsString(left);
-            assertJsonEquals(leftJson, rightJson);
-        } catch (JsonProcessingException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    /** Structurally compare two {@link JsonNode}s. */
-    public static void assertJsonEquals(JsonNode left, JsonNode right) {
-        try {
-            String leftJson = mapper.writeValueAsString(left);
-            String rightJson = mapper.writeValueAsString(right);
-            assertJsonEquals(leftJson, rightJson);
-        } catch (JsonProcessingException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-}
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottlerTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottlerTest.java
index 1267514b0d8..47aeb4d3b0f 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottlerTest.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottlerTest.java
@@ -1,7 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.http.client.core.operationProcessor;
 
+import com.yahoo.collections.Tuple2;
 import com.yahoo.vespa.http.client.core.ThrottlePolicy;
+import com.yahoo.vespa.http.client.core.operationProcessor.IncompleteResultsThrottler;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -33,6 +35,57 @@ public class IncompleteResultsThrottlerTest {
     }
 
     /**
+     * A mock 'gateway' this is slower with more requests in-flight. It starts to become really much slower at
+     * 'breakPoint' number of parallel requests.
+     */
+    class MockServer {
+        final LinkedList<Tuple2<Long, IncompleteResultsThrottler> > messageDoneByTime = new LinkedList<>();
+        final int breakPoint;
+        final Random random = new Random();
+        long time = 0;
+
+        MockServer(int breakPoint) {
+            this.breakPoint = breakPoint;
+        }
+
+        /**
+         * Figures out when next processed data will be ready.
+         * @return time in ms for next request to be finished.
+         */
+        long nextRequestFinished() {
+            if (messageDoneByTime.isEmpty()) {
+                return Integer.MAX_VALUE;
+            }
+            return messageDoneByTime.peek().first;
+        }
+
+        /**
+         * Advance simulation time and call finished on any requests.
+         * @param time to move to
+         */
+        void moveTime(long time) {
+            this.time = time;
+            while (!messageDoneByTime.isEmpty() && messageDoneByTime.peek().first <= time) {
+                messageDoneByTime.pop().second.resultReady(true);
+            }
+        }
+
+        /**
+         * New request.
+         * @param blocker do callback on blocker when request is done.
+         */
+        void newRequest(IncompleteResultsThrottler blocker) {
+            long nextTime = (long)(20 + 0.1 * messageDoneByTime.size());
+
+            if (messageDoneByTime.size() > breakPoint) {
+                nextTime += (long) (40 + (random.nextDouble()) * 0.01 *  messageDoneByTime.size()* messageDoneByTime.size());
+            }
+            nextTime += time + random.nextInt()%4;
+            messageDoneByTime.push(new Tuple2<>(nextTime, blocker));
+        }
+    }
+
+    /**
      * Simulate running requests.
      * @param clientCount number of parallel clients.
      * @param breakPoint how many requests the server should handle in parallel before it gets slower.
@@ -214,79 +267,4 @@ public class IncompleteResultsThrottlerTest {
         int distance = Math.abs(sweetSpot - size);
         return 1 + 20 * distance;
     }
-
-    /**
-     * A mock 'gateway' this is slower with more requests in-flight. It starts to become really much slower at
-     * 'breakPoint' number of parallel requests.
-     */
-    class MockServer {
-        final LinkedList<Tuple2<Long, IncompleteResultsThrottler> > messageDoneByTime = new LinkedList<>();
-        final int breakPoint;
-        final Random random = new Random();
-        long time = 0;
-
-        MockServer(int breakPoint) {
-            this.breakPoint = breakPoint;
-        }
-
-        /**
-         * Figures out when next processed data will be ready.
-         * @return time in ms for next request to be finished.
-         */
-        long nextRequestFinished() {
-            if (messageDoneByTime.isEmpty()) {
-                return Integer.MAX_VALUE;
-            }
-            return messageDoneByTime.peek().first;
-        }
-
-        /**
-         * Advance simulation time and call finished on any requests.
-         * @param time to move to
-         */
-        void moveTime(long time) {
-            this.time = time;
-            while (!messageDoneByTime.isEmpty() && messageDoneByTime.peek().first <= time) {
-                messageDoneByTime.pop().second.resultReady(true);
-            }
-        }
-
-        /**
-         * New request.
-         * @param blocker do callback on blocker when request is done.
-         */
-        void newRequest(IncompleteResultsThrottler blocker) {
-            long nextTime = (long)(20 + 0.1 * messageDoneByTime.size());
-
-            if (messageDoneByTime.size() > breakPoint) {
-                nextTime += (long) (40 + (random.nextDouble()) * 0.01 *  messageDoneByTime.size()* messageDoneByTime.size());
-            }
-            nextTime += time + random.nextInt()%4;
-            messageDoneByTime.push(new Tuple2<>(nextTime, blocker));
-        }
-    }
-
-    private static class Tuple2<T1, T2> {
-
-        public final T1 first;
-        public final T2 second;
-
-        public Tuple2(final T1 first, final T2 second) {
-            this.first = first;
-            this.second = second;
-        }
-
-        @Override
-        public int hashCode() { throw new UnsupportedOperationException(); }
-
-        @Override
-        public boolean equals(final Object obj) { throw new UnsupportedOperationException(); }
-
-        @Override
-        public String toString() {
-            return "Tuple2(" + first + ", " + second + ")";
-        }
-
-    }
-
 }
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/JsonReaderTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/JsonReaderTest.java
index e2046fe17a6..134274ff869 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/JsonReaderTest.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/JsonReaderTest.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.yahoo.vespa.http.client.JsonTestHelper.inputJson;
+import static com.yahoo.test.json.JsonTestHelper.inputJson;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.*;
 
diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml
index a0472c8d102..3567e6ed1e6 100644
--- a/vespaclient-container-plugin/pom.xml
+++ b/vespaclient-container-plugin/pom.xml
@@ -55,14 +55,25 @@
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpclient</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.yahoo.vespa</groupId>
+          <artifactId>annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.yahoo.vespa</groupId>
+          <artifactId>vespajlib</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.4</version>
-    </dependency>
-    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
diff --git a/vespajlib/src/main/java/com/yahoo/collections/Tuple2.java b/vespajlib/src/main/java/com/yahoo/collections/Tuple2.java
index 684781a358c..9f8a6763761 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/Tuple2.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/Tuple2.java
@@ -12,7 +12,7 @@ package com.yahoo.collections;
  * new class and do the work inside that class instead? Etc.)
  * </p>
  *
- * @author Steinar Knutsen
+ * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  */
 public final class Tuple2<T1, T2> {