Adding changes to sort uris.

Author: anu3990

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

@@ -27,7 +27,7 @@
  * {@link DocumentWriteSet#add add}, {@link DocumentWriteSet#addDefault addDefault}, or
  * {@link DocumentWriteSet#disableDefault disableDefault}.
  */
-public interface DocumentWriteOperation {
+public interface DocumentWriteOperation extends Comparable<DocumentWriteOperation> {
   public enum OperationType {
     /** This write operation (REST API mime part) sets the defaults for the
      * rest of the request.
@@ -139,6 +139,10 @@ public String getTemporalDocumentURI() {
                 return null;
             }
 
+            @Override
+            public int compareTo(DocumentWriteOperation o) {
+                return getUri().compareTo(o.getUri());
+            }
         }
         final class WrapperImpl {
             private DocumentUriMaker docUriMaker;

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

@@ -30,22 +30,24 @@
 
 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;
+  private List<DocumentWriteOperation> operations;
+  private int metadataCount;
 
   DocumentWriteSetImpl(){
-    setOperations(SET_TYPE);
-
+    operations = new ArrayList<>();
+    metadataCount = 0;
   }
   @Override
   public DocumentWriteSet addDefault(DocumentMetadataWriteHandle metadataHandle) {
+    this.metadataCount++;
     add(new DocumentWriteOperationImpl(OperationType.METADATA_DEFAULT,
       null, metadataHandle, null));
     return this;
   }
 
   @Override
   public DocumentWriteSet disableDefault() {
+    this.metadataCount++;
     add(new DocumentWriteOperationImpl(OperationType.DISABLE_METADATA_DEFAULT,
       null, new StringHandle("{ }").withFormat(Format.JSON), null));
     return this;
@@ -159,6 +161,8 @@ public boolean contains(Object o) {
 
   @Override
   public Iterator<DocumentWriteOperation> iterator() {
+    if(metadataCount <=1)
+      Collections.sort(operations);
     return operations.iterator();
   }
 
@@ -207,14 +211,4 @@ 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");
-    }
-  }
 }