Merge pull request #31 from shipunyc/master

Implements V2 indexing policy

Author: Ryan CrawCour

README.md

@@ -14,7 +14,7 @@ To get the binaries of this library as distributed by Microsoft, ready for use w
     <dependency>
     	<groupId>com.microsoft.azure</groupId>
     	<artifactId>azure-documentdb</artifactId>
-    	<version>1.0.1</version>
+    	<version>1.1.0</version>
     </dependency>
 
 ###Option 2: Source Via Git

changelog.md

@@ -0,0 +1,3 @@
+## Changes in 1.1.0 : ##
+
+- Implements V2 indexing policy

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.azure</groupId>
   <artifactId>azure-documentdb</artifactId>
-  <version>1.0.1</version>
+  <version>1.1.0</version>
   <name>${project.groupId}:${project.artifactId}</name>
   <description>Java SDK for Microsoft Azure DocumentDB</description>
   <url>http://azure.microsoft.com/en-us/services/documentdb/</url>

src/com/microsoft/azure/documentdb/Constants.java

@@ -89,13 +89,15 @@ static class Properties {
         static final String MAX_PATH_DEPTH = "maxPathDepth";
         static final String INDEXING_MODE = "indexingMode";
         static final String INDEX_TYPE = "IndexType";
+        static final String INDEX_KIND = "kind";
+        static final String DATA_TYPE = "dataType";
+        static final String PRECISION = "precision";
 
         static final String PATHS = "paths";
-        static final String PATH = "Path";
-        static final String FREQUENT_PATHS = "Frequent";
-        static final String INCLUDED_PATHS = "IncludedPaths";
-        static final String IN_FREQUENT_PATHS = "InFrequent";
-        static final String EXCLUDED_PATHS = "ExcludedPaths";
+        static final String PATH = "path";
+        static final String INCLUDED_PATHS = "includedPaths";
+        static final String EXCLUDED_PATHS = "excludedPaths";
+        static final String INDEXES = "indexes";
 
         //Conflict.
         static final String CONFLICT = "conflict";

src/com/microsoft/azure/documentdb/DocumentCollection.java

@@ -46,6 +46,10 @@ public DocumentCollection(JSONObject jsonObject) {
      * @param indexingPolicy the indexing policy.
      */
     public void setIndexingPolicy(IndexingPolicy indexingPolicy) {
+        if (indexingPolicy == null) {
+            throw new IllegalArgumentException("IndexingPolicy cannot be null.");
+        }
+
         this.indexingPolicy = indexingPolicy;
     }
 
@@ -120,9 +124,11 @@ public String getConflictsLink() {
 
     @Override
     public void onSave() {
-        if (this.indexingPolicy != null) {
-            this.indexingPolicy.onSave();
-            super.set(Constants.Properties.INDEXING_POLICY, this.indexingPolicy);
+        if (this.indexingPolicy == null) {
+            this.getIndexingPolicy();
         }
+
+        this.indexingPolicy.onSave();
+        super.set(Constants.Properties.INDEXING_POLICY, this.indexingPolicy);
     }
 }

src/com/microsoft/azure/documentdb/HttpConstants.java

@@ -147,14 +147,8 @@ public static class HttpHeaders {
     }
 
     public static class Versions {
-        // For DocumentServiceProperties and MediaIdFormatChange, Gateway will
-        // work for the version later than this version.
-        public static String DOCUMENT_SERVICE_PROPERTIES_VERSION_20131105 = "2013-11-05";
-        public static String MEDIA_ID_FORMAT_CHANGE_VERSION_20140418 = "2014-02-25";
-
-        public static String CURRENT_VERSION = "2015-04-08";
-
-        public static String USER_AGENT = "documentdb-java-sdk-1.0.1";
+        public static String CURRENT_VERSION = "2015-06-03";
+        public static String USER_AGENT = "documentdb-java-sdk-1.1.0";
     }
 
     public static class StatusCodes {

src/com/microsoft/azure/documentdb/IndexingMode.java

@@ -17,5 +17,14 @@ public enum IndexingMode {
      * <p>
      * With lazy indexing, queries are eventually consistent. The index is updated when the collection is idle.
      */
-    Lazy
+    Lazy,
+
+    /**
+     * No index is provided.
+     * <p>
+     * Setting IndexingMode to "None" drops the index. Use this if you don't want to maintain the index for a document
+     * collection, to save the storage cost or improve the write throughput. Your queries will degenerate to scans of
+     * the entire collection.
+     */
+    None
 }

src/com/microsoft/azure/documentdb/IndexingPolicy.java

@@ -12,6 +12,11 @@
  */
 public final class IndexingPolicy extends JsonSerializable {
 
+    private static final String DEFAULT_PATH = "/*";
+
+    private Collection<IncludedPath> includedPaths;
+    private Collection<ExcludedPath> excludedPaths;
+
     /**
      * Constructor.
      */
@@ -86,63 +91,70 @@ public IndexingMode getIndexingMode() {
         return result;
     }
 
-    /**
-     * Gets or sets the path level configurations for indexing.
-     */
-    private Collection<IndexingPath> included;
-    private Collection<String> excluded;
-
-
     /**
      * Gets the paths that are chosen to be indexed by the user.
      * 
      * @return the included paths.
      */
-    public Collection<IndexingPath> getIncludedPaths() {
-        if (this.included == null) {
-            this.included = super.getCollection(Constants.Properties.INCLUDED_PATHS, IndexingPath.class);
+    public Collection<IncludedPath> getIncludedPaths() {
+        if (this.includedPaths == null) {
+            this.includedPaths = super.getCollection(Constants.Properties.INCLUDED_PATHS, IncludedPath.class);
 
-            if (this.included == null) {
-                this.included = new ArrayList<IndexingPath>();
+            if (this.includedPaths == null) {
+                this.includedPaths = new ArrayList<IncludedPath>();
             }
         }
 
-        return this.included;
+        return this.includedPaths;
+    }
+
+    public void setIncludedPaths(Collection<IncludedPath> includedPaths) {
+        this.includedPaths = includedPaths;
     }
-    
+
     /**
      * Gets the paths that are not indexed.
      * 
      * @return the excluded paths.
      */
-    public Collection<String> getExcludedPaths() {
-        if (this.excluded == null) {
-            this.excluded = super.getCollection(Constants.Properties.EXCLUDED_PATHS, String.class);
+    public Collection<ExcludedPath> getExcludedPaths() {
+        if (this.excludedPaths == null) {
+            this.excludedPaths = super.getCollection(Constants.Properties.EXCLUDED_PATHS, ExcludedPath.class);
 
-            if (this.excluded == null) {
-                this.excluded = new ArrayList<String>();
+            if (this.excludedPaths == null) {
+                this.excludedPaths = new ArrayList<ExcludedPath>();
             }
         }
 
-        return this.excluded;
+        return this.excludedPaths;
+    }
+
+    public void setExcludedPaths(Collection<ExcludedPath> excludedPaths) {
+        this.excludedPaths = excludedPaths;
     }
 
     @Override
     void onSave() {
-        boolean bDefaultPaths = (this.included != null && this.included.size() == 0 && 
-                                 this.excluded != null && this.excluded.size() == 0);
-
-        // If we do not have any user-specified paths, do not serialize.
-        // If we don't do this, included and excluded will be sent as empty lists [], [] which have a different meaning
-        // on server.
-        if (bDefaultPaths) return;
+        // If indexing mode is not 'none' and not paths are set, set them to the defaults
+        if (this.getIndexingMode() != IndexingMode.None && this.getIncludedPaths().size() == 0 &&
+                this.getExcludedPaths().size() == 0) {
+            IncludedPath includedPath = new IncludedPath();
+            includedPath.setPath(IndexingPolicy.DEFAULT_PATH);
+            this.getIncludedPaths().add(includedPath);
+        }
 
-        if (this.included != null) {
-            super.set(Constants.Properties.INCLUDED_PATHS, this.included);
+        if (this.includedPaths != null) {
+            for (IncludedPath includedPath : this.includedPaths) {
+                includedPath.onSave();
+            }
+            super.set(Constants.Properties.INCLUDED_PATHS, this.includedPaths);
         }
 
-        if (this.excluded != null) {
-            super.set(Constants.Properties.EXCLUDED_PATHS, this.excluded);
+        if (this.excludedPaths != null) {
+            for (ExcludedPath excludedPath : this.excludedPaths) {
+                excludedPath.onSave();
+            }
+            super.set(Constants.Properties.EXCLUDED_PATHS, this.excludedPaths);
         }
     }
 }

src/com/microsoft/azure/documentdb/QueryIterable.java

@@ -4,7 +4,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.NoSuchElementException;
 
 
 /**