Clean up code.

Author: jeet1995

src/main/java/com/azure/cosmos/examples/queries/async/QueriesQuickstartAsync.java

@@ -122,8 +122,6 @@ private void queriesDemo() throws Exception {
 
         logger.info("Async doc create done.");
 
-        logger.info("Async doc create done.");
-
         //execute all the below query examples asynchronously and waiting until all done
 
         queryCrossPartitionAsyncUsingSessionConsistency();
@@ -464,7 +462,7 @@ private void queryWithQuerySpec() throws Exception {
         executeQueryWithQuerySpecPrintSingleResult(querySpec);
     }
 
-    private Map<String, String>  upsertMultipleDocumentsCollectSessionTokens(String dbName, String containerName, int totalDocuments) {
+    private Map<String, String> upsertMultipleDocumentsAndCollectSessionTokens(String dbName, String containerName, int totalDocuments) {
         Map<String, String> partitionToSessionToken = new ConcurrentHashMap<>();
 
         // Use a dedicated client instance for creates/upserts
@@ -473,7 +471,6 @@ private Map<String, String>  upsertMultipleDocumentsCollectSessionTokens(String
                 .key(AccountSettings.MASTER_KEY)
                 // Use SESSION consistency for session token semantics
                 .consistencyLevel(ConsistencyLevel.SESSION)
-                .contentResponseOnWriteEnabled(true)
                 .buildAsyncClient()) {
 
             CosmosAsyncContainer writerContainer = writerClient.getDatabase(dbName).getContainer(containerName);
@@ -509,15 +506,17 @@ private Map<String, String>  upsertMultipleDocumentsCollectSessionTokens(String
             }
 
             // Prepare upsert operations and attach callbacks to capture session tokens
-            List<Mono<CosmosItemResponse<Family>>> upserts = new java.util.ArrayList<>();
+            List<Mono<CosmosItemResponse<Family>>> upserts = new ArrayList<>();
+
+            CosmosItemRequestOptions requestOptionsForUpsert = new CosmosItemRequestOptions();
 
             for (String pkValue : upsertPartitionKeys) {
                 Family f = new Family();
                 f.setLastName(pkValue);
                 f.setId(UUID.randomUUID().toString());
 
                 Mono<CosmosItemResponse<Family>> upsertMono = writerContainer
-                        .upsertItem(f, new PartitionKey(pkValue), new CosmosItemRequestOptions())
+                        .upsertItem(f, new PartitionKey(pkValue), requestOptionsForUpsert)
                         .map(response -> {
 
                             String sessionTokenFromUpsert = response.getSessionToken();
@@ -565,13 +564,12 @@ private void queryWithCompoundSessionTokenAndIteratePages(String dbName, String
                 .key(AccountSettings.MASTER_KEY)
                 // Use SESSION consistency to honor session tokens
                 .consistencyLevel(ConsistencyLevel.SESSION)
-                .contentResponseOnWriteEnabled(false)
                 .buildAsyncClient()) {
 
             CosmosAsyncContainer readerContainer = readerClient.getDatabase(dbName).getContainer(containerName);
 
             CosmosQueryRequestOptions options = new CosmosQueryRequestOptions();
-            // Step 5: Plug in the compound session token
+            // Plug in the compound session token
             options.setSessionToken(compoundSessionToken);
 
             logger.info("Executing query with compound session token: {}", compoundSessionToken);
@@ -660,12 +658,12 @@ private void shutdown() {
 
     // Steps:
     // 1. Create multiple documents (some with duplicate partition keys) and collect latest session tokens per partition key.
-    // 2. Build a compound session token by concatenating the session tokens using commas present in partitionKeyToLastRecordedSessionToken.
+    // 2. Build a compound session token by concatenating the session tokens using commas present as values in partitionKeyToLastRecordedSessionToken.
     // 3. Perform a cross-partition query using the compound session token.
     private void queryCrossPartitionAsyncUsingSessionConsistency() {
-        logger.info("Starting cross-partition upserts and session-consistent query.");
+        logger.info("Starting upserts across various logical partitions and a session-consistent query...");
         try {
-            Map<String, String> partitionKeyToLastRecordedSessionToken = upsertMultipleDocumentsCollectSessionTokens(databaseName, containerName, 10);
+            Map<String, String> partitionKeyToLastRecordedSessionToken = upsertMultipleDocumentsAndCollectSessionTokens(databaseName, containerName, 10);
 
             String compoundSessionToken = buildCompoundSessionToken(partitionKeyToLastRecordedSessionToken);
 

src/main/java/com/azure/cosmos/examples/queries/sync/QueriesQuickstart.java

@@ -4,6 +4,7 @@
 package com.azure.cosmos.examples.queries.sync;
 
 import com.azure.cosmos.ConsistencyLevel;
+import com.azure.cosmos.CosmosAsyncClient;
 import com.azure.cosmos.CosmosClient;
 import com.azure.cosmos.CosmosClientBuilder;
 import com.azure.cosmos.CosmosContainer;
@@ -529,41 +530,50 @@ private String buildCompoundSessionToken(Map<String, String> partitionSessionTok
     }
 
     private void queryWithCompoundSessionTokenAndIteratePages(String databaseName, String containerName, String compoundSessionToken) {
-        // This method is not used in this sample but illustrates how to use a compound session token
-        // to execute a query and iterate over pages of results.
-        CosmosQueryRequestOptions options = new CosmosQueryRequestOptions();
-        options.setSessionToken(compoundSessionToken);
+        try (CosmosClient readerClient = new CosmosClientBuilder()
+                .endpoint(AccountSettings.HOST)
+                .key(AccountSettings.MASTER_KEY)
+                // Use SESSION consistency to honor session tokens
+                .consistencyLevel(ConsistencyLevel.SESSION)
+                .buildClient()) {
 
-        String query = "SELECT * FROM c";
-        int pageSize = 100;
-        String continuationToken = null;
-        int currentPageNumber = 1;
-        double requestCharge = 0.0;
+            CosmosQueryRequestOptions options = new CosmosQueryRequestOptions();
+            options.setSessionToken(compoundSessionToken);
 
-        do {
-            logger.info("Receiving a set of query response pages (sync). ContinuationToken={}", continuationToken);
+            CosmosContainer readerContainer = readerClient.getDatabase(databaseName).getContainer(containerName);
 
-            Iterable<FeedResponse<Family>> feedResponseIterator = container.queryItems(query, options, Family.class).iterableByPage(continuationToken, pageSize);
+            String query = "SELECT * FROM c";
+            int pageSize = 100;
+            String continuationToken = null;
+            int currentPageNumber = 1;
+            double requestCharge = 0.0;
 
-            for (FeedResponse<Family> page : feedResponseIterator) {
-                logger.info(String.format("Current page number: %d", currentPageNumber));
+            do {
+                logger.info("Receiving a set of query response pages (sync). ContinuationToken={}", continuationToken);
 
-                // Log the session token associated with this feed response
-                logger.info("FeedResponse.sessionToken={}", page.getSessionToken());
+                Iterable<FeedResponse<Family>> feedResponseIterator = readerContainer.queryItems(query, options, Family.class).iterableByPage(continuationToken, pageSize);
 
-                for (Family family : page.getResults()) {
-                    logger.info("Query result (sync): id={}, partitionKey={}", family.getId(), family.getLastName());
-                }
+                for (FeedResponse<Family> page : feedResponseIterator) {
+                    logger.info(String.format("Current page number: %d", currentPageNumber));
 
-                requestCharge += page.getRequestCharge();
-                logger.info(String.format("Total request charge so far: %f\n", requestCharge));
+                    logger.info("FeedResponse.sessionToken={}", page.getSessionToken());
 
-                continuationToken = page.getContinuationToken();
-                currentPageNumber++;
-            }
+                    for (Family family : page.getResults()) {
+                        logger.info("Query result (sync): id={}, partitionKey={}", family.getId(), family.getLastName());
+                    }
 
-        } while (continuationToken != null);
+                    requestCharge += page.getRequestCharge();
+                    logger.info(String.format("Total request charge so far: %f\n", requestCharge));
+
+                    continuationToken = page.getContinuationToken();
+                    currentPageNumber++;
+                }
 
-        logger.info(String.format("Total request charge (sync): %f\n", requestCharge));
+            } while (continuationToken != null);
+
+            logger.info(String.format("Total request charge (sync): %f\n", requestCharge));
+        } catch (Exception e) {
+            logger.error("Exception while querying with compound session token: {}", e.getMessage(), e);
+        }
     }
 }