Merge pull request #35 from shipunyc/master

Updates SDK version to 1.2.0:

Author: shipunyc

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

changelog.md

@@ -1,3 +1,9 @@
+## Changes in 1.2.0 : ##
+
+- Supports GeoSpatial index.
+- Validates resource id.
+- Adds new header "index transformation progress" to ResourceResponse.
+
 ## 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.1.0</version>
+  <version>1.2.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/DataType.java

@@ -1,6 +1,19 @@
 package com.microsoft.azure.documentdb;
 
 public enum DataType {
+
+    /**
+     * Represents a numeric data type.
+     */
     Number,
+
+    /**
+     * Represent a point data type.
+     */
+    Point,
+
+    /**
+     * Represents a string data type.
+     */
     String
 }

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

@@ -161,6 +161,8 @@ public ResourceResponse<Database> createDatabase(Database database, RequestOptio
             throw new IllegalArgumentException("Database");          
         }
 
+        DocumentClient.validateResource(database);
+
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.Database,
                                                                        Paths.DATABASES_ROOT,
@@ -284,6 +286,8 @@ public ResourceResponse<DocumentCollection> createCollection(String databaseLink
             throw new IllegalArgumentException("collection");          
         }
 
+        DocumentClient.validateResource(collection);
+
         String path = DocumentClient.joinPath(databaseLink, Paths.COLLECTIONS_PATH_SEGMENT);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.DocumentCollection,
@@ -293,6 +297,34 @@ public ResourceResponse<DocumentCollection> createCollection(String databaseLink
         return new ResourceResponse<DocumentCollection>(this.doCreate(request), DocumentCollection.class);
     }
 
