Changing packages from com.azure.data.cosmos -> com.azure.cosmos

eng/.docsettings.yml

@@ -48,7 +48,7 @@ known_presence_issues:
   - ['sdk/core/azure-core-management', '#2847']
   - ['cosmosdb/data-plane/commons-test-utils', '#2847']
   - ['cosmosdb/data-plane/sdk', '#2847']
-  - ['sdk/cosmos/microsoft-azure-cosmos', '#2847']
+  - ['sdk/cosmos/azure-cosmos', '#2847']
   - ['cosmosdb/data-plane/gateway', '#2847']
   - ['cosmosdb/data-plane/commons', '#2847']
   - ['cosmosdb/data-plane/direct-impl', '#2847']
@@ -73,7 +73,7 @@ known_content_issues:
   - ['cosmosdb/data-plane/faq/README.md', '#3113']
   - ['sdk/cosmos/faq/README.md', '#3113']
   - ['sdk/cosmos/changelog/README.md', '#3113']
-  - ['sdk/cosmos/microsoft-azure-cosmos-benchmark/README.md', '#3113']
+  - ['sdk/cosmos/azure-cosmos-benchmark/README.md', '#3113']
   - ['sdk/cosmos/README.md', '#3113']
   - ['sdk/storage/azure-storage-blob/swagger/README.md', '#3113']
   - ['sdk/storage/azure-storage-queue/swagger/README.md', '#3113']

sdk/cosmos/README.md

