sort documents by URI within a batch.

Author: anu3990

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

@@ -42,6 +42,7 @@ public enum OperationType {
      * <a href="http://docs.marklogic.com/guide/rest-dev/bulk#id_54554">
      * REST API Guide -&gt; Example: Reverting to System Default Metadata</a>
      */
+    @Deprecated
     DISABLE_METADATA_DEFAULT,
     /** This write operation (REST API mime part) creates or overwrites
      * one document and/or document metadata.

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

@@ -20,7 +20,7 @@
 import com.marklogic.client.io.marker.AbstractWriteHandle;
 import com.marklogic.client.io.marker.DocumentMetadataWriteHandle;
 
-public class DocumentWriteOperationImpl implements DocumentWriteOperation {
+public class DocumentWriteOperationImpl implements DocumentWriteOperation,Comparable<DocumentWriteOperation> {
   private OperationType operationType;
   private String uri;
   private String temporalDocumentURI;
@@ -30,20 +30,31 @@ public class DocumentWriteOperationImpl implements DocumentWriteOperation {
   public DocumentWriteOperationImpl(OperationType type, String uri,
                                     DocumentMetadataWriteHandle metadata, AbstractWriteHandle content)
   {
-    this.operationType = type;
-    this.uri = uri;
-    this.metadata = metadata;
-    this.content = content;
+    this(uri, type, metadata, content);
     this.temporalDocumentURI = null;
   }
 
   public DocumentWriteOperationImpl(OperationType type, String uri,
                                     DocumentMetadataWriteHandle metadata, AbstractWriteHandle content, String temporalDocumentURI) {
+    this(uri,type,metadata, content);
+    this.temporalDocumentURI = temporalDocumentURI;
+  }
+
+  private DocumentWriteOperationImpl(String uri, OperationType type,
+                                     DocumentMetadataWriteHandle metadata, AbstractWriteHandle content) {
+
+
+    if(type == OperationType.DOCUMENT_WRITE && uri == null) {
+      throw new IllegalArgumentException("Uri cannot be null when Operation Type is DOCUMENT_WRITE.");
+    }
+    if(!(type == OperationType.DOCUMENT_WRITE) && uri != null) {
+      throw new IllegalArgumentException("Operation Type should be DOCUMENT_WRITE when uri is not null");
+    }
+
     this.operationType = type;
     this.uri = uri;
     this.metadata = metadata;
     this.content = content;
-    this.temporalDocumentURI = temporalDocumentURI;
   }
 
   @Override
@@ -70,4 +81,37 @@ public DocumentMetadataWriteHandle getMetadata() {
   public AbstractWriteHandle getContent() {
     return content;
   }
+
+  @Override
+  public int compareTo(DocumentWriteOperation o) {
+    if(o == null)
+      throw new NullPointerException("DocumentWriteOperation cannot be null");
+
+    if(this.getUri() instanceof String && o.getUri() instanceof String)
+      return getUri().compareTo(o.getUri());
+
+    if(this.getUri() == null && o.getUri() instanceof String)
+      return -1;
+
+    if(this.getUri() instanceof String && o.getUri()==null)
+      return 1;
+
+    if(this.getUri() == null && o.getUri() == null)
+      super.hashCode();
+    return 0;
+  }
+
+  @Override
+  public int hashCode() {
+    if(this.getUri()!=null)
+      return this.getUri().hashCode();
+    return super.hashCode();
+  }
+
+  @Override
+  public boolean equals(Object o){
+    if(this.getUri()!=null)
+      return this.getUri().equals(o);
+    return super.equals(o);
+  }
 }

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

@@ -26,9 +26,17 @@
 import com.marklogic.client.io.marker.ContentHandle;
 import com.marklogic.client.io.marker.DocumentMetadataWriteHandle;
 
-import java.util.LinkedHashSet;
+import java.util.*;
 
-public class DocumentWriteSetImpl extends LinkedHashSet<DocumentWriteOperation> implements DocumentWriteSet {
+public class DocumentWriteSetImpl implements Set<DocumentWriteOperation>,DocumentWriteSet {
+
+  final private static String SET_TYPE = System.getProperty("com.marklogic.client.DocumentWriteSet.type", "sorted");
+  private Set<DocumentWriteOperation> operations;
+
+  DocumentWriteSetImpl(){
+    setOperations(SET_TYPE);
+
+  }
   @Override
   public DocumentWriteSet addDefault(DocumentMetadataWriteHandle metadataHandle) {
     add(new DocumentWriteOperationImpl(OperationType.METADATA_DEFAULT,
@@ -133,4 +141,81 @@ public DocumentWriteSet add(DocumentDescriptor desc, DocumentMetadataWriteHandle
       temporalDocumentURI));
     return this;
   }
+
+  @Override
+  public int size() {
+    return operations.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return operations.isEmpty();
+  }
+
+  @Override
+  public boolean contains(Object o) {
+    return operations.contains(o);
+  }
+
+  @Override
+  public Iterator<DocumentWriteOperation> iterator() {
+    return operations.iterator();
+  }
+
+  @Override
+  public Object[] toArray() {
+    return operations.toArray();
+  }
+
+  @Override
+  public <T> T[] toArray(T[] a) {
+    return operations.toArray(a);
+  }
+
+  @Override
+  public boolean add(DocumentWriteOperation documentWriteOperation) {
+    System.out.println(operations);
+    return operations.add(documentWriteOperation);
+  }
+
+  @Override
+  public boolean remove(Object o) {
+    return operations.remove(o);
+  }
+
+  @Override
+  public boolean containsAll(Collection<?> c) {
+    return operations.containsAll(c);
+  }
+
+  @Override
+  public boolean addAll(Collection<? extends DocumentWriteOperation> c) {
+    return operations.addAll(c);
+  }
+
+  @Override
+  public boolean retainAll(Collection<?> c) {
+    return operations.retainAll(c);
+  }
+
+  @Override
+  public boolean removeAll(Collection<?> c) {
+    return operations.removeAll(c);
+  }
+
+  @Override
+  public void clear() {
+    operations.clear();
+  }
+
+  private void setOperations(String SET_TYPE) {
+
+    if(SET_TYPE.equals("sorted")) {
+      this.operations = new TreeSet<DocumentWriteOperation>();
+    } else if(SET_TYPE.equals("unsorted")) {
+      this.operations = new LinkedHashSet<DocumentWriteOperation>();
+    } else {
+      throw new IllegalStateException("SET_TYPE should be either sorted or unsorted");
+    }
+  }
 }