resolving merge conflict

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java

@@ -18,6 +18,7 @@
 import com.azure.cosmos.models.FeedOptions;
 import com.azure.cosmos.models.ModelBridgeInternal;
 import com.azure.cosmos.models.SqlQuerySpec;
+import com.azure.cosmos.models.ThroughputProperties;
 import com.azure.cosmos.util.CosmosPagedFlux;
 import com.azure.cosmos.util.UtilBridgeInternal;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -53,6 +54,7 @@ public final class CosmosAsyncClient implements Closeable {
     private final boolean sessionCapturingOverride;
     private final boolean enableTransportClientSharing;
     private final TracerProvider tracerProvider;
+    private final boolean contentResponseOnWriteEnabled;
 
     CosmosAsyncClient(CosmosClientBuilder builder) {
         this.configs = builder.configs();
@@ -66,6 +68,7 @@ public final class CosmosAsyncClient implements Closeable {
         this.sessionCapturingOverride = builder.isSessionCapturingOverrideEnabled();
         this.enableTransportClientSharing = builder.isConnectionReuseAcrossClientsEnabled();
         this.tracerProvider = builder.getTracerProvider();
+        this.contentResponseOnWriteEnabled = builder.isContentResponseOnWriteEnabled();
         this.asyncDocumentClient = new AsyncDocumentClient.Builder()
                                        .withServiceEndpoint(this.serviceEndpoint)
                                        .withMasterKeyOrResourceToken(this.keyOrResourceToken)
@@ -76,6 +79,7 @@ public final class CosmosAsyncClient implements Closeable {
                                        .withTokenResolver(this.cosmosAuthorizationTokenResolver)
                                        .withCosmosKeyCredential(this.cosmosKeyCredential)
                                        .withTransportClientSharing(this.enableTransportClientSharing)
+                                       .withContentResponseOnWriteEnabled(this.contentResponseOnWriteEnabled)
                                        .build();
     }
 
@@ -168,6 +172,22 @@ CosmosKeyCredential cosmosKeyCredential() {
         return cosmosKeyCredential;
     }
 
+    /**
+     * Gets the boolean which indicates whether to only return the headers and status code in Cosmos DB response
+     * in case of Create, Update and Delete operations on CosmosItem.
+     *
+     * If set to false (which is by default), this removes the resource from response. It reduces networking
+     * and CPU load by not sending the resource back over the network and serializing it
+     * on the client.
+     *
+     * By-default, this is false.
+     *
+     * @return a boolean indicating whether resource will be included in the response or not
+     */
+    boolean isContentResponseOnWriteEnabled() {
+        return contentResponseOnWriteEnabled;
+    }
+
     /**
      * CREATE a Database if it does not already exist on the service
      * <p>
@@ -312,6 +332,19 @@ public Mono<CosmosAsyncDatabaseResponse> createDatabase(String id, int throughpu
         return createDatabase(new CosmosDatabaseProperties(id), options);
     }
 
+    /**
+     * Creates a database.
+     *
+     * @param id the id
+     * @param throughputProperties the throughputProperties
+     * @return the mono
+     */
+    public Mono<CosmosAsyncDatabaseResponse> createDatabase(String id, ThroughputProperties throughputProperties) {
+        CosmosDatabaseRequestOptions options = new CosmosDatabaseRequestOptions();
+        ModelBridgeInternal.setOfferProperties(options, throughputProperties);
+        return createDatabase(new CosmosDatabaseProperties(id), options);
+    }
+
     /**
      * Reads all databases.
      * <p>

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java

@@ -14,17 +14,24 @@
 import com.azure.cosmos.models.CosmosAsyncUserResponse;
 import com.azure.cosmos.models.CosmosContainerProperties;
 import com.azure.cosmos.models.CosmosContainerRequestOptions;
+import com.azure.cosmos.models.CosmosDatabaseProperties;
 import com.azure.cosmos.models.CosmosDatabaseRequestOptions;
 import com.azure.cosmos.models.CosmosUserProperties;
 import com.azure.cosmos.models.FeedOptions;
 import com.azure.cosmos.models.ModelBridgeInternal;
+import com.azure.cosmos.models.SqlParameter;
 import com.azure.cosmos.models.SqlQuerySpec;
+import com.azure.cosmos.models.ThroughputProperties;
+import com.azure.cosmos.models.ThroughputResponse;
 import com.azure.cosmos.util.CosmosPagedFlux;
 import com.azure.cosmos.util.UtilBridgeInternal;
 import reactor.core.Exceptions;
 import reactor.core.publisher.Mono;
 
 import static com.azure.core.util.FluxUtil.withContext;
+import java.util.Collections;
+import java.util.List;
+
 import static com.azure.cosmos.implementation.Utils.setContinuationTokenAndMaxItemCount;
 
 /**
@@ -159,6 +166,22 @@ public Mono<CosmosAsyncContainerResponse> createContainer(
         return createContainer(containerProperties, options);
     }
 
+    /**
+     * Creates a container.
+     *
+     * @param containerProperties the container properties
+     * @param throughputProperties the throughput properties
+     * @param options the request options
+     * @return the mono
+     */
+    public Mono<CosmosAsyncContainerResponse> createContainer(
+        CosmosContainerProperties containerProperties,
+        ThroughputProperties throughputProperties,
+        CosmosContainerRequestOptions options){
+        ModelBridgeInternal.setOfferProperties(options, throughputProperties);
+        return createContainer(containerProperties, options);
+    }
+
     /**
      * Creates a document container.
      * <p>
@@ -615,6 +638,79 @@ public Mono<Integer> replaceProvisionedThroughput(int requestUnitsPerSecond) {
         return TracerProvider.cosmosWithContext(withContext(context -> replaceProvisionedThroughput(requestUnitsPerSecond, context)), client.getTracerProvider());
     }
 
+    /**
+     * Sets throughput provisioned for a container in measurement of
+     * Requests-per-Unit in the Azure Cosmos service.
+     *
+     * @param throughputProperties the throughput properties
+     * @return the mono
+     */
+    public Mono<ThroughputResponse> replaceThroughput(ThroughputProperties throughputProperties) {
+        return this.read()
+                   .flatMap(response -> this.getDocClientWrapper()
+                                            .queryOffers(getOfferQuerySpecFromResourceId(response.getProperties()
+                                                                                             .getResourceId()),
+                                                         new FeedOptions())
+                                            .single()
+                                            .flatMap(offerFeedResponse -> {
+                                                if (offerFeedResponse.getResults().isEmpty()) {
+                                                    return Mono.error(BridgeInternal
+                                                                          .createCosmosClientException(
+                                                                              HttpConstants.StatusCodes.BADREQUEST,
+                                                                              "No offers found for the " +
+                                                                                  "resource " + this.getId()));
+                                                }
+
+                                                Offer existingOffer = offerFeedResponse.getResults().get(0);
+                                                Offer updatedOffer =
+                                                    ModelBridgeInternal.updateOfferFromProperties(existingOffer,
+                                                                                              throughputProperties);
+
+                                                return this.getDocClientWrapper()
+                                                           .replaceOffer(updatedOffer)
+                                                           .single();
+                                            })
+                                            .map(ModelBridgeInternal::createThroughputRespose));
+    }
+
+    /**
+     * Gets the throughput of the database
+     *
+     * @return the mono containing throughput response
+     */
+    public Mono<ThroughputResponse> readThroughput() {
+        return this.read()
+                   .flatMap(response -> getDocClientWrapper()
+                                            .queryOffers(getOfferQuerySpecFromResourceId(response.getProperties()
+                                                                                            .getResourceId()),
+                                                         new FeedOptions())
+                                            .single()
+                                            .flatMap(offerFeedResponse -> {
+                                                if (offerFeedResponse.getResults().isEmpty()) {
+                                                    return Mono.error(BridgeInternal
+                                                                          .createCosmosClientException(
+                                                                              HttpConstants.StatusCodes.BADREQUEST,
+                                                                              "No offers found for the " +
+                                                                                  "resource " + this.getId()));
+                                                }
+                                                return getDocClientWrapper()
+                                                           .readOffer(offerFeedResponse.getResults()
+                                                                          .get(0)
+                                                                          .getSelfLink())
+                                                           .single();
+                                            })
+                                            .map(ModelBridgeInternal::createThroughputRespose));
+    }
+
+    SqlQuerySpec getOfferQuerySpecFromResourceId(String resourceId) {
+        String queryText = "select * from c where c.offerResourceId = @resourceId";
+        SqlQuerySpec querySpec = new SqlQuerySpec(queryText);
+        List<SqlParameter> parameters = Collections
+                                            .singletonList(new SqlParameter("@resourceId", resourceId));
+        querySpec.setParameters(parameters);
+        return querySpec;
+    }
+
     CosmosAsyncClient getClient() {
         return client;
     }

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientBuilder.java

@@ -42,7 +42,9 @@ public class CosmosClientBuilder {
     private CosmosKeyCredential cosmosKeyCredential;
     private boolean sessionCapturingOverrideEnabled;
     private boolean connectionReuseAcrossClientsEnabled;
+
     private TracerProvider tracerProvider;
+    private boolean contentResponseOnWriteEnabled;
 
     /**
      * Instantiates a new Cosmos client builder.
@@ -51,6 +53,14 @@ public CosmosClientBuilder() {
         this.tracerProvider = new TracerProvider(ServiceLoader.load(Tracer.class));
     }
 
+    /**
+     * Get the tracer provider
+     * @return tracerProvider
+     */
+    public TracerProvider getTracerProvider() {
+        return tracerProvider;
+    }
+
     /**
      * Session capturing is enabled by default for {@link ConsistencyLevel#SESSION}.
      * For other consistency levels, it is not needed, unless if you need occasionally send requests with Session
@@ -297,12 +307,38 @@ public CosmosClientBuilder keyCredential(CosmosKeyCredential cosmosKeyCredential
     }
 
     /**
-     * Gets the tracer provider
+     * Gets the boolean which indicates whether to only return the headers and status code in Cosmos DB response
+     * in case of Create, Update and Delete operations on CosmosItem.
      *
-     * @return tracerProvider
+     * If set to false (which is by default), this removes the resource from response. It reduces networking
+     * and CPU load by not sending the resource back over the network and serializing it
+     * on the client.
+     *
+     * By-default, this is false.
+     *
+     * @return a boolean indicating whether resource will be included in the response or not
      */
-    public TracerProvider getTracerProvider() {
-        return this.tracerProvider;
+    boolean isContentResponseOnWriteEnabled() {
+        return contentResponseOnWriteEnabled;
+    }
+
+    /**
+     * Sets the boolean to only return the headers and status code in Cosmos DB response
+     * in case of Create, Update and Delete operations on CosmosItem.
+     *
+     * If set to false (which is by default), this removes the resource from response. It reduces networking
+     * and CPU load by not sending the resource back over the network and serializing it on the client.
+     *
+     * This feature does not impact RU usage for read or write operations.
+     *
+     * By-default, this is false.
+     *
+     * @param contentResponseOnWriteEnabled a boolean indicating whether resource will be included in the response or not
+     * @return current cosmosClientBuilder
+     */
+    public CosmosClientBuilder contentResponseOnWriteEnabled(boolean contentResponseOnWriteEnabled) {
+        this.contentResponseOnWriteEnabled = contentResponseOnWriteEnabled;
+        return this;
     }
 
     /**