1 files changed, 6 insertions, 106 deletions
diff --git a/docproc/abi-spec.json b/docproc/abi-spec.json
index f90d31023d3..41c76cc3a17 100644
--- a/docproc/abi-spec.json
+++ b/docproc/abi-spec.json
@@ -132,72 +132,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.docproc.DocprocExecutor": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String, com.yahoo.docproc.CallStack)",
-      "public void <init>(com.yahoo.docproc.DocprocExecutor, com.yahoo.docproc.CallStack)",
-      "public com.yahoo.docproc.CallStack getCallStack()",
-      "public java.lang.String getName()",
-      "public com.yahoo.docproc.DocumentProcessor$Progress process(com.yahoo.docproc.Processing)",
-      "public com.yahoo.docproc.DocumentProcessor$Progress processUntilDone(com.yahoo.docproc.Processing)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.docproc.DocprocService": {
-    "superClass": "com.yahoo.component.AbstractComponent",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.component.ComponentId)",
-      "public void <init>(com.yahoo.component.ComponentId, com.yahoo.docproc.CallStack, com.yahoo.document.DocumentTypeManager, int)",
-      "public void <init>(com.yahoo.component.ComponentId, com.yahoo.docproc.CallStack, com.yahoo.document.DocumentTypeManager)",
-      "public void <init>(java.lang.String)",
-      "public void deconstruct()",
-      "public com.yahoo.document.DocumentTypeManager getDocumentTypeManager()",
-      "public void setDocumentTypeManager(com.yahoo.document.DocumentTypeManager)",
-      "public int getQueueSize()",
-      "public com.yahoo.docproc.DocprocExecutor getExecutor()",
-      "public java.util.concurrent.ThreadPoolExecutor getThreadPoolExecutor()",
-      "public void setInService(boolean)",
-      "public boolean isInService()",
-      "public boolean isAcceptingNewProcessings()",
-      "public void setAcceptingNewProcessings(boolean)",
-      "public java.lang.String getName()",
-      "public com.yahoo.docproc.CallStack getCallStack()",
-      "public void setCallStack(com.yahoo.docproc.CallStack)",
-      "public void process(com.yahoo.docproc.Processing, com.yahoo.docproc.ProcessingEndpoint)",
-      "public void process(com.yahoo.docproc.Processing)",
-      "public void process(com.yahoo.document.DocumentOperation, com.yahoo.docproc.ProcessingEndpoint)",
-      "public void process(com.yahoo.document.DocumentOperation)",
-      "public void processDocumentOperations(java.util.List, com.yahoo.docproc.ProcessingEndpoint)",
-      "public void processDocumentOperations(java.util.List)",
-      "public boolean doWork()",
-      "public boolean doWorkBlocking()"
-    ],
-    "fields": [
-      "public static com.yahoo.docproc.proxy.SchemaMap schemaMap"
-    ]
-  },
-  "com.yahoo.docproc.DocumentOperationWrapper": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract com.yahoo.document.DocumentOperation getWrappedDocumentOperation()"
-    ],
-    "fields": []
-  },
   "com.yahoo.docproc.DocumentProcessor$LaterProgress": {
     "superClass": "com.yahoo.docproc.DocumentProcessor$Progress",
     "interfaces": [],
@@ -252,19 +186,8 @@
     ],
     "fields": []
   },
-  "com.yahoo.docproc.HandledProcessingException": {
-    "superClass": "java.lang.RuntimeException",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String)"
-    ],
-    "fields": []
-  },
   "com.yahoo.docproc.Processing": {
-    "superClass": "java.lang.Object",
+    "superClass": "com.yahoo.docproc.impl.ProcessingAccess",
     "interfaces": [],
     "attributes": [
       "public"
@@ -273,39 +196,27 @@
       "public void <init>()",
       "public static com.yahoo.docproc.Processing of(com.yahoo.document.DocumentOperation)",
       "public void <init>(java.lang.String, com.yahoo.document.DocumentOperation, com.yahoo.docproc.CallStack)",
+      "protected void <init>(java.lang.String, java.util.List, com.yahoo.docproc.CallStack, com.yahoo.docproc.impl.ProcessingEndpoint, boolean)",
       "public static com.yahoo.docproc.Processing createProcessingFromDocumentOperations(java.lang.String, java.util.List, com.yahoo.docproc.CallStack)",
-      "public com.yahoo.component.provider.ComponentRegistry getDocprocServiceRegistry()",
-      "public void setDocprocServiceRegistry(com.yahoo.component.provider.ComponentRegistry)",
       "public java.lang.String getServiceName()",
       "public void setServiceName(java.lang.String)",
-      "public com.yahoo.docproc.DocprocService getService()",
       "public java.lang.Object getVariable(java.lang.String)",
       "public java.util.Iterator getVariableAndNameIterator()",
       "public void clearVariables()",
       "public void setVariable(java.lang.String, java.lang.Object)",
       "public java.lang.Object removeVariable(java.lang.String)",
       "public boolean hasVariable(java.lang.String)",
+      "protected com.yahoo.docproc.impl.ProcessingEndpoint getEndpoint()",
+      "protected void setEndpoint(com.yahoo.docproc.impl.ProcessingEndpoint)",
       "public void addDocumentOperation(com.yahoo.document.DocumentOperation)",
       "public java.util.List getDocumentOperations()",
       "public com.yahoo.docproc.CallStack callStack()",
+      "protected void setCallStack(com.yahoo.docproc.CallStack)",
+      "protected java.util.List getOnceOperationsToBeProcessed()",
       "public java.lang.String toString()"
     ],
     "fields": []
   },
-  "com.yahoo.docproc.ProcessingEndpoint": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void processingDone(com.yahoo.docproc.Processing)",
-      "public abstract void processingFailed(com.yahoo.docproc.Processing, java.lang.Exception)"
-    ],
-    "fields": []
-  },
   "com.yahoo.docproc.SimpleDocumentProcessor": {
     "superClass": "com.yahoo.docproc.DocumentProcessor",
     "interfaces": [],
@@ -320,16 +231,5 @@
       "public final com.yahoo.docproc.DocumentProcessor$Progress process(com.yahoo.docproc.Processing)"
     ],
     "fields": []
-  },
-  "com.yahoo.docproc.TransientFailureException": {
-    "superClass": "java.lang.RuntimeException",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String)"
-    ],
-    "fields": []
   }
 }
 \ No newline at end of file