+    /**
+     * Replaces a document collection.
+     * 
+     * @param collection the document collection to use.
+     * @param options the request options.
+     * @return the resource response with the replaced document collection.
+     * @throws DocumentClientException the document client exception.
+     */
+    public ResourceResponse<DocumentCollection> replaceCollection(DocumentCollection collection,
+                                                                  RequestOptions options)
+            throws DocumentClientException {
+
+        if (collection == null) {
+            throw new IllegalArgumentException("collection");          
+        }
+
+        DocumentClient.validateResource(collection);
+
+        String path = DocumentClient.joinPath(collection.getSelfLink(), null);
+        Map<String, String> requestHeaders = this.getRequestHeaders(options);
+
+        DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.DocumentCollection,
+                                                                       path,
+                                                                       collection,
+                                                                       requestHeaders);
+        return new ResourceResponse<DocumentCollection>(this.doReplace(request), DocumentCollection.class);
+    }
+
     /**
      * Deletes a document collection by the collection link.
      * 
@@ -442,6 +474,8 @@ public ResourceResponse<Document> createDocument(String collectionLink,
 
         Document typedDocument = Document.FromObject(document);
 
+        DocumentClient.validateResource(typedDocument);
+
         if (typedDocument.getId() == null && !disableAutomaticIdGeneration) {
             // We are supposed to use GUID. Basically UUID is the same as GUID
             // when represented as a string.
@@ -475,9 +509,12 @@ public ResourceResponse<Document> replaceDocument(String documentLink, Object do
             throw new IllegalArgumentException("document");          
         }
 
+        Document typedDocument = Document.FromObject(document);
+        DocumentClient.validateResource(typedDocument);
+
         String path = DocumentClient.joinPath(documentLink, null);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
-        Document typedDocument = Document.FromObject(document);
+
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.Document,
                                                                        path,
                                                                        typedDocument,
@@ -500,6 +537,8 @@ public ResourceResponse<Document> replaceDocument(Document document, RequestOpti
             throw new IllegalArgumentException("document");          
         }
 
+        DocumentClient.validateResource(document);
+
         String path = DocumentClient.joinPath(document.getSelfLink(), null);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.Document,
@@ -641,6 +680,8 @@ public ResourceResponse<StoredProcedure> createStoredProcedure(String collection
             throw new IllegalArgumentException("storedProcedure");          
         }
 
+        DocumentClient.validateResource(storedProcedure);
+
         String path = DocumentClient.joinPath(collectionLink, Paths.STORED_PROCEDURES_PATH_SEGMENT);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.StoredProcedure,
@@ -666,6 +707,8 @@ public ResourceResponse<StoredProcedure> replaceStoredProcedure(StoredProcedure
             throw new IllegalArgumentException("storedProcedure");          
         }
 
+        DocumentClient.validateResource(storedProcedure);
+
         String path = DocumentClient.joinPath(storedProcedure.getSelfLink(), null);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.StoredProcedure,
@@ -839,6 +882,8 @@ public ResourceResponse<Trigger> createTrigger(String collectionLink, Trigger tr
             throw new IllegalArgumentException("trigger");          
         }
 
+        DocumentClient.validateResource(trigger);
+
         String path = DocumentClient.joinPath(collectionLink, Paths.TRIGGERS_PATH_SEGMENT);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.Trigger,
@@ -863,6 +908,8 @@ public ResourceResponse<Trigger> replaceTrigger(Trigger trigger, RequestOptions
             throw new IllegalArgumentException("trigger");          
         }
 
+        DocumentClient.validateResource(trigger);
+
         String path = DocumentClient.joinPath(trigger.getSelfLink(), null);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.Trigger,
@@ -1008,6 +1055,8 @@ public ResourceResponse<UserDefinedFunction> createUserDefinedFunction(
             throw new IllegalArgumentException("udf");          
         }
 
+        DocumentClient.validateResource(udf);
+
         String path = DocumentClient.joinPath(collectionLink, Paths.USER_DEFINED_FUNCTIONS_PATH_SEGMENT);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.UserDefinedFunction,
@@ -1032,6 +1081,8 @@ public ResourceResponse<UserDefinedFunction> replaceUserDefinedFunction(UserDefi
             throw new IllegalArgumentException("udf");          
         }
 
+        DocumentClient.validateResource(udf);
+
         String path = DocumentClient.joinPath(udf.getSelfLink(), null);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.UserDefinedFunction,
@@ -1184,7 +1235,9 @@ public ResourceResponse<Attachment> createAttachment(String documentLink,
         if (attachment == null) {
             throw new IllegalArgumentException("attachment");          
         }
-        
+
+        DocumentClient.validateResource(attachment);
+
         String path = DocumentClient.joinPath(documentLink, Paths.ATTACHMENTS_PATH_SEGMENT);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.Attachment,
@@ -1208,6 +1261,8 @@ public ResourceResponse<Attachment> replaceAttachment(Attachment attachment, Req
             throw new IllegalArgumentException("attachment");          
         }
 
+        DocumentClient.validateResource(attachment);
+
         String path = DocumentClient.joinPath(attachment.getSelfLink(), null);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.Attachment,
@@ -1546,6 +1601,8 @@ public ResourceResponse<User> createUser(String databaseLink, User user, Request
             throw new IllegalArgumentException("user");
         }
 
+        DocumentClient.validateResource(user);
+
         String path = DocumentClient.joinPath(databaseLink, Paths.USERS_PATH_SEGMENT);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.User, path, user, requestHeaders);
@@ -1566,6 +1623,8 @@ public ResourceResponse<User> replaceUser(User user, RequestOptions options) thr
             throw new IllegalArgumentException("user");          
         }
 
+        DocumentClient.validateResource(user);
+
         String path = DocumentClient.joinPath(user.getSelfLink(), null);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.User, path, user, requestHeaders);
@@ -1699,6 +1758,8 @@ public ResourceResponse<Permission> createPermission(String userLink, Permission
             throw new IllegalArgumentException("permission");          
         }
 
+        DocumentClient.validateResource(permission);
+
         String path = DocumentClient.joinPath(userLink, Paths.PERMISSIONS_PATH_SEGMENT);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.Permission,
@@ -1723,6 +1784,8 @@ public ResourceResponse<Permission> replacePermission(Permission permission, Req
             throw new IllegalArgumentException("permission");          
         }
 
+        DocumentClient.validateResource(permission);
+
         String path = DocumentClient.joinPath(permission.getSelfLink(), null);
         Map<String, String> requestHeaders = this.getRequestHeaders(options);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.Permission,
@@ -1862,6 +1925,8 @@ public ResourceResponse<Offer> replaceOffer(Offer offer) throws DocumentClientEx
             throw new IllegalArgumentException("offer");          
         }
 
+        DocumentClient.validateResource(offer);
+
         String path = DocumentClient.joinPath(offer.getSelfLink(), null);
         DocumentServiceRequest request = DocumentServiceRequest.create(ResourceType.Offer,
                                                                        path,
@@ -2193,4 +2258,17 @@ private static String serializeProcedureParams(Object[] objectArray) {
 
         return String.format("[%s]", StringUtils.join(stringArray, ","));
     }
+
+    private static void validateResource(Resource resource) {
+        if (!StringUtils.isEmpty(resource.getId())) {
+            if (resource.getId().indexOf('/') != -1 || resource.getId().indexOf('\\') != -1 ||
+                    resource.getId().indexOf('?') != -1 || resource.getId().indexOf('#') != -1) {
+                throw new IllegalArgumentException("Id contains illagel chars.");
+            }
+
+            if (resource.getId().endsWith(" ")) {
+                throw new IllegalArgumentException("Id ends with a space.");
+            }
+        }
+    }
 }