@@ -26,7 +26,7 @@
 See the complete code for the above sample in [`HelloWorldDemo.java`](./microsoft-azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/HelloWorldDemo.java)
 
 ```java
-import com.azure.data.cosmos.*;
+import com.azure.cosmos.*;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;

sdk/cosmos/azure-cosmos-benchmark/pom.xml

@@ -8,12 +8,12 @@ Licensed under the MIT License.
   <parent>
     <groupId>com.azure</groupId>
     <artifactId>azure-cosmos-parent</artifactId>
-    <version>4.0.0-preview.4</version>
+    <version>4.0.0-preview.1</version>
   </parent>
 
   <groupId>com.azure</groupId>
   <artifactId>azure-cosmos-benchmark</artifactId>
-  <version>4.0.0-preview.4</version>
+  <version>4.0.0-preview.1</version>
   <name>Microsoft Azure SDK for SQL API of Azure Cosmos DB Service - Benchmarking tool</name>
   <description>This package contains Benchmarking tool for Microsoft Azure SDK for SQL API of Azure Cosmos DB Service</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
@@ -33,7 +33,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.0.0-preview.4</version>
+      <version>4.0.0-preview.1</version>
     </dependency>
 
     <dependency>
@@ -124,7 +124,7 @@ Licensed under the MIT License.
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
         <configuration>
-          <mainClass>com.azure.data.cosmos.benchmark.Main</mainClass>
+          <mainClass>com.azure.cosmos.benchmark.Main</mainClass>
         </configuration>
       </plugin>
 
@@ -137,7 +137,7 @@ Licensed under the MIT License.
           </descriptorRefs>
           <archive>
             <manifest>
-              <mainClass>com.azure.data.cosmos.benchmark.Main</mainClass>
+              <mainClass>com.azure.cosmos.benchmark.Main</mainClass>
             </manifest>
           </archive>
         </configuration>

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncBenchmark.java → sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncBenchmark.java

@@ -1,15 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
-
-import com.azure.data.cosmos.internal.AsyncDocumentClient;
-import com.azure.data.cosmos.BridgeInternal;
-import com.azure.data.cosmos.internal.Database;
-import com.azure.data.cosmos.internal.Document;
-import com.azure.data.cosmos.internal.DocumentCollection;
-import com.azure.data.cosmos.benchmark.Configuration.Operation;
-import com.azure.data.cosmos.internal.ResourceResponse;
+package com.azure.cosmos.benchmark;
+
+import com.azure.cosmos.internal.AsyncDocumentClient;
+import com.azure.cosmos.BridgeInternal;
+import com.azure.cosmos.internal.Database;
+import com.azure.cosmos.internal.Document;
+import com.azure.cosmos.internal.DocumentCollection;
+import com.azure.cosmos.internal.ResourceResponse;
 import com.codahale.metrics.ConsoleReporter;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricFilter;
@@ -74,9 +73,9 @@ abstract class AsyncBenchmark<T> {
 
         ArrayList<Flux<Document>> createDocumentObservables = new ArrayList<>();
 
-        if (configuration.getOperationType() != Operation.WriteLatency
-                && configuration.getOperationType() != Operation.WriteThroughput
-                && configuration.getOperationType() != Operation.ReadMyWrites) {
+        if (configuration.getOperationType() != Configuration.Operation.WriteLatency
+                && configuration.getOperationType() != Configuration.Operation.WriteThroughput
+                && configuration.getOperationType() != Configuration.Operation.ReadMyWrites) {
             String dataFieldValue = RandomStringUtils.randomAlphabetic(cfg.getDocumentDataFieldSize());
             for (int i = 0; i < cfg.getNumberOfPreCreatedDocuments(); i++) {
                 String uuid = UUID.randomUUID().toString();
@@ -182,8 +181,8 @@ void run() throws Exception {
 
         successMeter = metricsRegistry.meter("#Successful Operations");
         failureMeter = metricsRegistry.meter("#Unsuccessful Operations");
-        if (configuration.getOperationType() == Operation.ReadLatency
-                || configuration.getOperationType() == Operation.WriteLatency)
+        if (configuration.getOperationType() == Configuration.Operation.ReadLatency
+                || configuration.getOperationType() == Configuration.Operation.WriteLatency)
             latency = metricsRegistry.timer("Latency");
 
         reporter.start(configuration.getPrintingInterval(), TimeUnit.SECONDS);

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncMixedBenchmark.java → sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncMixedBenchmark.java

@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
-
-import com.azure.data.cosmos.BridgeInternal;
-import com.azure.data.cosmos.internal.Document;
-import com.azure.data.cosmos.FeedOptions;
-import com.azure.data.cosmos.PartitionKey;
-import com.azure.data.cosmos.internal.RequestOptions;
-import com.azure.data.cosmos.internal.ResourceResponse;
+package com.azure.cosmos.benchmark;
+
+import com.azure.cosmos.BridgeInternal;
+import com.azure.cosmos.internal.Document;
+import com.azure.cosmos.FeedOptions;
+import com.azure.cosmos.PartitionKey;
+import com.azure.cosmos.internal.RequestOptions;
+import com.azure.cosmos.internal.ResourceResponse;
 import org.apache.commons.lang3.RandomStringUtils;
 import reactor.core.publisher.BaseSubscriber;
 import reactor.core.publisher.Flux;

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQueryBenchmark.java → sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncQueryBenchmark.java

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
+package com.azure.cosmos.benchmark;
 
-import com.azure.data.cosmos.internal.Document;
-import com.azure.data.cosmos.FeedOptions;
-import com.azure.data.cosmos.FeedResponse;
-import com.azure.data.cosmos.PartitionKey;
+import com.azure.cosmos.internal.Document;
+import com.azure.cosmos.FeedOptions;
+import com.azure.cosmos.FeedResponse;
+import com.azure.cosmos.PartitionKey;
 import reactor.core.publisher.BaseSubscriber;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQuerySinglePartitionMultiple.java → sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncQuerySinglePartitionMultiple.java

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
+package com.azure.cosmos.benchmark;
 
-import com.azure.data.cosmos.internal.Document;
-import com.azure.data.cosmos.FeedOptions;
-import com.azure.data.cosmos.FeedResponse;
-import com.azure.data.cosmos.PartitionKey;
+import com.azure.cosmos.internal.Document;
+import com.azure.cosmos.FeedOptions;
+import com.azure.cosmos.FeedResponse;
+import com.azure.cosmos.PartitionKey;
 import reactor.core.publisher.BaseSubscriber;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncReadBenchmark.java → sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncReadBenchmark.java

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
+package com.azure.cosmos.benchmark;
 
-import com.azure.data.cosmos.internal.Document;
-import com.azure.data.cosmos.PartitionKey;
-import com.azure.data.cosmos.internal.RequestOptions;
-import com.azure.data.cosmos.internal.ResourceResponse;
+import com.azure.cosmos.internal.Document;
+import com.azure.cosmos.PartitionKey;
+import com.azure.cosmos.internal.RequestOptions;
+import com.azure.cosmos.internal.ResourceResponse;
 import com.codahale.metrics.Timer;
 import org.reactivestreams.Subscription;
 import reactor.core.publisher.BaseSubscriber;

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncWriteBenchmark.java → sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncWriteBenchmark.java

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
+package com.azure.cosmos.benchmark;
 
-import com.azure.data.cosmos.BridgeInternal;
-import com.azure.data.cosmos.internal.Document;
-import com.azure.data.cosmos.internal.ResourceResponse;
+import com.azure.cosmos.BridgeInternal;
+import com.azure.cosmos.internal.Document;
+import com.azure.cosmos.internal.ResourceResponse;
 import com.codahale.metrics.Timer;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.reactivestreams.Subscription;

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/Configuration.java → sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Configuration.java

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
+package com.azure.cosmos.benchmark;
 
-import com.azure.data.cosmos.ConnectionMode;
-import com.azure.data.cosmos.ConnectionPolicy;
-import com.azure.data.cosmos.ConsistencyLevel;
-import com.azure.data.cosmos.benchmark.Configuration.Operation.OperationTypeConverter;
+import com.azure.cosmos.ConnectionMode;
+import com.azure.cosmos.ConnectionPolicy;
+import com.azure.cosmos.ConsistencyLevel;
+import com.azure.cosmos.benchmark.Configuration.Operation.OperationTypeConverter;
 import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/DocDBUtils.java → sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/DocDBUtils.java

@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
-
-import com.azure.data.cosmos.internal.AsyncDocumentClient;
-import com.azure.data.cosmos.internal.Database;
-import com.azure.data.cosmos.internal.DocumentCollection;
-import com.azure.data.cosmos.FeedResponse;
-import com.azure.data.cosmos.SqlParameter;
-import com.azure.data.cosmos.SqlParameterList;
-import com.azure.data.cosmos.SqlQuerySpec;
+package com.azure.cosmos.benchmark;
+
+import com.azure.cosmos.internal.AsyncDocumentClient;
+import com.azure.cosmos.internal.Database;
+import com.azure.cosmos.internal.DocumentCollection;
+import com.azure.cosmos.FeedResponse;
+import com.azure.cosmos.SqlParameter;
+import com.azure.cosmos.SqlParameterList;
+import com.azure.cosmos.SqlQuerySpec;
 
 class DocDBUtils {
 

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/Main.java → sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/Main.java

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
+package com.azure.cosmos.benchmark;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.ParameterException;

sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/data/cosmos/benchmark/ReadMyWriteWorkflow.java → sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/ReadMyWriteWorkflow.java

@@ -1,19 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
-
-import com.azure.data.cosmos.BridgeInternal;
-import com.azure.data.cosmos.internal.Document;
-import com.azure.data.cosmos.FeedOptions;
-import com.azure.data.cosmos.NotFoundException;
-import com.azure.data.cosmos.PartitionKey;
-import com.azure.data.cosmos.SqlParameter;
-import com.azure.data.cosmos.SqlParameterList;
-import com.azure.data.cosmos.SqlQuerySpec;
-import com.azure.data.cosmos.internal.RequestOptions;
-import com.azure.data.cosmos.internal.ResourceResponse;
-import com.azure.data.cosmos.internal.Utils;
+package com.azure.cosmos.benchmark;
+
+import com.azure.cosmos.BridgeInternal;
+import com.azure.cosmos.internal.Document;
+import com.azure.cosmos.FeedOptions;
+import com.azure.cosmos.NotFoundException;
+import com.azure.cosmos.PartitionKey;
+import com.azure.cosmos.SqlParameter;
+import com.azure.cosmos.SqlParameterList;
+import com.azure.cosmos.SqlQuerySpec;
+import com.azure.cosmos.internal.RequestOptions;
+import com.azure.cosmos.internal.ResourceResponse;
+import com.azure.cosmos.internal.Utils;
 import org.apache.commons.lang3.RandomUtils;
 import reactor.core.publisher.BaseSubscriber;
 import reactor.core.publisher.Flux;

sdk/cosmos/azure-cosmos-benchmark/src/main/resources/log4j.properties

@@ -3,12 +3,12 @@
 # Set root logger level to DEBUG and its only appender to A1.
 log4j.rootLogger=INFO, A1
 
-log4j.category.com.azure.data.cosmos.internal.directconnectivity.rntbd=WARN
+log4j.category.com.azure.cosmos.internal.directconnectivity.rntbd=WARN
 log4j.category.io.netty=INFO
 log4j.category.io.reactivex=INFO
 # A1 is set to be a ConsoleAppender.
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
 
 # A1 uses PatternLayout.
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d %5X{pid} [%t] %-5p %c - %m%n
+log4j.appender.A1.layout.ConversionPattern=%d %5X{pid} [%t] %-5p %c - %m%n

sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/QueryBuilderTest.java → sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/QueryBuilderTest.java

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
+package com.azure.cosmos.benchmark;
 
-import com.azure.data.cosmos.SqlParameter;
+import com.azure.cosmos.SqlParameter;
 import com.google.common.collect.ImmutableList;
 import org.testng.annotations.Test;
 

sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/ReadMyWritesConsistencyTest.java → sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/ReadMyWritesConsistencyTest.java

@@ -1,19 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
-
-import com.azure.data.cosmos.BridgeInternal;
-import com.azure.data.cosmos.DataType;
-import com.azure.data.cosmos.IncludedPath;
-import com.azure.data.cosmos.Index;
-import com.azure.data.cosmos.IndexingPolicy;
-import com.azure.data.cosmos.PartitionKeyDefinition;
-import com.azure.data.cosmos.internal.AsyncDocumentClient;
-import com.azure.data.cosmos.internal.Database;
-import com.azure.data.cosmos.internal.DocumentCollection;
-import com.azure.data.cosmos.internal.RequestOptions;
-import com.azure.data.cosmos.internal.TestConfigurations;
+package com.azure.cosmos.benchmark;
+
+import com.azure.cosmos.BridgeInternal;
+import com.azure.cosmos.DataType;
+import com.azure.cosmos.IncludedPath;
+import com.azure.cosmos.Index;
+import com.azure.cosmos.IndexingPolicy;
+import com.azure.cosmos.PartitionKeyDefinition;
+import com.azure.cosmos.internal.AsyncDocumentClient;
+import com.azure.cosmos.internal.Database;
+import com.azure.cosmos.internal.DocumentCollection;
+import com.azure.cosmos.internal.RequestOptions;
+import com.azure.cosmos.internal.TestConfigurations;
 import com.beust.jcommander.JCommander;
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Strings;

sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/data/cosmos/benchmark/Utils.java → sdk/cosmos/azure-cosmos-benchmark/src/test/java/com/azure/cosmos/benchmark/Utils.java

@@ -1,18 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.cosmos.benchmark;
-
-import com.azure.data.cosmos.internal.AsyncDocumentClient;
-import com.azure.data.cosmos.ConnectionPolicy;
-import com.azure.data.cosmos.internal.Database;
-import com.azure.data.cosmos.internal.DatabaseForTest;
-import com.azure.data.cosmos.internal.DocumentCollection;
-import com.azure.data.cosmos.FeedResponse;
-import com.azure.data.cosmos.internal.ResourceResponse;
-import com.azure.data.cosmos.RetryOptions;
-import com.azure.data.cosmos.SqlQuerySpec;
-import com.azure.data.cosmos.internal.TestConfigurations;
+package com.azure.cosmos.benchmark;
+
+import com.azure.cosmos.internal.AsyncDocumentClient;
+import com.azure.cosmos.ConnectionPolicy;
+import com.azure.cosmos.internal.Database;
+import com.azure.cosmos.internal.DatabaseForTest;
+import com.azure.cosmos.internal.DocumentCollection;
+import com.azure.cosmos.FeedResponse;
+import com.azure.cosmos.internal.ResourceResponse;
+import com.azure.cosmos.RetryOptions;
+import com.azure.cosmos.SqlQuerySpec;
+import com.azure.cosmos.internal.TestConfigurations;
 import reactor.core.publisher.Flux;
 
 public class Utils {