Merge pull request #6 from kushagraThapar/master

Upgrade the getting started to new version of azure-cosmos release

Author: kushagraThapar

pom.xml

@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-cosmos</artifactId>
-            <version>4.0.0-preview.2</version>
+            <version>4.0.1-beta.1</version>
         </dependency>
     </dependencies>
 

src/main/java/com/azure/cosmos/sample/async/AsyncMain.java

@@ -7,16 +7,16 @@
 import com.azure.cosmos.ConsistencyLevel;
 import com.azure.cosmos.CosmosAsyncClient;
 import com.azure.cosmos.CosmosAsyncContainer;
-import com.azure.cosmos.CosmosAsyncContainerResponse;
 import com.azure.cosmos.CosmosAsyncDatabase;
-import com.azure.cosmos.CosmosAsyncDatabaseResponse;
-import com.azure.cosmos.CosmosAsyncItemResponse;
 import com.azure.cosmos.CosmosClientBuilder;
 import com.azure.cosmos.CosmosClientException;
-import com.azure.cosmos.CosmosContainerProperties;
-import com.azure.cosmos.CosmosContinuablePagedFlux;
-import com.azure.cosmos.FeedOptions;
-import com.azure.cosmos.PartitionKey;
+import com.azure.cosmos.CosmosPagedFlux;
+import com.azure.cosmos.models.CosmosAsyncContainerResponse;
+import com.azure.cosmos.models.CosmosAsyncDatabaseResponse;
+import com.azure.cosmos.models.CosmosAsyncItemResponse;
+import com.azure.cosmos.models.CosmosContainerProperties;
+import com.azure.cosmos.models.FeedOptions;
+import com.azure.cosmos.models.PartitionKey;
 import com.azure.cosmos.sample.common.AccountSettings;
 import com.azure.cosmos.sample.common.Families;
 import com.azure.cosmos.sample.common.Family;
@@ -161,7 +161,7 @@ private void createFamilies(Flux<Family> families) throws Exception {
                 System.out.println(String.format("Created item with request charge of %.2f within" +
                     " duration %s",
                     itemResponse.getRequestCharge(), itemResponse.getRequestLatency()));
-                System.out.println(String.format("Item ID: %s\n", itemResponse.getResource().getId()));
+                System.out.println(String.format("Item ID: %s\n", itemResponse.getItem().getId()));
                 return Mono.just(itemResponse.getRequestCharge());
             }) //Flux of request charges
             .reduce(0.0, 
@@ -212,7 +212,7 @@ private void readItems(Flux<Family> familiesToCreate) {
                                 double requestCharge = itemResponse.getRequestCharge();
                                 Duration requestLatency = itemResponse.getRequestLatency();
                                 System.out.println(String.format("Item successfully read with id %s with a charge of %.2f and within duration %s",
-                                    itemResponse.getResource().getId(), requestCharge, requestLatency));
+                                    itemResponse.getItem().getId(), requestCharge, requestLatency));
                             },
                             err -> {
                                 if (err instanceof CosmosClientException) {
@@ -244,17 +244,16 @@ private void queryItems() {
         // Set some common query options
 
         FeedOptions queryOptions = new FeedOptions();
-        queryOptions.maxItemCount(10);
         //queryOptions.setEnableCrossPartitionQuery(true); //No longer needed in SDK v4
         //  Set populate query metrics to get metrics around query executions
-        queryOptions.populateQueryMetrics(true);
+        queryOptions.setPopulateQueryMetrics(true);
 
-        CosmosContinuablePagedFlux<Family> pagedFluxResponse = container.queryItems(
+        CosmosPagedFlux<Family> pagedFluxResponse = container.queryItems(
             "SELECT * FROM Family WHERE Family.lastName IN ('Andersen', 'Wakefield', 'Johnson')", queryOptions, Family.class);
 
         final CountDownLatch completionLatch = new CountDownLatch(1);
 
-        pagedFluxResponse.byPage().subscribe(
+        pagedFluxResponse.byPage(10).subscribe(
             fluxResponse -> {
                 System.out.println("Got a page of query result with " +
                     fluxResponse.getResults().size() + " items(s)"

src/main/java/com/azure/cosmos/sample/sync/SyncMain.java

@@ -9,13 +9,13 @@
 import com.azure.cosmos.CosmosClientBuilder;
 import com.azure.cosmos.CosmosClientException;
 import com.azure.cosmos.CosmosContainer;
-import com.azure.cosmos.CosmosContainerProperties;
-import com.azure.cosmos.CosmosContinuablePagedIterable;
 import com.azure.cosmos.CosmosDatabase;
-import com.azure.cosmos.CosmosItemRequestOptions;
-import com.azure.cosmos.CosmosItemResponse;
-import com.azure.cosmos.FeedOptions;
-import com.azure.cosmos.PartitionKey;
+import com.azure.cosmos.CosmosPagedIterable;
+import com.azure.cosmos.models.CosmosContainerProperties;
+import com.azure.cosmos.models.CosmosItemRequestOptions;
+import com.azure.cosmos.models.CosmosItemResponse;
+import com.azure.cosmos.models.FeedOptions;
+import com.azure.cosmos.models.PartitionKey;
 import com.azure.cosmos.sample.common.AccountSettings;
 import com.azure.cosmos.sample.common.Families;
 import com.azure.cosmos.sample.common.Family;
@@ -177,15 +177,14 @@ private void queryItems() {
         //  <QueryItems>
         // Set some common query options
         FeedOptions queryOptions = new FeedOptions();
-        queryOptions.maxItemCount(10);
         //queryOptions.setEnableCrossPartitionQuery(true); //No longer necessary in SDK v4
         //  Set populate query metrics to get metrics around query executions
-        queryOptions.populateQueryMetrics(true);
+        queryOptions.setPopulateQueryMetrics(true);
 
-        CosmosContinuablePagedIterable<Family> familiesPagedIterable = container.queryItems(
-                "SELECT * FROM Family WHERE Family.lastName IN ('Andersen', 'Wakefield', 'Johnson')", queryOptions, Family.class);
+        CosmosPagedIterable<Family> familiesPagedIterable = container.queryItems(
+            "SELECT * FROM Family WHfERE Family.lastName IN ('Andersen', 'Wakefield', 'Johnson')", queryOptions, Family.class);
 
-        familiesPagedIterable.iterableByPage().forEach(cosmosItemPropertiesFeedResponse -> {
+        familiesPagedIterable.iterableByPage(10).forEach(cosmosItemPropertiesFeedResponse -> {
             System.out.println("Got a page of query result with " +
                 cosmosItemPropertiesFeedResponse.getResults().size() + " items(s)"
                 + " and request charge of " + cosmosItemPropertiesFeedResponse.getRequestCharge());