> consumer);
/**
- * Sets an existing {@link CosmosContainer} to be used to read from the leases collection.
+ * Sets an existing {@link CosmosAsyncContainer} to be used to read from the leases collection.
*
- * @param leaseContainer the instance of {@link CosmosContainer} to use.
+ * @param leaseContainer the instance of {@link CosmosAsyncContainer} to use.
* @return current Builder.
*/
- BuilderDefinition leaseContainer(CosmosContainer leaseContainer);
+ BuilderDefinition setLeaseContainer(CosmosAsyncContainer leaseContainer);
/**
* Builds a new instance of the {@link ChangeFeedProcessor} with the specified configuration asynchronously.
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessorOptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessorOptions.java
similarity index 88%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessorOptions.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessorOptions.java
index 6d2686bba32f..fcca233c881d 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessorOptions.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ChangeFeedProcessorOptions.java
@@ -43,7 +43,7 @@ public ChangeFeedProcessorOptions() {
*
* @return the renew interval for all leases for partitions.
*/
- public Duration leaseRenewInterval() {
+ public Duration getLeaseRenewInterval() {
return this.leaseRenewInterval;
}
@@ -53,7 +53,7 @@ public Duration leaseRenewInterval() {
* @param leaseRenewInterval the renew interval for all leases for partitions currently held by {@link ChangeFeedProcessor} instance.
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions leaseRenewInterval(Duration leaseRenewInterval) {
+ public ChangeFeedProcessorOptions setLeaseRenewInterval(Duration leaseRenewInterval) {
this.leaseRenewInterval = leaseRenewInterval;
return this;
}
@@ -63,7 +63,7 @@ public ChangeFeedProcessorOptions leaseRenewInterval(Duration leaseRenewInterval
*
* @return the interval to kick off a task to compute if partitions are distributed evenly among known host instances.
*/
- public Duration leaseAcquireInterval() {
+ public Duration getLeaseAcquireInterval() {
return this.leaseAcquireInterval;
}
@@ -72,7 +72,7 @@ public Duration leaseAcquireInterval() {
* @param leaseAcquireInterval he interval to kick off a task to compute if partitions are distributed evenly among known host instances.
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions leaseAcquireInterval(Duration leaseAcquireInterval) {
+ public ChangeFeedProcessorOptions setLeaseAcquireInterval(Duration leaseAcquireInterval) {
this.leaseAcquireInterval = leaseAcquireInterval;
return this;
}
@@ -86,7 +86,7 @@ public ChangeFeedProcessorOptions leaseAcquireInterval(Duration leaseAcquireInte
*
* @return the interval for which the lease is taken on a lease representing a partition.
*/
- public Duration leaseExpirationInterval() {
+ public Duration getLeaseExpirationInterval() {
return this.leaseExpirationInterval;
}
@@ -100,7 +100,7 @@ public Duration leaseExpirationInterval() {
* @param leaseExpirationInterval the interval for which the lease is taken on a lease representing a partition.
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions leaseExpirationInterval(Duration leaseExpirationInterval) {
+ public ChangeFeedProcessorOptions setLeaseExpirationInterval(Duration leaseExpirationInterval) {
this.leaseExpirationInterval = leaseExpirationInterval;
return this;
}
@@ -110,7 +110,7 @@ public ChangeFeedProcessorOptions leaseExpirationInterval(Duration leaseExpirati
*
* @return the delay in between polling a partition for new changes on the feed.
*/
- public Duration feedPollDelay() {
+ public Duration getFeedPollDelay() {
return this.feedPollDelay;
}
@@ -120,7 +120,7 @@ public Duration feedPollDelay() {
* @param feedPollDelay the delay in between polling a partition for new changes on the feed, after all current changes are drained.
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions feedPollDelay(Duration feedPollDelay) {
+ public ChangeFeedProcessorOptions setFeedPollDelay(Duration feedPollDelay) {
this.feedPollDelay = feedPollDelay;
return this;
}
@@ -133,7 +133,7 @@ public ChangeFeedProcessorOptions feedPollDelay(Duration feedPollDelay) {
*
* @return a prefix to be used as part of the lease ID.
*/
- public String leasePrefix() {
+ public String getLeasePrefix() {
return this.leasePrefix;
}
@@ -143,7 +143,7 @@ public String leasePrefix() {
* @param leasePrefix a prefix to be used as part of the lease ID.
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions leasePrefix(String leasePrefix) {
+ public ChangeFeedProcessorOptions setLeasePrefix(String leasePrefix) {
this.leasePrefix = leasePrefix;
return this;
}
@@ -153,7 +153,7 @@ public ChangeFeedProcessorOptions leasePrefix(String leasePrefix) {
*
* @return the maximum number of items to be returned in the enumeration operation in the Azure Cosmos DB service.
*/
- public int maxItemCount() {
+ public int getMaxItemCount() {
return this.maxItemCount;
}
@@ -163,7 +163,7 @@ public int maxItemCount() {
* @param maxItemCount the maximum number of items to be returned in the enumeration operation.
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions maxItemCount(int maxItemCount) {
+ public ChangeFeedProcessorOptions setMaxItemCount(int maxItemCount) {
this.maxItemCount = maxItemCount;
return this;
}
@@ -176,7 +176,7 @@ public ChangeFeedProcessorOptions maxItemCount(int maxItemCount) {
*
* @return the start request continuation token to start looking for changes after.
*/
- public String startContinuation() {
+ public String getStartContinuation() {
return this.startContinuation;
}
@@ -189,7 +189,7 @@ public String startContinuation() {
* @param startContinuation the start request continuation token to start looking for changes after.
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions startContinuation(String startContinuation) {
+ public ChangeFeedProcessorOptions setStartContinuation(String startContinuation) {
this.startContinuation= startContinuation;
return this;
}
@@ -204,7 +204,7 @@ public ChangeFeedProcessorOptions startContinuation(String startContinuation) {
*
* @return the time (exclusive) to start looking for changes after.
*/
- public OffsetDateTime startTime() {
+ public OffsetDateTime getStartTime() {
return this.startTime;
}
@@ -219,7 +219,7 @@ public OffsetDateTime startTime() {
* @param startTime the time (exclusive) to start looking for changes after.
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions startTime(OffsetDateTime startTime) {
+ public ChangeFeedProcessorOptions setStartTime(OffsetDateTime startTime) {
this.startTime = startTime;
return this;
}
@@ -235,7 +235,7 @@ public ChangeFeedProcessorOptions startTime(OffsetDateTime startTime) {
*
* @return a value indicating whether change feed in the Azure Cosmos DB service should start from.
*/
- public boolean startFromBeginning() {
+ public boolean getStartFromBeginning() {
return this.startFromBeginning;
}
@@ -250,7 +250,7 @@ public boolean startFromBeginning() {
* @param startFromBeginning Indicates to start from beginning if true
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions startFromBeginning(boolean startFromBeginning) {
+ public ChangeFeedProcessorOptions setStartFromBeginning(boolean startFromBeginning) {
this.startFromBeginning = startFromBeginning;
return this;
}
@@ -263,7 +263,7 @@ public ChangeFeedProcessorOptions startFromBeginning(boolean startFromBeginning)
*
* @return the minimum scale count for the host.
*/
- public int minScaleCount() {
+ public int getMinScaleCount() {
return this.minScaleCount;
}
@@ -276,7 +276,7 @@ public int minScaleCount() {
* @param minScaleCount the minimum partition count for the host.
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions minScaleCount(int minScaleCount) {
+ public ChangeFeedProcessorOptions setMinScaleCount(int minScaleCount) {
this.minScaleCount = minScaleCount;
return this;
}
@@ -289,7 +289,7 @@ public ChangeFeedProcessorOptions minScaleCount(int minScaleCount) {
*
* @return the maximum number of partitions the host can serve.
*/
- public int maxScaleCount() {
+ public int getMaxScaleCount() {
return this.maxScaleCount;
}
@@ -299,7 +299,7 @@ public int maxScaleCount() {
* @param maxScaleCount the maximum number of partitions the host can serve.
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions maxScaleCount(int maxScaleCount) {
+ public ChangeFeedProcessorOptions setMaxScaleCount(int maxScaleCount) {
this.maxScaleCount = maxScaleCount;
return this;
}
@@ -310,7 +310,7 @@ public ChangeFeedProcessorOptions maxScaleCount(int maxScaleCount) {
*
* @return a value indicating whether on start of the host all existing leases should be deleted and the host should start from scratch.
*/
- public boolean discardExistingLeases() {
+ public boolean getDiscardExistingLeases() {
return this.discardExistingLeases;
}
@@ -321,7 +321,7 @@ public boolean discardExistingLeases() {
* @param discardExistingLeases Indicates whether to discard all existing leases if true
* @return the current ChangeFeedProcessorOptions instance.
*/
- public ChangeFeedProcessorOptions discardExistingLeases(boolean discardExistingLeases) {
+ public ChangeFeedProcessorOptions setDiscardExistingLeases(boolean discardExistingLeases) {
this.discardExistingLeases = discardExistingLeases;
return this;
}
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ClientSideRequestStatistics.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ClientSideRequestStatistics.java
similarity index 100%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ClientSideRequestStatistics.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ClientSideRequestStatistics.java
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CommonsBridgeInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CommonsBridgeInternal.java
similarity index 52%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CommonsBridgeInternal.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CommonsBridgeInternal.java
index ce7273c3cacf..400c157f77cf 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CommonsBridgeInternal.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CommonsBridgeInternal.java
@@ -5,46 +5,46 @@
public class CommonsBridgeInternal {
public static boolean isV2(PartitionKeyDefinition pkd) {
- return pkd.version() != null && PartitionKeyDefinitionVersion.V2.val == pkd.version().val;
+ return pkd.getVersion() != null && PartitionKeyDefinitionVersion.V2.val == pkd.getVersion().val;
}
public static void setV2(PartitionKeyDefinition pkd) {
- pkd.version(PartitionKeyDefinitionVersion.V2);
+ pkd.setVersion(PartitionKeyDefinitionVersion.V2);
}
/**
- * Gets the partitionKeyRangeId.
+ * Gets the getPartitionKeyRangeId.
*
- * @return the partitionKeyRangeId.
+ * @return the getPartitionKeyRangeId.
*/
public static String partitionKeyRangeIdInternal(FeedOptions options) {
- return options.partitionKeyRangeIdInternal();
+ return options.getPartitionKeyRangeIdInternal();
}
/**
- * Gets the partitionKeyRangeId.
+ * Gets the getPartitionKeyRangeId.
*
- * @return the partitionKeyRangeId.
+ * @return the getPartitionKeyRangeId.
*/
public static String partitionKeyRangeIdInternal(ChangeFeedOptions options) {
- return options.partitionKeyRangeId();
+ return options.getPartitionKeyRangeId();
}
/**
- * Sets the partitionKeyRangeId.
+ * Sets the getPartitionKeyRangeId.
*
- * @return the partitionKeyRangeId.
+ * @return the getPartitionKeyRangeId.
*/
public static FeedOptions partitionKeyRangeIdInternal(FeedOptions options, String partitionKeyRangeId) {
- return options.partitionKeyRangeIdInternal(partitionKeyRangeId);
+ return options.setPartitionKeyRangeIdInternal(partitionKeyRangeId);
}
/**
- * Sets the partitionKeyRangeId.
+ * Sets the getPartitionKeyRangeId.
*
- * @return the partitionKeyRangeId.
+ * @return the getPartitionKeyRangeId.
*/
public static ChangeFeedOptions partitionKeyRangeIdInternal(ChangeFeedOptions options, String partitionKeyRangeId) {
- return options.partitionKeyRangeId(partitionKeyRangeId);
+ return options.setPartitionKeyRangeId(partitionKeyRangeId);
}
}
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePath.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePath.java
similarity index 88%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePath.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePath.java
index 3cc94f9fc300..a8b0731e3dc2 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePath.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePath.java
@@ -34,7 +34,7 @@ public CompositePath(String jsonString) {
*
* @return the path.
*/
- public String path() {
+ public String getPath() {
return super.getString(Constants.Properties.PATH);
}
@@ -44,7 +44,7 @@ public String path() {
* @param path the path.
* @return the CompositePath.
*/
- public CompositePath path(String path) {
+ public CompositePath setPath(String path) {
super.set(Constants.Properties.PATH, path);
return this;
}
@@ -57,13 +57,13 @@ public CompositePath path(String path) {
*
* @return the sort order.
*/
- public CompositePathSortOrder order() {
+ public CompositePathSortOrder getOrder() {
String strValue = super.getString(Constants.Properties.ORDER);
if (!StringUtils.isEmpty(strValue)) {
try {
return CompositePathSortOrder.valueOf(StringUtils.upperCase(super.getString(Constants.Properties.ORDER)));
} catch (IllegalArgumentException e) {
- this.getLogger().warn("INVALID indexingMode value {}.", super.getString(Constants.Properties.ORDER));
+ this.getLogger().warn("INVALID getIndexingMode getValue {}.", super.getString(Constants.Properties.ORDER));
return CompositePathSortOrder.ASCENDING;
}
}
@@ -79,7 +79,7 @@ public CompositePathSortOrder order() {
* @param order the sort order.
* @return the CompositePath.
*/
- public CompositePath order(CompositePathSortOrder order) {
+ public CompositePath setOrder(CompositePathSortOrder order) {
super.set(Constants.Properties.ORDER, order.toString());
return this;
}
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePathSortOrder.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePathSortOrder.java
similarity index 100%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePathSortOrder.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CompositePathSortOrder.java
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictException.java
similarity index 100%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictException.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictException.java
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionMode.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionMode.java
similarity index 100%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionMode.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionMode.java
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionPolicy.java
similarity index 88%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionPolicy.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionPolicy.java
index 215acb251077..bfb4894d468e 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionPolicy.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConflictResolutionPolicy.java
@@ -17,10 +17,10 @@
* A collection with custom conflict resolution with no user-registered stored procedure.
* {@code
* DocumentCollection collectionSpec = new DocumentCollection();
- * collectionSpec.id("Multi-master collection");
+ * collectionSpec.getId("Multi-master collection");
*
* ConflictResolutionPolicy policy = ConflictResolutionPolicy.createCustomPolicy();
- * collectionSpec.conflictResolutionPolicy(policy);
+ * collectionSpec.getConflictResolutionPolicy(policy);
*
* DocumentCollection collection = client.createCollection(databaseLink, collectionSpec, null)
* .toBlocking().single().getResource();
@@ -31,10 +31,10 @@
* A collection with custom conflict resolution with a user-registered stored procedure.
* {@code
* DocumentCollection collectionSpec = new DocumentCollection();
- * collectionSpec.id("Multi-master collection");
+ * collectionSpec.getId("Multi-master collection");
*
* ConflictResolutionPolicy policy = ConflictResolutionPolicy.createCustomPolicy(conflictResolutionSprocName);
- * collectionSpec.conflictResolutionPolicy(policy);
+ * collectionSpec.getConflictResolutionPolicy(policy);
*
* DocumentCollection collection = client.createCollection(databaseLink, collectionSpec, null)
* .toBlocking().single().getResource();
@@ -46,10 +46,10 @@
* A collection with custom conflict resolution with a user-registered stored procedure.
* {@code
* DocumentCollection collectionSpec = new DocumentCollection();
- * collectionSpec.id("Multi-master collection");
+ * collectionSpec.getId("Multi-master collection");
*
* ConflictResolutionPolicy policy = ConflictResolutionPolicy.createLastWriterWinsPolicy("/path/for/conflict/resolution");
- * collectionSpec.conflictResolutionPolicy(policy);
+ * collectionSpec.getConflictResolutionPolicy(policy);
*
* DocumentCollection collection = client.createCollection(databaseLink, collectionSpec, null)
* .toBlocking().single().getResource();
@@ -64,12 +64,13 @@ public class ConflictResolutionPolicy extends JsonSerializable {
*
* In case of a conflict occurring on a document, the document with the higher integer value in the default path
* {@link Resource#timestamp()}, i.e., "/_ts" will be used.
+ * {@link Resource#getTimestamp()}, i.e., "/_ts" will be used.
*
* @return ConflictResolutionPolicy.
*/
public static ConflictResolutionPolicy createLastWriterWinsPolicy() {
ConflictResolutionPolicy policy = new ConflictResolutionPolicy();
- policy.mode(ConflictResolutionMode.LAST_WRITER_WINS);
+ policy.setMode(ConflictResolutionMode.LAST_WRITER_WINS);
return policy;
}
@@ -87,9 +88,9 @@ public static ConflictResolutionPolicy createLastWriterWinsPolicy() {
*/
public static ConflictResolutionPolicy createLastWriterWinsPolicy(String conflictResolutionPath) {
ConflictResolutionPolicy policy = new ConflictResolutionPolicy();
- policy.mode(ConflictResolutionMode.LAST_WRITER_WINS);
+ policy.setMode(ConflictResolutionMode.LAST_WRITER_WINS);
if (conflictResolutionPath != null) {
- policy.conflictResolutionPath(conflictResolutionPath);
+ policy.setConflictResolutionPath(conflictResolutionPath);
}
return policy;
}
@@ -110,9 +111,9 @@ public static ConflictResolutionPolicy createLastWriterWinsPolicy(String conflic
*/
public static ConflictResolutionPolicy createCustomPolicy(String conflictResolutionSprocName) {
ConflictResolutionPolicy policy = new ConflictResolutionPolicy();
- policy.mode(ConflictResolutionMode.CUSTOM);
+ policy.setMode(ConflictResolutionMode.CUSTOM);
if (conflictResolutionSprocName != null) {
- policy.conflictResolutionProcedure(conflictResolutionSprocName);
+ policy.setConflictResolutionProcedure(conflictResolutionSprocName);
}
return policy;
}
@@ -127,7 +128,7 @@ public static ConflictResolutionPolicy createCustomPolicy(String conflictResolut
*/
public static ConflictResolutionPolicy createCustomPolicy() {
ConflictResolutionPolicy policy = new ConflictResolutionPolicy();
- policy.mode(ConflictResolutionMode.CUSTOM);
+ policy.setMode(ConflictResolutionMode.CUSTOM);
return policy;
}
@@ -146,7 +147,7 @@ public ConflictResolutionPolicy(String jsonString) {
*
* @return ConflictResolutionMode.
*/
- public ConflictResolutionMode mode() {
+ public ConflictResolutionMode getMode() {
String strValue = super.getString(Constants.Properties.MODE);
@@ -154,7 +155,7 @@ public ConflictResolutionMode mode() {
try {
return ConflictResolutionMode.valueOf(Strings.fromCamelCaseToUpperCase(super.getString(Constants.Properties.MODE)));
} catch (IllegalArgumentException e) {
- this.getLogger().warn("INVALID ConflictResolutionMode value {}.", super.getString(Constants.Properties.MODE));
+ this.getLogger().warn("INVALID ConflictResolutionMode getValue {}.", super.getString(Constants.Properties.MODE));
return ConflictResolutionMode.INVALID;
}
}
@@ -168,7 +169,7 @@ public ConflictResolutionMode mode() {
*
* @param mode One of the values of the {@link ConflictResolutionMode} enum.
*/
- ConflictResolutionPolicy mode(ConflictResolutionMode mode) {
+ ConflictResolutionPolicy setMode(ConflictResolutionMode mode) {
super.set(Constants.Properties.MODE, mode.toString());
return this;
}
@@ -184,7 +185,7 @@ ConflictResolutionPolicy mode(ConflictResolutionMode mode) {
* @return The path to check values for last-writer wins conflict resolution.
* That path is a rooted path of the property in the document, such as "/name/first".
*/
- public String conflictResolutionPath() {
+ public String getConflictResolutionPath() {
return super.getString(Constants.Properties.CONFLICT_RESOLUTION_PATH);
}
@@ -199,7 +200,7 @@ public String conflictResolutionPath() {
* @param value The path to check values for last-writer wins conflict resolution.
* That path is a rooted path of the property in the document, such as "/name/first".
*/
- ConflictResolutionPolicy conflictResolutionPath(String value) {
+ ConflictResolutionPolicy setConflictResolutionPath(String value) {
super.set(Constants.Properties.CONFLICT_RESOLUTION_PATH, value);
return this;
}
@@ -217,11 +218,11 @@ ConflictResolutionPolicy conflictResolutionPath(String value) {
**
* @return the stored procedure to perform conflict resolution.]
*/
- public String conflictResolutionProcedure() {
+ public String getConflictResolutionProcedure() {
return super.getString(Constants.Properties.CONFLICT_RESOLUTION_PROCEDURE);
}
- ConflictResolutionPolicy conflictResolutionProcedure(String value) {
+ ConflictResolutionPolicy setConflictResolutionProcedure(String value) {
super.set(Constants.Properties.CONFLICT_RESOLUTION_PROCEDURE, value);
return this;
}
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionMode.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionMode.java
similarity index 100%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionMode.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionMode.java
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionPolicy.java
similarity index 88%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionPolicy.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionPolicy.java
index 328a3453d1b6..e33cc2df291e 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionPolicy.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConnectionPolicy.java
@@ -53,7 +53,7 @@ public ConnectionPolicy() {
*
* @return the default connection policy.
*/
- public static ConnectionPolicy defaultPolicy() {
+ public static ConnectionPolicy getDefaultPolicy() {
if (ConnectionPolicy.default_policy == null) {
ConnectionPolicy.default_policy = new ConnectionPolicy();
}
@@ -66,7 +66,7 @@ public static ConnectionPolicy defaultPolicy() {
*
* @return the request timeout in milliseconds.
*/
- public int requestTimeoutInMillis() {
+ public int getRequestTimeoutInMillis() {
return this.requestTimeoutInMillis;
}
@@ -77,7 +77,7 @@ public int requestTimeoutInMillis() {
* @param requestTimeoutInMillis the request timeout in milliseconds.
* @return the ConnectionPolicy.
*/
- public ConnectionPolicy requestTimeoutInMillis(int requestTimeoutInMillis) {
+ public ConnectionPolicy setRequestTimeoutInMillis(int requestTimeoutInMillis) {
this.requestTimeoutInMillis = requestTimeoutInMillis;
return this;
}
@@ -87,7 +87,7 @@ public ConnectionPolicy requestTimeoutInMillis(int requestTimeoutInMillis) {
*
* @return the connection mode.
*/
- public ConnectionMode connectionMode() {
+ public ConnectionMode getConnectionMode() {
return this.connectionMode;
}
@@ -97,7 +97,7 @@ public ConnectionMode connectionMode() {
* @param connectionMode the connection mode.
* @return the ConnectionPolicy.
*/
- public ConnectionPolicy connectionMode(ConnectionMode connectionMode) {
+ public ConnectionPolicy setConnectionMode(ConnectionMode connectionMode) {
this.connectionMode = connectionMode;
return this;
}
@@ -107,7 +107,7 @@ public ConnectionPolicy connectionMode(ConnectionMode connectionMode) {
*
* @return connection pool size.
*/
- public int maxPoolSize() {
+ public int getMaxPoolSize() {
return this.maxPoolSize;
}
@@ -118,7 +118,7 @@ public int maxPoolSize() {
* @param maxPoolSize The value of the connection pool size.
* @return the ConnectionPolicy.
*/
- public ConnectionPolicy maxPoolSize(int maxPoolSize) {
+ public ConnectionPolicy setMaxPoolSize(int maxPoolSize) {
this.maxPoolSize = maxPoolSize;
return this;
}
@@ -129,7 +129,7 @@ public ConnectionPolicy maxPoolSize(int maxPoolSize) {
*
* @return Idle connection timeout.
*/
- public int idleConnectionTimeoutInMillis() {
+ public int getIdleConnectionTimeoutInMillis() {
return this.idleConnectionTimeoutInMillis;
}
@@ -140,7 +140,7 @@ public int idleConnectionTimeoutInMillis() {
* @param idleConnectionTimeoutInMillis the timeout for an idle connection in seconds.
* @return the ConnectionPolicy.
*/
- public ConnectionPolicy idleConnectionTimeoutInMillis(int idleConnectionTimeoutInMillis) {
+ public ConnectionPolicy setIdleConnectionTimeoutInMillis(int idleConnectionTimeoutInMillis) {
this.idleConnectionTimeoutInMillis = idleConnectionTimeoutInMillis;
return this;
}
@@ -150,7 +150,7 @@ public ConnectionPolicy idleConnectionTimeoutInMillis(int idleConnectionTimeoutI
*
* @return the value of user-agent suffix.
*/
- public String userAgentSuffix() {
+ public String getUserAgentSuffix() {
return this.userAgentSuffix;
}
@@ -161,7 +161,7 @@ public String userAgentSuffix() {
* used for monitoring purposes.
* @return the ConnectionPolicy.
*/
- public ConnectionPolicy userAgentSuffix(String userAgentSuffix) {
+ public ConnectionPolicy setUserAgentSuffix(String userAgentSuffix) {
this.userAgentSuffix = userAgentSuffix;
return this;
}
@@ -171,7 +171,7 @@ public ConnectionPolicy userAgentSuffix(String userAgentSuffix) {
*
* @return the RetryOptions instance.
*/
- public RetryOptions retryOptions() {
+ public RetryOptions getRetryOptions() {
return this.retryOptions;
}
@@ -186,7 +186,7 @@ public RetryOptions retryOptions() {
* @param retryOptions the RetryOptions instance.
* @return the ConnectionPolicy.
*/
- public ConnectionPolicy retryOptions(RetryOptions retryOptions) {
+ public ConnectionPolicy setRetryOptions(RetryOptions retryOptions) {
if (retryOptions == null) {
throw new IllegalArgumentException("retryOptions value must not be null.");
}
@@ -200,7 +200,7 @@ public ConnectionPolicy retryOptions(RetryOptions retryOptions) {
*
* @return whether endpoint discovery is enabled.
*/
- public boolean enableEndpointDiscovery() {
+ public boolean getEnableEndpointDiscovery() {
return this.enableEndpointDiscovery;
}
@@ -216,7 +216,7 @@ public boolean enableEndpointDiscovery() {
* @param enableEndpointDiscovery true if EndpointDiscovery is enabled.
* @return the ConnectionPolicy.
*/
- public ConnectionPolicy enableEndpointDiscovery(boolean enableEndpointDiscovery) {
+ public ConnectionPolicy setEnableEndpointDiscovery(boolean enableEndpointDiscovery) {
this.enableEndpointDiscovery = enableEndpointDiscovery;
return this;
}
@@ -235,7 +235,7 @@ public ConnectionPolicy enableEndpointDiscovery(boolean enableEndpointDiscovery)
*
* @return flag to enable writes on any locations (regions) for geo-replicated database accounts.
*/
- public boolean usingMultipleWriteLocations() {
+ public boolean getUsingMultipleWriteLocations() {
return this.usingMultipleWriteLocations;
}
@@ -251,7 +251,7 @@ public boolean usingMultipleWriteLocations() {
*
* @return flag to allow for reads to go to multiple regions configured on an account of Azure Cosmos DB service.
*/
- public Boolean enableReadRequestsFallback() {
+ public Boolean getEnableReadRequestsFallback() {
return this.enableReadRequestsFallback;
}
@@ -270,7 +270,7 @@ public Boolean enableReadRequestsFallback() {
* @param usingMultipleWriteLocations flag to enable writes on any locations (regions) for geo-replicated database accounts.
* @return the ConnectionPolicy.
*/
- public ConnectionPolicy usingMultipleWriteLocations(boolean usingMultipleWriteLocations) {
+ public ConnectionPolicy setUsingMultipleWriteLocations(boolean usingMultipleWriteLocations) {
this.usingMultipleWriteLocations = usingMultipleWriteLocations;
return this;
}
@@ -288,7 +288,7 @@ public ConnectionPolicy usingMultipleWriteLocations(boolean usingMultipleWriteLo
* @param enableReadRequestsFallback flag to enable reads to go to multiple regions configured on an account of Azure Cosmos DB service.
* @return the ConnectionPolicy.
*/
- public ConnectionPolicy enableReadRequestsFallback(Boolean enableReadRequestsFallback) {
+ public ConnectionPolicy setEnableReadRequestsFallback(Boolean enableReadRequestsFallback) {
this.enableReadRequestsFallback = enableReadRequestsFallback;
return this;
}
@@ -298,7 +298,7 @@ public ConnectionPolicy enableReadRequestsFallback(Boolean enableReadRequestsFal
*
* @return the list of preferred location.
*/
- public List preferredLocations() {
+ public List getPreferredLocations() {
return this.preferredLocations != null ? preferredLocations : Collections.emptyList();
}
@@ -315,7 +315,7 @@ public List preferredLocations() {
* @param preferredLocations the list of preferred locations.
* @return the ConnectionPolicy.
*/
- public ConnectionPolicy preferredLocations(List preferredLocations) {
+ public ConnectionPolicy setPreferredLocations(List preferredLocations) {
this.preferredLocations = preferredLocations;
return this;
}
@@ -325,7 +325,7 @@ public ConnectionPolicy preferredLocations(List preferredLocations) {
*
* @return the value of proxyHost.
*/
- public InetSocketAddress proxy() {
+ public InetSocketAddress getProxy() {
return this.inetSocketProxyAddress;
}
@@ -336,7 +336,7 @@ public InetSocketAddress proxy() {
* @param proxyPort The proxy server port.
* @return the ConnectionPolicy.
*/
- public ConnectionPolicy proxy(String proxyHost, int proxyPort) {
+ public ConnectionPolicy setProxy(String proxyHost, int proxyPort) {
this.inetSocketProxyAddress = new InetSocketAddress(proxyHost, proxyPort);
return this;
}
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyLevel.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyLevel.java
similarity index 100%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyLevel.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyLevel.java
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyPolicy.java
similarity index 89%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyPolicy.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyPolicy.java
index 17f12bf13097..1fa944c8e8df 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyPolicy.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/ConsistencyPolicy.java
@@ -38,7 +38,7 @@ public ConsistencyPolicy() {
*
* @return the default consistency level.
*/
- public ConsistencyLevel defaultConsistencyLevel() {
+ public ConsistencyLevel getDefaultConsistencyLevel() {
ConsistencyLevel result = ConsistencyPolicy.DEFAULT_DEFAULT_CONSISTENCY_LEVEL;
try {
@@ -57,7 +57,7 @@ public ConsistencyLevel defaultConsistencyLevel() {
* @param level the consistency level.
* @return the ConsistenctPolicy.
*/
- public ConsistencyPolicy defaultConsistencyLevel(ConsistencyLevel level) {
+ public ConsistencyPolicy setDefaultConsistencyLevel(ConsistencyLevel level) {
super.set(Constants.Properties.DEFAULT_CONSISTENCY_LEVEL, level.toString());
return this;
}
@@ -68,7 +68,7 @@ public ConsistencyPolicy defaultConsistencyLevel(ConsistencyLevel level) {
*
* @return the max staleness prefix.
*/
- public int maxStalenessPrefix() {
+ public int getMaxStalenessPrefix() {
Integer value = super.getInt(Constants.Properties.MAX_STALENESS_PREFIX);
if (value == null) {
return ConsistencyPolicy.DEFAULT_MAX_STALENESS_PREFIX;
@@ -83,7 +83,7 @@ public int maxStalenessPrefix() {
* @param maxStalenessPrefix the max staleness prefix.
* @return the ConsistenctPolicy.
*/
- public ConsistencyPolicy maxStalenessPrefix(int maxStalenessPrefix) {
+ public ConsistencyPolicy setMaxStalenessPrefix(int maxStalenessPrefix) {
super.set(Constants.Properties.MAX_STALENESS_PREFIX, maxStalenessPrefix);
return this;
}
@@ -93,7 +93,7 @@ public ConsistencyPolicy maxStalenessPrefix(int maxStalenessPrefix) {
*
* @return the max staleness prefix.
*/
- public int maxStalenessIntervalInSeconds() {
+ public int getMaxStalenessIntervalInSeconds() {
Integer value = super.getInt(Constants.Properties.MAX_STALENESS_INTERVAL_IN_SECONDS);
if (value == null) {
return ConsistencyPolicy.DEFAULT_MAX_STALENESS_INTERVAL;
@@ -107,7 +107,7 @@ public int maxStalenessIntervalInSeconds() {
* @param maxStalenessIntervalInSeconds the max staleness interval in seconds.
* @return the ConsistenctPolicy.
*/
- public ConsistencyPolicy maxStalenessIntervalInSeconds(int maxStalenessIntervalInSeconds) {
+ public ConsistencyPolicy setMaxStalenessIntervalInSeconds(int maxStalenessIntervalInSeconds) {
super.set(Constants.Properties.MAX_STALENESS_INTERVAL_IN_SECONDS, maxStalenessIntervalInSeconds);
return this;
}
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncClient.java
similarity index 80%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClient.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncClient.java
index 2740ead28186..fbf7859a64a6 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosClient.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncClient.java
@@ -2,6 +2,7 @@
// Licensed under the MIT License.
package com.azure.data.cosmos;
+import com.azure.core.implementation.annotation.ServiceClient;
import com.azure.data.cosmos.internal.AsyncDocumentClient;
import com.azure.data.cosmos.internal.Configs;
import com.azure.data.cosmos.internal.Database;
@@ -19,7 +20,10 @@
* This asynchronous client is used to configure and execute requests
* against the service.
*/
-public class CosmosClient implements AutoCloseable {
+@ServiceClient(
+ builder=CosmosClientBuilder.class,
+ isAsync = true)
+public class CosmosAsyncClient implements AutoCloseable {
// Async document client wrapper
private final Configs configs;
@@ -33,15 +37,15 @@ public class CosmosClient implements AutoCloseable {
private final CosmosKeyCredential cosmosKeyCredential;
- CosmosClient(CosmosClientBuilder builder) {
+ CosmosAsyncClient(CosmosClientBuilder builder) {
this.configs = builder.configs();
- this.serviceEndpoint = builder.endpoint();
- this.keyOrResourceToken = builder.key();
- this.connectionPolicy = builder.connectionPolicy();
- this.desiredConsistencyLevel = builder.consistencyLevel();
- this.permissions = builder.permissions();
- this.tokenResolver = builder.tokenResolver();
- this.cosmosKeyCredential = builder.cosmosKeyCredential();
+ this.serviceEndpoint = builder.getEndpoint();
+ this.keyOrResourceToken = builder.getKey();
+ this.connectionPolicy = builder.getConnectionPolicy();
+ this.desiredConsistencyLevel = builder.getConsistencyLevel();
+ this.permissions = builder.getPermissions();
+ this.tokenResolver = builder.getTokenResolver();
+ this.cosmosKeyCredential = builder.getCosmosKeyCredential();
this.asyncDocumentClient = new AsyncDocumentClient.Builder()
.withServiceEndpoint(this.serviceEndpoint)
.withMasterKeyOrResourceToken(this.keyOrResourceToken)
@@ -58,7 +62,7 @@ AsyncDocumentClient getContextClient() {
}
/**
- * Instantiate the cosmos client builder to build cosmos client
+ * Instantiate the cosmos client builder to buildAsyncClient cosmos client
* @return {@link CosmosClientBuilder}
*/
public static CosmosClientBuilder builder(){
@@ -69,7 +73,7 @@ public static CosmosClientBuilder builder(){
* Monitor Cosmos client performance and resource utilization using the specified meter registry
* @param registry meter registry to use for performance monitoring
*/
- static void monitorTelemetry(MeterRegistry registry) {
+ static void setMonitorTelemetry(MeterRegistry registry) {
RntbdMetrics.add(registry);
}
@@ -150,8 +154,8 @@ CosmosKeyCredential cosmosKeyCredential() {
* @return a {@link Mono} containing the cosmos database response with the created or existing database or
* an error.
*/
- public Mono createDatabaseIfNotExists(CosmosDatabaseProperties databaseSettings) {
- return createDatabaseIfNotExistsInternal(getDatabase(databaseSettings.id()));
+ public Mono createDatabaseIfNotExists(CosmosDatabaseProperties databaseSettings) {
+ return createDatabaseIfNotExistsInternal(getDatabase(databaseSettings.getId()));
}
/**
@@ -162,16 +166,16 @@ public Mono createDatabaseIfNotExists(CosmosDatabaseProp
* @return a {@link Mono} containing the cosmos database response with the created or existing database or
* an error
*/
- public Mono createDatabaseIfNotExists(String id) {
+ public Mono createDatabaseIfNotExists(String id) {
return createDatabaseIfNotExistsInternal(getDatabase(id));
}
- private Mono createDatabaseIfNotExistsInternal(CosmosDatabase database){
+ private Mono createDatabaseIfNotExistsInternal(CosmosAsyncDatabase database){
return database.read().onErrorResume(exception -> {
if (exception instanceof CosmosClientException) {
CosmosClientException cosmosClientException = (CosmosClientException) exception;
- if (cosmosClientException.statusCode() == HttpConstants.StatusCodes.NOTFOUND) {
- return createDatabase(new CosmosDatabaseProperties(database.id()), new CosmosDatabaseRequestOptions());
+ if (cosmosClientException.getStatusCode() == HttpConstants.StatusCodes.NOTFOUND) {
+ return createDatabase(new CosmosDatabaseProperties(database.getId()), new CosmosDatabaseRequestOptions());
}
}
return Mono.error(exception);
@@ -190,15 +194,15 @@ private Mono createDatabaseIfNotExistsInternal(CosmosDat
* @param options {@link CosmosDatabaseRequestOptions}
* @return an {@link Mono} containing the single cosmos database response with the created database or an error.
*/
- public Mono createDatabase(CosmosDatabaseProperties databaseSettings,
- CosmosDatabaseRequestOptions options) {
+ public Mono createDatabase(CosmosDatabaseProperties databaseSettings,
+ CosmosDatabaseRequestOptions options) {
if (options == null) {
options = new CosmosDatabaseRequestOptions();
}
Database wrappedDatabase = new Database();
- wrappedDatabase.id(databaseSettings.id());
+ wrappedDatabase.setId(databaseSettings.getId());
return asyncDocumentClient.createDatabase(wrappedDatabase, options.toRequestOptions()).map(databaseResourceResponse ->
- new CosmosDatabaseResponse(databaseResourceResponse, this)).single();
+ new CosmosAsyncDatabaseResponse(databaseResourceResponse, this)).single();
}
/**
@@ -212,7 +216,7 @@ public Mono createDatabase(CosmosDatabaseProperties data
* @param databaseSettings {@link CosmosDatabaseProperties}
* @return an {@link Mono} containing the single cosmos database response with the created database or an error.
*/
- public Mono createDatabase(CosmosDatabaseProperties databaseSettings) {
+ public Mono createDatabase(CosmosDatabaseProperties databaseSettings) {
return createDatabase(databaseSettings, new CosmosDatabaseRequestOptions());
}
@@ -227,7 +231,7 @@ public Mono createDatabase(CosmosDatabaseProperties data
* @param id id of the database
* @return a {@link Mono} containing the single cosmos database response with the created database or an error.
*/
- public Mono createDatabase(String id) {
+ public Mono createDatabase(String id) {
return createDatabase(new CosmosDatabaseProperties(id), new CosmosDatabaseRequestOptions());
}
@@ -244,17 +248,17 @@ public Mono createDatabase(String id) {
* @param options {@link CosmosDatabaseRequestOptions}
* @return an {@link Mono} containing the single cosmos database response with the created database or an error.
*/
- public Mono createDatabase(CosmosDatabaseProperties databaseSettings,
- int throughput,
- CosmosDatabaseRequestOptions options) {
+ public Mono createDatabase(CosmosDatabaseProperties databaseSettings,
+ int throughput,
+ CosmosDatabaseRequestOptions options) {
if (options == null) {
options = new CosmosDatabaseRequestOptions();
}
- options.offerThroughput(throughput);
+ options.setOfferThroughput(throughput);
Database wrappedDatabase = new Database();
- wrappedDatabase.id(databaseSettings.id());
+ wrappedDatabase.setId(databaseSettings.getId());
return asyncDocumentClient.createDatabase(wrappedDatabase, options.toRequestOptions()).map(databaseResourceResponse ->
- new CosmosDatabaseResponse(databaseResourceResponse, this)).single();
+ new CosmosAsyncDatabaseResponse(databaseResourceResponse, this)).single();
}
/**
@@ -269,9 +273,9 @@ public Mono createDatabase(CosmosDatabaseProperties data
* @param throughput the throughput for the database
* @return an {@link Mono} containing the single cosmos database response with the created database or an error.
*/
- public Mono createDatabase(CosmosDatabaseProperties databaseSettings, int throughput) {
+ public Mono createDatabase(CosmosDatabaseProperties databaseSettings, int throughput) {
CosmosDatabaseRequestOptions options = new CosmosDatabaseRequestOptions();
- options.offerThroughput(throughput);
+ options.setOfferThroughput(throughput);
return createDatabase(databaseSettings, options);
}
@@ -287,9 +291,9 @@ public Mono createDatabase(CosmosDatabaseProperties data
* @param throughput the throughput for the database
* @return a {@link Mono} containing the single cosmos database response with the created database or an error.
*/
- public Mono createDatabase(String id, int throughput) {
+ public Mono createDatabase(String id, int throughput) {
CosmosDatabaseRequestOptions options = new CosmosDatabaseRequestOptions();
- options.offerThroughput(throughput);
+ options.setOfferThroughput(throughput);
return createDatabase(new CosmosDatabaseProperties(id), options);
}
@@ -305,8 +309,8 @@ public Mono createDatabase(String id, int throughput) {
*/
public Flux> readAllDatabases(FeedOptions options) {
return getDocClientWrapper().readDatabases(options)
- .map(response-> BridgeInternal.createFeedResponse(CosmosDatabaseProperties.getFromV2Results(response.results()),
- response.responseHeaders()));
+ .map(response-> BridgeInternal.createFeedResponse(CosmosDatabaseProperties.getFromV2Results(response.getResults()),
+ response.getResponseHeaders()));
}
/**
@@ -352,8 +356,8 @@ public Flux> queryDatabases(String query,
public Flux> queryDatabases(SqlQuerySpec querySpec, FeedOptions options){
return getDocClientWrapper().queryDatabases(querySpec, options)
.map(response-> BridgeInternal.createFeedResponse(
- CosmosDatabaseProperties.getFromV2Results(response.results()),
- response.responseHeaders()));
+ CosmosDatabaseProperties.getFromV2Results(response.getResults()),
+ response.getResponseHeaders()));
}
public Mono readDatabaseAccount() {
@@ -364,14 +368,14 @@ public Mono readDatabaseAccount() {
* Gets a database object without making a service call.
*
* @param id name of the database
- * @return {@link CosmosDatabase}
+ * @return {@link CosmosAsyncDatabase}
*/
- public CosmosDatabase getDatabase(String id) {
- return new CosmosDatabase(id, this);
+ public CosmosAsyncDatabase getDatabase(String id) {
+ return new CosmosAsyncDatabase(id, this);
}
/**
- * Close this {@link CosmosClient} instance and cleans up the resources.
+ * Close this {@link CosmosAsyncClient} instance and cleans up the resources.
*/
@Override
public void close() {
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosConflict.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncConflict.java
similarity index 73%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosConflict.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncConflict.java
index 4531cf4e3480..fde73bbc78b7 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosConflict.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncConflict.java
@@ -10,9 +10,9 @@
/**
* Read and delete conflicts
*/
-public class CosmosConflict {
+public class CosmosAsyncConflict {
- private CosmosContainer container;
+ private CosmosAsyncContainer container;
private String id;
/**
@@ -21,27 +21,27 @@ public class CosmosConflict {
* @param id the conflict id
* @param container the container
*/
- CosmosConflict(String id, CosmosContainer container) {
+ CosmosAsyncConflict(String id, CosmosAsyncContainer container) {
this.id = id;
this.container = container;
}
/**
- * Get the id of the {@link CosmosConflict}
+ * Get the id of the {@link CosmosAsyncConflict}
*
- * @return the id of the {@link CosmosConflict}
+ * @return the id of the {@link CosmosAsyncConflict}
*/
- public String id() {
+ public String getId() {
return id;
}
/**
- * Set the id of the {@link CosmosConflict}
+ * Set the id of the {@link CosmosAsyncConflict}
*
- * @param id the id of the {@link CosmosConflict}
- * @return the same {@link CosmosConflict} that had the id set
+ * @param id the id of the {@link CosmosAsyncConflict}
+ * @return the same {@link CosmosAsyncConflict} that had the id set
*/
- CosmosConflict id(String id) {
+ CosmosAsyncConflict setId(String id) {
this.id = id;
return this;
}
@@ -57,13 +57,13 @@ CosmosConflict id(String id) {
* @return a {@link Mono} containing the single resource response with the read
* conflict or an error.
*/
- public Mono read(CosmosConflictRequestOptions options) {
+ public Mono read(CosmosConflictRequestOptions options) {
if (options == null) {
options = new CosmosConflictRequestOptions();
}
RequestOptions requestOptions = options.toRequestOptions();
return this.container.getDatabase().getDocClientWrapper().readConflict(getLink(), requestOptions)
- .map(response -> new CosmosConflictResponse(response, container)).single();
+ .map(response -> new CosmosAsyncConflictResponse(response, container)).single();
}
@@ -78,13 +78,13 @@ public Mono read(CosmosConflictRequestOptions options) {
* @return a {@link Mono} containing one or several feed response pages of the
* read conflicts or an error.
*/
- public Mono delete(CosmosConflictRequestOptions options) {
+ public Mono delete(CosmosConflictRequestOptions options) {
if (options == null) {
options = new CosmosConflictRequestOptions();
}
RequestOptions requestOptions = options.toRequestOptions();
return this.container.getDatabase().getDocClientWrapper().deleteConflict(getLink(), requestOptions)
- .map(response -> new CosmosConflictResponse(response, container)).single();
+ .map(response -> new CosmosAsyncConflictResponse(response, container)).single();
}
String URIPathSegment() {
@@ -101,7 +101,7 @@ String getLink() {
builder.append("/");
builder.append(URIPathSegment());
builder.append("/");
- builder.append(id());
+ builder.append(getId());
return builder.toString();
}
}
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncConflictResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncConflictResponse.java
new file mode 100644
index 000000000000..9beee6b6a2be
--- /dev/null
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncConflictResponse.java
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.data.cosmos;
+
+import com.azure.data.cosmos.internal.Conflict;
+import com.azure.data.cosmos.internal.ResourceResponse;
+
+public class CosmosAsyncConflictResponse extends CosmosResponse {
+ private CosmosAsyncContainer container;
+ private CosmosAsyncConflict conflictClient;
+
+ CosmosAsyncConflictResponse(ResourceResponse response, CosmosAsyncContainer container) {
+ super(response);
+ this.container = container;
+ if(response.getResource() == null){
+ super.setProperties(null);
+ }else{
+ super.setProperties(new CosmosConflictProperties(response.getResource().toJson()));
+ conflictClient = new CosmosAsyncConflict(response.getResource().getId(), container);
+ }
+ }
+
+ CosmosAsyncContainer getContainer() {
+ return container;
+ }
+
+ /**
+ * Get conflict client
+ * @return the cosmos conflict client
+ */
+ public CosmosAsyncConflict getConflict() {
+ return conflictClient;
+ }
+
+ /**
+ * Get conflict properties object representing the resource on the server
+ * @return the conflict properties
+ */
+ public CosmosConflictProperties getProperties() {
+ return this.getProperties();
+ }
+}
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainer.java
similarity index 82%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainer.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainer.java
index a529ec140e10..526aab0a1b98 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainer.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainer.java
@@ -15,33 +15,33 @@
* Provides methods for reading, deleting, and replacing existing Containers.
* Provides methods for interacting with child resources (Items, Scripts, Conflicts)
*/
-public class CosmosContainer {
+public class CosmosAsyncContainer {
- private CosmosDatabase database;
+ private CosmosAsyncDatabase database;
private String id;
- private CosmosScripts scripts;
+ private CosmosAsyncScripts scripts;
- CosmosContainer(String id, CosmosDatabase database) {
+ CosmosAsyncContainer(String id, CosmosAsyncDatabase database) {
this.id = id;
this.database = database;
}
/**
- * Get the id of the {@link CosmosContainer}
+ * Get the id of the {@link CosmosAsyncContainer}
*
- * @return the id of the {@link CosmosContainer}
+ * @return the id of the {@link CosmosAsyncContainer}
*/
- public String id() {
+ public String getId() {
return id;
}
/**
- * Set the id of the {@link CosmosContainer}
+ * Set the id of the {@link CosmosAsyncContainer}
*
- * @param id the id of the {@link CosmosContainer}
- * @return the same {@link CosmosContainer} that had the id set
+ * @param id the id of the {@link CosmosAsyncContainer}
+ * @return the same {@link CosmosAsyncContainer} that had the id set
*/
- CosmosContainer id(String id) {
+ CosmosAsyncContainer setId(String id) {
this.id = id;
return this;
}
@@ -56,7 +56,7 @@ CosmosContainer id(String id) {
* @return an {@link Mono} containing the single cosmos container response with
* the read container or an error.
*/
- public Mono read() {
+ public Mono read() {
return read(new CosmosContainerRequestOptions());
}
@@ -71,12 +71,12 @@ public Mono read() {
* @return an {@link Mono} containing the single cosmos container response with
* the read container or an error.
*/
- public Mono read(CosmosContainerRequestOptions options) {
+ public Mono read(CosmosContainerRequestOptions options) {
if (options == null) {
options = new CosmosContainerRequestOptions();
}
return database.getDocClientWrapper().readCollection(getLink(), options.toRequestOptions())
- .map(response -> new CosmosContainerResponse(response, database)).single();
+ .map(response -> new CosmosAsyncContainerResponse(response, database)).single();
}
/**
@@ -90,12 +90,12 @@ public Mono read(CosmosContainerRequestOptions options)
* @return an {@link Mono} containing the single cosmos container response for
* the deleted database or an error.
*/
- public Mono delete(CosmosContainerRequestOptions options) {
+ public Mono delete(CosmosContainerRequestOptions options) {
if (options == null) {
options = new CosmosContainerRequestOptions();
}
return database.getDocClientWrapper().deleteCollection(getLink(), options.toRequestOptions())
- .map(response -> new CosmosContainerResponse(response, database)).single();
+ .map(response -> new CosmosAsyncContainerResponse(response, database)).single();
}
/**
@@ -108,7 +108,7 @@ public Mono delete(CosmosContainerRequestOptions option
* @return an {@link Mono} containing the single cosmos container response for
* the deleted container or an error.
*/
- public Mono delete() {
+ public Mono delete() {
return delete(new CosmosContainerRequestOptions());
}
@@ -124,7 +124,7 @@ public Mono delete() {
* @return an {@link Mono} containing the single cosmos container response with
* the replaced document container or an error.
*/
- public Mono replace(CosmosContainerProperties containerSettings) {
+ public Mono replace(CosmosContainerProperties containerSettings) {
return replace(containerSettings, null);
}
@@ -141,18 +141,18 @@ public Mono replace(CosmosContainerProperties container
* @return an {@link Mono} containing the single cosmos container response with
* the replaced document container or an error.
*/
- public Mono replace(CosmosContainerProperties containerSettings,
- CosmosContainerRequestOptions options) {
+ public Mono replace(CosmosContainerProperties containerSettings,
+ CosmosContainerRequestOptions options) {
validateResource(containerSettings);
if (options == null) {
options = new CosmosContainerRequestOptions();
}
return database.getDocClientWrapper()
.replaceCollection(containerSettings.getV2Collection(), options.toRequestOptions())
- .map(response -> new CosmosContainerResponse(response, database)).single();
+ .map(response -> new CosmosAsyncContainerResponse(response, database)).single();
}
- /* CosmosItem operations */
+ /* CosmosAsyncItem operations */
/**
* Creates a cosmos item.
@@ -165,7 +165,7 @@ public Mono replace(CosmosContainerProperties container
* @return an {@link Mono} containing the single resource response with the
* created cosmos item or an error.
*/
- public Mono createItem(Object item) {
+ public Mono createItem(Object item) {
return createItem(item, new CosmosItemRequestOptions());
}
@@ -181,14 +181,14 @@ public Mono createItem(Object item) {
* @return an {@link Mono} containing the single resource response with the
* created cosmos item or an error.
*/
- public Mono createItem(Object item, CosmosItemRequestOptions options) {
+ public Mono createItem(Object item, CosmosItemRequestOptions options) {
if (options == null) {
options = new CosmosItemRequestOptions();
}
RequestOptions requestOptions = options.toRequestOptions();
return database.getDocClientWrapper()
.createDocument(getLink(), CosmosItemProperties.fromObject(item), requestOptions, true)
- .map(response -> new CosmosItemResponse(response, requestOptions.getPartitionKey(), this)).single();
+ .map(response -> new CosmosAsyncItemResponse(response, requestOptions.getPartitionKey(), this)).single();
}
/**
@@ -202,7 +202,7 @@ public Mono createItem(Object item, CosmosItemRequestOptions
* @return an {@link Mono} containing the single resource response with the
* upserted document or an error.
*/
- public Mono upsertItem(Object item) {
+ public Mono upsertItem(Object item) {
return upsertItem(item, null);
}
@@ -218,7 +218,7 @@ public Mono upsertItem(Object item) {
* @return an {@link Mono} containing the single resource response with the
* upserted document or an error.
*/
- public Mono upsertItem(Object item, CosmosItemRequestOptions options) {
+ public Mono upsertItem(Object item, CosmosItemRequestOptions options) {
if (options == null) {
options = new CosmosItemRequestOptions();
}
@@ -226,7 +226,7 @@ public Mono upsertItem(Object item, CosmosItemRequestOptions
return this.getDatabase().getDocClientWrapper()
.upsertDocument(this.getLink(), CosmosItemProperties.fromObject(item), options.toRequestOptions(), true)
- .map(response -> new CosmosItemResponse(response, requestOptions.getPartitionKey(), this)).single();
+ .map(response -> new CosmosAsyncItemResponse(response, requestOptions.getPartitionKey(), this)).single();
}
/**
@@ -256,8 +256,8 @@ public Flux> readAllItems() {
*/
public Flux> readAllItems(FeedOptions options) {
return getDatabase().getDocClientWrapper().readDocuments(getLink(), options).map(
- response -> BridgeInternal.createFeedResponse(CosmosItemProperties.getFromV2Results(response.results()),
- response.responseHeaders()));
+ response -> BridgeInternal.createFeedResponse(CosmosItemProperties.getFromV2Results(response.getResults()),
+ response.getResponseHeaders()));
}
/**
@@ -321,7 +321,7 @@ public Flux> queryItems(SqlQuerySpec querySpe
public Flux> queryItems(SqlQuerySpec querySpec, FeedOptions options) {
return getDatabase().getDocClientWrapper().queryDocuments(getLink(), querySpec, options)
.map(response -> BridgeInternal.createFeedResponseWithQueryMetrics(
- CosmosItemProperties.getFromV2Results(response.results()), response.responseHeaders(),
+ CosmosItemProperties.getFromV2Results(response.getResults()), response.getResponseHeaders(),
response.queryMetrics()));
}
@@ -339,23 +339,23 @@ public Flux> queryItems(SqlQuerySpec querySpe
public Flux> queryChangeFeedItems(ChangeFeedOptions changeFeedOptions) {
return getDatabase().getDocClientWrapper().queryDocumentChangeFeed(getLink(), changeFeedOptions)
.map(response -> new FeedResponse(
- CosmosItemProperties.getFromV2Results(response.results()), response.responseHeaders(), false));
+ CosmosItemProperties.getFromV2Results(response.getResults()), response.getResponseHeaders(), false));
}
/**
- * Gets a CosmosItem object without making a service call
+ * Gets a CosmosAsyncItem object without making a service call
*
* @param id id of the item
* @param partitionKey the partition key
* @return a cosmos item
*/
- public CosmosItem getItem(String id, Object partitionKey) {
- return new CosmosItem(id, partitionKey, this);
+ public CosmosAsyncItem getItem(String id, Object partitionKey) {
+ return new CosmosAsyncItem(id, partitionKey, this);
}
- public CosmosScripts getScripts() {
+ public CosmosAsyncScripts getScripts() {
if (this.scripts == null) {
- this.scripts = new CosmosScripts(this);
+ this.scripts = new CosmosAsyncScripts(this);
}
return this.scripts;
}
@@ -370,7 +370,7 @@ public CosmosScripts getScripts() {
public Flux> readAllConflicts(FeedOptions options) {
return database.getDocClientWrapper().readConflicts(getLink(), options)
.map(response -> BridgeInternal.createFeedResponse(
- CosmosConflictProperties.getFromV2Results(response.results()), response.responseHeaders()));
+ CosmosConflictProperties.getFromV2Results(response.getResults()), response.getResponseHeaders()));
}
/**
@@ -395,17 +395,17 @@ public Flux> queryConflicts(String query)
public Flux> queryConflicts(String query, FeedOptions options) {
return database.getDocClientWrapper().queryConflicts(getLink(), query, options)
.map(response -> BridgeInternal.createFeedResponse(
- CosmosConflictProperties.getFromV2Results(response.results()), response.responseHeaders()));
+ CosmosConflictProperties.getFromV2Results(response.getResults()), response.getResponseHeaders()));
}
/**
- * Gets a CosmosConflict object without making a service call
+ * Gets a CosmosAsyncConflict object without making a service call
*
* @param id id of the cosmos conflict
* @return a cosmos conflict
*/
- public CosmosConflict getConflict(String id) {
- return new CosmosConflict(id, this);
+ public CosmosAsyncConflict getConflict(String id) {
+ return new CosmosAsyncConflict(id, this);
}
/**
@@ -416,13 +416,13 @@ public CosmosConflict getConflict(String id) {
public Mono readProvisionedThroughput() {
return this.read().flatMap(cosmosContainerResponse -> database.getDocClientWrapper()
.queryOffers("select * from c where c.offerResourceId = '"
- + cosmosContainerResponse.resourceSettings().resourceId() + "'", new FeedOptions())
+ + cosmosContainerResponse.getProperties().getResourceId() + "'", new FeedOptions())
.single()).flatMap(offerFeedResponse -> {
- if (offerFeedResponse.results().isEmpty()) {
+ if (offerFeedResponse.getResults().isEmpty()) {
return Mono.error(BridgeInternal.createCosmosClientException(HttpConstants.StatusCodes.BADREQUEST,
"No offers found for the resource"));
}
- return database.getDocClientWrapper().readOffer(offerFeedResponse.results().get(0).selfLink())
+ return database.getDocClientWrapper().readOffer(offerFeedResponse.getResults().get(0).getSelfLink())
.single();
}).map(cosmosOfferResponse -> cosmosOfferResponse.getResource().getThroughput());
}
@@ -438,13 +438,13 @@ public Mono readProvisionedThroughput() {
public Mono replaceProvisionedThroughput(int requestUnitsPerSecond) {
return this.read().flatMap(cosmosContainerResponse -> database.getDocClientWrapper()
.queryOffers("select * from c where c.offerResourceId = '"
- + cosmosContainerResponse.resourceSettings().resourceId() + "'", new FeedOptions())
+ + cosmosContainerResponse.getProperties().getResourceId() + "'", new FeedOptions())
.single()).flatMap(offerFeedResponse -> {
- if (offerFeedResponse.results().isEmpty()) {
+ if (offerFeedResponse.getResults().isEmpty()) {
return Mono.error(BridgeInternal.createCosmosClientException(HttpConstants.StatusCodes.BADREQUEST,
"No offers found for the resource"));
}
- Offer offer = offerFeedResponse.results().get(0);
+ Offer offer = offerFeedResponse.getResults().get(0);
offer.setThroughput(requestUnitsPerSecond);
return database.getDocClientWrapper().replaceOffer(offer).single();
}).map(offerResourceResponse -> offerResourceResponse.getResource().getThroughput());
@@ -453,9 +453,9 @@ public Mono replaceProvisionedThroughput(int requestUnitsPerSecond) {
/**
* Gets the parent Database
*
- * @return the {@link CosmosDatabase}
+ * @return the {@link CosmosAsyncDatabase}
*/
- public CosmosDatabase getDatabase() {
+ public CosmosAsyncDatabase getDatabase() {
return database;
}
@@ -473,7 +473,7 @@ String getLink() {
builder.append("/");
builder.append(URIPathSegment());
builder.append("/");
- builder.append(id());
+ builder.append(getId());
return builder.toString();
}
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainerResponse.java
similarity index 59%
rename from sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerResponse.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainerResponse.java
index 4078532bb288..a95620d54435 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosContainerResponse.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/data/cosmos/CosmosAsyncContainerResponse.java
@@ -5,17 +5,17 @@
import com.azure.data.cosmos.internal.DocumentCollection;
import com.azure.data.cosmos.internal.ResourceResponse;
-public class CosmosContainerResponse extends CosmosResponse {
+public class CosmosAsyncContainerResponse extends CosmosResponse {
- private CosmosContainer container;
+ private CosmosAsyncContainer container;
- CosmosContainerResponse(ResourceResponse response, CosmosDatabase database) {
+ CosmosAsyncContainerResponse(ResourceResponse response, CosmosAsyncDatabase database) {
super(response);
if(response.getResource() == null){
- super.resourceSettings(null);
+ super.setProperties(null);
}else{
- super.resourceSettings(new CosmosContainerProperties(response));
- container = new CosmosContainer(resourceSettings().id(), database);
+ super.setProperties(new CosmosContainerProperties(response));
+ container = new CosmosAsyncContainer(this.getProperties().getId(), database);
}
}
@@ -24,7 +24,7 @@ public class CosmosContainerResponse extends CosmosResponse read() {
+ public Mono read() {
return read(new CosmosDatabaseRequestOptions());
}
@@ -69,12 +69,12 @@ public Mono read() {
* @return an {@link Mono} containing the single cosmos database response with
* the read database or an error.
*/
- public Mono read(CosmosDatabaseRequestOptions options) {
+ public Mono read(CosmosDatabaseRequestOptions options) {
if (options == null) {
options = new CosmosDatabaseRequestOptions();
}
return getDocClientWrapper().readDatabase(getLink(), options.toRequestOptions())
- .map(response -> new CosmosDatabaseResponse(response, getClient())).single();
+ .map(response -> new CosmosAsyncDatabaseResponse(response, getClient())).single();
}
/**
@@ -86,7 +86,7 @@ public Mono read(CosmosDatabaseRequestOptions options) {
*
* @return an {@link Mono} containing the single cosmos database response
*/
- public Mono delete() {
+ public Mono delete() {
return delete(new CosmosDatabaseRequestOptions());
}
@@ -100,15 +100,15 @@ public Mono delete() {
* @param options the request options
* @return an {@link Mono} containing the single cosmos database response
*/
- public Mono