Fine tuning.

Author: anu3990

marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentWriteOperation.java

@@ -19,7 +19,7 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import com.marklogic.client.MarkLogicInternalException;
+import com.marklogic.client.impl.DocumentWriteOperationImpl;
 import com.marklogic.client.io.marker.AbstractWriteHandle;
 import com.marklogic.client.io.marker.DocumentMetadataWriteHandle;
 
@@ -91,7 +91,7 @@ public enum OperationType {
    * @return the logical temporal document URI
    */
   String getTemporalDocumentURI();
-  
+
   /**
    * The from method prepares each content object for writing as a document including generating a URI by inserting a UUID.
    * @param content a subclass of AbstractWriteHandle
@@ -102,54 +102,15 @@ public static Stream<DocumentWriteOperation> from(Stream<? extends AbstractWrite
             final DocumentUriMaker uriMaker) {
         if(content == null || uriMaker == null)
             throw new IllegalArgumentException("Content and/or Uri maker cannot be null");
-        
-        final class DocumentWriteOperationImpl implements DocumentWriteOperation {
-            
-            private AbstractWriteHandle content;
-            private String uri;
-            
-            public DocumentWriteOperationImpl(AbstractWriteHandle content, String uri) {
-                this.content = content;
-                this.uri = uri;
-            }
-
-
-            @Override
-            public OperationType getOperationType() {
-                return null;
-            }
-
-            @Override
-            public String getUri() {
-                return uri;
-            }
-
-            @Override
-            public DocumentMetadataWriteHandle getMetadata() {
-                return null;
-            }
-
-            @Override
-            public AbstractWriteHandle getContent() {
-                return content;
-            }
-
-            @Override
-            public String getTemporalDocumentURI() {
-                return null;
-            }
 
-        }
         final class WrapperImpl {
             private DocumentUriMaker docUriMaker;
             WrapperImpl(DocumentUriMaker uriMaker){
                 this.docUriMaker = uriMaker;
             }
             DocumentWriteOperation mapper(AbstractWriteHandle content) {
                 String uri = docUriMaker.apply(content);
-                if (uri == null)
-                    throw new MarkLogicInternalException("Uri could not be created");
-                return new DocumentWriteOperationImpl(content, uri);
+                return new DocumentWriteOperationImpl(uri, content);
             }
 
         }
@@ -187,28 +148,4 @@ String makeUri(AbstractWriteHandle content) {
     @FunctionalInterface
     public interface DocumentUriMaker extends Function<AbstractWriteHandle, String> {
     }
-
-    default int compareTo(DocumentWriteOperation o) {
-        if(o == null)
-            throw new NullPointerException("DocumentWriteOperation cannot be null");
-
-        if(this.getUri() != null && o.getUri() != null)
-            return getUri().compareTo(o.getUri());
-
-        if(this.getUri() == null && o.getUri() != null)
-            return -1;
-
-        if(this.getUri() != null && o.getUri()==null)
-            return 1;
-
-        if(this.getUri() == null && o.getUri() == null)
-        {
-            if(this.hashCode() > o.hashCode())
-                return 1;
-            else if (this.hashCode() < o.hashCode())
-                return -1;
-            return 0;
-        }
-        return 0;
-    }
 }

marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentWriteOperationImpl.java

@@ -16,7 +16,6 @@
 package com.marklogic.client.impl;
 
 import com.marklogic.client.document.DocumentWriteOperation;
-import com.marklogic.client.document.DocumentWriteOperation.OperationType;
 import com.marklogic.client.io.marker.AbstractWriteHandle;
 import com.marklogic.client.io.marker.DocumentMetadataWriteHandle;
 
@@ -49,6 +48,10 @@ public DocumentWriteOperationImpl(OperationType type, String uri,
     this.temporalDocumentURI = temporalDocumentURI;
   }
 
+  public DocumentWriteOperationImpl(String uri, AbstractWriteHandle content){
+    this(OperationType.DOCUMENT_WRITE, uri, null, content, null);
+  }
+
   @Override
   public OperationType getOperationType() {
     return operationType;
@@ -74,6 +77,31 @@ public AbstractWriteHandle getContent() {
     return content;
   }
 
+  @Override
+  public int compareTo(DocumentWriteOperation o) {
+    if(o == null)
+      throw new NullPointerException("DocumentWriteOperation cannot be null");
+
+    if(this.getUri() != null && o.getUri() != null)
+      return getUri().compareTo(o.getUri());
+
+    if(this.getUri() == null && o.getUri() != null)
+      return -1;
+
+    if(this.getUri() != null && o.getUri()==null)
+      return 1;
+
+    if(this.getUri() == null && o.getUri() == null)
+    {
+      if(this.hashCode() > o.hashCode())
+        return 1;
+      else if (this.hashCode() < o.hashCode())
+        return -1;
+      return 0;
+    }
+    return 0;
+  }
+
   @Override
   public int hashCode() {
     if(this.getUri()!=null)