Merge pull request #51 from shellygms/master

DocumentDB Java SDK 1.8.0 commit.

Author: Shelly Guo

.classpath

@@ -6,13 +6,13 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/classes" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="src" output="target/test-classes" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

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.7.1</version>
+    	<version>1.8.0</version>
     </dependency>
 
 ###Option 2: Source Via Git

changelog.md

@@ -1,3 +1,12 @@
+## Changes in 1.8.0 : ##
+
+    - Added support for endpoint management for geo-distributed databases. User can customize
+      how endpoints are selected for each request by setting the ConnectionPolicy.EnableEndpointDiscovery 
+      and ConnectionPolicy.PreferredLocations properties when creating a DocumentClient instance.
+    - Added support for automatic retry on throttled requests with options to customize the max retry attempts
+      and max retry wait time.  See RetryOptions and ConnectionPolicy.getRetryOptions().
+    - Deprecated IPartitionResolver based custom partitioning code. Please use partitioned collections for higher storage and throughput.
+
 ## Changes in 1.7.1 : ##
 
     - Setting Cookie policy on httpclient to ignoring server cookies as we don't use them.

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.azure</groupId>
   <artifactId>azure-documentdb</artifactId>
-  <version>1.7.1</version>
+  <version>1.8.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>
@@ -151,11 +151,6 @@
       <artifactId>commons-lang3</artifactId>
       <version>3.3.2</version>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
@@ -167,9 +162,16 @@
       <version>4.2.5</version>
     </dependency>
     <dependency>
-    	<groupId>org.mockito</groupId>
-    	<artifactId>mockito-core</artifactId>
-    	<version>1.10.19</version>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.10.19</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
   <distributionManagement>

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

@@ -15,6 +15,7 @@
 import javax.crypto.spec.SecretKeySpec;
 
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * This class is used by both client (for generating the auth header with master/system key) and by the G/W when
@@ -110,41 +111,39 @@ public static String GenerateKeyAuthorizationSignature(String verb,
      * @param resourceId the resource id.
      * @return the authorization token.
      */
-    public static String GetAuthorizationTokenUsingResourceTokens(Map<String, String> resourceTokens,
+    public static String getAuthorizationTokenUsingResourceTokens(Map<String, String> resourceTokens,
                                                                   String path,
                                                                   String resourceId) {
         if (resourceTokens == null) {
             throw new IllegalArgumentException("resourceTokens");
         }
 
-        if (path == null || path.isEmpty()) {
-            throw new IllegalArgumentException("path");
-        }
-
-        if (resourceId == null || resourceId.isEmpty()) {
-            throw new IllegalArgumentException("resourceId");
-        }
-
+        String resourceToken = null;
         if (resourceTokens.containsKey(resourceId) && resourceTokens.get(resourceId) != null) {
-            return resourceTokens.get(resourceId);
+            resourceToken = resourceTokens.get(resourceId);
+        } else if (StringUtils.isEmpty(path) || StringUtils.isEmpty(resourceId)) {
+            if (resourceTokens.size() > 0) {
+                resourceToken = resourceTokens.values().iterator().next();
+            }
         } else {
+            // Get the last resource id from the path and use that to find the corresponding token.
             String[] pathParts = path.split("/");
             String[] resourceTypes = { "dbs", "colls", "docs", "sprocs", "udfs", "triggers", "users", "permissions",
                     "attachments", "media", "conflicts" };
             HashSet<String> resourceTypesSet = new HashSet<String>();
             for (String resourceType : resourceTypes) {
                 resourceTypesSet.add(resourceType);
             }
-
+        
             for (int i = pathParts.length - 1; i >= 0; --i) {
-
+        
                 if (!resourceTypesSet.contains(pathParts[i]) && resourceTokens.containsKey(pathParts[i])) {
-                    return resourceTokens.get(pathParts[i]);
+                    resourceToken = resourceTokens.get(pathParts[i]);
                 }
             }
-
-            return null;
         }
+        
+        return resourceToken;
     }
 
     private static String getResourceSegement(ResourceType resourceType) {