Move un-exported enum to exported package

1 files changed, 9 insertions, 10 deletions

diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
index f85805ab4af..ea99c5bf762 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
@@ -12,9 +12,9 @@ import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.document.DocumentUpdate;
 import com.yahoo.document.TestAndSetCondition;
 import com.yahoo.document.config.DocumentmanagerConfig;
+import com.yahoo.document.json.DocumentOperationType;
 import com.yahoo.document.json.JsonReader;
 import com.yahoo.document.json.JsonWriter;
-import com.yahoo.document.json.document.DocumentParser;
 import com.yahoo.document.restapi.DocumentOperationExecutor;
 import com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType;
 import com.yahoo.document.restapi.DocumentOperationExecutor.Group;
@@ -26,7 +26,6 @@ import com.yahoo.document.restapi.DocumentOperationExecutorImpl;
 import com.yahoo.documentapi.DocumentOperationParameters;
 import com.yahoo.documentapi.metrics.DocumentApiMetrics;
 import com.yahoo.documentapi.metrics.DocumentOperationStatus;
-import com.yahoo.documentapi.metrics.DocumentOperationType;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.Request;
 import com.yahoo.jdisc.Response;
@@ -283,7 +282,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
 
     private ContentChannel postDocument(HttpRequest request, DocumentPath path, ResponseHandler rawHandler) {
         DocumentId id = path.id();
-        ResponseHandler handler = new MeasuringResponseHandler(rawHandler, DocumentOperationType.PUT, clock.instant());
+        ResponseHandler handler = new MeasuringResponseHandler(rawHandler, com.yahoo.documentapi.metrics.DocumentOperationType.PUT, clock.instant());
         return new ForwardingContentChannel(in -> {
             try {
                 DocumentPut put = parser.parsePut(in, id.toString());
@@ -304,7 +303,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
 
     private ContentChannel putDocument(HttpRequest request, DocumentPath path, ResponseHandler rawHandler) {
         DocumentId id = path.id();
-        ResponseHandler handler = new MeasuringResponseHandler(rawHandler, DocumentOperationType.UPDATE, clock.instant());
+        ResponseHandler handler = new MeasuringResponseHandler(rawHandler, com.yahoo.documentapi.metrics.DocumentOperationType.UPDATE, clock.instant());
         return new ForwardingContentChannel(in -> {
             try {
                 DocumentUpdate update = parser.parseUpdate(in, id.toString());
@@ -326,7 +325,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
 
     private ContentChannel deleteDocument(HttpRequest request, DocumentPath path, ResponseHandler rawHandler) {
         DocumentId id = path.id();
-        ResponseHandler handler = new MeasuringResponseHandler(rawHandler, DocumentOperationType.REMOVE, clock.instant());
+        ResponseHandler handler = new MeasuringResponseHandler(rawHandler, com.yahoo.documentapi.metrics.DocumentOperationType.REMOVE, clock.instant());
         executor.remove(id,
                         getProperty(request, ROUTE).map(parameters()::withRoute).orElse(parameters()),
                         new OperationContext((type, message) -> handleError(request, type, message, responseRoot(request, id), handler),
@@ -593,14 +592,14 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
         }
 
         DocumentPut parsePut(InputStream inputStream, String docId) {
-            return (DocumentPut) parse(inputStream, docId, DocumentParser.SupportedOperation.PUT);
+            return (DocumentPut) parse(inputStream, docId, DocumentOperationType.PUT);
         }
 
         DocumentUpdate parseUpdate(InputStream inputStream, String docId)  {
-            return (DocumentUpdate) parse(inputStream, docId, DocumentParser.SupportedOperation.UPDATE);
+            return (DocumentUpdate) parse(inputStream, docId, DocumentOperationType.UPDATE);
         }
 
-        private DocumentOperation parse(InputStream inputStream, String docId, DocumentParser.SupportedOperation operation)  {
+        private DocumentOperation parse(InputStream inputStream, String docId, DocumentOperationType operation)  {
             return new JsonReader(manager, inputStream, jsonFactory).readSingleDocument(operation, docId);
         }
 
@@ -609,10 +608,10 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
     private class MeasuringResponseHandler implements ResponseHandler {
 
         private final ResponseHandler delegate;
-        private final DocumentOperationType type;
+        private final com.yahoo.documentapi.metrics.DocumentOperationType type;
         private final Instant start;
 
-        private MeasuringResponseHandler(ResponseHandler delegate, DocumentOperationType type, Instant start) {
+        private MeasuringResponseHandler(ResponseHandler delegate, com.yahoo.documentapi.metrics.DocumentOperationType type, Instant start) {
             this.delegate = delegate;
             this.type = type;
             this.start = start;